diff options
| author | Gunnar Sletta <gunnar@sletta.org> | 2015-10-19 20:02:57 +0200 |
|---|---|---|
| committer | Gunnar Sletta <gunnar@sletta.org> | 2015-12-08 06:05:23 +0000 |
| commit | 3f240169388d2f3090cd5730e03df8d8ab670510 (patch) | |
| tree | e5296f87fa55bbc7bad600ff651354173a0d8759 /tests | |
| parent | 59699c9322b3861e3d0251dfd40a65d0f03c76d4 (diff) | |
Fix SourceProxy's method for determining when to activate.v5.6.0-beta1
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 <mitch.curtis@theqtcompany.com>
Reviewed-by: Laszlo Agocs <laszlo.agocs@theqtcompany.com>
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/manual/SourceProxyTest.qml | 2 | ||||
| -rw-r--r-- | tests/manual/testSourceProxy.qml | 6 |
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 } |