summaryrefslogtreecommitdiffstats
path: root/demos/embedded
diff options
context:
space:
mode:
authoraxis <qt-info@nokia.com>2010-02-23 14:51:12 (GMT)
committeraxis <qt-info@nokia.com>2010-02-23 14:54:45 (GMT)
commit3fc0b4194bffae9a0d7c7d87f97bb4d1e96e773b (patch)
tree9672a9193db2f87b501a7a221fa29ed990c1d935 /demos/embedded
parent734596c1986f84f4c565f30fd436de94cf3cee1f (diff)
downloadQt-3fc0b4194bffae9a0d7c7d87f97bb4d1e96e773b.zip
Qt-3fc0b4194bffae9a0d7c7d87f97bb4d1e96e773b.tar.gz
Qt-3fc0b4194bffae9a0d7c7d87f97bb4d1e96e773b.tar.bz2
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/embedded')
-rw-r--r--demos/embedded/embedded.pro2
1 files changed, 2 insertions, 0 deletions
diff --git a/demos/embedded/embedded.pro b/demos/embedded/embedded.pro
index 5bd3276..da764d1 100644
--- a/demos/embedded/embedded.pro
+++ b/demos/embedded/embedded.pro
@@ -4,6 +4,8 @@ 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
}