From 9ec54f4c3a7ecb483a7687aec3de232914d0eca8 Mon Sep 17 00:00:00 2001 From: Toby Tomkins Date: Fri, 23 Sep 2011 15:52:07 +1000 Subject: [PATCH] [tests] Fix unit test compilation, now uses QWidget. Fixed unit test, also enabled this autotest to run. Change-Id: I92ad1a17d1fa4674a0746767d6a4100b21999a43 Reviewed-on: http://codereview.qt-project.org/5440 Reviewed-by: Qt Sanity Bot Reviewed-by: Martin Jones --- tests/auto/declarative/declarative.pro | 2 +- .../qdeclarativemetatype/qdeclarativemetatype.pro | 2 +- .../tst_qdeclarativemetatype.cpp | 2 ++ 3 files changed, 4 insertions(+), 2 deletions(-) diff --git a/tests/auto/declarative/declarative.pro b/tests/auto/declarative/declarative.pro index 9cc8dbc..87d12c8 100644 --- a/tests/auto/declarative/declarative.pro +++ b/tests/auto/declarative/declarative.pro @@ -1,7 +1,7 @@ TEMPLATE = subdirs METATYPETESTS += \ -# qdeclarativemetatype \ + qdeclarativemetatype \ qmetaobjectbuilder PUBLICTESTS += \ diff --git a/tests/auto/declarative/qdeclarativemetatype/qdeclarativemetatype.pro b/tests/auto/declarative/qdeclarativemetatype/qdeclarativemetatype.pro index a7a2953..ef22a55 100644 --- a/tests/auto/declarative/qdeclarativemetatype/qdeclarativemetatype.pro +++ b/tests/auto/declarative/qdeclarativemetatype/qdeclarativemetatype.pro @@ -1,5 +1,5 @@ load(qttest_p4) -contains(QT_CONFIG,declarative): QT += declarative +contains(QT_CONFIG,declarative): QT += declarative widgets SOURCES += tst_qdeclarativemetatype.cpp macx:CONFIG -= app_bundle diff --git a/tests/auto/declarative/qdeclarativemetatype/tst_qdeclarativemetatype.cpp b/tests/auto/declarative/qdeclarativemetatype/tst_qdeclarativemetatype.cpp index e248c7c..ca97912 100644 --- a/tests/auto/declarative/qdeclarativemetatype/tst_qdeclarativemetatype.cpp +++ b/tests/auto/declarative/qdeclarativemetatype/tst_qdeclarativemetatype.cpp @@ -51,6 +51,7 @@ #include #include #include +#include #include @@ -209,6 +210,7 @@ void tst_qdeclarativemetatype::copy() QPixmap icon(100, 100); QIcon v = QIcon(icon); QIcon v2 = QIcon(icon); + QEXPECT_FAIL("", "QTBUG-21629 - copy() test function failure.", Continue); QVERIFY(QDeclarativeMetaType::copy(QMetaType::QIcon, &v, 0)); QVERIFY(v.isNull() == QIcon().isNull()); QVERIFY(QDeclarativeMetaType::copy(QMetaType::QIcon , &v, &v2)); -- 1.7.2.5