Fix autotest
authorAaron Kennedy <aaron.kennedy@nokia.com>
Mon, 7 Nov 2011 18:59:52 +0000 (18:59 +0000)
committerQt by Nokia <qt-info@nokia.com>
Tue, 8 Nov 2011 12:49:28 +0000 (13:49 +0100)
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>
tests/auto/declarative/qdeclarativemetatype/tst_qdeclarativemetatype.cpp

index a85e73e..ce8b335 100644 (file)
@@ -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));