diff options
author | Marko Niemelä <marko.a.niemela@nokia.com> | 2012-01-24 14:44:25 +0200 |
---|---|---|
committer | Marko Niemelä <marko.a.niemela@nokia.com> | 2012-01-24 14:44:25 +0200 |
commit | b546a5bc585ef365b5062cafcaf6ce34c96f2abe (patch) | |
tree | 513b009071d7a2cf493ead6032c181fefc4d0f8e /tests/manual | |
parent | b9efc48aa67d92f3a9b009bd7296f5b220474f0b (diff) | |
parent | 4664e86672ee0242f4201ebf7e4673b16e7dc733 (diff) | |
download | qtgraphicaleffects-b546a5bc585ef365b5062cafcaf6ce34c96f2abe.tar.gz |
Merge branch 'master' of git://gitorious.org/qt-labs/qtgraphicaleffects
Diffstat (limited to 'tests/manual')
-rw-r--r-- | tests/manual/testbed/TestDisplace.qml | 20 | ||||
-rwxr-xr-x | tests/manual/testbed/images/displacementmap.png | bin | 51611 -> 0 bytes | |||
-rwxr-xr-x | tests/manual/testbed/images/glass_normal.png | bin | 0 -> 13489 bytes |
3 files changed, 10 insertions, 10 deletions
diff --git a/tests/manual/testbed/TestDisplace.qml b/tests/manual/testbed/TestDisplace.qml index 15ef6f0..de8a2a1 100644 --- a/tests/manual/testbed/TestDisplace.qml +++ b/tests/manual/testbed/TestDisplace.qml @@ -54,14 +54,14 @@ TestCaseTemplate { color: "#8080ff" smooth: true anchors.fill: parent - Image { - id: di - x: (parent.width - width) / 2 - y: (parent.height - height) / 2 - sourceSize: Qt.size(128, 128) - source: "images/displacementmap.png" - smooth: true - } + Image { + id: di + x: (parent.width - width) / 2 + y: (parent.height - height) / 2 + sourceSize: Qt.size(128, 128) + source: "images/glass_normal.png" + smooth: true + } } Displace { @@ -87,8 +87,8 @@ TestCaseTemplate { Slider { id: displacementScaleSlider caption: "displacement" - minimum: -1.0 - maximum: 1.0 + minimum: -0.5 + maximum: 0.5 value: 0.1 } }, diff --git a/tests/manual/testbed/images/displacementmap.png b/tests/manual/testbed/images/displacementmap.png Binary files differdeleted file mode 100755 index 7614db8..0000000 --- a/tests/manual/testbed/images/displacementmap.png +++ /dev/null diff --git a/tests/manual/testbed/images/glass_normal.png b/tests/manual/testbed/images/glass_normal.png Binary files differnew file mode 100755 index 0000000..ba360ef --- /dev/null +++ b/tests/manual/testbed/images/glass_normal.png |