diff options
Diffstat (limited to 'tests')
-rw-r--r-- | tests/auto/tst_qtgraphicaleffects.cpp | 28 | ||||
-rw-r--r-- | tests/manual/testbed/TestBedModel.qml | 1 | ||||
-rw-r--r-- | tests/manual/testbed/TestGlow.qml | 10 |
3 files changed, 9 insertions, 30 deletions
diff --git a/tests/auto/tst_qtgraphicaleffects.cpp b/tests/auto/tst_qtgraphicaleffects.cpp index a90658b..4f29d1e 100644 --- a/tests/auto/tst_qtgraphicaleffects.cpp +++ b/tests/auto/tst_qtgraphicaleffects.cpp @@ -60,7 +60,6 @@ private slots: void dropShadow(); void fastBlur(); void fastDropShadow(); - void fastGlow(); void fastInnerShadow(); void gammaAdjust(); void gaussianBlur(); @@ -568,32 +567,7 @@ void tst_qtgraphicaleffects::glow() QCOMPARE(obj->property("spread").toDouble(), 0.0); QCOMPARE(obj->property("color").toString(), QString("#ffffff")); QCOMPARE(obj->property("transparentBorder").toBool(), false); - - delete obj; -} - -void tst_qtgraphicaleffects::fastGlow() -{ - // Creation - QString componentStr = "import QtQuick 2.0\n" - "import effects 0.1\n" - "FastGlow {" - "source: ShaderEffectSource {sourceItem: Rectangle {width: 100; height: 100}}" - "width: 50; height: 50\n" - "}"; - QDeclarativeComponent component(&engine); - component.setData(componentStr.toLatin1(), QUrl::fromLocalFile("")); - QObject *obj = component.create(); - QTest::qWait(100); - QVERIFY(obj != 0); - - // Default values - QCOMPARE(obj->property("blur").toDouble(), 0.0); - QCOMPARE(obj->property("spread").toDouble(), 0.0); - QCOMPARE(obj->property("cached").toBool(), false); - QCOMPARE(obj->property("source").toInt(), 0); - QCOMPARE(obj->property("color").toString(), QString("#ffffff")); - QCOMPARE(obj->property("transparentBorder").toBool(), false); + QCOMPARE(obj->property("fast").toBool(), false); delete obj; } diff --git a/tests/manual/testbed/TestBedModel.qml b/tests/manual/testbed/TestBedModel.qml index 755a2be..7b8dd10 100644 --- a/tests/manual/testbed/TestBedModel.qml +++ b/tests/manual/testbed/TestBedModel.qml @@ -44,7 +44,6 @@ ListModel { ListElement { name: "TestDisplace.qml"; group: "Distortion"; last: true } ListElement { name: "TestOpacityMask.qml"; group: "Mask" } ListElement { name: "TestThresholdMask.qml"; group: "Mask"; last: true } - ListElement { name: "TestFastGlow.qml"; group: "Glow" } ListElement { name: "TestGlow.qml"; group: "Glow" } ListElement { name: "TestRectangularGlow.qml"; group: "Glow"; last: true } ListElement { name: "TestFastBlur.qml"; group: "Blur" } diff --git a/tests/manual/testbed/TestGlow.qml b/tests/manual/testbed/TestGlow.qml index ca6006c..f8988e8 100644 --- a/tests/manual/testbed/TestGlow.qml +++ b/tests/manual/testbed/TestGlow.qml @@ -52,6 +52,7 @@ TestCaseTemplate { maximumRadius: maximumRadiusSlider.value visible: enabledCheckBox.selected cached: cachedCheckBox.selected + fast: fastCheckBox.selected source: sourceType.value == "shaderEffectSource" ? shaderEffectSource : imageSource } @@ -94,10 +95,15 @@ TestCaseTemplate { id: maximumRadiusSlider minimum: 0 maximum: 16 - value: 8 + value: 16 integer: true caption: "maximumRadius" } + CheckBox { + id: fastCheckBox + caption: "fast" + selected: false + } }, Control { @@ -106,7 +112,7 @@ TestCaseTemplate { id: colorPicker hue: 0 saturation: 1 - lightness: 0.5 + lightness: 1 } }, |