summaryrefslogtreecommitdiffstats
path: root/mkspecs/symbian-sbsv2
diff options
context:
space:
mode:
authorQt Continuous Integration System <qt-info@nokia.com>2010-02-26 17:42:20 (GMT)
committerQt Continuous Integration System <qt-info@nokia.com>2010-02-26 17:42:20 (GMT)
commit0fa408468327672f7e1ad8c628dc073c43bf2b3f (patch)
tree4eb888ca8a5d2e9d593c4cc904fd77c242e5f27d /mkspecs/symbian-sbsv2
parentca82ee4ee55e52c75326949148455af1095df014 (diff)
parented1d9f24d035857438e5bb9ccb423310bc30310b (diff)
downloadQt-0fa408468327672f7e1ad8c628dc073c43bf2b3f.zip
Qt-0fa408468327672f7e1ad8c628dc073c43bf2b3f.tar.gz
Qt-0fa408468327672f7e1ad8c628dc073c43bf2b3f.tar.bz2
Merge branch 'master' of scm.dev.nokia.troll.no:qt/berlin-staging-1 into master-integration
* 'master' of scm.dev.nokia.troll.no:qt/berlin-staging-1: (22 commits) fix "configure -fast" on Windows for other maketools than nmake Get qmake to add pdb files to install target in debug configuration. add TARGET_PLATFORM to qmakespecs with MAKEFILE_GENERATOR = UNIX give symbian an own platform mode deprecate -win32/-unix/-macx which set both host and target mode decouple host platform mode from target platform mode factor out applyHostMode() make QMAKE_QMAKE and QMAKE_EXT_OBJ magic builtins use QDir::separator() instead of Option::dir_sep where appropriate simplify string ops sanitize evaluation of OS scopes instead of hard-coding recursion for symbian, add it to the specs add possibility to request project recursion from within a pro file fix ts-assistant target use QList::reserve() as appropriate optimize appending of (empty) lists to (empty) lists suppress pointer aliasing warnings Fix compilation with namespace. Assistant: Make ~AbstractHelpViewer() virtual. Prepare German translations for 4.7 (except Quick). ...
Diffstat (limited to 'mkspecs/symbian-sbsv2')
-rw-r--r--mkspecs/symbian-sbsv2/qmake.conf1
1 files changed, 1 insertions, 0 deletions
diff --git a/mkspecs/symbian-sbsv2/qmake.conf b/mkspecs/symbian-sbsv2/qmake.conf
index 0a5e878..585e645 100644
--- a/mkspecs/symbian-sbsv2/qmake.conf
+++ b/mkspecs/symbian-sbsv2/qmake.conf
@@ -5,5 +5,6 @@
#
MAKEFILE_GENERATOR = SYMBIAN_SBSV2
+option(recursive)
include(../common/symbian/symbian.conf)