summaryrefslogtreecommitdiffstats
path: root/mkspecs
diff options
context:
space:
mode:
authorMiikka Heikkinen <miikka.heikkinen@digia.com>2010-04-12 10:59:34 (GMT)
committerMiikka Heikkinen <miikka.heikkinen@digia.com>2010-04-12 11:31:57 (GMT)
commita46b1d4060fd392c10d6c55d51f536ba92d9f5c3 (patch)
treeba33d7aebb321d1505992785274dd8f5db3c9aa0 /mkspecs
parentec171d35582ea440a1a790296e1875876ae7c568 (diff)
downloadQt-a46b1d4060fd392c10d6c55d51f536ba92d9f5c3.zip
Qt-a46b1d4060fd392c10d6c55d51f536ba92d9f5c3.tar.gz
Qt-a46b1d4060fd392c10d6c55d51f536ba92d9f5c3.tar.bz2
Improved support for OPTION and LINKEROPTION statements in MMP files
VERSION_FLAGS.<keyword> can now be used for all compilers and not just armcc, and version flagging can now be used with QMAKE_LFLAGS as well as QMAKE_CXXFLAGS. Also, MMP_OPTION_KEYWORDS variable is used to define supported keywords for OPTION and LINKEROPTION statements, which are defined via QMAKE_CXXFLAGS.<keyword> and QMAKE_LFLAGS.<keyword> variables. This improves flexibility in the future if new keywords need to be supported. Task-number: QTBUG-8685 Reviewed-by: Janne Koskinen
Diffstat (limited to 'mkspecs')
-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 d66d227..ba31116 100644
--- a/mkspecs/common/symbian/symbian.conf
+++ b/mkspecs/common/symbian/symbian.conf
@@ -26,7 +26,7 @@ QMAKE_CFLAGS_RELEASE =
QMAKE_CFLAGS_DEBUG =
QMAKE_CFLAGS_YACC = -Wno-unused -Wno-parentheses
-
+MMP_OPTION_KEYWORDS = CW ARMCC GCCE
VERSION_FLAGS.ARMCC = ARMCC_4_0
QMAKE_CXX = g++
QMAKE_CXXFLAGS = $$QMAKE_CFLAGS