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, 11 insertions, 11 deletions

diff --git a/tests/auto/quick/qquickanimatedimage/tst_qquickanimatedimage.cpp b/tests/auto/quick/qquickanimatedimage/tst_qquickanimatedimage.cpp
index c42000d418..a0accfcd58 100644
--- a/tests/auto/quick/qquickanimatedimage/tst_qquickanimatedimage.cpp
+++ b/tests/auto/quick/qquickanimatedimage/tst_qquickanimatedimage.cpp
@@ -253,11 +253,11 @@ void tst_qquickanimatedimage::remote()
     QFETCH(bool, paused);
 
     TestHTTPServer server;
-    QVERIFY2(server.listen(14449), qPrintable(server.errorString()));
+    QVERIFY2(server.listen(), qPrintable(server.errorString()));
     server.serveDirectory(dataDirectory());
 
     QQmlEngine engine;
-    QQmlComponent component(&engine, QUrl("http://127.0.0.1:14449/" + fileName));
+    QQmlComponent component(&engine, server.url(fileName));
     QTRY_VERIFY(component.isReady());
 
     QQuickAnimatedImage *anim = qobject_cast<QQuickAnimatedImage *>(component.create());
@@ -318,7 +318,7 @@ void tst_qquickanimatedimage::invalidSource()
 void tst_qquickanimatedimage::sourceSizeChanges()
 {
     TestHTTPServer server;
-    QVERIFY2(server.listen(14449), qPrintable(server.errorString()));
+    QVERIFY2(server.listen(), qPrintable(server.errorString()));
     server.serveDirectory(dataDirectory());
 
     QQmlEngine engine;
@@ -358,19 +358,19 @@ void tst_qquickanimatedimage::sourceSizeChanges()
     QTRY_VERIFY(sourceSizeSpy.count() == 3);
 
     // Remote
-    ctxt->setContextProperty("srcImage", QUrl("http://127.0.0.1:14449/hearts.gif"));
+    ctxt->setContextProperty("srcImage", server.url("/hearts.gif"));
     QTRY_COMPARE(anim->status(), QQuickAnimatedImage::Ready);
     QTRY_VERIFY(sourceSizeSpy.count() == 4);
 
-    ctxt->setContextProperty("srcImage", QUrl("http://127.0.0.1:14449/hearts.gif"));
+    ctxt->setContextProperty("srcImage", server.url("/hearts.gif"));
     QTRY_COMPARE(anim->status(), QQuickAnimatedImage::Ready);
     QTRY_VERIFY(sourceSizeSpy.count() == 4);
 
-    ctxt->setContextProperty("srcImage", QUrl("http://127.0.0.1:14449/hearts_copy.gif"));
+    ctxt->setContextProperty("srcImage", server.url("/hearts_copy.gif"));
     QTRY_COMPARE(anim->status(), QQuickAnimatedImage::Ready);
     QTRY_VERIFY(sourceSizeSpy.count() == 4);
 
-    ctxt->setContextProperty("srcImage", QUrl("http://127.0.0.1:14449/colors.gif"));
+    ctxt->setContextProperty("srcImage", server.url("/colors.gif"));
     QTRY_COMPARE(anim->status(), QQuickAnimatedImage::Ready);
     QTRY_VERIFY(sourceSizeSpy.count() == 5);
 
@@ -384,7 +384,7 @@ void tst_qquickanimatedimage::sourceSizeChanges()
 void tst_qquickanimatedimage::qtbug_16520()
 {
     TestHTTPServer server;
-    QVERIFY2(server.listen(14449), qPrintable(server.errorString()));
+    QVERIFY2(server.listen(), qPrintable(server.errorString()));
     server.serveDirectory(dataDirectory());
 
     QQmlEngine engine;
@@ -396,7 +396,7 @@ void tst_qquickanimatedimage::qtbug_16520()
     QQuickAnimatedImage *anim = root->findChild<QQuickAnimatedImage*>("anim");
     QVERIFY(anim != 0);
 
-    anim->setProperty("source", "http://127.0.0.1:14449/stickman.gif");
+    anim->setProperty("source", server.urlString("/stickman.gif"));
     QTRY_VERIFY(anim->opacity() == 0);
     QTRY_VERIFY(anim->opacity() == 1);
 
@@ -407,7 +407,7 @@ void tst_qquickanimatedimage::qtbug_16520()
 void tst_qquickanimatedimage::progressAndStatusChanges()
 {
     TestHTTPServer server;
-    QVERIFY2(server.listen(14449), qPrintable(server.errorString()));
+    QVERIFY2(server.listen(), qPrintable(server.errorString()));
     server.serveDirectory(dataDirectory());
 
     QQmlEngine engine;
@@ -443,7 +443,7 @@ void tst_qquickanimatedimage::progressAndStatusChanges()
     QTRY_COMPARE(statusSpy.count(), 1);
 
     // Loading remote file
-    ctxt->setContextProperty("srcImage", "http://127.0.0.1:14449/stickman.gif");
+    ctxt->setContextProperty("srcImage", server.url("/stickman.gif"));
     QTRY_VERIFY(obj->status() == QQuickImage::Loading);
     QTRY_VERIFY(obj->progress() == 0.0);
     QTRY_VERIFY(obj->status() == QQuickImage::Ready);