diff options
| author | axis <qt-info@nokia.com> | 2010-07-22 14:33:53 (GMT) |
|---|---|---|
| committer | axis <qt-info@nokia.com> | 2010-07-22 14:36:37 (GMT) |
| commit | 34f8befe468435e97ed6498784b13cdf74d6ead5 (patch) | |
| tree | faa3970124e47bf2f598cba82ae33186c8957557 /mkspecs/features | |
| parent | 3949e198e991d81061696e153309c113b95aa49c (diff) | |
| download | Qt-34f8befe468435e97ed6498784b13cdf74d6ead5.zip Qt-34f8befe468435e97ed6498784b13cdf74d6ead5.tar.gz Qt-34f8befe468435e97ed6498784b13cdf74d6ead5.tar.bz2 | |
Made the makefile build system use QMAKE_CFLAGS.xxx properly.
Previously, the variable would be appended too soon, so not all
values would be included. Now it is one of the last steps.
RevBy: Trust me
Diffstat (limited to 'mkspecs/features')
| -rw-r--r-- | mkspecs/features/symbian/symbian_building.prf | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/mkspecs/features/symbian/symbian_building.prf b/mkspecs/features/symbian/symbian_building.prf index ce124ec..073ef18 100644 --- a/mkspecs/features/symbian/symbian_building.prf +++ b/mkspecs/features/symbian/symbian_building.prf @@ -1,3 +1,11 @@ +linux-armcc { + QMAKE_CFLAGS += $$QMAKE_CFLAGS.ARMCC + QMAKE_CXXFLAGS += $$QMAKE_CXXFLAGS.ARMCC +} else:linux-gcce { + QMAKE_CFLAGS += $$QMAKE_CFLAGS.GCCE + QMAKE_CXXFLAGS += $$QMAKE_CXXFLAGS.GCCE +} + # We need a target name without the INFIX'ed part, since flags are not infixed. equals(QMAKE_TARGET_PRODUCT, Qt4):clean_TARGET = $$replace(TARGET, "$${QT_LIBINFIX}$", "") else:clean_TARGET = $$TARGET |