diff options
| author | axis <qt-info@nokia.com> | 2010-11-08 14:18:11 (GMT) |
|---|---|---|
| committer | axis <qt-info@nokia.com> | 2010-11-08 14:41:45 (GMT) |
| commit | 5657b8f13bd6ef456a1da7ae08a2924e256b8ea3 (patch) | |
| tree | 5436a19cb63f420345b9ca9d229ba7e2c774b56f /mkspecs/common | |
| parent | e5345aa59d6573abb39b50285b63aafcddd9f13b (diff) | |
| download | Qt-5657b8f13bd6ef456a1da7ae08a2924e256b8ea3.zip Qt-5657b8f13bd6ef456a1da7ae08a2924e256b8ea3.tar.gz Qt-5657b8f13bd6ef456a1da7ae08a2924e256b8ea3.tar.bz2 | |
Started using qtmain.lib for all Qt applications, also corelib ones.
This commit also fixes the issue that 564058a1bb didn't, namely that
config tests broke on Symbian. It does this by continuing to use the
Open C libcrt0.lib library for non-Qt applications. This is also more
correct, since you should not have to compile the Qt libs to compile
a non-Qt app.
Task: QTBUG-14735
RevBy: Miikka Heikkinen
Diffstat (limited to 'mkspecs/common')
| -rw-r--r-- | mkspecs/common/symbian/symbian.conf | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/mkspecs/common/symbian/symbian.conf b/mkspecs/common/symbian/symbian.conf index 2fb799d..69188a8 100644 --- a/mkspecs/common/symbian/symbian.conf +++ b/mkspecs/common/symbian/symbian.conf @@ -79,7 +79,6 @@ 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) { @@ -127,6 +126,10 @@ QT_ARCH = symbian load(qt_config) +QMAKE_LIBS_QT_ENTRY = -lqtmain$${QT_LIBINFIX}.lib +QMAKE_LIBS_NO_QT_ENTRY = -llibcrt0.lib +QMAKE_LIBS_NO_QT_ENTRY_GCCE = -llibcrt0_gcce.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 |