diff options
| author | Aaron Kennedy <aaron.kennedy@nokia.com> | 2011-11-07 18:59:52 +0000 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2011-11-08 13:49:28 +0100 |
| commit | e74adbb87dc099f217ff89806e55bef41c4fac86 (patch) | |
| tree | 3a9eb07cff39cedcebf5afc35f5125ef537aed3c /tests/auto/declarative/qdeclarativemetatype | |
| parent | 46e54ea850de93ca46ad9e374714f5a30ddf7dfe (diff) | |
Fix autotest
We can't copy QIcon and QKeySequence as we don't link to QtWidgets.
Task-number: QTBUG-21629
Change-Id: I4e935e4dd398202f442288849b1cbb9b3d02932b
Reviewed-by: Martin Jones <martin.jones@nokia.com>
Diffstat (limited to 'tests/auto/declarative/qdeclarativemetatype')
| -rw-r--r-- | tests/auto/declarative/qdeclarativemetatype/tst_qdeclarativemetatype.cpp | 12 |
1 files changed, 0 insertions, 12 deletions
diff --git a/tests/auto/declarative/qdeclarativemetatype/tst_qdeclarativemetatype.cpp b/tests/auto/declarative/qdeclarativemetatype/tst_qdeclarativemetatype.cpp index a85e73ed57..ce8b3357fa 100644 --- a/tests/auto/declarative/qdeclarativemetatype/tst_qdeclarativemetatype.cpp +++ b/tests/auto/declarative/qdeclarativemetatype/tst_qdeclarativemetatype.cpp @@ -202,17 +202,6 @@ void tst_qdeclarativemetatype::copy() QT_COPY_TEST(QPalette, QPalette(Qt::green)); { - QPixmap icon(100, 100); - - QIcon v = QIcon(icon); QIcon v2 = QIcon(icon); - QEXPECT_FAIL("", "QTBUG-21629 - copy() test function failure.", Abort); - QVERIFY(QDeclarativeMetaType::copy(QMetaType::QIcon, &v, 0)); - QVERIFY(v.isNull() == QIcon().isNull()); - QVERIFY(QDeclarativeMetaType::copy(QMetaType::QIcon , &v, &v2)); - QVERIFY(v.isNull() == QIcon(icon).isNull()); - } - - { QImage v = QImage(100, 100, QImage::Format_RGB32); QImage v2 = QImage(100, 100, QImage::Format_RGB32); QVERIFY(QDeclarativeMetaType::copy(QMetaType::QImage, &v, 0)); @@ -240,7 +229,6 @@ void tst_qdeclarativemetatype::copy() QVERIFY(v.shape() == QCursor(Qt::SizeFDiagCursor).shape()); } - QT_COPY_TEST(QSizePolicy, QSizePolicy(QSizePolicy::Fixed, QSizePolicy::Maximum)); QT_COPY_TEST(QKeySequence, QKeySequence("Ctrl+O")); QT_COPY_TEST(QPen, QPen(Qt::red)); QT_COPY_TEST(QTextLength, QTextLength(QTextLength::FixedLength, 10.2)); |