diff options
| author | axis <qt-info@nokia.com> | 2010-02-04 09:15:07 (GMT) |
|---|---|---|
| committer | axis <qt-info@nokia.com> | 2010-02-04 09:15:07 (GMT) |
| commit | 471cecfa2d1e84b5ddc04dafa9eeddc8e51dc3e7 (patch) | |
| tree | 73ec3941c3e7573915139b7d347b0d1e0a3b8aec | |
| parent | 3fefcaff4abbb32c978d97fbac66929eb5fef1f6 (diff) | |
| parent | 08581d2aa53fff9ff8625a484b9633753ba9b1a0 (diff) | |
| download | Qt-471cecfa2d1e84b5ddc04dafa9eeddc8e51dc3e7.zip Qt-471cecfa2d1e84b5ddc04dafa9eeddc8e51dc3e7.tar.gz Qt-471cecfa2d1e84b5ddc04dafa9eeddc8e51dc3e7.tar.bz2 | |
Merge branch 'webkitCompile'
| -rw-r--r-- | mkspecs/common/symbian/symbian-makefile.conf | 6 | ||||
| -rw-r--r-- | mkspecs/symbian/linux-armcc/features/symbian_building.prf | 4 | ||||
| -rw-r--r-- | src/3rdparty/webkit/WebCore/WebCore.pro | 12 |
3 files changed, 18 insertions, 4 deletions
diff --git a/mkspecs/common/symbian/symbian-makefile.conf b/mkspecs/common/symbian/symbian-makefile.conf index bf4f43c..dc428b9 100644 --- a/mkspecs/common/symbian/symbian-makefile.conf +++ b/mkspecs/common/symbian/symbian-makefile.conf @@ -18,8 +18,12 @@ QMAKE_CXXFLAGS += $$QMAKE_CFLAGS --no_parse_templates QMAKE_LFLAGS += --diag_suppress 6331,6780 --bpabi --reloc --datacompressor=off --split --rw-base 0x800000 --dll --no_scanlib QMAKE_LFLAGS_APP += --entry _E32Startup QMAKE_LFLAGS_SHLIB += --entry _E32Dll +QMAKE_CFLAGS_DEBUG += -g +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 a176547..da15872 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, \.) diff --git a/src/3rdparty/webkit/WebCore/WebCore.pro b/src/3rdparty/webkit/WebCore/WebCore.pro index 04aba62..de185c1 100644 --- a/src/3rdparty/webkit/WebCore/WebCore.pro +++ b/src/3rdparty/webkit/WebCore/WebCore.pro @@ -23,9 +23,15 @@ symbian: { TARGET.UID3 = 0x200267C2 # RO text (code) section in qtwebkit.dll exceeds allocated space for gcce udeb target. # Move RW-section base address to start from 0xE00000 instead of the toolchain default 0x400000. - MMP_RULES += "LINKEROPTION armcc --rw-base 0xE00000" - MMP_RULES += ALWAYS_BUILD_AS_ARM - QMAKE_CXXFLAGS.ARMCC += -OTime -O3 + QMAKE_LFLAGS.ARMCC += --rw-base 0xE00000 + symbian-abld|symbian-sbsv2 { + MMP_RULES += ALWAYS_BUILD_AS_ARM + } else:linux-armcc { + QMAKE_CFLAGS -= --thumb + QMAKE_CFLAGS += --arm + QMAKE_CXXFLAGS -= --thumb + QMAKE_CXXFLAGS += --arm + } } include($$PWD/../WebKit.pri) |