summaryrefslogtreecommitdiffstats
path: root/mkspecs/symbian/linux-armcc/qmake.conf
diff options
context:
space:
mode:
authoraxis <qt-info@nokia.com>2009-10-16 11:45:22 (GMT)
committeraxis <qt-info@nokia.com>2009-10-23 15:32:24 (GMT)
commit31d299b666e2043a450eac7f76b318d664d9efa0 (patch)
tree985526cabdc0f2e536e9b2599c4c1e7be3f3fa09 /mkspecs/symbian/linux-armcc/qmake.conf
parent3c8f2ad71e0afe9ded1f2f695709f98fa1ef644b (diff)
downloadQt-31d299b666e2043a450eac7f76b318d664d9efa0.zip
Qt-31d299b666e2043a450eac7f76b318d664d9efa0.tar.gz
Qt-31d299b666e2043a450eac7f76b318d664d9efa0.tar.bz2
Added support for both lib and app templates.
Diffstat (limited to 'mkspecs/symbian/linux-armcc/qmake.conf')
-rw-r--r--mkspecs/symbian/linux-armcc/qmake.conf8
1 files changed, 5 insertions, 3 deletions
diff --git a/mkspecs/symbian/linux-armcc/qmake.conf b/mkspecs/symbian/linux-armcc/qmake.conf
index 2a926dd..577c4e2 100644
--- a/mkspecs/symbian/linux-armcc/qmake.conf
+++ b/mkspecs/symbian/linux-armcc/qmake.conf
@@ -28,7 +28,9 @@ QMAKE_MKDIR = mkdir -p
QMAKE_CFLAGS += --preinclude rvct2_2.h --diag_suppress 186,654,1300 --thumb --fpu softvfp --cpu 5T --enum_is_int -Ono_known_library --fpmode ieee_no_fenv --export_all_vtbl --no_vfe --apcs /inter --dllimport_runtime --gnu
QMAKE_CXXFLAGS += $$QMAKE_CFLAGS --no_parse_templates
-QMAKE_LFLAGS_SHLIB += --entry _E32Dll --diag_suppress 6331,6780 --shl --reloc --split --rw-base 0x400000 --noscanlib
+QMAKE_LFLAGS += --diag_suppress 6331,6780 --shl --reloc --split --rw-base 0x400000 --noscanlib
+QMAKE_LFLAGS_APP += --entry _E32Startup
+QMAKE_LFLAGS_SHLIB += --entry _E32Dll
QT_ARCH = symbian
@@ -37,7 +39,7 @@ DEFINES += __SYMBIAN32__ EKA2 __S60_50__ __S60_3X__ __SERIES60_3X__
INCLUDEPATH += $$[QT_INSTALL_PREFIX]/mkspecs/common/symbian/stl-off
# ### FIXME Move these to proper locations.
-QMAKE_LIBS = -llibc -llibm -leuser -llibdl -llibpthread -lefsrv -llibstdcpp -llibc.lib\\(VtblExports.o\\) -llibm.lib\\(VtblExports.o\\) -leuser.lib\\(VtblExports.o\\) -llibdl.lib\\(VtblExports.o\\) -llibpthread.lib\\(VtblExports.o\\) -lefsrv.lib\\(VtblExports.o\\) -llibstdcpp.lib\\(VtblExports.o\\)
-QMAKE_LIBS += -ledllstub -ledll.lib\\(uc_dll_.o\\) -lusrt2_2 -ldfpaeabi -ldfprvct2_2.lib -ldrtaeabi -ldrtaeabi.lib\\(VtblExports.o\\) -lscppnwdl -ldrtrvct2_2
+QMAKE_LIBS += -llibc -llibm -leuser -llibdl -llibpthread -lefsrv -llibstdcpp -llibc.lib\\(VtblExports.o\\) -llibm.lib\\(VtblExports.o\\) -leuser.lib\\(VtblExports.o\\) -llibdl.lib\\(VtblExports.o\\) -llibpthread.lib\\(VtblExports.o\\) -lefsrv.lib\\(VtblExports.o\\) -llibstdcpp.lib\\(VtblExports.o\\)
+QMAKE_LIBS += -lusrt2_2 -ldfpaeabi -ldfprvct2_2.lib -ldrtaeabi -ldrtaeabi.lib\\(VtblExports.o\\) -lscppnwdl -ldrtrvct2_2
include(../../common/unix.conf)