summaryrefslogtreecommitdiffstats
path: root/mkspecs/common
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/common
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/common')
-rw-r--r--mkspecs/common/symbian/symbian.conf3
1 files changed, 1 insertions, 2 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