summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMiikka Heikkinen <miikka.heikkinen@digia.com>2010-06-29 11:38:42 (GMT)
committerMiikka Heikkinen <miikka.heikkinen@digia.com>2010-06-29 12:38:54 (GMT)
commitce57d92ef5723f54c1e3a1b50d66eb74273b995b (patch)
treec9ca89ef966d808e201eb787b8c05fdbcc9cab09
parent0b3ca8620fdc66e726a3db5c50656ed0616d37c7 (diff)
downloadQt-ce57d92ef5723f54c1e3a1b50d66eb74273b995b.zip
Qt-ce57d92ef5723f54c1e3a1b50d66eb74273b995b.tar.gz
Qt-ce57d92ef5723f54c1e3a1b50d66eb74273b995b.tar.bz2
Fix s60main linking issue with gcce applications
MMP_RULES_DONT_EXPORT_ALL_CLASS_IMPEDIMENTA must not be included in s60main build, otherwise some symbols will not be relocatable when linked against from gcce build. Task-number: QTBUG-11804 Reviewed-by: Alessandro Portale
-rw-r--r--src/s60main/s60main.pro4
1 files changed, 4 insertions, 0 deletions
diff --git a/src/s60main/s60main.pro b/src/s60main/s60main.pro
index 1ba105d..9ea3080 100644
--- a/src/s60main/s60main.pro
+++ b/src/s60main/s60main.pro
@@ -25,6 +25,10 @@ symbian {
# Workaround for abld toolchain problem to make ARMV6 qtmain.lib link with GCCE apps
symbian-abld: QMAKE_CXXFLAGS.ARMCC += --dllimport_runtime
+
+ # Having MMP_RULES_DONT_EXPORT_ALL_CLASS_IMPEDIMENTA will cause s60main.lib be unlinkable
+ # against GCCE apps, so remove it
+ MMP_RULES -= $$MMP_RULES_DONT_EXPORT_ALL_CLASS_IMPEDIMENTA
} else {
error("$$_FILE_ is intended only for Symbian!")
}