summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMiikka Heikkinen <miikka.heikkinen@digia.com>2009-11-18 08:07:17 (GMT)
committeraxis <qt-info@nokia.com>2009-11-18 16:56:02 (GMT)
commit1b259bccdc906b9f20935897f03e0c75d1358515 (patch)
tree6b01dd63f2a142621291ea4d3bc232d92f37f830
parent6e6907962972aed3d054c1fa43b4303e4e66ccaf (diff)
downloadQt-1b259bccdc906b9f20935897f03e0c75d1358515.zip
Qt-1b259bccdc906b9f20935897f03e0c75d1358515.tar.gz
Qt-1b259bccdc906b9f20935897f03e0c75d1358515.tar.bz2
Removed Browser demo from Symbian builds
Browser demo isn't currently compiling for Symbian GCCE builds because ARMV5 built static uitools.lib apparently isn't compatible with linking into GCCE application. Removed the browser from Symbian builds as a hotfix for 4.6.0. Task-number: QTBUG-5692 Reviewed-by: Janne Anttila (cherry picked from commit 31d29b227a7609ab0dadca4244cafec919264ba8)
-rw-r--r--demos/demos.pro2
1 files changed, 1 insertions, 1 deletions
diff --git a/demos/demos.pro b/demos/demos.pro
index 5e400ea..a943bfd 100644
--- a/demos/demos.pro
+++ b/demos/demos.pro
@@ -37,7 +37,7 @@ wince*: SUBDIRS += demos_sqlbrowser
}
}
contains(QT_CONFIG, phonon):!static:SUBDIRS += demos_mediaplayer
-contains(QT_CONFIG, webkit):contains(QT_CONFIG, svg):SUBDIRS += demos_browser
+contains(QT_CONFIG, webkit):contains(QT_CONFIG, svg):!symbian:SUBDIRS += demos_browser
# install
sources.files = README *.pro