summaryrefslogtreecommitdiffstats
path: root/configure
diff options
context:
space:
mode:
authorMarius Storm-Olsen <marius.storm-olsen@nokia.com>2012-03-21 11:15:22 +0100
committerQt by Nokia <qt-info@nokia.com>2012-03-27 12:01:59 +0200
commitac02d4e7adf5df01379398e0fa759ec64f19819f (patch)
tree3f38a334cb436784301c12feb3677cbbdbd16665 /configure
parentb72fd8482e9bfbf924fe05e6efdb58a6bb25b887 (diff)
Remove 'tests' as default build part.
This requires 'configure -make tests' if you want to automatically build autotests for a module by default. You can still go into the individual tests/ directories and 'qmake && make check' to build and run the autotests. configure -developer-build will enable the tests by default, like it did in Qt4. Change-Id: If4d870987de0947a8328509dcc227fa9e6284201 Reviewed-by: Jason McDonald <jason.mcdonald@nokia.com> Reviewed-by: Sergio Ahumada <sergio.ahumada@nokia.com> Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
Diffstat (limited to 'configure')
-rwxr-xr-xconfigure7
1 files changed, 6 insertions, 1 deletions
diff --git a/configure b/configure
index fbd6b35b6d..fa5e894058 100755
--- a/configure
+++ b/configure
@@ -703,7 +703,7 @@ CFG_SSE=auto
CFG_FONTCONFIG=auto
CFG_LIBFREETYPE=auto
CFG_SQL_AVAILABLE=
-QT_DEFAULT_BUILD_PARTS="libs examples tests"
+QT_DEFAULT_BUILD_PARTS="libs examples"
CFG_BUILD_PARTS=""
CFG_NOBUILD_PARTS=""
CFG_RELEASE_QMAKE=no
@@ -2698,6 +2698,11 @@ fi
if [ -z "$CFG_BUILD_PARTS" ]; then
CFG_BUILD_PARTS="$QT_DEFAULT_BUILD_PARTS"
+ # build tests by default, if a developer build
+ if [ "$CFG_DEV" = "yes" ]; then
+ CFG_BUILD_PARTS="$CFG_BUILD_PARTS tests"
+ fi
+
# don't build tools by default when cross-compiling
if [ "$PLATFORM" != "$XPLATFORM" ]; then
CFG_BUILD_PARTS=`echo "$CFG_BUILD_PARTS" | sed "s, tools,,g"`