diff options
| author | Liang Qi <liang.qi@nokia.com> | 2011-04-07 11:52:42 (GMT) |
|---|---|---|
| committer | Liang Qi <liang.qi@nokia.com> | 2011-04-07 11:52:42 (GMT) |
| commit | 99eb6c6c2048ce4d96348c54a79986c779fdf656 (patch) | |
| tree | 2f12a0c0dbd28ebdc5f1879ee5cb4da84541b250 /mkspecs | |
| parent | c2383fa6a8070bf5bec4a444ae7d486874f35ab2 (diff) | |
| download | Qt-99eb6c6c2048ce4d96348c54a79986c779fdf656.zip Qt-99eb6c6c2048ce4d96348c54a79986c779fdf656.tar.gz Qt-99eb6c6c2048ce4d96348c54a79986c779fdf656.tar.bz2 | |
Support QMAKE_LFLAGS.ARMCC and QMAKE_LFLAGS.GCCE in makefile build system
Reviewed-by: axis
Diffstat (limited to 'mkspecs')
| -rw-r--r-- | mkspecs/common/symbian/symbian.conf | 3 | ||||
| -rw-r--r-- | mkspecs/features/symbian/symbian_building.prf | 2 |
2 files changed, 4 insertions, 1 deletions
diff --git a/mkspecs/common/symbian/symbian.conf b/mkspecs/common/symbian/symbian.conf index e35786b..f955e3c 100644 --- a/mkspecs/common/symbian/symbian.conf +++ b/mkspecs/common/symbian/symbian.conf @@ -57,7 +57,8 @@ QMAKE_INCDIR = QMAKE_INCDIR_QT = $$[QT_INSTALL_HEADERS] QMAKE_LFLAGS = -QMAKE_LFLAGS.ARMCC = +QMAKE_LFLAGS.ARMCC = +QMAKE_LFLAGS.GCCE = QMAKE_LFLAGS_EXCEPTIONS_ON = QMAKE_LFLAGS_EXCEPTIONS_OFF = QMAKE_LFLAGS_RELEASE = diff --git a/mkspecs/features/symbian/symbian_building.prf b/mkspecs/features/symbian/symbian_building.prf index 28046b4..8c75707 100644 --- a/mkspecs/features/symbian/symbian_building.prf +++ b/mkspecs/features/symbian/symbian_building.prf @@ -1,6 +1,7 @@ symbian-armcc { QMAKE_CFLAGS += $$QMAKE_CFLAGS.ARMCC QMAKE_CXXFLAGS += $$QMAKE_CXXFLAGS.ARMCC + QMAKE_LFLAGS += $$QMAKE_LFLAGS.ARMCC # This is to prevent inclusion of the shipped RVCT headers, which are often in the # environment variable RVCTxxINC by default. -J prevents the searching of that location, # but needs a path, so just specify somewhere guaranteed not to contain header files. @@ -9,6 +10,7 @@ symbian-armcc { } else:symbian-gcce { QMAKE_CFLAGS += $$QMAKE_CFLAGS.GCCE QMAKE_CXXFLAGS += $$QMAKE_CXXFLAGS.GCCE + QMAKE_LFLAGS += $$QMAKE_LFLAGS.GCCE } # We need a target name without the INFIX'ed part, since flags are not infixed. |