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

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;