summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMiikka Heikkinen <miikka.heikkinen@digia.com>2009-11-18 08:07:17 (GMT)
committerJason McDonald <jason.mcdonald@nokia.com>2009-11-19 03:25:37 (GMT)
commit6e68ada53c6e061e1839354e2c917339853bcbac (patch)
tree8a1206cee9d0a906d4400e17b7ec41c89e608b30
parentf3a483ab2f9ed9c585c6d036880157bb6ed98c89 (diff)
downloadQt-6e68ada53c6e061e1839354e2c917339853bcbac.zip
Qt-6e68ada53c6e061e1839354e2c917339853bcbac.tar.gz
Qt-6e68ada53c6e061e1839354e2c917339853bcbac.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) (cherry picked from commit 1b259bccdc906b9f20935897f03e0c75d1358515)
-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