From 3f240169388d2f3090cd5730e03df8d8ab670510 Mon Sep 17 00:00:00 2001 From: Gunnar Sletta Date: Mon, 19 Oct 2015 20:02:57 +0200 Subject: Fix SourceProxy's method for determining when to activate. The logic had several flaws, including not respecting sourceRect and wanted interpolation, so do it over. Change-Id: I40b147a0e18ef5f9f3a0086904f9e9f93463c7fc Task-number: QTBUG-47749 Reviewed-by: Mitch Curtis Reviewed-by: Laszlo Agocs --- tests/manual/SourceProxyTest.qml | 2 +- tests/manual/testSourceProxy.qml | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) (limited to 'tests') 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 } -- cgit v1.2.1