summaryrefslogtreecommitdiffstats
path: root/mkspecs
diff options
context:
space:
mode:
authoraxis <qt-info@nokia.com>2010-11-05 15:23:34 (GMT)
committeraxis <qt-info@nokia.com>2010-11-05 15:23:34 (GMT)
commit5fffdfb33379210ef37a68ae4257e693f7181c48 (patch)
tree4421e567482c6cc44415efae024c801e39de70a6 /mkspecs
parent45e3b274cbdfaa46c6e4f17e1635fba6b5e97e26 (diff)
downloadQt-5fffdfb33379210ef37a68ae4257e693f7181c48.zip
Qt-5fffdfb33379210ef37a68ae4257e693f7181c48.tar.gz
Qt-5fffdfb33379210ef37a68ae4257e693f7181c48.tar.bz2
Revert "Use qtmain.lib to provide entry point for all Symbian applications"
This reverts commit 564058a1bbfb1c67bc3d68b7c7a2ebfe83481334. It breaks massively on the symbian/linux-armcc mkspec. Will find a different solution.
Diffstat (limited to 'mkspecs')
-rw-r--r--mkspecs/common/symbian/symbian.conf3
-rw-r--r--mkspecs/features/symbian/default_post.prf3
-rw-r--r--mkspecs/features/symbian/symbian_building.prf20
3 files changed, 19 insertions, 7 deletions
diff --git a/mkspecs/common/symbian/symbian.conf b/mkspecs/common/symbian/symbian.conf
index 6d1f708..decec14 100644
--- a/mkspecs/common/symbian/symbian.conf
+++ b/mkspecs/common/symbian/symbian.conf
@@ -79,6 +79,7 @@ QMAKE_LIBS_OPENGL_ES2_QT = -llibglesv2 -lcone -lws32
QMAKE_LIBS_OPENVG = -llibOpenVG -lfbscli -lbitgdi -lgdi
QMAKE_LIBS_THREAD = -llibpthread
QMAKE_LIBS_COMPAT =
+QMAKE_LIBS_QT_ENTRY = -llibcrt0.lib
QMAKE_LIBS_S60 = -lavkon -leikcoctl
exists($${EPOCROOT}epoc32/include/platform/sgresource/sgimage.h) {
@@ -126,8 +127,6 @@ QT_ARCH = symbian
load(qt_config)
-QMAKE_LIBS_QT_ENTRY = -lqtmain$${QT_LIBINFIX}.lib
-
# These directories must match what configure uses for QT_INSTALL_PLUGINS and QT_INSTALL_IMPORTS
QT_PLUGINS_BASE_DIR = /resource/qt$${QT_LIBINFIX}/plugins
QT_IMPORTS_BASE_DIR = /resource/qt/imports
diff --git a/mkspecs/features/symbian/default_post.prf b/mkspecs/features/symbian/default_post.prf
index 348c366..0564e9b 100644
--- a/mkspecs/features/symbian/default_post.prf
+++ b/mkspecs/features/symbian/default_post.prf
@@ -3,6 +3,9 @@ load(default_post)
contains(TEMPLATE, ".*app") {
contains(CONFIG, stdbinary) {
QMAKE_LIBS +=
+ } else:contains(QT, gui):contains(CONFIG,qt) {
+ S60MAIN_LIBS = -leuser
+ QMAKE_LIBS += -lqtmain$${QT_LIBINFIX}.lib $$S60MAIN_LIBS
} else {
QMAKE_LIBS += $$QMAKE_LIBS_QT_ENTRY
}
diff --git a/mkspecs/features/symbian/symbian_building.prf b/mkspecs/features/symbian/symbian_building.prf
index 20bc3a3..1a51cb2 100644
--- a/mkspecs/features/symbian/symbian_building.prf
+++ b/mkspecs/features/symbian/symbian_building.prf
@@ -187,16 +187,26 @@ contains(TEMPLATE, app):!contains(QMAKE_LINK, "^@:.*") {
linux-armcc: {
QMAKE_LIBS += usrt2_2.lib dfpaeabi.dso dfprvct2_2.dso drtaeabi.dso scppnwdl.dso drtrvct2_2.dso h_t__uf.l\\(switch8.o\\)
QMAKE_LIBS += -leexe.lib\\(uc_exe_.o\\)
- QMAKE_LIBS -= $$QMAKE_LIBS_QT_ENTRY
- QMAKE_LIBS += $$QMAKE_LIBS_QT_ENTRY
+ contains(CONFIG, "qt"):contains(QT, "gui") { #if linking with QtCore
+ QMAKE_LIBS -= -lqtmain$${QT_LIBINFIX}.lib
+ QMAKE_LIBS += -lqtmain$${QT_LIBINFIX}.lib
+ } else {
+ QMAKE_LIBS -= -llibcrt0.lib
+ QMAKE_LIBS += -llibcrt0.lib
+ }
} else :linux-gcce {
# notice that we can't merge these as ordering of arguments is important.
QMAKE_LIBS += \
-l:eexe.lib \
-l:usrt2_2.lib
- modified_entry = $$replace(QMAKE_LIBS_QT_ENTRY, "^-l", "-l:")
- QMAKE_LIBS -= $$modified_entry
- QMAKE_LIBS += $$modified_entry
+ contains(CONFIG, "qt"):contains(QT, "gui") { #if linking with QtCore
+ QMAKE_LIBS -= -l:qtmain$${QT_LIBINFIX}.lib
+ QMAKE_LIBS += -l:qtmain$${QT_LIBINFIX}.lib
+ } else {
+ QMAKE_LIBS -= -l:libcrt0.lib
+ QMAKE_LIBS -= -l:libcrt0_gcce.lib
+ QMAKE_LIBS += -l:libcrt0_gcce.lib
+ }
QMAKE_LIBS += \
-l:dfpaeabi.dso \
-l:drtaeabi.dso \