Merge remote-tracking branch 'origin/5.6' into 5.7v5.7.0-alpha1

Conflicts:
	.qmake.conf

Change-Id: Ia67a352bb51848428f8b907629c70ed340b57d78

2 files changed, 4 insertions, 4 deletions

diff --git a/tests/manual/SourceProxyTest.qml b/tests/manual/SourceProxyTest.qml
index 94c948d..5ba74e7 100644
--- a/tests/manual/SourceProxyTest.qml
+++ b/tests/manual/SourceProxyTest.qml
@@ -91,7 +91,7 @@ Rectangle {
 
     SourceProxy {
         id: proxy
-        input: sourcing == "shadersource" ? shaderSource : text;
+        input: sourcing == "shadersource" ? shaderSource : (root.sourcing == "layered" ? text : null);
         visible: false
         sourceRect: proxyPadding ? Qt.rect(-1, -1, text.width, text.height) : Qt.rect(0, 0, 0, 0);
     }
diff --git a/tests/manual/testSourceProxy.qml b/tests/manual/testSourceProxy.qml
index 1ca3f95..a623ff7 100644
--- a/tests/manual/testSourceProxy.qml
+++ b/tests/manual/testSourceProxy.qml
@@ -223,19 +223,19 @@ Item {
                 label: "source: none\nproxy: any-interpolation"
                 sourcing: "none"
                 proxyInterpolation: SourceProxy.AnyInterpolation
-                expectProxy: true
+                expectProxy: false
             }
             SourceProxyTest {
                 label: "source: none\nproxy: nearest-interpolation"
                 sourcing: "none"
                 proxyInterpolation: SourceProxy.NearestInterpolation
-                expectProxy: true
+                expectProxy: false
             }
             SourceProxyTest {
                 label: "source: none\nproxy: linear-interpolation"
                 sourcing: "none"
                 proxyInterpolation: SourceProxy.LinearInterpolation
-                expectProxy: true
+                expectProxy: false
             }