summaryrefslogtreecommitdiffstats
path: root/demos/demos.pro
diff options
context:
space:
mode:
authoraxis <qt-info@nokia.com>2010-02-23 15:51:12 +0100
committeraxis <qt-info@nokia.com>2010-02-23 15:54:45 +0100
commit3fc0b4194bffae9a0d7c7d87f97bb4d1e96e773b (patch)
tree9672a9193db2f87b501a7a221fa29ed990c1d935 /demos/demos.pro
parent734596c1986f84f4c565f30fd436de94cf3cee1f (diff)
Implemented recursive "sis" target and enabled sis_targets feature.
The sis target will depend on the main build target of each project, which should make it possible to simply run "make sis" in the root of a clean tree (after configure, of course), and have sis packages generated for everything. It works at least for Qt. This required some changes to the dependency generation in Qt, to make sure that s60installs builds its package after all of Qt, and that fluidlauncher has all the required files before building a package. In addition, all the sis target code was moved into its own qmake feature file, called sis_targets. It is currently enabled by default for Symbian.
Diffstat (limited to 'demos/demos.pro')
-rw-r--r--demos/demos.pro5
1 files changed, 4 insertions, 1 deletions
diff --git a/demos/demos.pro b/demos/demos.pro
index 08dd8af092..6340175075 100644
--- a/demos/demos.pro
+++ b/demos/demos.pro
@@ -43,7 +43,7 @@ SUBDIRS += demos_boxes
}
mac*: SUBDIRS += demos_macmainwindow
-wince*|symbian|embedded|x11: SUBDIRS += embedded
+wince*|symbian|embedded|x11: SUBDIRS += demos_embedded
!contains(QT_EDITION, Console):!cross_compile:!embedded:!wince*:SUBDIRS += demos_arthurplugin
@@ -65,6 +65,9 @@ symbian: include($$QT_SOURCE_TREE/demos/symbianpkgrules.pri)
demos_chip.subdir = chip
demos_embeddeddialogs.subdir = embeddeddialogs
+demos_embedded.subdir = embedded
+# Because of fluidlauncher
+demos_embedded.depends = demos_deform demos_pathstroke
demos_shared.subdir = shared
demos_deform.subdir = deform
demos_gradients.subdir = gradients