summaryrefslogtreecommitdiffstats
path: root/src/src.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 /src/src.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 'src/src.pro')
-rw-r--r--src/src.pro6
1 files changed, 5 insertions, 1 deletions
diff --git a/src/src.pro b/src/src.pro
index 2ce564253f..ec7b14b6fb 100644
--- a/src/src.pro
+++ b/src/src.pro
@@ -6,7 +6,7 @@ win32:SRC_SUBDIRS += src_winmain
wince*:{
SRC_SUBDIRS += src_corelib src_xml src_gui src_sql src_network src_testlib
} else:symbian {
- SRC_SUBDIRS += src_s60main src_corelib src_xml src_gui src_network src_sql src_testlib src_s60installs
+ SRC_SUBDIRS += src_s60main src_corelib src_xml src_gui src_network src_sql src_testlib
!symbian-abld:!symbian-sbsv2 {
include(tools/tools.pro)
}
@@ -32,6 +32,9 @@ contains(QT_CONFIG, script): SRC_SUBDIRS += src_script
contains(QT_CONFIG, scripttools): SRC_SUBDIRS += src_scripttools
contains(QT_CONFIG, declarative): SRC_SUBDIRS += src_declarative
SRC_SUBDIRS += src_plugins
+# s60installs need to be at the end, because projects.pro does an ordered build,
+# and s60installs depends on all the others.
+symbian:SRC_SUBDIRS += src_s60installs
src_s60main.subdir = $$QT_SOURCE_TREE/src/s60main
src_s60main.target = sub-s60main
@@ -106,6 +109,7 @@ src_declarative.target = sub-declarative
src_tools_activeqt.depends = src_tools_idc src_gui
src_declarative.depends = src_xml src_gui src_script src_network src_svg
src_plugins.depends = src_gui src_sql src_svg
+ src_s60installs.depends = $$TOOLS_SUBDIRS $$SRC_SUBDIRS
contains(QT_CONFIG, webkit) {
src_webkit.depends = src_gui src_sql src_network src_xml
contains(QT_CONFIG, phonon):src_webkit.depends += src_phonon