summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThomas Zander <t.zander@nokia.com>2010-05-19 13:43:38 (GMT)
committerThomas Zander <t.zander@nokia.com>2010-05-19 13:44:16 (GMT)
commit6bdba9c7909d8f53e28823b16e82f89650eea16d (patch)
tree7e6cc4998eecae6beba647b026b95f24e23b9fc2
parente8bf969172647406cc400a5368a5eb624b2e1ec1 (diff)
downloadQt-6bdba9c7909d8f53e28823b16e82f89650eea16d.zip
Qt-6bdba9c7909d8f53e28823b16e82f89650eea16d.tar.gz
Qt-6bdba9c7909d8f53e28823b16e82f89650eea16d.tar.bz2
Disable compiling unsupported classes for Symbian
The accessibility classes are currently unsupported on Symbian, so don't compile them in. The various styles will not be pretty on symbian either, so don't compile them in.
-rwxr-xr-xconfigure13
1 files changed, 11 insertions, 2 deletions
diff --git a/configure b/configure
index d357fde..dc0434f 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 s60"
+QMakeVar add styles "cde mac motif plastique cleanlooks windows"
QMakeVar add decorations "default windows styled"
QMakeVar add mouse-drivers "pc"
if [ "$UNAME_SYSTEM" = "Linux" ] ; then
@@ -4699,6 +4699,8 @@ if [ "$CFG_ZLIB" = "auto" ]; then
fi
case "$XPLATFORM" in *symbian*)
+ QMakeVar set styles "windows s60" #overwrite previous default
+
if test -z "$EPOCROOT"; then
echo "Please export EPOCROOT. It should point to the sdk install dir"
exit 1
@@ -4828,7 +4830,14 @@ fi
# detect accessibility
if [ "$CFG_ACCESSIBILITY" = "auto" ]; then
- CFG_ACCESSIBILITY=yes
+ case "$XPLATFORM" in
+ symbian*)
+ # accessibility is currently unsupported
+ CFG_ACCESSIBILITY=no
+ ;;
+ *)
+ CFG_ACCESSIBILITY=yes
+ esac
fi
# auto-detect SQL-modules support