summaryrefslogtreecommitdiffstats
path: root/demos
diff options
context:
space:
mode:
authoraxis <qt-info@nokia.com>2009-11-18 09:28:59 (GMT)
committeraxis <qt-info@nokia.com>2009-11-18 09:28:59 (GMT)
commitdb3efe5bf4d03d6fcdbf435c2445203bb07475f9 (patch)
tree36da498928e2b27f3b17e9613df08aaa93ce0201 /demos
parent484a6043ef84df3d0d01a19247ea2c89eb8b309f (diff)
parent31d29b227a7609ab0dadca4244cafec919264ba8 (diff)
downloadQt-db3efe5bf4d03d6fcdbf435c2445203bb07475f9.zip
Qt-db3efe5bf4d03d6fcdbf435c2445203bb07475f9.tar.gz
Qt-db3efe5bf4d03d6fcdbf435c2445203bb07475f9.tar.bz2
Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt-s60-public into 4.6-staging2
Diffstat (limited to 'demos')
-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