diff options
| author | Morten Sorvig <msorvig@trolltech.com> | 2009-08-17 11:14:27 (GMT) |
|---|---|---|
| committer | Morten Sorvig <msorvig@trolltech.com> | 2009-08-17 11:14:27 (GMT) |
| commit | efd84105355552bcb203b5e402be0352641e7480 (patch) | |
| tree | beaa711cdde3c51d8ed9e3f8907ad5d07faea569 /mkspecs/features | |
| parent | caef9533a860941701745e221e719438ea6870d8 (diff) | |
| download | Qt-efd84105355552bcb203b5e402be0352641e7480.zip Qt-efd84105355552bcb203b5e402be0352641e7480.tar.gz Qt-efd84105355552bcb203b5e402be0352641e7480.tar.bz2 | |
Fix compiler flags setting for .mm files on Mac.
Commit 7f1cba82 causes {x86, x86_64, ppc, ppc64}.prf to be loaded before objective_c.prf.
This will add content to QMAKE_OBJECTIVE_CFLAGS, causing the isEmpty test to skip
populating QMAKE_OBJECTIVE_CFLAGS. Remove the isEmpty test to fix the issue.
Diffstat (limited to 'mkspecs/features')
| -rw-r--r-- | mkspecs/features/mac/objective_c.prf | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/mkspecs/features/mac/objective_c.prf b/mkspecs/features/mac/objective_c.prf index 0a73af9..0df7013 100644 --- a/mkspecs/features/mac/objective_c.prf +++ b/mkspecs/features/mac/objective_c.prf @@ -1,6 +1,5 @@ isEmpty(QMAKE_OBJECTIVE_CC):QMAKE_OBJECTIVE_CC = $$QMAKE_CC -isEmpty(QMAKE_OBJECTIVE_CFLAGS) { #bootstrap QMAKE_OBJECTIVE_CFLAGS = $$QMAKE_CFLAGS QMAKE_OBJECTIVE_CFLAGS_WARN_ON = $$QMAKE_CFLAGS_WARN_ON QMAKE_OBJECTIVE_CFLAGS_WARN_OFF = $$QMAKE_CFLAGS_WARN_OFF @@ -9,7 +8,7 @@ isEmpty(QMAKE_OBJECTIVE_CFLAGS) { #bootstrap QMAKE_OBJECTIVE_CFLAGS_X86 = $$QMAKE_CFLAGS_X86 QMAKE_OBJECTIVE_CFLAGS_PPC = $$QMAKE_CFLAGS_PPC QMAKE_OBJECTIVE_CFLAGS_HIDESYMS = $$QMAKE_CXXFLAGS_HIDESYMS -} + OBJECTIVE_C_OBJECTS_DIR = $$OBJECTS_DIR isEmpty(OBJECTIVE_C_OBJECTS_DIR):OBJECTIVE_C_OBJECTS_DIR = . isEmpty(QMAKE_EXT_OBJECTIVE_C):QMAKE_EXT_OBJECTIVE_C = .mm .m |