Merge remote-tracking branch 'origin/5.4' into 5.5

Conflicts:
	.qmake.conf
	tests/auto/qml/qqmlxmlhttprequest/tst_qqmlxmlhttprequest.cpp

Change-Id: I715b8a78b74cbe0dcaf599367fd6e08af4858e11

1 files changed, 20 insertions, 20 deletions

diff --git a/tests/auto/quick/qquickpixmapcache/tst_qquickpixmapcache.cpp b/tests/auto/quick/qquickpixmapcache/tst_qquickpixmapcache.cpp
index c8c01fc6cf..b9f93a4dcf 100644
--- a/tests/auto/quick/qquickpixmapcache/tst_qquickpixmapcache.cpp
+++ b/tests/auto/quick/qquickpixmapcache/tst_qquickpixmapcache.cpp
@@ -108,7 +108,7 @@ void tst_qquickpixmapcache::initTestCase()
 {
     QQmlDataTest::initTestCase();
 
-    QVERIFY2(server.listen(14452), qPrintable(server.errorString()));
+    QVERIFY2(server.listen(), qPrintable(server.errorString()));
 
     // This avoids a race condition/deadlock bug in network config
     // manager when it is accessed by the HTTP server thread before
@@ -133,8 +133,8 @@ void tst_qquickpixmapcache::single_data()
     // File URLs are optimized
     QTest::newRow("local") << testFileUrl("exists.png") << localfile_optimized << true << false;
     QTest::newRow("local") << testFileUrl("notexists.png") << localfile_optimized << false << false;
-    QTest::newRow("remote") << QUrl("http://127.0.0.1:14452/exists.png") << false << true << false;
-    QTest::newRow("remote") << QUrl("http://127.0.0.1:14452/notexists.png") << false << false << true;
+    QTest::newRow("remote") << server.url("/exists.png") << false << true << false;
+    QTest::newRow("remote") << server.url("/notexists.png") << false << false << true;
 }
 
 void tst_qquickpixmapcache::single()
@@ -201,26 +201,26 @@ void tst_qquickpixmapcache::parallel_data()
             << -1;
 
     QTest::newRow("remote")
-            << QUrl("http://127.0.0.1:14452/exists2.png")
-            << QUrl("http://127.0.0.1:14452/exists3.png")
+            << server.url("/exists2.png")
+            << server.url("/exists3.png")
             << 0
             << -1;
 
     QTest::newRow("remoteagain")
-            << QUrl("http://127.0.0.1:14452/exists2.png")
-            << QUrl("http://127.0.0.1:14452/exists3.png")
+            << server.url("/exists2.png")
+            << server.url("/exists3.png")
             << 2
             << -1;
 
     QTest::newRow("remotecopy")
-            << QUrl("http://127.0.0.1:14452/exists4.png")
-            << QUrl("http://127.0.0.1:14452/exists4.png")
+            << server.url("/exists4.png")
+            << server.url("/exists4.png")
             << 0
             << -1;
 
     QTest::newRow("remotecopycancel")
-            << QUrl("http://127.0.0.1:14452/exists5.png")
-            << QUrl("http://127.0.0.1:14452/exists5.png")
+            << server.url("/exists5.png")
+            << server.url("/exists5.png")
             << 0
             << 0;
 }
@@ -332,7 +332,7 @@ void tst_qquickpixmapcache::massive()
 // QTBUG-12729
 void tst_qquickpixmapcache::cancelcrash()
 {
-    QUrl url("http://127.0.0.1:14452/cancelcrash_notexist.png");
+    QUrl url = server.url("/cancelcrash_notexist.png");
     for (int ii = 0; ii < 1000; ++ii) {
         QQuickPixmap pix(&engine, url);
     }
@@ -370,12 +370,10 @@ void tst_qquickpixmapcache::shrinkcache()
 
 #ifndef QT_NO_CONCURRENT
 
-void createNetworkServer()
+void createNetworkServer(TestHTTPServer *server)
 {
    QEventLoop eventLoop;
-   TestHTTPServer server;
-   QVERIFY2(server.listen(14453), qPrintable(server.errorString()));
-   server.serveDirectory(QQmlDataTest::instance()->testFile("http"));
+   server->serveDirectory(QQmlDataTest::instance()->testFile("http"));
    QTimer::singleShot(100, &eventLoop, SLOT(quit()));
    eventLoop.exec();
 }
@@ -384,11 +382,13 @@ void createNetworkServer()
 // QT-3957
 void tst_qquickpixmapcache::networkCrash()
 {
-    QFuture<void> future = QtConcurrent::run(createNetworkServer);
+   TestHTTPServer server;
+   QVERIFY2(server.listen(), qPrintable(server.errorString()));
+    QFuture<void> future = QtConcurrent::run(createNetworkServer, &server);
     QQmlEngine engine;
     for (int ii = 0; ii < 100 ; ++ii) {
         QQuickPixmap* pixmap = new QQuickPixmap;
-        pixmap->load(&engine,  QUrl(QString("http://127.0.0.1:14453/exists.png")));
+        pixmap->load(&engine,  server.url("/exists.png"));
         QTest::qSleep(1);
         pixmap->clear();
         delete pixmap;
@@ -403,14 +403,14 @@ void tst_qquickpixmapcache::networkCrash()
 void tst_qquickpixmapcache::lockingCrash()
 {
     TestHTTPServer server;
-    QVERIFY2(server.listen(14453), qPrintable(server.errorString()));
+    QVERIFY2(server.listen(), qPrintable(server.errorString()));
     server.serveDirectory(testFile("http"), TestHTTPServer::Delay);
 
     {
         QQuickPixmap* p = new QQuickPixmap;
         {
             QQmlEngine e;
-            p->load(&e,  QUrl(QString("http://127.0.0.1:14453/exists6.png")));
+            p->load(&e,  server.url("/exists6.png"));
         }
         p->clear();
         QVERIFY(p->isNull());