diff options
| author | Thiago Macieira <thiago.macieira@nokia.com> | 2009-10-06 08:52:17 (GMT) |
|---|---|---|
| committer | Thiago Macieira <thiago.macieira@nokia.com> | 2009-10-06 08:52:17 (GMT) |
| commit | 58563dcb2cab0949d21337b7b7cd34e3bdd29bbc (patch) | |
| tree | 2715d69c247748ba1501e50ec432415d3ffebcae /mkspecs | |
| parent | 564f65bdcf42bcdaceea902b99bcbfafef5b97f3 (diff) | |
| parent | 2dc7fae7ea38a0169c4c5c78d0534d688347aacb (diff) | |
| download | Qt-58563dcb2cab0949d21337b7b7cd34e3bdd29bbc.zip Qt-58563dcb2cab0949d21337b7b7cd34e3bdd29bbc.tar.gz Qt-58563dcb2cab0949d21337b7b7cd34e3bdd29bbc.tar.bz2 | |
Merge branch '4.6'
Conflicts:
src/corelib/io/qdatastream.h
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 |