diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2011-05-20 12:14:17 +1000 |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2011-05-20 12:14:17 +1000 |
| commit | 67eeff8459db037591b67e749da97b8fc0abc222 (patch) | |
| tree | 1c0d14895cb8de77d3312702700b3c923eb65e0c | |
| parent | b6b1aebf480ef84d8b2b3a7fc338493811cc2ee0 (diff) | |
| parent | d2a49efb7942b283850cef6b1585cd366247ea54 (diff) | |
Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qtdeclarative-staging
* 'master' of git://scm.dev.nokia.troll.no/qt/qtdeclarative-staging:
Remove Qt3Support code from qtdeclarative module
| -rw-r--r-- | tests/auto/declarative/qdeclarativemetatype/tst_qdeclarativemetatype.cpp | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/tests/auto/declarative/qdeclarativemetatype/tst_qdeclarativemetatype.cpp b/tests/auto/declarative/qdeclarativemetatype/tst_qdeclarativemetatype.cpp index 87825d23dd..b72236d4ac 100644 --- a/tests/auto/declarative/qdeclarativemetatype/tst_qdeclarativemetatype.cpp +++ b/tests/auto/declarative/qdeclarativemetatype/tst_qdeclarativemetatype.cpp @@ -191,10 +191,6 @@ void tst_qdeclarativemetatype::copy() variantHash.insert("Hello World!", QVariant(19)); QT_COPY_TEST(QVariantHash, variantHash); -#ifdef QT3_SUPPORT - QT_COPY_TEST(QColorGroup, QColorGroup(Qt::red, Qt::red, Qt::red, Qt::red, Qt::red, Qt::red, Qt::red)); -#endif - QT_COPY_TEST(QFont, QFont("Helvetica", 1024)); { |