diff options
| author | Aaron Kennedy <aaron.kennedy@nokia.com> | 2010-03-08 04:39:11 (GMT) |
|---|---|---|
| committer | Aaron Kennedy <aaron.kennedy@nokia.com> | 2010-03-08 04:39:11 (GMT) |
| commit | ef16993782b834cb34ed0281925ddfc49535e78b (patch) | |
| tree | 20a8c5f093f26d4365f92342b24fa447baeaf271 /tests/auto/declarative/qdeclarativeqt/tst_qdeclarativeqt.cpp | |
| parent | b513c31f34b9e5484889697314dc2ecb619b88a3 (diff) | |
| download | Qt-ef16993782b834cb34ed0281925ddfc49535e78b.zip Qt-ef16993782b834cb34ed0281925ddfc49535e78b.tar.gz Qt-ef16993782b834cb34ed0281925ddfc49535e78b.tar.bz2 | |
Fix Qt.tint() algorithm
QT-2424
Diffstat (limited to 'tests/auto/declarative/qdeclarativeqt/tst_qdeclarativeqt.cpp')
| -rw-r--r-- | tests/auto/declarative/qdeclarativeqt/tst_qdeclarativeqt.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/tests/auto/declarative/qdeclarativeqt/tst_qdeclarativeqt.cpp b/tests/auto/declarative/qdeclarativeqt/tst_qdeclarativeqt.cpp index 90afd4e..b70011b 100644 --- a/tests/auto/declarative/qdeclarativeqt/tst_qdeclarativeqt.cpp +++ b/tests/auto/declarative/qdeclarativeqt/tst_qdeclarativeqt.cpp @@ -254,8 +254,8 @@ void tst_qdeclarativeqt::tint() QCOMPARE(qvariant_cast<QColor>(object->property("test1")), QColor::fromRgbF(0, 0, 1)); QCOMPARE(qvariant_cast<QColor>(object->property("test2")), QColor::fromRgbF(1, 0, 0)); - QEXPECT_FAIL("", "QT-2424",Continue); - QCOMPARE(qvariant_cast<QColor>(object->property("test3")), QColor::fromRgbF(1, 0, 0)); + QColor test3 = qvariant_cast<QColor>(object->property("test3")); + QCOMPARE(test3.rgba(), 0xFF7F0080); QCOMPARE(qvariant_cast<QColor>(object->property("test4")), QColor()); QCOMPARE(qvariant_cast<QColor>(object->property("test5")), QColor()); |