1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

iOS: Enable building of basic tests

Browse Source 
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:
Tor Arne Vestbø 2014-01-16 11:00:30 +01:00 committed by The Qt Project
parent 7ddd813b7f
commit b2f8a70890
6 changed files with 15 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
configure vendored
View File

@ -3358,7 +3358,7 @@ fi
if [ "$XPLATFORM_IOS" = "yes" ]; then if [ "$XPLATFORM_IOS" = "yes" ]; then
CFG_RPATH="no" CFG_RPATH="no"
CFG_PKGCONFIG="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_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" CFG_SKIP_MODULES="$CFG_SKIP_MODULES qtconnectivity qtdoc qtlocation qtmacextras qtserialport qttools qtwebkit qtwebkit-examples"

2
mkspecs/features/qt_parts.prf
View File

@ -60,7 +60,7 @@ exists($$_PRO_FILE_PWD_/tests/tests.pro) {
sub_tests.CONFIG = no_default_install sub_tests.CONFIG = no_default_install
!contains(QT_BUILD_PARTS, tests) { !contains(QT_BUILD_PARTS, tests) {
sub_tests.CONFIG += no_default_target sub_tests.CONFIG += no_default_target
} else { } else: !ios {
# Make sure these are there in case we need them # Make sure these are there in case we need them
sub_tools.CONFIG -= no_default_target sub_tools.CONFIG -= no_default_target
sub_examples.CONFIG -= no_default_target sub_examples.CONFIG -= no_default_target

2
tests/auto/auto.pro
View File

@ -19,6 +19,8 @@ SUBDIRS += \
installed_cmake.depends = cmake installed_cmake.depends = cmake
ios: SUBDIRS = corelib gui
wince*: SUBDIRS -= printsupport wince*: SUBDIRS -= printsupport
cross_compile: SUBDIRS -= tools cross_compile: SUBDIRS -= tools
!qtHaveModule(opengl): SUBDIRS -= opengl !qtHaveModule(opengl): SUBDIRS -= opengl

8
tests/auto/corelib/corelib.pro
View File

@ -1,16 +1,18 @@
TEMPLATE=subdirs TEMPLATE=subdirs
SUBDIRS=\
SUBDIRS = \
kernel
!ios: SUBDIRS += \
animation \ animation \
codecs \ codecs \
global \ global \
io \ io \
itemmodels \ itemmodels \
json \ json \
kernel \
mimetypes \ mimetypes \
plugin \ plugin \
statemachine \ statemachine \
thread \ thread \
tools \ tools \
xml xml

7
tests/auto/gui/gui.pro
View File

@ -1,7 +1,10 @@
TEMPLATE=subdirs TEMPLATE=subdirs
SUBDIRS=\
SUBDIRS = \
kernel
!ios: SUBDIRS += \
image \ image \
kernel \
math3d \ math3d \
painting \ painting \
qopengl \ qopengl \

2
tests/tests.pro
View File

@ -4,4 +4,4 @@ SUBDIRS = auto
# benchmarks in debug mode is rarely sensible # benchmarks in debug mode is rarely sensible
# benchmarks are not sensible for code coverage (here with tool testcocoon) # 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