diff options
| author | Miikka Heikkinen <miikka.heikkinen@digia.com> | 2010-06-29 14:38:42 +0300 |
|---|---|---|
| committer | Jason McDonald <jason.mcdonald@nokia.com> | 2010-06-30 11:21:46 +1000 |
| commit | fd75bec667e011c0700e0e6bcd45ff2fc29beb8d (patch) | |
| tree | c004f7ad688eaf093d906787084d01b4bca2854a | |
| parent | 7bf890a45139c06a66eb362dec9fa6e17205291d (diff) | |
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
(cherry picked from commit ce57d92ef5723f54c1e3a1b50d66eb74273b995b)
| -rw-r--r-- | src/s60main/s60main.pro | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/src/s60main/s60main.pro b/src/s60main/s60main.pro index 1ba105d7c2..9ea308049a 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!") } |