diff options
| author | axis <qt-info@nokia.com> | 2010-03-15 16:00:35 (GMT) |
|---|---|---|
| committer | axis <qt-info@nokia.com> | 2010-03-15 16:02:18 (GMT) |
| commit | 7ca339be57f1b8dbf9e289fae578c110813eb767 (patch) | |
| tree | 48c2f07d171ff60ecd08a385db0c33999d623baa | |
| parent | 1c8b5d83301455b8dabb9674503bb0990ca50909 (diff) | |
| download | Qt-7ca339be57f1b8dbf9e289fae578c110813eb767.zip Qt-7ca339be57f1b8dbf9e289fae578c110813eb767.tar.gz Qt-7ca339be57f1b8dbf9e289fae578c110813eb767.tar.bz2 | |
Fixed a building bug where the DLL entry point was undefined.
| -rw-r--r-- | mkspecs/features/symbian/symbian_building.prf | 2 | ||||
| -rw-r--r-- | mkspecs/symbian/linux-armcc/qmake.conf | 1 | ||||
| -rw-r--r-- | mkspecs/symbian/linux-gcce/qmake.conf | 2 |
3 files changed, 3 insertions, 2 deletions
diff --git a/mkspecs/features/symbian/symbian_building.prf b/mkspecs/features/symbian/symbian_building.prf index 4760e09..b543587 100644 --- a/mkspecs/features/symbian/symbian_building.prf +++ b/mkspecs/features/symbian/symbian_building.prf @@ -134,7 +134,7 @@ contains(TEMPLATE, lib):!contains(CONFIG, static):!contains(CONFIG, staticlib) { #QMAKE_LIBS += -l:edllstub.lib -l:edll.lib } - QMAKE_LFLAGS += --soname $${TARGET}\\{$${hexVersion}\\}\\[$${intUid3}\\].dll -u _E32Dll --entry=_E32Dll + QMAKE_LFLAGS += --soname $${TARGET}\\{$${hexVersion}\\}\\[$${intUid3}\\].dll DEFINES += __DLL__ } diff --git a/mkspecs/symbian/linux-armcc/qmake.conf b/mkspecs/symbian/linux-armcc/qmake.conf index 750fb79..57eb1fc 100644 --- a/mkspecs/symbian/linux-armcc/qmake.conf +++ b/mkspecs/symbian/linux-armcc/qmake.conf @@ -36,6 +36,7 @@ QMAKE_CFLAGS += --dllimport_runtime --preinclude rvct2_2.h --diag_suppress 186 QMAKE_CXXFLAGS += $$QMAKE_CFLAGS --no_parse_templates $$QMAKE_CXXFLAGS.ARMCC QMAKE_LFLAGS += --symver_soname --diag_suppress 6331,6780 --bpabi --reloc --datacompressor=off --split --dll --no_scanlib QMAKE_LFLAGS_APP += --entry _E32Startup +QMAKE_LFLAGS_SHLIB += --entry _E32Dll DEFINES += EKA2 \ __ARMCC__ \ diff --git a/mkspecs/symbian/linux-gcce/qmake.conf b/mkspecs/symbian/linux-gcce/qmake.conf index 0d81693..6d31f66 100644 --- a/mkspecs/symbian/linux-gcce/qmake.conf +++ b/mkspecs/symbian/linux-gcce/qmake.conf @@ -54,7 +54,7 @@ DEFINES += __GCCE__ \ _STLP_NO_EXCEPTION_HEADER QMAKE_LFLAGS_APP += --entry _E32Startup -QMAKE_LFLAGS_SHLIB += --default-symver +QMAKE_LFLAGS_SHLIB += --default-symver --entry _E32Dll gcceExtraFlags = --include=${EPOCROOT}epoc32/include/gcce/gcce.h -march=armv5t -mapcs -mthumb-interwork -nostdinc -c -fvisibility-inlines-hidden -msoft-float -T script QMAKE_CFLAGS += $${gcceExtraFlags} |