diff options
| author | Marko Niemelä <marko.a.niemela@nokia.com> | 2012-01-16 15:54:54 +0200 |
|---|---|---|
| committer | Marko Niemelä <marko.a.niemela@nokia.com> | 2012-01-16 15:54:54 +0200 |
| commit | ab89135affba382fa141f285e32964a5a7591210 (patch) | |
| tree | 6a7de136b673fcb19605767685eb7f6e72864645 /tests | |
| parent | 8e68fea33a7881bd3da511d353a2d83942a43b44 (diff) | |
| download | qtgraphicaleffects-ab89135affba382fa141f285e32964a5a7591210.tar.gz | |
Fixed manualtest background color selection on latest Qt versions
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/manual/testbed/BGColorPicker.qml | 4 | ||||
| -rw-r--r-- | tests/manual/testbed/TestCaseTemplate.qml | 6 |
2 files changed, 5 insertions, 5 deletions
diff --git a/tests/manual/testbed/BGColorPicker.qml b/tests/manual/testbed/BGColorPicker.qml index 176d9e7..ede5c8c 100644 --- a/tests/manual/testbed/BGColorPicker.qml +++ b/tests/manual/testbed/BGColorPicker.qml @@ -42,7 +42,7 @@ import QtQuick 2.0 Label { id: bgColorPicker - property string color: "#242424" + property color color: "#242424" caption: "Background color" Image { id: highlight @@ -95,7 +95,7 @@ Label { MouseArea { anchors.fill: parent onClicked: { - bgColorPicker.color = parent.source + bgColorPicker.color = "#010101" highlight.x = parent.x - 3 } } diff --git a/tests/manual/testbed/TestCaseTemplate.qml b/tests/manual/testbed/TestCaseTemplate.qml index 2c93d7e..099e4cd 100644 --- a/tests/manual/testbed/TestCaseTemplate.qml +++ b/tests/manual/testbed/TestCaseTemplate.qml @@ -48,13 +48,13 @@ Rectangle { property alias controls: controlsColumn.children property string currentTest: "" property string fps: "nan" - property string bgColor: "black" + property color bgColor: "black" property int dummy: 0 property int fpsCount: 0 anchors.fill: parent - color: bgColor.charAt(0) == '#' ? bgColor : "red" + color: bgColor onDummyChanged: fpsCount++; @@ -79,7 +79,7 @@ Rectangle { id: background anchors.fill: parent fillMode: Image.Tile - source: bgColor.substring(0,7) == "file://" ? bgColor : "" + source: bgColor.toString() == "#010101" ? "images/background.png" : "" } Item { |