From b2f8a70890868f344499d5c8f62454922bc0f371 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tor=20Arne=20Vestb=C3=B8?= <tor.arne.vestbo@digia.com>
Date: Thu, 16 Jan 2014 11:00:30 +0100
Subject: iOS: Enable building of basic tests
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Allows us to sanity check the iOS build in the CI.

Change-Id: I16f9bfafef3988dcab6efd3155503ca0d0b4d1d8
Reviewed-by: Morten Johan Sørvig <morten.sorvig@digia.com>
---
 configure                      | 2 +-
 mkspecs/features/qt_parts.prf  | 2 +-
 tests/auto/auto.pro            | 2 ++
 tests/auto/corelib/corelib.pro | 8 +++++---
 tests/auto/gui/gui.pro         | 7 +++++--
 tests/tests.pro                | 2 +-
 6 files changed, 15 insertions(+), 8 deletions(-)

diff --git a/configure b/configure
index 0d746acf0d..40126cbc36 100755
--- a/configure
+++ b/configure
@@ -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
-- 
cgit v1.2.3