diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-05-03 16:59:12 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-05-03 16:59:12 (GMT) |
| commit | d9fa51324940a73360f8473acf8231aa50f3efbd (patch) | |
| tree | 17ab9f718befe1b2f56a5c8bd2225e2b2caacf65 /mkspecs/common | |
| parent | 9b77de3effdb2eb7d6df212ab9a8a19551ecb550 (diff) | |
| parent | 38cd479383056fb08041e31e3ca6bdb0006f959e (diff) | |
| download | Qt-d9fa51324940a73360f8473acf8231aa50f3efbd.zip Qt-d9fa51324940a73360f8473acf8231aa50f3efbd.tar.gz Qt-d9fa51324940a73360f8473acf8231aa50f3efbd.tar.bz2 | |
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public:
Enabled previously disabled Qt features.
Fix includes so it compiles
Use lowercase includes so it compiles in Linux too
Fixed library dependency for Gnupoc.
Removed the --export_all_vtbl from linking.
Cleaned up the elf2e32 options a bit.
Diffstat (limited to 'mkspecs/common')
| -rw-r--r-- | mkspecs/common/symbian/symbian-makefile.conf | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/mkspecs/common/symbian/symbian-makefile.conf b/mkspecs/common/symbian/symbian-makefile.conf index 3801eff..2397c96 100644 --- a/mkspecs/common/symbian/symbian-makefile.conf +++ b/mkspecs/common/symbian/symbian-makefile.conf @@ -13,7 +13,13 @@ QMAKE_RUN_CC_IMP = $(CC) -c $(CFLAGS) $(INCPATH) -o $@ $< QMAKE_RUN_CXX = $(CXX) -c $(CXXFLAGS) $(INCPATH) -o $obj $src QMAKE_RUN_CXX_IMP = $(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $< -QMAKE_ELF2E32_FLAGS += +QMAKE_ELF2E32_FLAGS = --dlldata \ + --heap=0x00020000,0x00800000 \ + --stack=0x00014000 \ + --fpu=softvfp \ + --unfrozen \ + --compressionmethod bytepair \ + --unpaged include(../../common/unix.conf) |