diff options
| author | Tor Arne Vestbø <tor.arne.vestbo@digia.com> | 2014-01-16 11:00:30 +0100 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2014-01-22 12:35:17 +0100 |
| commit | b2f8a70890868f344499d5c8f62454922bc0f371 (patch) | |
| tree | 4e80b1e12bb472f013b83ed506dc9831727cf244 | |
| parent | 7ddd813b7f4a7c68047f4296247ddf7f277582b7 (diff) | |
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>
| -rwxr-xr-x | configure | 2 | ||||
| -rw-r--r-- | mkspecs/features/qt_parts.prf | 2 | ||||
| -rw-r--r-- | tests/auto/auto.pro | 2 | ||||
| -rw-r--r-- | tests/auto/corelib/corelib.pro | 8 | ||||
| -rw-r--r-- | tests/auto/gui/gui.pro | 7 | ||||
| -rw-r--r-- | tests/tests.pro | 2 |
6 files changed, 15 insertions, 8 deletions
@@ -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" diff --git a/mkspecs/features/qt_parts.prf b/mkspecs/features/qt_parts.prf index ed028d59d3..fee711aeb8 100644 --- a/mkspecs/features/qt_parts.prf +++ b/mkspecs/features/qt_parts.prf @@ -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 diff --git a/tests/auto/auto.pro b/tests/auto/auto.pro index 3ff78a955f..a9aecc9448 100644 --- a/tests/auto/auto.pro +++ b/tests/auto/auto.pro @@ -19,6 +19,8 @@ SUBDIRS += \ installed_cmake.depends = cmake +ios: SUBDIRS = corelib gui + wince*: SUBDIRS -= printsupport cross_compile: SUBDIRS -= tools !qtHaveModule(opengl): SUBDIRS -= opengl diff --git a/tests/auto/corelib/corelib.pro b/tests/auto/corelib/corelib.pro index a85a385f80..4d88b04828 100644 --- a/tests/auto/corelib/corelib.pro +++ b/tests/auto/corelib/corelib.pro @@ -1,16 +1,18 @@ TEMPLATE=subdirs -SUBDIRS=\ + +SUBDIRS = \ + kernel + +!ios: SUBDIRS += \ animation \ codecs \ global \ io \ itemmodels \ json \ - kernel \ mimetypes \ plugin \ statemachine \ thread \ tools \ xml - diff --git a/tests/auto/gui/gui.pro b/tests/auto/gui/gui.pro index b6c55c5eaa..d250e45a4e 100644 --- a/tests/auto/gui/gui.pro +++ b/tests/auto/gui/gui.pro @@ -1,7 +1,10 @@ TEMPLATE=subdirs -SUBDIRS=\ + +SUBDIRS = \ + kernel + +!ios: SUBDIRS += \ image \ - kernel \ math3d \ painting \ qopengl \ diff --git a/tests/tests.pro b/tests/tests.pro index 0f50930774..79bee02b65 100644 --- a/tests/tests.pro +++ b/tests/tests.pro @@ -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 |