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 | |
| 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')
| -rw-r--r-- | mkspecs/features/symbian/symbian_building.prf | 8 | ||||
| -rw-r--r-- | mkspecs/symbian/linux-armcc/qmake.conf | 4 |
2 files changed, 10 insertions, 2 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 diff --git a/mkspecs/symbian/linux-armcc/qmake.conf b/mkspecs/symbian/linux-armcc/qmake.conf index 77fb1ea..f8072e3 100644 --- a/mkspecs/symbian/linux-armcc/qmake.conf +++ b/mkspecs/symbian/linux-armcc/qmake.conf @@ -31,8 +31,8 @@ QMAKE_QtWebKit_CXXFLAGS = --arm # Move RW-section base address to start from 0xE00000 instead of the toolchain default 0x400000. QMAKE_QtWebKit_LFLAGS = --rw-base 0xE00000 -QMAKE_CFLAGS += --dllimport_runtime --preinclude rvct2_2.h --diag_suppress 186,654,1300 --thumb --fpu softvfp --cpu 5T --enum_is_int -Ono_known_library --fpmode ieee_no_fenv --no_vfe --apcs /inter $$QMAKE_CFLAGS.ARMCC -QMAKE_CXXFLAGS += $$QMAKE_CFLAGS $$QMAKE_CXXFLAGS.ARMCC +QMAKE_CFLAGS += --dllimport_runtime --preinclude rvct2_2.h --diag_suppress 186,611,654,1300 --thumb --fpu softvfp --cpu 5T --enum_is_int -Ono_known_library --fpmode ieee_no_fenv --no_vfe --apcs /inter +QMAKE_CXXFLAGS += $$QMAKE_CFLAGS QMAKE_LFLAGS += --symver_soname --diag_suppress 6331,6780 --bpabi --reloc --datacompressor=off --split --dll --no_scanlib QMAKE_LFLAGS_APP += --entry _E32Startup QMAKE_LFLAGS_SHLIB += --entry _E32Dll |