diff options
| author | Miikka Heikkinen <miikka.heikkinen@digia.com> | 2010-02-08 09:40:44 (GMT) |
|---|---|---|
| committer | Jesper Thomschutz <jesper.thomschutz@nokia.com> | 2010-02-08 21:58:41 (GMT) |
| commit | e98b0f99aee7a3bc112db6c7da991ecc7da5357d (patch) | |
| tree | 1695a6e97781c820afe13eab87913e3c911c20b5 | |
| parent | c4d52845c0483e3f246dffbafbfa502a7e2232a5 (diff) | |
| download | Qt-e98b0f99aee7a3bc112db6c7da991ecc7da5357d.zip Qt-e98b0f99aee7a3bc112db6c7da991ecc7da5357d.tar.gz Qt-e98b0f99aee7a3bc112db6c7da991ecc7da5357d.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
(cherry picked from commit 95a095c69973081b66782e83fccd54ba15ca0b71)
| -rw-r--r-- | src/s60main/s60main.pro | 3 |
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!") } |