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/symbian | |
| 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/symbian')
| -rw-r--r-- | mkspecs/symbian/linux-armcc/qmake.conf | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/mkspecs/symbian/linux-armcc/qmake.conf b/mkspecs/symbian/linux-armcc/qmake.conf index 599e552..77fb1ea 100644 --- a/mkspecs/symbian/linux-armcc/qmake.conf +++ b/mkspecs/symbian/linux-armcc/qmake.conf @@ -6,8 +6,6 @@ include(../../common/symbian/symbian-makefile.conf) include(../../common/armcc.conf) -QMAKE_LIBS += usrt2_2.lib dfpaeabi.dso dfprvct2_2.dso drtaeabi.dso scppnwdl.dso drtrvct2_2.dso h_t__uf.l\\(switch8.o\\) - QMAKE_RVCT_LINKSTYLE = 1 # notice that the middle part of the following set of vars matches the TARGET content of the libs @@ -33,8 +31,8 @@ QMAKE_QtWebKit_CXXFLAGS = --arm # Move RW-section base address to start from 0xE00000 instead of the toolchain default 0x400000. QMAKE_QtWebKit_LFLAGS = --rw-base 0xE00000 -QMAKE_CFLAGS += --dllimport_runtime --preinclude rvct2_2.h --diag_suppress 186,654,1300 --thumb --fpu softvfp --cpu 5T --enum_is_int -Ono_known_library --fpmode ieee_no_fenv --export_all_vtbl --no_vfe --apcs /inter $$QMAKE_CFLAGS.ARMCC -QMAKE_CXXFLAGS += $$QMAKE_CFLAGS --no_parse_templates $$QMAKE_CXXFLAGS.ARMCC +QMAKE_CFLAGS += --dllimport_runtime --preinclude rvct2_2.h --diag_suppress 186,654,1300 --thumb --fpu softvfp --cpu 5T --enum_is_int -Ono_known_library --fpmode ieee_no_fenv --no_vfe --apcs /inter $$QMAKE_CFLAGS.ARMCC +QMAKE_CXXFLAGS += $$QMAKE_CFLAGS $$QMAKE_CXXFLAGS.ARMCC QMAKE_LFLAGS += --symver_soname --diag_suppress 6331,6780 --bpabi --reloc --datacompressor=off --split --dll --no_scanlib QMAKE_LFLAGS_APP += --entry _E32Startup QMAKE_LFLAGS_SHLIB += --entry _E32Dll |