diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-04-12 12:55:28 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-04-12 12:55:28 (GMT) |
| commit | 957f36cb498657f94f1b5b92f52713254ff8c051 (patch) | |
| tree | 2f5eb7274d87308a365ae18d91d79c80af45c333 /mkspecs | |
| parent | 1bcbd8aa87db82f045b935861510ee7480578f04 (diff) | |
| parent | a46b1d4060fd392c10d6c55d51f536ba92d9f5c3 (diff) | |
| download | Qt-957f36cb498657f94f1b5b92f52713254ff8c051.zip Qt-957f36cb498657f94f1b5b92f52713254ff8c051.tar.gz Qt-957f36cb498657f94f1b5b92f52713254ff8c051.tar.bz2 | |
Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.6-integration
* '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public:
Improved support for OPTION and LINKEROPTION statements in MMP files
Diffstat (limited to 'mkspecs')
| -rw-r--r-- | mkspecs/common/symbian/symbian.conf | 2 |
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 |