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

diff --git a/tests/auto/quick/qquickimage/data/qtbug_22125.qml b/tests/auto/quick/qquickimage/data/qtbug_22125.qml
index 9b68c0a125..30c0b1d7fb 100644
--- a/tests/auto/quick/qquickimage/data/qtbug_22125.qml
+++ b/tests/auto/quick/qquickimage/data/qtbug_22125.qml
@@ -8,7 +8,7 @@ Item {
     GridView {
         anchors.fill: parent
         delegate: Image {
-            source: imagePath;
+            source: serverBaseUrl + imagePath;
             asynchronous: true
             smooth: true
             width: 200
@@ -16,28 +16,28 @@ Item {
         }
         model: ListModel {
             ListElement {
-                imagePath: "http://127.0.0.1:14451/big256.png"
+                imagePath: "/big256.png"
             }
             ListElement {
-                imagePath: "http://127.0.0.1:14451/big256.png"
+                imagePath: "/big256.png"
             }
             ListElement {
-                imagePath: "http://127.0.0.1:14451/big256.png"
+                imagePath: "/big256.png"
             }
             ListElement {
-                imagePath: "http://127.0.0.1:14451/colors.png"
+                imagePath: "/colors.png"
             }
             ListElement {
-                imagePath: "http://127.0.0.1:14451/colors1.png"
+                imagePath: "/colors1.png"
             }
             ListElement {
-                imagePath: "http://127.0.0.1:14451/big.jpeg"
+                imagePath: "/big.jpeg"
             }
             ListElement {
-                imagePath: "http://127.0.0.1:14451/heart.png"
+                imagePath: "/heart.png"
             }
             ListElement {
-                imagePath: "http://127.0.0.1:14451/green.png"
+                imagePath: "/green.png"
             }
         }
     }