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:
parent
294960c160
commit
32db7de207
@ -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
|
||||
|
@ -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
|
||||
|
@ -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
|
||||
|
||||
|
@ -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))
|
||||
}
|
||||
|
||||
|
@ -14,6 +14,8 @@ SUBDIRS=\
|
||||
qsidebar \
|
||||
qwizard \
|
||||
|
||||
!wince*:SUBDIRS -= qabstractprintdialog
|
||||
|
||||
!contains(QT_CONFIG, private_tests): SUBDIRS -= \
|
||||
qsidebar \
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user