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>
This commit is contained in:
Bjoern Breitmeyer 2012-07-06 10:48:06 +02:00 committed by Qt by Nokia
parent 294960c160
commit 32db7de207
5 changed files with 5 additions and 19 deletions

View File

@ -16,6 +16,7 @@ SUBDIRS += \
printsupport \ printsupport \
cmake cmake
!wince*: SUBDIRS -= printsupport
cross_compile: SUBDIRS -= tools cross_compile: SUBDIRS -= tools
!contains(QT_CONFIG, opengl): SUBDIRS -= opengl !contains(QT_CONFIG, opengl): SUBDIRS -= opengl
!unix|embedded|!contains(QT_CONFIG, dbus): SUBDIRS -= dbus !unix|embedded|!contains(QT_CONFIG, dbus): SUBDIRS -= dbus

View File

@ -7,8 +7,4 @@ QT += testlib
SOURCES += tst_qicon.cpp SOURCES += tst_qicon.cpp
RESOURCES = tst_qicon.qrc RESOURCES = tst_qicon.qrc
wince* {
QT += xml svg
DEPLOYMENT_PLUGIN += qsvg
}
TESTDATA += icons/* *.png *.svg *.svgz TESTDATA += icons/* *.png *.svg *.svgz

View File

@ -3,7 +3,8 @@ CONFIG += parallel_test
TARGET = tst_qpainter TARGET = tst_qpainter
QT += testlib 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 SOURCES += tst_qpainter.cpp

View File

@ -25,17 +25,3 @@ CONFIG(debug_and_release) {
DESTDIR = .. 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))
}

View File

@ -14,6 +14,8 @@ SUBDIRS=\
qsidebar \ qsidebar \
qwizard \ qwizard \
!wince*:SUBDIRS -= qabstractprintdialog
!contains(QT_CONFIG, private_tests): SUBDIRS -= \ !contains(QT_CONFIG, private_tests): SUBDIRS -= \
qsidebar \ qsidebar \