diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-03-26 08:55:01 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-03-26 08:55:01 (GMT) |
| commit | 8c4991d5b034d518dd06dc42c3cc9a7fa9b9e3a1 (patch) | |
| tree | 1ae28a4c94b7712005d3a0a1d1edb11c3ee48912 /qmake/generators/symbian/symmake.cpp | |
| parent | 2aaad2476345e0c44da488ed33c71b8f378a582c (diff) | |
| parent | aaf0f47930a44f5f36bb825e10a5067eeced6718 (diff) | |
| download | Qt-8c4991d5b034d518dd06dc42c3cc9a7fa9b9e3a1.zip Qt-8c4991d5b034d518dd06dc42c3cc9a7fa9b9e3a1.tar.gz Qt-8c4991d5b034d518dd06dc42c3cc9a7fa9b9e3a1.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:
Changed pkg_prerules to not use default_deployment for vendor ID
Enable armcc version specific compler options for Symbian
Diffstat (limited to 'qmake/generators/symbian/symmake.cpp')
| -rw-r--r-- | qmake/generators/symbian/symmake.cpp | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/qmake/generators/symbian/symmake.cpp b/qmake/generators/symbian/symmake.cpp index 1470a12..e1256d8 100644 --- a/qmake/generators/symbian/symmake.cpp +++ b/qmake/generators/symbian/symmake.cpp @@ -1246,6 +1246,16 @@ void SymbianMakefileGenerator::writeMmpFileCompilerOptionPart(QTextStream& t) t << MMP_OPTION_CW " " << cw << endl; if (!armcc.isEmpty()) t << MMP_OPTION_ARMCC " " << armcc << endl; + + foreach(QString armccVersion, project->values("VERSION_FLAGS.ARMCC")) { + QStringList currentValues = project->values("QMAKE_CXXFLAGS." + armccVersion); + if (currentValues.size()) { + t << "#if defined(" << armccVersion << ")" << endl; + t << MMP_OPTION_ARMCC " " << currentValues.join(" ") << endl; + t << "#endif" << endl; + } + } + if (!gcce.isEmpty()) t << MMP_OPTION_GCCE " " << gcce << endl; |