diff options
| -rw-r--r-- | doc/src/development/qmake-manual.qdoc | 3 | ||||
| -rw-r--r-- | qmake/generators/symbian/symmake.cpp | 24 |
2 files changed, 23 insertions, 4 deletions
diff --git a/doc/src/development/qmake-manual.qdoc b/doc/src/development/qmake-manual.qdoc index 1bd85b0..861c772 100644 --- a/doc/src/development/qmake-manual.qdoc +++ b/doc/src/development/qmake-manual.qdoc @@ -959,7 +959,8 @@ General compiler options can as usual be set using \c QMAKE_CFLAGS and \c QMAKE_CXXFLAGS. In order to set specific compiler options, \c QMAKE_CFLAGS.<compiler> and \c QMAKE_CXXFLAGS.<compiler> can be used. \c <compiler> can be either \c CW for the WINSCW - architecture (emulator), or \c ARMCC for the ARMv5 architecture (hardware). + architecture (emulator), or \c ARMCC for the ARMv5 architecture (hardware), or \c GCCE for + the ARMv5 architecture (hardware). Here is an example: diff --git a/qmake/generators/symbian/symmake.cpp b/qmake/generators/symbian/symmake.cpp index db69a4f..dd1dd5f 100644 --- a/qmake/generators/symbian/symmake.cpp +++ b/qmake/generators/symbian/symmake.cpp @@ -933,7 +933,7 @@ void SymbianMakefileGenerator::writeMmpFileCapabilityPart(QTextStream& t) void SymbianMakefileGenerator::writeMmpFileCompilerOptionPart(QTextStream& t) { - QString cw, armcc; + QString cw, armcc, gcce; if (0 != project->values("QMAKE_CXXFLAGS.CW").size()) { cw.append(project->values("QMAKE_CXXFLAGS.CW").join(" ")); @@ -945,6 +945,11 @@ void SymbianMakefileGenerator::writeMmpFileCompilerOptionPart(QTextStream& t) armcc.append(" "); } + if (0 != project->values("QMAKE_CXXFLAGS.GCCE").size()) { + gcce.append(project->values("QMAKE_CXXFLAGS.GCCE").join(" ")); + gcce.append(" "); + } + if (0 != project->values("QMAKE_CFLAGS.CW").size()) { cw.append(project->values("QMAKE_CFLAGS.CW").join(" ")); cw.append(" "); @@ -955,11 +960,18 @@ void SymbianMakefileGenerator::writeMmpFileCompilerOptionPart(QTextStream& t) armcc.append(" "); } + if (0 != project->values("QMAKE_CFLAGS.GCCE").size()) { + gcce.append(project->values("QMAKE_CXXFLAGS.GCCE").join(" ")); + gcce.append(" "); + } + if (0 != project->values("QMAKE_CXXFLAGS").size()) { cw.append(project->values("QMAKE_CXXFLAGS").join(" ")); cw.append(" "); armcc.append(project->values("QMAKE_CXXFLAGS").join(" ")); armcc.append(" "); + gcce.append(project->values("QMAKE_CXXFLAGS").join(" ")); + gcce.append(" "); } if (0 != project->values("QMAKE_CFLAGS").size()) { @@ -967,17 +979,23 @@ void SymbianMakefileGenerator::writeMmpFileCompilerOptionPart(QTextStream& t) cw.append(" "); armcc.append(project->values("QMAKE_CFLAGS").join(" ")); armcc.append(" "); + gcce.append(project->values("QMAKE_CFLAGS").join(" ")); + gcce.append(" "); } if (!cw.isEmpty() && cw[cw.size()-1] == ' ') cw.chop(1); if (!armcc.isEmpty() && armcc[armcc.size()-1] == ' ') armcc.chop(1); + if (!gcce.isEmpty() && gcce[gcce.size()-1] == ' ') + gcce.chop(1); if (!cw.isEmpty()) - t << "OPTION" << '\t' << " CW " << cw << endl; + t << "OPTION CW " << cw << endl; if (!armcc.isEmpty()) - t << "OPTION" << '\t' << " ARMCC " << armcc << endl; + t << "OPTION ARMCC " << armcc << endl; + if (!gcce.isEmpty()) + t << "OPTION GCCE " << gcce << endl; t << endl; } |