diff options
author | axis <qt-info@nokia.com> | 2010-03-26 13:08:48 (GMT) |
---|---|---|
committer | Thomas Zander <t.zander@nokia.com> | 2010-05-03 15:30:43 (GMT) |
commit | 8cbdeb1306084d01b00028e8a08b54165dd73fb4 (patch) | |
tree | 81e0db247ddc472f597078ff87ac6c782af545e5 /mkspecs/features/symbian/symbian_building.prf | |
parent | c04fbce5ee7f6b59c01bb444ca8e0e166aae0317 (diff) | |
download | Qt-8cbdeb1306084d01b00028e8a08b54165dd73fb4.zip Qt-8cbdeb1306084d01b00028e8a08b54165dd73fb4.tar.gz Qt-8cbdeb1306084d01b00028e8a08b54165dd73fb4.tar.bz2 |
Removed the --export_all_vtbl from linking.
It causes wrong exports.
This required rearranging some libraries to avoid undefined symbols.
Diffstat (limited to 'mkspecs/features/symbian/symbian_building.prf')
-rw-r--r-- | mkspecs/features/symbian/symbian_building.prf | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/mkspecs/features/symbian/symbian_building.prf b/mkspecs/features/symbian/symbian_building.prf index 17c9be3..261cc10 100644 --- a/mkspecs/features/symbian/symbian_building.prf +++ b/mkspecs/features/symbian/symbian_building.prf @@ -126,9 +126,10 @@ contains(TEMPLATE, lib):!contains(CONFIG, static):!contains(CONFIG, staticlib) { QMAKE_CLEAN += $${symbianObjdir}/$${TARGET}.def linux-armcc: { - QMAKE_LIBS += -ledllstub.lib -ledll.lib\\(uc_dll_.o\\) + LIBS += usrt2_2.lib dfpaeabi.dso dfprvct2_2.dso drtaeabi.dso scppnwdl.dso drtrvct2_2.dso h_t__uf.l\\(switch8.o\\) + LIBS += -ledllstub.lib -ledll.lib\\(uc_dll_.o\\) } else :linux-gcce { - QMAKE_LIBS += \ + LIBS += \ -l:edll.lib \ -l:usrt2_2.lib \ -l:dfpaeabi.dso \ @@ -170,6 +171,7 @@ contains(TEMPLATE, app):!contains(QMAKE_LINK, "^@.*") { QMAKE_CLEAN += $${symbianDestdir}/$${TARGET} 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 QMAKE_LIBS += -lqtmain$${QT_LIBINFIX}.lib |