diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-10-27 14:39:56 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-10-27 14:39:56 (GMT) |
| commit | 57de927f17130f6f4cab51d412132c2cb45af1c0 (patch) | |
| tree | ef69987f5f20897a6f47e6e063865bbb24725847 /mkspecs/symbian-gcce/qmake.conf | |
| parent | 27b07b4794b8773b00f4cab8898ba00c125498cb (diff) | |
| parent | 40554dd9dbee365789dfaf27d2f7126a9ab04903 (diff) | |
| download | Qt-57de927f17130f6f4cab51d412132c2cb45af1c0.zip Qt-57de927f17130f6f4cab51d412132c2cb45af1c0.tar.gz Qt-57de927f17130f6f4cab51d412132c2cb45af1c0.tar.bz2 | |
Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-s60-public into master-integration
* 'master' of scm.dev.nokia.troll.no:qt/qt-s60-public:
Fixed a bug in the elf2e32_qtwrapper script.
Fix some build issues for building Qt for Symbian on Mac OS X.
Diffstat (limited to 'mkspecs/symbian-gcce/qmake.conf')
| -rw-r--r-- | mkspecs/symbian-gcce/qmake.conf | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/mkspecs/symbian-gcce/qmake.conf b/mkspecs/symbian-gcce/qmake.conf index f012217..9aff4e5 100644 --- a/mkspecs/symbian-gcce/qmake.conf +++ b/mkspecs/symbian-gcce/qmake.conf @@ -4,6 +4,7 @@ include(../common/symbian/symbian-makefile.conf) +include(../common/gcc-base.conf) include(../common/g++.conf) QMAKE_CC = arm-none-symbianelf-gcc @@ -54,7 +55,7 @@ DEFINES += __GCCE__ \ _STLP_NO_EXCEPTION_HEADER QMAKE_LFLAGS_APP += --entry=_E32Startup -u _E32Startup -QMAKE_LFLAGS_SHLIB += --default-symver --entry _E32Dll +QMAKE_LFLAGS_SHLIB += -shared --default-symver --entry _E32Dll QMAKE_LFLAGS_PLUGIN += $$QMAKE_LFLAGS_SHLIB gcceExtraFlags = --include=${EPOCROOT}/epoc32/include/gcce/gcce.h -march=armv5t -mapcs -mthumb-interwork -nostdinc -c -msoft-float -T script |