summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authoraxis <qt-info@nokia.com>2010-03-26 13:12:01 (GMT)
committerThomas Zander <t.zander@nokia.com>2010-05-03 15:31:19 (GMT)
commit38cd479383056fb08041e31e3ca6bdb0006f959e (patch)
treecb1cb2b28c727f08a42c192e4574fe489cc5889e
parent6b36913cbe0b97431742edc3b16639e8cf2a722a (diff)
downloadQt-38cd479383056fb08041e31e3ca6bdb0006f959e.zip
Qt-38cd479383056fb08041e31e3ca6bdb0006f959e.tar.gz
Qt-38cd479383056fb08041e31e3ca6bdb0006f959e.tar.bz2
Enabled previously disabled Qt features.
-rwxr-xr-xconfigure4
1 files changed, 2 insertions, 2 deletions
diff --git a/configure b/configure
index 63d8f2d..a15f61f 100755
--- a/configure
+++ b/configure
@@ -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
@@ -7495,7 +7495,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