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>

diff --git a/tests/auto/auto.pro b/tests/auto/auto.pro
index 6f94525..54e5000 100644 (file)
--- 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 3c6ced8..d03f3e6 100644 (file)
--- 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 5371aa4..90c8402 100644 (file)
--- 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 9052495..6a5df7f 100644 (file)
--- 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 53e2338..b8d8869 100644 (file)
--- 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 \