diff options
| author | Liang Qi <liang.qi@theqtcompany.com> | 2015-12-03 21:51:29 +0100 |
|---|---|---|
| committer | Liang Qi <liang.qi@theqtcompany.com> | 2015-12-03 21:51:57 +0100 |
| commit | 6148c9c0f213478d12fb67b04de102666b8c0c05 (patch) | |
| tree | c4e64381758b163b73a0ee01de758a6b4386732e | |
| parent | 10a83691db650fe27666d44223e099df21073b42 (diff) | |
| parent | 59699c9322b3861e3d0251dfd40a65d0f03c76d4 (diff) | |
| download | qtgraphicaleffects-6148c9c0f213478d12fb67b04de102666b8c0c05.tar.gz | |
Merge remote-tracking branch 'origin/5.6' into dev
Change-Id: I4979880863035841c54b771a35f5a22efad335aa
| -rw-r--r-- | tests/auto/tst_qtgraphicaleffects.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/tests/auto/tst_qtgraphicaleffects.cpp b/tests/auto/tst_qtgraphicaleffects.cpp index a0104d8..c36f290 100644 --- a/tests/auto/tst_qtgraphicaleffects.cpp +++ b/tests/auto/tst_qtgraphicaleffects.cpp @@ -405,7 +405,7 @@ void tst_qtgraphicaleffects::colorOverlay() // Default values QCOMPARE(obj->property("cached").toBool(), false); - QCOMPARE(obj->property("color").toString(), QString("#000000")); + QCOMPARE(obj->property("color").toString(), QString("#00000000")); delete obj; } @@ -782,9 +782,9 @@ void tst_qtgraphicaleffects::levelAdjust() // Default values QCOMPARE(obj->property("source").toInt(), 0); - QCOMPARE(obj->property("minimumInput").toString(), QString("#000000")); + QCOMPARE(obj->property("minimumInput").toString(), QString("#00000000")); QCOMPARE(obj->property("maximumInput").toString(), QString("#ffffff")); - QCOMPARE(obj->property("minimumOutput").toString(), QString("#000000")); + QCOMPARE(obj->property("minimumOutput").toString(), QString("#00000000")); QCOMPARE(obj->property("maximumOutput").toString(), QString("#ffffff")); QCOMPARE(obj->property("cached").toBool(), false); |