diff options
| author | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2013-10-24 12:48:39 +0200 |
|---|---|---|
| committer | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2013-10-24 12:48:42 +0200 |
| commit | 840f6a40e6218992b5b9d451ee3c0886a4846c89 (patch) | |
| tree | 2b808decc7adf5218b810d2de6b45c5a8b4cfc42 /tests/auto/testlib/selftests | |
| parent | 109bf980b37fed405c6c1eb14cb9c83ff897e389 (diff) | |
| parent | 2e3870fe37d36ccf4bd84eb90e1d5e08ad00c1bc (diff) | |
Merge remote-tracking branch 'origin/stable' into dev
Change-Id: Ie56539b2e0be611a363b5f15ae5412a78d6945a2
Diffstat (limited to 'tests/auto/testlib/selftests')
| -rw-r--r-- | tests/auto/testlib/selftests/cmptest/cmptest.pro | 3 | ||||
| -rw-r--r-- | tests/auto/testlib/selftests/cmptest/tst_cmptest.cpp | 6 |
2 files changed, 8 insertions, 1 deletions
diff --git a/tests/auto/testlib/selftests/cmptest/cmptest.pro b/tests/auto/testlib/selftests/cmptest/cmptest.pro index a793c203dd..2d5dd071a9 100644 --- a/tests/auto/testlib/selftests/cmptest/cmptest.pro +++ b/tests/auto/testlib/selftests/cmptest/cmptest.pro @@ -1,5 +1,6 @@ SOURCES += tst_cmptest.cpp -QT = core gui testlib +QT = core testlib +qtHaveModule(gui): QT += gui mac:CONFIG -= app_bundle CONFIG -= debug_and_release_target diff --git a/tests/auto/testlib/selftests/cmptest/tst_cmptest.cpp b/tests/auto/testlib/selftests/cmptest/tst_cmptest.cpp index e9ad1778fa..9f8343b57a 100644 --- a/tests/auto/testlib/selftests/cmptest/tst_cmptest.cpp +++ b/tests/auto/testlib/selftests/cmptest/tst_cmptest.cpp @@ -42,8 +42,10 @@ #include <QtCore/QCoreApplication> #include <QtTest/QtTest> +#ifdef QT_GUI_LIB #include <QtGui/QImage> #include <QtGui/QPixmap> +#endif /* XPM test data for QPixmap, QImage tests (use drag cursors as example) */ @@ -138,10 +140,12 @@ private slots: void compareQStringLists_data(); void compareQListInt(); void compareQListDouble(); +#ifdef QT_GUI_LIB void compareQPixmaps(); void compareQPixmaps_data(); void compareQImages(); void compareQImages_data(); +#endif }; static bool boolfunc() { return true; } @@ -323,6 +327,7 @@ void tst_Cmptest::compareQListDouble() QCOMPARE(double1, double2); } +#ifdef QT_GUI_LIB void tst_Cmptest::compareQPixmaps_data() { QTest::addColumn<QPixmap>("opA"); @@ -374,6 +379,7 @@ void tst_Cmptest::compareQImages() QCOMPARE(opA, opB); } +#endif QTEST_MAIN(tst_Cmptest) #include "tst_cmptest.moc" |