summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authoraxis <qt-info@nokia.com>2009-08-14 09:40:05 (GMT)
committeraxis <qt-info@nokia.com>2009-10-23 14:53:30 (GMT)
commit1ddd1b7f27ee668d256f78e88f180eeb4fc565ba (patch)
treebb7e048d0242cd20d74665bf89439a4de2cb9f30
parentf0f011280f4b2e7f5a92e52ed3080dcc750d5208 (diff)
downloadQt-1ddd1b7f27ee668d256f78e88f180eeb4fc565ba.zip
Qt-1ddd1b7f27ee668d256f78e88f180eeb4fc565ba.tar.gz
Qt-1ddd1b7f27ee668d256f78e88f180eeb4fc565ba.tar.bz2
Add extra linker options to RVCT.
These are needed to set correct entry point, as well as deal with the delicate symbol handling on Symbian. The symbols will be resolved properly later on by the elftran tool.
-rw-r--r--mkspecs/symbian/linux-armcc/qmake.conf2
1 files changed, 2 insertions, 0 deletions
diff --git a/mkspecs/symbian/linux-armcc/qmake.conf b/mkspecs/symbian/linux-armcc/qmake.conf
index 08fbe08..10b6d73 100644
--- a/mkspecs/symbian/linux-armcc/qmake.conf
+++ b/mkspecs/symbian/linux-armcc/qmake.conf
@@ -26,6 +26,8 @@ QMAKE_DEL_DIR = rmdir
QMAKE_CHK_DIR_EXISTS = test -d
QMAKE_MKDIR = mkdir -p
+QMAKE_LFLAGS_SHLIB += --entry _E32Dll --partial --diag_suppress 6331,6780
+
QT_ARCH = arm
DEFINES += __SYMBIAN32__ EKA2 __S60_50__ __S60_3X__ __SERIES60_3X__ __EPOC32__ __MARM__ __EABI__ __ARMCC__ __ARMcc_2__ __ARMCC_2_2__ __MARM_ARMV5__ __DLL__ _UNICODE