diff options
author | Miikka Heikkinen <miikka.heikkinen@digia.com> | 2010-03-25 10:12:01 (GMT) |
---|---|---|
committer | Miikka Heikkinen <miikka.heikkinen@digia.com> | 2010-03-26 08:47:23 (GMT) |
commit | c3a7d812d3cf30d23049cfd355c6290a7985f81d (patch) | |
tree | fa080b4d3e65158e40cebaf675a0800fc639b73d /qmake/generators | |
parent | 039b057b95db7687867904e1a9a5046a8e3b3fc0 (diff) | |
download | Qt-c3a7d812d3cf30d23049cfd355c6290a7985f81d.zip Qt-c3a7d812d3cf30d23049cfd355c6290a7985f81d.tar.gz Qt-c3a7d812d3cf30d23049cfd355c6290a7985f81d.tar.bz2 |
Enable armcc version specific compler options for Symbian
VERSION_FLAGS.ARMCC variable is used in symbian.conf to define
supported armcc compiler version flags. Values given to this
variable must be directly usable as ifdef flags in mmp.
QMAKE_CXXFLAGS.<version flag> variables can now be used to add
compiler options to specific compiler versions.
Note that options added via QMAKE_CXXFLAGS.ARMCC flag
will apply to all versions of armcc compiler.
Task-number: QTBUG-8685
Reviewed-by: Iain
Diffstat (limited to 'qmake/generators')
-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; |