diff options
| author | Iain <qt-info@nokia.com> | 2009-10-05 18:38:27 (GMT) |
|---|---|---|
| committer | Iain <qt-info@nokia.com> | 2009-10-05 18:45:54 (GMT) |
| commit | 8cac1e7fe5bfda7e876d03d1407f616f89bd74f8 (patch) | |
| tree | ecbb7031dfd13d568247ebce659a055b5f6ebc30 /mkspecs | |
| parent | 2d0c3bd0fac50d4e9f6c2d7d5e9c2fd8eee4d599 (diff) | |
| download | Qt-8cac1e7fe5bfda7e876d03d1407f616f89bd74f8.zip Qt-8cac1e7fe5bfda7e876d03d1407f616f89bd74f8.tar.gz Qt-8cac1e7fe5bfda7e876d03d1407f616f89bd74f8.tar.bz2 | |
Workaround for the problem with abld ignoring OPTION_REPLACE
abld in the S60 SDKs has a bug where OPTION_REPLACE cannot be used to
remove options from the command line (ie. replace them with nothing),
so this workaround introduces a macro definition (that should never be
used) as a harmless replacement option.
Reviewed-by: Aleksandar Sasha Babic
Diffstat (limited to 'mkspecs')
| -rw-r--r-- | mkspecs/common/symbian/symbian.conf | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/mkspecs/common/symbian/symbian.conf b/mkspecs/common/symbian/symbian.conf index 38e955a..1acfefe 100644 --- a/mkspecs/common/symbian/symbian.conf +++ b/mkspecs/common/symbian/symbian.conf @@ -106,7 +106,13 @@ QMAKE_STRIPFLAGS_LIB += --strip-unneeded load(qt_config) load(platform_paths) -MMP_RULES_DONT_EXPORT_ALL_CLASS_IMPEDIMENTA = "OPTION_REPLACE ARMCC --export_all_vtbl // don't use --export_all_vtbl" +symbian-abld { +# Versions of abld prior to Symbian^3 have a bug where you cannot remove something from the command line without replacing it +# Rather than figure out which version of abld we're using, we'll replace the command with a macro *that should never be used* + MMP_RULES_DONT_EXPORT_ALL_CLASS_IMPEDIMENTA = "OPTION_REPLACE ARMCC --export_all_vtbl -D__QT_NOEFFECTMACRO_DONOTUSE" +} else { + MMP_RULES_DONT_EXPORT_ALL_CLASS_IMPEDIMENTA = "OPTION_REPLACE ARMCC --export_all_vtbl // don't use --export_all_vtbl" +} MMP_RULES += PAGED MMP_RULES += $$MMP_RULES_DONT_EXPORT_ALL_CLASS_IMPEDIMENTA SYMBIAN_PLATFORMS = WINSCW GCCE ARMV5 ARMV6 |