diff options
| author | Olivier Goffart <olivier.goffart@nokia.com> | 2011-04-18 16:31:19 (GMT) |
|---|---|---|
| committer | Olivier Goffart <olivier.goffart@nokia.com> | 2011-04-18 16:31:19 (GMT) |
| commit | fda9cc1d8a0e49817d1c6192c52d18dffcecf327 (patch) | |
| tree | aa9a3209339af6882eb496ab827f5ac297452d66 /mkspecs/features/symbian | |
| parent | 6814998ab4d9c6b0990b0bf01119ace69363ce3e (diff) | |
| parent | c8aafe9a63b13a4af3049c43fcd5e8cce27db829 (diff) | |
| download | Qt-fda9cc1d8a0e49817d1c6192c52d18dffcecf327.zip Qt-fda9cc1d8a0e49817d1c6192c52d18dffcecf327.tar.gz Qt-fda9cc1d8a0e49817d1c6192c52d18dffcecf327.tar.bz2 | |
Merge remote-tracking branch 'origin/4.7' into qt-master-from-4.7
Conflicts:
qmake/generators/makefile.cpp
qmake/generators/win32/msbuild_objectmodel.cpp
qmake/generators/win32/msvc_vcxproj.cpp
src/corelib/global/qnamespace.h
src/gui/text/qtextcontrol.cpp
Diffstat (limited to 'mkspecs/features/symbian')
| -rw-r--r-- | mkspecs/features/symbian/do_not_build_as_thumb.prf | 5 | ||||
| -rw-r--r-- | mkspecs/features/symbian/symbian_building.prf | 2 |
2 files changed, 7 insertions, 0 deletions
diff --git a/mkspecs/features/symbian/do_not_build_as_thumb.prf b/mkspecs/features/symbian/do_not_build_as_thumb.prf index 0f1fd9f..91a63c2 100644 --- a/mkspecs/features/symbian/do_not_build_as_thumb.prf +++ b/mkspecs/features/symbian/do_not_build_as_thumb.prf @@ -5,4 +5,9 @@ symbian-abld|symbian-sbsv2 { QMAKE_CFLAGS += --arm QMAKE_CXXFLAGS -= --thumb QMAKE_CXXFLAGS += --arm +} else:symbian-gcce { + QMAKE_CFLAGS -= --thumb + QMAKE_CFLAGS += -marm -mthumb-interwork -mapcs + QMAKE_CXXFLAGS -= --thumb + QMAKE_CXXFLAGS += -marm -mthumb-interwork -mapcs } 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. |