diff options
| author | Bjoern Breitmeyer <bjoern.breitmeyer@kdab.com> | 2012-07-06 10:48:06 +0200 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2012-07-06 21:14:09 +0200 |
| commit | 32db7de2079967fe1c333c562b742318c50321a4 (patch) | |
| tree | 1995a27ad5f39dbddda3542322ace2da0acb70e4 /tests | |
| parent | 294960c1604218618c31878a68f25aee53972103 (diff) | |
fixed unittest builds for wince
removed printsupport tests for wince as there
is no print support on wince and removed the special
handling for wince from 4.8 on some tests as the dependent
modules are not part of qt base anymore
Change-Id: I4ffb22da11f98beee1013f775cb5ce4b936d3211
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/auto/auto.pro | 1 | ||||
| -rw-r--r-- | tests/auto/gui/image/qicon/qicon.pro | 4 | ||||
| -rw-r--r-- | tests/auto/gui/painting/qpainter/qpainter.pro | 3 | ||||
| -rw-r--r-- | tests/auto/network/socket/qlocalsocket/test/test.pro | 14 | ||||
| -rw-r--r-- | tests/auto/widgets/dialogs/dialogs.pro | 2 |
5 files changed, 5 insertions, 19 deletions
diff --git a/tests/auto/auto.pro b/tests/auto/auto.pro index 6f945254c8..54e5000e41 100644 --- a/tests/auto/auto.pro +++ b/tests/auto/auto.pro @@ -16,6 +16,7 @@ SUBDIRS += \ printsupport \ cmake +!wince*: SUBDIRS -= printsupport cross_compile: SUBDIRS -= tools !contains(QT_CONFIG, opengl): SUBDIRS -= opengl !unix|embedded|!contains(QT_CONFIG, dbus): SUBDIRS -= dbus diff --git a/tests/auto/gui/image/qicon/qicon.pro b/tests/auto/gui/image/qicon/qicon.pro index 3c6ced85bd..d03f3e62e9 100644 --- a/tests/auto/gui/image/qicon/qicon.pro +++ b/tests/auto/gui/image/qicon/qicon.pro @@ -7,8 +7,4 @@ QT += testlib SOURCES += tst_qicon.cpp RESOURCES = tst_qicon.qrc -wince* { - QT += xml svg - DEPLOYMENT_PLUGIN += qsvg -} TESTDATA += icons/* *.png *.svg *.svgz diff --git a/tests/auto/gui/painting/qpainter/qpainter.pro b/tests/auto/gui/painting/qpainter/qpainter.pro index 5371aa451a..90c840213b 100644 --- a/tests/auto/gui/painting/qpainter/qpainter.pro +++ b/tests/auto/gui/painting/qpainter/qpainter.pro @@ -3,7 +3,8 @@ CONFIG += parallel_test TARGET = tst_qpainter QT += testlib -!contains(QT_CONFIG, no-widgets): QT += widgets widgets-private printsupport +!contains(QT_CONFIG, no-widgets): QT += widgets widgets-private +!contains(QT_CONFIG, no-widgets):!wince*: QT += printsupport SOURCES += tst_qpainter.cpp diff --git a/tests/auto/network/socket/qlocalsocket/test/test.pro b/tests/auto/network/socket/qlocalsocket/test/test.pro index 90524958e1..6a5df7f9b6 100644 --- a/tests/auto/network/socket/qlocalsocket/test/test.pro +++ b/tests/auto/network/socket/qlocalsocket/test/test.pro @@ -25,17 +25,3 @@ CONFIG(debug_and_release) { DESTDIR = .. } -wince* { - additionalFiles.files = ../lackey/lackey.exe - additionalFiles.path = lackey -} - -wince* { - scriptFiles.files = ../lackey/scripts/*.js - scriptFiles.path = lackey/scripts - DEPLOYMENT += additionalFiles scriptFiles - QT += script # for easy deployment of QtScript - - requires(contains(QT_CONFIG,script)) -} - diff --git a/tests/auto/widgets/dialogs/dialogs.pro b/tests/auto/widgets/dialogs/dialogs.pro index 53e2338158..b8d8869142 100644 --- a/tests/auto/widgets/dialogs/dialogs.pro +++ b/tests/auto/widgets/dialogs/dialogs.pro @@ -14,6 +14,8 @@ SUBDIRS=\ qsidebar \ qwizard \ +!wince*:SUBDIRS -= qabstractprintdialog + !contains(QT_CONFIG, private_tests): SUBDIRS -= \ qsidebar \ |