diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-05-03 16:59:12 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-05-03 16:59:12 (GMT) |
| commit | d9fa51324940a73360f8473acf8231aa50f3efbd (patch) | |
| tree | 17ab9f718befe1b2f56a5c8bd2225e2b2caacf65 /configure | |
| parent | 9b77de3effdb2eb7d6df212ab9a8a19551ecb550 (diff) | |
| parent | 38cd479383056fb08041e31e3ca6bdb0006f959e (diff) | |
| download | Qt-d9fa51324940a73360f8473acf8231aa50f3efbd.zip Qt-d9fa51324940a73360f8473acf8231aa50f3efbd.tar.gz Qt-d9fa51324940a73360f8473acf8231aa50f3efbd.tar.bz2 | |
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public:
Enabled previously disabled Qt features.
Fix includes so it compiles
Use lowercase includes so it compiles in Linux too
Fixed library dependency for Gnupoc.
Removed the --export_all_vtbl from linking.
Cleaned up the elf2e32 options a bit.
Diffstat (limited to 'configure')
| -rwxr-xr-x | configure | 4 |
1 files changed, 2 insertions, 2 deletions
@@ -607,7 +607,7 @@ mkdir -p "$outpath/config.tests" rm -f "$outpath/config.tests/.qmake.cache" cp "$QMAKE_VARS_FILE" "$outpath/config.tests/.qmake.cache" -QMakeVar add styles "cde mac motif plastique cleanlooks windows" +QMakeVar add styles "cde mac motif plastique cleanlooks windows s60" QMakeVar add decorations "default windows styled" QMakeVar add mouse-drivers "pc" if [ "$UNAME_SYSTEM" = "Linux" ] ; then @@ -7494,7 +7494,7 @@ 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_CURSOR QT_NO_SYSTEMTRAYICON" + QCONFIG_FLAGS="$QCONFIG_FLAGS QT_NO_CONCURRENT QT_NO_QFUTURE QT_NO_CRASHHANDLER QT_NO_PRINTER QT_NO_SYSTEMTRAYICON" fi if [ -n "$QCONFIG_FLAGS" ]; then |