diff options
author | Qt Continuous Integration System <qt-info@nokia.com> | 2011-05-16 18:33:46 +1000 |
---|---|---|
committer | Qt Continuous Integration System <qt-info@nokia.com> | 2011-05-16 18:33:46 +1000 |
commit | ad5ded99d2a404318451b9c4c90296b9947d3b31 (patch) | |
tree | db4019dbc70325b5e79c6f610da38b72eb089eb1 /configure | |
parent | 083867348f84971ff3911b298c1fc91a0a07217c (diff) | |
parent | 76db499560be7bbb44a2d3bde13cc64d69dab453 (diff) |
Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qtbase-earth-staging
* 'master' of git://scm.dev.nokia.troll.no/qt/qtbase-earth-staging:
Update configure to enable QtConcurrent for Symbian
Diffstat (limited to 'configure')
-rwxr-xr-x | configure | 4 |
1 files changed, 1 insertions, 3 deletions
@@ -7535,10 +7535,8 @@ EOF canBuildQtConcurrent="no" ;; symbian-gcce) - canBuildQtConcurrent="no" ;; symbian-armcc) - canBuildQtConcurrent="no" ;; esac @@ -8269,7 +8267,7 @@ if [ "$XPLATFORM_SYMBIAN" = "yes" ]; then # We cannot use Linux's default export rules since they export everything. QCONFIG_FLAGS="$QCONFIG_FLAGS QT_DLL" # Disable non-working features. - QCONFIG_FLAGS="$QCONFIG_FLAGS QT_NO_CONCURRENT QT_NO_QFUTURE QT_NO_CRASHHANDLER QT_NO_PRINTER QT_NO_SYSTEMTRAYICON" + QCONFIG_FLAGS="$QCONFIG_FLAGS QT_NO_CRASHHANDLER QT_NO_PRINTER QT_NO_SYSTEMTRAYICON" fi if [ -n "$QCONFIG_FLAGS" ]; then |