diff options
| author | Martin Jones <martin.jones@nokia.com> | 2010-03-01 03:56:02 (GMT) |
|---|---|---|
| committer | Martin Jones <martin.jones@nokia.com> | 2010-03-01 03:56:02 (GMT) |
| commit | 9b54e9e7168cafd3885a0784dd24f74b8ad058ab (patch) | |
| tree | 2464a4194ad9237494f5828a00321eadee1c1d4e /mkspecs/common/symbian/symbian.conf | |
| parent | 2c3cc70107d2a4ae32e092703dd6a7de734bee4a (diff) | |
| parent | b1e097af8c0537794a64cfacd23848f8a2a7f0ca (diff) | |
| download | Qt-9b54e9e7168cafd3885a0784dd24f74b8ad058ab.zip Qt-9b54e9e7168cafd3885a0784dd24f74b8ad058ab.tar.gz Qt-9b54e9e7168cafd3885a0784dd24f74b8ad058ab.tar.bz2 | |
Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qml
Diffstat (limited to 'mkspecs/common/symbian/symbian.conf')
| -rw-r--r-- | mkspecs/common/symbian/symbian.conf | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/mkspecs/common/symbian/symbian.conf b/mkspecs/common/symbian/symbian.conf index d2edbdb..48a28b7 100644 --- a/mkspecs/common/symbian/symbian.conf +++ b/mkspecs/common/symbian/symbian.conf @@ -115,6 +115,7 @@ QMAKE_STRIPFLAGS_LIB += --strip-unneeded load(qt_config) load(symbian/platform_paths) +load(symbian/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 @@ -123,7 +124,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 @@ -153,7 +154,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 } } @@ -171,4 +172,4 @@ symbian { # [TODO] QMAKE_CXXFLAGS.GCCE += $${QMAKE_CXXFLAGS_FAST_VFP.GCCE} } } -}
\ No newline at end of file +} |