diff options
author | Michael Brasser <michael.brasser@nokia.com> | 2009-12-17 23:46:27 (GMT) |
---|---|---|
committer | Michael Brasser <michael.brasser@nokia.com> | 2009-12-17 23:46:27 (GMT) |
commit | a60c9a1ff41e5ca1482121ff3f89a112b359b6d4 (patch) | |
tree | ebe4f5e941eb3bda28593c2b170101867cb0afe3 /tests/auto/qvariant/tst_qvariant.cpp | |
parent | 412920402f488c2cf6eb81e7582f9b5aa7b06680 (diff) | |
parent | b8a4b365b1105a742369bbaa5dc00e43914089e0 (diff) | |
download | Qt-a60c9a1ff41e5ca1482121ff3f89a112b359b6d4.zip Qt-a60c9a1ff41e5ca1482121ff3f89a112b359b6d4.tar.gz Qt-a60c9a1ff41e5ca1482121ff3f89a112b359b6d4.tar.bz2 |
Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt into kinetic-declarativeui
Conflicts:
.gitignore
tests/benchmarks/benchmarks.pro
Diffstat (limited to 'tests/auto/qvariant/tst_qvariant.cpp')
-rw-r--r-- | tests/auto/qvariant/tst_qvariant.cpp | 17 |
1 files changed, 17 insertions, 0 deletions
diff --git a/tests/auto/qvariant/tst_qvariant.cpp b/tests/auto/qvariant/tst_qvariant.cpp index 3d68a73..ae0131c 100644 --- a/tests/auto/qvariant/tst_qvariant.cpp +++ b/tests/auto/qvariant/tst_qvariant.cpp @@ -272,6 +272,8 @@ private slots: void numericalConvert(); void moreCustomTypes(); void variantInVariant(); + + void colorInteger(); }; Q_DECLARE_METATYPE(QDate) @@ -3388,5 +3390,20 @@ void tst_QVariant::variantInVariant() QCOMPARE(qvariant_cast<QVariant>(var9), var1); } +void tst_QVariant::colorInteger() +{ + QVariant v = QColor(Qt::red); + QCOMPARE(v.type(), QVariant::Color); + QCOMPARE(v.value<QColor>(), QColor(Qt::red)); + + v.setValue(1000); + QCOMPARE(v.type(), QVariant::Int); + QCOMPARE(v.toInt(), 1000); + + v.setValue(QColor(Qt::yellow)); + QCOMPARE(v.type(), QVariant::Color); + QCOMPARE(v.value<QColor>(), QColor(Qt::yellow)); +} + QTEST_MAIN(tst_QVariant) #include "tst_qvariant.moc" |