summaryrefslogtreecommitdiffstats
path: root/mkspecs/common
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 /mkspecs/common
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 'mkspecs/common')
-rw-r--r--mkspecs/common/symbian/symbian.conf2
1 files changed, 1 insertions, 1 deletions
diff --git a/mkspecs/common/symbian/symbian.conf b/mkspecs/common/symbian/symbian.conf
index a11f011561..744ffda1f6 100644
--- a/mkspecs/common/symbian/symbian.conf
+++ b/mkspecs/common/symbian/symbian.conf
@@ -3,7 +3,7 @@
#
TEMPLATE = app
-CONFIG += qt warn_on release incremental link_prl rvct_linker
+CONFIG += qt warn_on release incremental link_prl rvct_linker sis_targets
QT += core gui
QMAKE_INCREMENTAL_STYLE = sublib