From 7c64ab4966e24834768eb1a09b3d2fd08471787a Mon Sep 17 00:00:00 2001
From: Jason McDonald <jason.mcdonald@nokia.com>
Date: Tue, 11 Oct 2011 14:15:52 +1000
Subject: Exclude qtconcurrent tests via .pro files.
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

If Qt is built without QtConcurrent, the relevant autotests should be
excluded from the build, rather than building empty tests that appear
to pass and thus produce confusing test results.

Change-Id: I43bafcb0ffa42e8981bec4e27bf6a23a28d86df9
Reviewed-on: http://codereview.qt-project.org/6395
Reviewed-by: Morten Johan Sørvig <morten.sorvig@nokia.com>
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
---
 configure | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'configure')

diff --git a/configure b/configure
index 5e6b289aaf..c11ab76f2c 100755
--- a/configure
+++ b/configure
@@ -7543,6 +7543,8 @@ CFG_CONCURRENT="yes"
 if [ "$canBuildQtConcurrent" = "no" ]; then
     QCONFIG_FLAGS="$QCONFIG_FLAGS QT_NO_CONCURRENT"
     CFG_CONCURRENT="no"
+else
+    QT_CONFIG="$QT_CONFIG concurrent"
 fi
 
 if [ "$CFG_XMLPATTERNS" = "yes" -a "$CFG_EXCEPTIONS" = "no" ]; then
-- 
cgit v1.2.3