diff options
| author | axis <qt-info@nokia.com> | 2010-02-04 08:46:06 (GMT) |
|---|---|---|
| committer | axis <qt-info@nokia.com> | 2010-02-04 09:14:40 (GMT) |
| commit | b22525edc8c75c1aae34b10dc47d3dabf77e030d (patch) | |
| tree | b36d5090aaa5969cac5e6f56e4eae97d3d58598b /mkspecs | |
| parent | 4efb96943e863e29d5e20e1b0417dd83b014593d (diff) | |
| download | Qt-b22525edc8c75c1aae34b10dc47d3dabf77e030d.zip Qt-b22525edc8c75c1aae34b10dc47d3dabf77e030d.tar.gz Qt-b22525edc8c75c1aae34b10dc47d3dabf77e030d.tar.bz2 | |
Fixed compilation in ARM mode.
An extra define needs to change between ARM/Thumb.
Diffstat (limited to 'mkspecs')
| -rw-r--r-- | mkspecs/common/symbian/symbian-makefile.conf | 2 | ||||
| -rw-r--r-- | mkspecs/symbian/linux-armcc/features/symbian_building.prf | 4 |
2 files changed, 5 insertions, 1 deletions
diff --git a/mkspecs/common/symbian/symbian-makefile.conf b/mkspecs/common/symbian/symbian-makefile.conf index 341e27a..dc428b9 100644 --- a/mkspecs/common/symbian/symbian-makefile.conf +++ b/mkspecs/common/symbian/symbian-makefile.conf @@ -23,7 +23,7 @@ QMAKE_CXXFLAGS_DEBUG += -g QMAKE_CFLAGS_RELEASE += -O2 -Otime QMAKE_CXXFLAGS_RELEASE += -O2 -Otime -DEFINES += __SYMBIAN32__ EKA2 __S60_50__ __S60_3X__ __SERIES60_3X__ __EPOC32__ __MARM__ __EABI__ __ARMCC__ __ARMcc_2__ __ARMCC_2_2__ __MARM_ARMV5__ __MARM_THUMB__ __MARM_INTERWORK__ __DLL__ _UNICODE __SUPPORT_CPP_EXCEPTIONS__ +DEFINES += __SYMBIAN32__ EKA2 __S60_50__ __S60_3X__ __SERIES60_3X__ __EPOC32__ __MARM__ __EABI__ __ARMCC__ __ARMcc_2__ __ARMCC_2_2__ __MARM_ARMV5__ __MARM_INTERWORK__ __DLL__ _UNICODE __SUPPORT_CPP_EXCEPTIONS__ include(../../common/unix.conf) diff --git a/mkspecs/symbian/linux-armcc/features/symbian_building.prf b/mkspecs/symbian/linux-armcc/features/symbian_building.prf index 0a697f4..b8b5639 100644 --- a/mkspecs/symbian/linux-armcc/features/symbian_building.prf +++ b/mkspecs/symbian/linux-armcc/features/symbian_building.prf @@ -10,6 +10,10 @@ isEmpty(symbianDestdir) { symbianDestdir = . } +contains(QMAKE_CFLAGS, "--thumb")|contains(QMAKE_CXXFLAGS, "--thumb") { + DEFINES += __MARM_THUMB__ +} + for(libraries, LIBS) { libraries = $$replace(libraries, "\.dll$", ".dso") isFullName = $$find(libraries, \.) |