diff options
| author | Tor Arne Vestbø <tor.arne.vestbo@nokia.com> | 2010-10-28 11:28:58 (GMT) |
|---|---|---|
| committer | Tor Arne Vestbø <tor.arne.vestbo@nokia.com> | 2010-10-28 11:28:58 (GMT) |
| commit | e7b9fb2e87641a36301babf457056b3350f0431c (patch) | |
| tree | 3db3d29297d29ac1801a33d50c1273efec97352b /mkspecs/symbian-gcce | |
| parent | b36e845dde90313cf98df118ce6ffd88502b943b (diff) | |
| parent | 77819edac505823226c40033e76d2dda0e8b363a (diff) | |
| download | Qt-e7b9fb2e87641a36301babf457056b3350f0431c.zip Qt-e7b9fb2e87641a36301babf457056b3350f0431c.tar.gz Qt-e7b9fb2e87641a36301babf457056b3350f0431c.tar.bz2 | |
Merge remote branch 'scm/qt/master'
Conflicts:
mkspecs/symbian-gcce/qmake.conf
Diffstat (limited to 'mkspecs/symbian-gcce')
| -rw-r--r-- | mkspecs/symbian-gcce/qmake.conf | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/mkspecs/symbian-gcce/qmake.conf b/mkspecs/symbian-gcce/qmake.conf index 7051a9c..02ad626 100644 --- a/mkspecs/symbian-gcce/qmake.conf +++ b/mkspecs/symbian-gcce/qmake.conf @@ -55,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 |