summaryrefslogtreecommitdiffstats
path: root/configure
diff options
context:
space:
mode:
authorKent Hansen <kent.hansen@nokia.com>2012-08-09 11:06:46 (GMT)
committerQt by Nokia <qt-info@nokia.com>2012-08-10 00:45:23 (GMT)
commit1ebaa841ddc54a2e8af9f3708538010a007a7197 (patch)
tree4111abb38ce0a33b0f4435d57cdd4dccae56409d /configure
parent1ae0f6f9077e2364bbbb90208ed0a5e1d385361a (diff)
downloadQt-1ebaa841ddc54a2e8af9f3708538010a007a7197.zip
Qt-1ebaa841ddc54a2e8af9f3708538010a007a7197.tar.gz
Qt-1ebaa841ddc54a2e8af9f3708538010a007a7197.tar.bz2
Don't build qtscript when stl isn't available
Task-number: QTBUG-7813 Change-Id: Ie0873e7fbd1168b11e5881d156a0583d0fa7f859 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
Diffstat (limited to 'configure')
-rwxr-xr-xconfigure8
1 files changed, 7 insertions, 1 deletions
diff --git a/configure b/configure
index 4abe8f2..0392524 100755
--- a/configure
+++ b/configure
@@ -7509,6 +7509,7 @@ fi
#
canBuildQtXmlPatterns="yes"
canBuildWebKit="$HAVE_STL"
+canBuildQtScript="$HAVE_STL"
canBuildQtConcurrent="yes"
# WebKit requires stdint.h
@@ -7700,8 +7701,13 @@ else
QCONFIG_FLAGS="$QCONFIG_FLAGS QT_NO_WEBKIT"
fi
+if [ "$CFG_SCRIPT" = "yes" -a "$canBuildQtScript" = "no" ]; then
+ echo "Error: QtScript was requested, but it can't be built on this platform."
+ exit 1
+fi
+
if [ "$CFG_SCRIPT" = "auto" ]; then
- CFG_SCRIPT="yes"
+ CFG_SCRIPT="$canBuildQtScript"
fi
if [ "$CFG_SCRIPT" = "yes" ]; then