diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-02-23 12:55:04 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-02-23 12:55:04 (GMT) |
| commit | 412512466183c021cee95002f57215707fbfb8ca (patch) | |
| tree | 16b2b0657d976768970c3b4c9586c5a17bb7cbab /mkspecs/common/symbian/symbian.conf | |
| parent | 7e138f0fcd52464e21a22bf3c76b1478e9c2b631 (diff) | |
| parent | 9be36306cd19626344cdedf5d99f5b142c2356d0 (diff) | |
| download | Qt-412512466183c021cee95002f57215707fbfb8ca.zip Qt-412512466183c021cee95002f57215707fbfb8ca.tar.gz Qt-412512466183c021cee95002f57215707fbfb8ca.tar.bz2 | |
Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.6-integration
* '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public:
Always define Q_WS_S60 on Symbian unless configured with -no-s60.
Enable window size caching on Symbian NGA variants.
Use the SYMBIAN_BUILD_GCE macro to check if the GCE variant can be used
enable bytepair compression for S60 3.2 and newer
Diffstat (limited to 'mkspecs/common/symbian/symbian.conf')
| -rw-r--r-- | mkspecs/common/symbian/symbian.conf | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/mkspecs/common/symbian/symbian.conf b/mkspecs/common/symbian/symbian.conf index 7b2ee91..f3026ad 100644 --- a/mkspecs/common/symbian/symbian.conf +++ b/mkspecs/common/symbian/symbian.conf @@ -115,7 +115,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 @@ -145,7 +145,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 } } @@ -163,4 +163,4 @@ symbian { # [TODO] QMAKE_CXXFLAGS.GCCE += $${QMAKE_CXXFLAGS_FAST_VFP.GCCE} } } -}
\ No newline at end of file +} |