summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLiang Qi <liang.qi@nokia.com>2011-08-03 06:04:06 (GMT)
committerLiang Qi <liang.qi@nokia.com>2011-08-03 06:04:06 (GMT)
commit443a1c9e569044e83605c6350dfda384201cfe83 (patch)
treeed4f976b9aef175b5afb68ca22e8ae7991ab99ca
parent62d6b794be90087848958dc2516f213bfa70f36d (diff)
parentc2f1012e54f43886d513346e0f6e4ba6dc87da45 (diff)
downloadQt-443a1c9e569044e83605c6350dfda384201cfe83.zip
Qt-443a1c9e569044e83605c6350dfda384201cfe83.tar.gz
Qt-443a1c9e569044e83605c6350dfda384201cfe83.tar.bz2
Merge remote-tracking branch 'origin/4.7' into qt-4.8-from-4.7
-rw-r--r--mkspecs/common/symbian/symbian-makefile.conf5
-rw-r--r--mkspecs/common/symbian/symbian-mmp.conf2
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