summaryrefslogtreecommitdiffstats
path: root/src/s60main
diff options
context:
space:
mode:
authorMiikka Heikkinen <miikka.heikkinen@digia.com>2010-02-08 09:40:44 (GMT)
committerMiikka Heikkinen <miikka.heikkinen@digia.com>2010-02-08 11:13:45 (GMT)
commit95a095c69973081b66782e83fccd54ba15ca0b71 (patch)
treeeaa3e81ec9e8521b549cfca3572a91870dccfe63 /src/s60main
parentc2d213becf8f96257789ebeb3ab074733da36424 (diff)
downloadQt-95a095c69973081b66782e83fccd54ba15ca0b71.zip
Qt-95a095c69973081b66782e83fccd54ba15ca0b71.tar.gz
Qt-95a095c69973081b66782e83fccd54ba15ca0b71.tar.bz2
Workaround for abld toolchain issue with s60main
When building for ARMV6 with abld toolchain in Symbian, qtmain.lib ends up missing some symbols that are required to link it against GCCE apps. This happens because --dllimport_runtime compiler option is missing in ARMV6 builds of qtmain.lib. Task-number: QTBUG-7952 Reviewed-by: axis
Diffstat (limited to 'src/s60main')
-rw-r--r--src/s60main/s60main.pro3
1 files changed, 3 insertions, 0 deletions
diff --git a/src/s60main/s60main.pro b/src/s60main/s60main.pro
index 47cf020..25fb188 100644
--- a/src/s60main/s60main.pro
+++ b/src/s60main/s60main.pro
@@ -22,6 +22,9 @@ symbian {
# staticlib should not have any lib depencies in s60
# This seems not to work, some hard coded libs are still added as dependency
LIBS =
+
+ # Workaround for abld toolchain problem to make ARMV6 qtmain.lib link with GCCE apps
+ symbian-abld: QMAKE_CXXFLAGS.ARMCC += --dllimport_runtime
} else {
error("$$_FILE_ is intended only for Symbian!")
}