diff options
| author | axis <qt-info@nokia.com> | 2010-03-01 14:06:02 (GMT) |
|---|---|---|
| committer | axis <qt-info@nokia.com> | 2010-03-01 14:06:02 (GMT) |
| commit | 88a36e9e7e0e0bc09788c41ab6b968031dbc9154 (patch) | |
| tree | 947663f695f54a0deb2724116f82d89fde761576 /mkspecs/common/symbian | |
| parent | 4be1e01c6faebe11bfe205c1b910049747b5c335 (diff) | |
| parent | ca82ee4ee55e52c75326949148455af1095df014 (diff) | |
| download | Qt-88a36e9e7e0e0bc09788c41ab6b968031dbc9154.zip Qt-88a36e9e7e0e0bc09788c41ab6b968031dbc9154.tar.gz Qt-88a36e9e7e0e0bc09788c41ab6b968031dbc9154.tar.bz2 | |
Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-s60-public
Conflicts:
configure
mkspecs/common/symbian/symbian.conf
qmake/generators/symbian/initprojectdeploy_symbian.cpp
qmake/generators/symbian/symmake_abld.cpp
qmake/generators/symbian/symmake_sbsv2.cpp
src/plugins/plugins.pro
Diffstat (limited to 'mkspecs/common/symbian')
| -rw-r--r-- | mkspecs/common/symbian/symbian-mmp.conf | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/mkspecs/common/symbian/symbian-mmp.conf b/mkspecs/common/symbian/symbian-mmp.conf index 2a570d5..3eedf4f 100644 --- a/mkspecs/common/symbian/symbian-mmp.conf +++ b/mkspecs/common/symbian/symbian-mmp.conf @@ -13,6 +13,7 @@ contains(QMAKE_HOST.os, "Windows") { } include(symbian.conf) +load(add_mmp_rules) symbian-abld { # Versions of abld prior to Symbian^3 have a bug where you cannot remove something from the command line without replacing it @@ -21,7 +22,7 @@ symbian-abld { } 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 += PAGED BYTEPAIRCOMPRESSTARGET MMP_RULES += $$MMP_RULES_DONT_EXPORT_ALL_CLASS_IMPEDIMENTA SYMBIAN_PLATFORMS = WINSCW GCCE ARMV5 ARMV6 @@ -51,7 +52,7 @@ exists($${EPOCROOT}epoc32/release/winscw/udeb/z/system/install/series60v5.0.sis S60_VERSION = 3.2 } else { S60_VERSION = 3.1 - MMP_RULES -= PAGED + MMP_RULES -= PAGED BYTEPAIRCOMPRESSTARGET } } |