Merge branch 'master' of mercury.wipsl.com:/var/git/irwi

Conflicts:
	ut/stubs/qnetworkreply.cpp
	ut/stubs/qnetworkreply.h

diff --cc ut/stubs/qnetworkreply.cpp
index 95dd27e,9ea8f5f..b5427da
--- 1/ut/stubs/qnetworkreply.cpp
--- 2/ut/stubs/qnetworkreply.cpp
+++ b/ut/stubs/qnetworkreply.cpp
@@@ -1,7 -1,7 +1,6 @@@
 -#include <QDebug>
  #include "qnetworkreply.h"
  
- QByteArray QNetworkReply::content;
- 
+ QBuffer QNetworkReply::data;
  
  QNetworkReply::QNetworkReply()
  {
@@@ -31,7 -34,6 +33,7 @@@ void QNetworkReply::deleteLater(
  
  QByteArray QNetworkReply::readLine(qint64 maxlen)
  {
-     return QByteArray();
+     return data.readLine(maxlen);
  }
  
 +