diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2011-08-02 16:25:58 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2011-08-02 16:25:58 (GMT) |
| commit | db89f3c6a5efbee336c891af080cc2c1b405397a (patch) | |
| tree | 583ad2dca5cca875aab741e106f61e5307391052 /mkspecs | |
| parent | 08d4a7ba40be36d8d8ae63b3bbaeb7823441c8aa (diff) | |
| parent | 983dca7f3d92bd4f284f83464c164d5fa580b48f (diff) | |
| download | Qt-db89f3c6a5efbee336c891af080cc2c1b405397a.zip Qt-db89f3c6a5efbee336c891af080cc2c1b405397a.tar.gz Qt-db89f3c6a5efbee336c891af080cc2c1b405397a.tar.bz2 | |
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public:
Support debuggable in the makefile build system
Mark all Symbian debug binaries debuggable by default
Diffstat (limited to 'mkspecs')
| -rw-r--r-- | mkspecs/common/symbian/symbian-makefile.conf | 5 | ||||
| -rw-r--r-- | mkspecs/common/symbian/symbian-mmp.conf | 2 |
2 files changed, 7 insertions, 0 deletions
diff --git a/mkspecs/common/symbian/symbian-makefile.conf b/mkspecs/common/symbian/symbian-makefile.conf index a725df3..14acd69 100644 --- a/mkspecs/common/symbian/symbian-makefile.conf +++ b/mkspecs/common/symbian/symbian-makefile.conf @@ -34,6 +34,11 @@ QMAKE_ELF2E32_FLAGS = --dlldata \ --compressionmethod bytepair \ --unpaged +CONFIG(debug, debug|release) { + QMAKE_ELF2E32_FLAGS += \ + --debuggable +} + QMAKE_PREFIX_SHLIB = CONFIG *= no_plugin_name_prefix QMAKE_PREFIX_STATICLIB = diff --git a/mkspecs/common/symbian/symbian-mmp.conf b/mkspecs/common/symbian/symbian-mmp.conf index 8ed326a..fa2a815 100644 --- a/mkspecs/common/symbian/symbian-mmp.conf +++ b/mkspecs/common/symbian/symbian-mmp.conf @@ -58,3 +58,5 @@ symbian-sbsv2 { QMAKE_SBSV2_DEL_TREE = $(GNURM) -rf } +# Mark all debug executables debuggable. +MMP_RULES += DEBUGGABLE_UDEBONLY |