summaryrefslogtreecommitdiffstats
path: root/mkspecs/symbian/linux-armcc
diff options
context:
space:
mode:
authoraxis <qt-info@nokia.com>2009-11-27 15:20:05 (GMT)
committeraxis <qt-info@nokia.com>2009-12-11 10:36:28 (GMT)
commit1e6d71f5560f651041a574d899979a770c1974c1 (patch)
treea9e9b7829a399d2a9153f26a3500bf7b017456b2 /mkspecs/symbian/linux-armcc
parent2409649053279db13f829c168dccbb6da98c866b (diff)
downloadQt-1e6d71f5560f651041a574d899979a770c1974c1.zip
Qt-1e6d71f5560f651041a574d899979a770c1974c1.tar.gz
Qt-1e6d71f5560f651041a574d899979a770c1974c1.tar.bz2
Added support for QT_*_STATICLIB variables in qmake.
This is so that Symbian can have custom prefixes and extensions.
Diffstat (limited to 'mkspecs/symbian/linux-armcc')
-rw-r--r--mkspecs/symbian/linux-armcc/qmake.conf7
1 files changed, 4 insertions, 3 deletions
diff --git a/mkspecs/symbian/linux-armcc/qmake.conf b/mkspecs/symbian/linux-armcc/qmake.conf
index 567bcf6..97d3c2d 100644
--- a/mkspecs/symbian/linux-armcc/qmake.conf
+++ b/mkspecs/symbian/linux-armcc/qmake.conf
@@ -32,9 +32,6 @@ QMAKE_LFLAGS += --diag_suppress 6331,6780 --bpabi --reloc --datacompressor
QMAKE_LFLAGS_APP += --entry _E32Startup
QMAKE_LFLAGS_SHLIB += --entry _E32Dll
-QMAKE_EXTENSION_SHLIB += dll
-QMAKE_SYMBIAN_SHLIB = 1
-
QT_ARCH = symbian
DEFINES += __SYMBIAN32__ EKA2 __S60_50__ __S60_3X__ __SERIES60_3X__ __EPOC32__ __MARM__ __EABI__ __ARMCC__ __ARMcc_2__ __ARMCC_2_2__ __MARM_ARMV5__ __MARM_THUMB__ __MARM_INTERWORK__ __DLL__ _UNICODE __SUPPORT_CPP_EXCEPTIONS__
@@ -47,5 +44,9 @@ QMAKE_LIBS += -llibc -llibm -leuser -llibdl -llibpthread -lefsrv -llib
include(../../common/unix.conf)
QMAKE_PREFIX_SHLIB =
+QMAKE_EXTENSION_SHLIB = dll
+QMAKE_PREFIX_STATICLIB =
+QMAKE_EXTENSION_STATICLIB = lib
+QMAKE_SYMBIAN_SHLIB = 1
include(symbian.conf)