Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-earth-staging into master-integration

* 'master' of scm.dev.nokia.troll.no:qt/qt-earth-staging: (198 commits)
  QNetworkCookie: do not access date string out of bounds
  Fix compile error with QT_NO_OPENSSL
  Fix qfile autotest hanging in CI system
  Revert "QNativeWifiEngine: Fix problem with wifi polling on Windows"
  QSslConfiguration: fix equals operator
  HTTP+SSL: use default SSL configuration, and avoid setting it explctly
  QLocale: Fixed double to currency string conversion on Mac.
  QNativeWifiEngine: Fix problem with wifi polling on Windows
  Applying the QTBUG-17986 fix to Symbian
  Added support for libICU for collation and toLower/toUpper.
  Fix regression with Qt::AutoConnection
  Revert "HTTP caching internals: fix logic for PreferNetwork and PreferCache"
  Implement support for sockets started before the event loop
  QUdpSocket autotest updates
  tst_qnetworkreply: skip ioGetFromBuiltinHttp test.
  tst_qtcpserver: Add a mapped v4 addr test
  QHostInfo autotest fixes related to symbian
  QHostInfo symbian backend finalisation
  Add autotests for QHostInfo::abortHostLookup
  Updating comment in QHostInfo::localDomainName
  ...

2 files changed, 6 insertions, 0 deletions

diff --git a/tests/auto/qeventloop/qeventloop.pro b/tests/auto/qeventloop/qeventloop.pro
index f6c24ae..e7489fa 100644
--- a/tests/auto/qeventloop/qeventloop.pro
+++ b/tests/auto/qeventloop/qeventloop.pro
@@ -5,3 +5,4 @@ QT += network
 
 win32:!wince*:LIBS += -luser32
 
+symbian:TARGET.CAPABILITY += NetworkServices
\ No newline at end of file
diff --git a/tests/auto/qeventloop/tst_qeventloop.cpp b/tests/auto/qeventloop/tst_qeventloop.cpp
index 6860f19..fa2a34e 100644
--- a/tests/auto/qeventloop/tst_qeventloop.cpp
+++ b/tests/auto/qeventloop/tst_qeventloop.cpp
@@ -602,8 +602,10 @@ public slots:
         QTcpSocket *serverSocket = server->nextPendingConnection();
         serverSocket->write(data, size);
         serverSocket->flush();
+        QTest::qSleep(200); //allow the TCP/IP stack time to loopback the data, so our socket is ready to read
         QCoreApplication::processEvents(QEventLoop::ExcludeSocketNotifiers);
         testResult = dataArrived;
+        QCoreApplication::processEvents(); //check the deferred event is processed
         serverSocket->close();
         QThread::currentThread()->exit(0);
     }
@@ -620,9 +622,11 @@ public:
         if (tester->init())
             exec();
         testResult = tester->testResult;
+        dataArrived = tester->dataArrived;
         delete tester;
     }
      bool testResult;
+     bool dataArrived;
 };
 
 void tst_QEventLoop::processEventsExcludeSocket()
@@ -631,6 +635,7 @@ void tst_QEventLoop::processEventsExcludeSocket()
     thread.start();
     QVERIFY(thread.wait());
     QVERIFY(!thread.testResult);
+    QVERIFY(thread.dataArrived);
 }
 
 class TimerReceiver : public QObject