diff options
| author | axis <qt-info@nokia.com> | 2010-10-04 08:46:14 (GMT) |
|---|---|---|
| committer | axis <qt-info@nokia.com> | 2010-10-04 10:53:52 (GMT) |
| commit | 4207bded6577f24fb4c20cc84880fd48eb9c0c9b (patch) | |
| tree | 1b510b97310b2d7753007a1251d2c579b77d6d9b /mkspecs | |
| parent | 77a92b39b30bf14f6509dfb578bad8511ef9a32e (diff) | |
| download | Qt-4207bded6577f24fb4c20cc84880fd48eb9c0c9b.zip Qt-4207bded6577f24fb4c20cc84880fd48eb9c0c9b.tar.gz Qt-4207bded6577f24fb4c20cc84880fd48eb9c0c9b.tar.bz2 | |
Fixed library ordering when linking to qtmain.
Done-with: Liang Qi
Reviewed-by: Trust me
Diffstat (limited to 'mkspecs')
| -rw-r--r-- | mkspecs/features/symbian/symbian_building.prf | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/mkspecs/features/symbian/symbian_building.prf b/mkspecs/features/symbian/symbian_building.prf index 539609d..614fb65 100644 --- a/mkspecs/features/symbian/symbian_building.prf +++ b/mkspecs/features/symbian/symbian_building.prf @@ -187,9 +187,11 @@ 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\\) - contains(CONFIG, "qt"):contains(QT, "core") { #if linking with QtCore + 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 { @@ -197,9 +199,12 @@ contains(TEMPLATE, app):!contains(QMAKE_LINK, "^@:.*") { QMAKE_LIBS += \ -l:eexe.lib \ -l:usrt2_2.lib - contains(CONFIG, "qt"):contains(QT, "core") { #if linking with QtCore + 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 += \ |