diff options
author | Thiago Macieira <thiago.macieira@nokia.com> | 2011-03-11 14:04:57 (GMT) |
---|---|---|
committer | Thiago Macieira <thiago.macieira@nokia.com> | 2011-03-11 14:04:57 (GMT) |
commit | 2ec2dc55ddf424f5a7acd0a4729ddd9af2d7c398 (patch) | |
tree | 3833140ddaca4723f452ffa6de973784380d91b2 /configure | |
parent | 649e65519bef38948a818f282e3022d034dc80a5 (diff) | |
parent | 4f3587e749a8503f6207174705ed5db74affb3a5 (diff) | |
download | Qt-2ec2dc55ddf424f5a7acd0a4729ddd9af2d7c398.zip Qt-2ec2dc55ddf424f5a7acd0a4729ddd9af2d7c398.tar.gz Qt-2ec2dc55ddf424f5a7acd0a4729ddd9af2d7c398.tar.bz2 |
Merge remote-tracking branch 'origin/master' into qt-master-from-4.7
Conflicts:
src/s60installs/eabi/QtOpenVGu.def
Diffstat (limited to 'configure')
-rwxr-xr-x | configure | 8 |
1 files changed, 5 insertions, 3 deletions
@@ -6707,6 +6707,8 @@ if [ "$CFG_JAVASCRIPTCORE_JIT" = "yes" ] || [ "$CFG_JAVASCRIPTCORE_JIT" = "auto" if [ $? != "0" ]; then CFG_JAVASCRIPTCORE_JIT=no fi + elif [ "$XPLATFORM" = "symbian-gcce" ]; then + CFG_JAVASCRIPTCORE_JIT=no fi fi @@ -7412,11 +7414,11 @@ EOF canBuildWebKit="no" canBuildQtConcurrent="no" ;; - symbian/*-gcce) + symbian-gcce) canBuildWebKit="no" canBuildQtConcurrent="no" ;; - symbian/*-armcc) + symbian-armcc) canBuildQtConcurrent="no" ;; esac @@ -7479,7 +7481,7 @@ else QCONFIG_FLAGS="$QCONFIG_FLAGS QT_NO_SVG" fi -if [ "$CFG_WEBKIT" = "auto" ]; then +if [ "$CFG_WEBKIT" != "no" ]; then CFG_WEBKIT="$canBuildWebKit" fi |