summaryrefslogtreecommitdiffstats
path: root/demos
diff options
context:
space:
mode:
authorMarius Storm-Olsen <marius.storm-olsen@nokia.com>2011-03-02 13:44:28 -0600
committeraxis <qt-info@nokia.com>2011-04-27 12:05:59 +0200
commitac1fee88d2a99d04bbb7a3820e76eb68c2138019 (patch)
tree1898ee442c82920ebcec89703998eb502120081a /demos
parentd383f9f8bc3a3310683502df4f2cf0c0c18060f4 (diff)
Diffstat (limited to 'demos')
-rw-r--r--demos/demos.pro2
-rw-r--r--demos/embedded/embedded.pro20
2 files changed, 0 insertions, 22 deletions
diff --git a/demos/demos.pro b/demos/demos.pro
index fe8b416ba9..cbee2b2f42 100644
--- a/demos/demos.pro
+++ b/demos/demos.pro
@@ -48,8 +48,6 @@ SUBDIRS += demos_boxes
mac* && !qpa: SUBDIRS += demos_macmainwindow
wince*|symbian|embedded|x11: SUBDIRS += demos_embedded
-!contains(QT_EDITION, Console):!cross_compile:!embedded:!wince*:SUBDIRS += demos_arthurplugin
-
!cross_compile:{
contains(QT_BUILD_PARTS, tools):{
!wince*:SUBDIRS += demos_sqlbrowser demos_qtdemo
diff --git a/demos/embedded/embedded.pro b/demos/embedded/embedded.pro
index f67ac56152..e9a448b1e3 100644
--- a/demos/embedded/embedded.pro
+++ b/demos/embedded/embedded.pro
@@ -1,28 +1,8 @@
TEMPLATE = subdirs
SUBDIRS = styledemo raycasting flickable digiflip
-contains(QT_CONFIG, svg) {
- SUBDIRS += embeddedsvgviewer \
- desktopservices
- fluidlauncher.subdir = fluidlauncher
- fluidlauncher.depends = styledemo desktopservices raycasting flickable digiflip lightmaps flightinfo
- !vxworks:!qnx:SUBDIRS += fluidlauncher
-}
-
SUBDIRS += lightmaps
SUBDIRS += flightinfo
-contains(QT_CONFIG, svg) {
- SUBDIRS += weatherinfo
-}
-
-contains(QT_CONFIG, webkit) {
- SUBDIRS += anomaly
-}
-
-contains(QT_CONFIG, declarative) {
- # Qml demos require DEPLOYMENT support. Therefore, only symbian.
- symbian:SUBDIRS += qmlcalculator qmlclocks qmldialcontrol qmleasing qmlflickr qmlphotoviewer qmltwitter
-}
# install
sources.files = README *.pro