summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorIain <qt-info@nokia.com>2009-11-18 21:33:30 (GMT)
committerIain <qt-info@nokia.com>2009-11-18 21:33:30 (GMT)
commit6340cf327515252ffbb21e98486e9abfc713149e (patch)
tree8c4ac02d2932dd9aec64d18aa39f031a30a21da1 /src
parent0f9c96ead0ae5d52827ae0f0b277178cd2103e46 (diff)
downloadQt-6340cf327515252ffbb21e98486e9abfc713149e.zip
Qt-6340cf327515252ffbb21e98486e9abfc713149e.tar.gz
Qt-6340cf327515252ffbb21e98486e9abfc713149e.tar.bz2
Disable linker warning 6780 in RVCT builds for Symbian OS
The linker warning that indicates symbol visibility changes is not useful as it is an expected change to symbol visibility and produces lots of clutter in the build logs. (It is not desirable to follow the ELF spec when it comes to symbol visibility in this case, which is why the linker warns and we ignore it) This is likely to be a Raptor-only issue - I believe abld suppresses the warning by default (at least in ABIv1 mode) Also update gui.pro to use LFLAGS rather than MMP_RULES to alter the arguments to ARMCC toolchain. qmake ought to detect this (incorrect) usage of MMP_RULES and abort MMP file generation - raised QTBU-5961 to look at this. Reviewed-by: Shane Kearns
Diffstat (limited to 'src')
-rw-r--r--src/gui/gui.pro2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/gui/gui.pro b/src/gui/gui.pro
index 7c24002..4215f97 100644
--- a/src/gui/gui.pro
+++ b/src/gui/gui.pro
@@ -54,4 +54,4 @@ DEFINES += Q_INTERNAL_QAPP_SRC
symbian:TARGET.UID3=0x2001B2DD
# ro-section in gui can exceed default allocated space, so more rw-section little further
-symbian-sbsv2: MMP_RULES += "LINKEROPTION armcc --rw-base 0x800000"
+symbian-sbsv2: QMAKE_LFLAGS.ARMCC += --rw-base 0x800000"