iOS: Enable building of basic tests
Allows us to sanity check the iOS build in the CI. Change-Id: I16f9bfafef3988dcab6efd3155503ca0d0b4d1d8 Reviewed-by: Morten Johan Sørvig <morten.sorvig@digia.com>
This commit is contained in:
parent
7ddd813b7f
commit
b2f8a70890
2
configure
vendored
2
configure
vendored
@ -3358,7 +3358,7 @@ fi
|
||||
if [ "$XPLATFORM_IOS" = "yes" ]; then
|
||||
CFG_RPATH="no"
|
||||
CFG_PKGCONFIG="no"
|
||||
CFG_NOBUILD_PARTS="$CFG_NOBUILD_PARTS examples tests"
|
||||
CFG_NOBUILD_PARTS="$CFG_NOBUILD_PARTS examples"
|
||||
CFG_SHARED="no" # iOS builds should be static to be able to submit to the App Store
|
||||
CFG_SKIP_MODULES="$CFG_SKIP_MODULES qtconnectivity qtdoc qtlocation qtmacextras qtserialport qttools qtwebkit qtwebkit-examples"
|
||||
|
||||
|
@ -60,7 +60,7 @@ exists($$_PRO_FILE_PWD_/tests/tests.pro) {
|
||||
sub_tests.CONFIG = no_default_install
|
||||
!contains(QT_BUILD_PARTS, tests) {
|
||||
sub_tests.CONFIG += no_default_target
|
||||
} else {
|
||||
} else: !ios {
|
||||
# Make sure these are there in case we need them
|
||||
sub_tools.CONFIG -= no_default_target
|
||||
sub_examples.CONFIG -= no_default_target
|
||||
|
@ -19,6 +19,8 @@ SUBDIRS += \
|
||||
|
||||
installed_cmake.depends = cmake
|
||||
|
||||
ios: SUBDIRS = corelib gui
|
||||
|
||||
wince*: SUBDIRS -= printsupport
|
||||
cross_compile: SUBDIRS -= tools
|
||||
!qtHaveModule(opengl): SUBDIRS -= opengl
|
||||
|
@ -1,16 +1,18 @@
|
||||
TEMPLATE=subdirs
|
||||
SUBDIRS=\
|
||||
|
||||
SUBDIRS = \
|
||||
kernel
|
||||
|
||||
!ios: SUBDIRS += \
|
||||
animation \
|
||||
codecs \
|
||||
global \
|
||||
io \
|
||||
itemmodels \
|
||||
json \
|
||||
kernel \
|
||||
mimetypes \
|
||||
plugin \
|
||||
statemachine \
|
||||
thread \
|
||||
tools \
|
||||
xml
|
||||
|
||||
|
@ -1,7 +1,10 @@
|
||||
TEMPLATE=subdirs
|
||||
SUBDIRS=\
|
||||
|
||||
SUBDIRS = \
|
||||
kernel
|
||||
|
||||
!ios: SUBDIRS += \
|
||||
image \
|
||||
kernel \
|
||||
math3d \
|
||||
painting \
|
||||
qopengl \
|
||||
|
@ -4,4 +4,4 @@ SUBDIRS = auto
|
||||
|
||||
# benchmarks in debug mode is rarely sensible
|
||||
# benchmarks are not sensible for code coverage (here with tool testcocoon)
|
||||
!testcocoon:contains(QT_CONFIG,release):SUBDIRS += benchmarks
|
||||
!ios:!testcocoon:contains(QT_CONFIG,release):SUBDIRS += benchmarks
|
||||
|
Loading…
x
Reference in New Issue
Block a user