diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-06-03 22:03:47 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-06-03 22:03:47 (GMT) |
| commit | 58c591974bf34577e27638f1328a04c4f7c698f8 (patch) | |
| tree | dcca369ccf58ab2e0e1b07ec4ed064bca3e98f32 /mkspecs | |
| parent | a66efc054ce9a9b2fc0535a7269f921ea411498c (diff) | |
| parent | 7d71e65658d27c200f97b93781c3c7f7c313ff56 (diff) | |
| download | Qt-58c591974bf34577e27638f1328a04c4f7c698f8.zip Qt-58c591974bf34577e27638f1328a04c4f7c698f8.tar.gz Qt-58c591974bf34577e27638f1328a04c4f7c698f8.tar.bz2 | |
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public:
Using Symbian's future font table getter Api
Standalone Qml demos for Fluidlauncher
Fixed S60_VERSION variable exists checks
Diffstat (limited to 'mkspecs')
| -rw-r--r-- | mkspecs/common/symbian/symbian-mmp.conf | 22 |
1 files changed, 14 insertions, 8 deletions
diff --git a/mkspecs/common/symbian/symbian-mmp.conf b/mkspecs/common/symbian/symbian-mmp.conf index b0d17be..5a7b2d2 100644 --- a/mkspecs/common/symbian/symbian-mmp.conf +++ b/mkspecs/common/symbian/symbian-mmp.conf @@ -40,15 +40,21 @@ MMP_RULES += "USERINCLUDE ." exists($${EPOCROOT}epoc32/release/winscw/udeb/z/system/install/series60v5.2.sis)|exists($${EPOCROOT}epoc32/data/z/system/install/series60v5.2.sis) { S60_VERSION = 5.2 symbian3 -} else:exists($${EPOCROOT}epoc32/release/winscw/udeb/z/system/install/series60v5.1.sis)|exists($${EPOCROOT}epoc32/data/z/system/install/series60v5.1.sis) { - S60_VERSION = 5.1 symbian2 -} else:exists($${EPOCROOT}epoc32/release/winscw/udeb/z/system/install/series60v5.0.sis)|exists($${EPOCROOT}epoc32/data/z/system/install/series60v5.0.sis) { - S60_VERSION = 5.0 -} else:exists($${EPOCROOT}epoc32/release/winscw/udeb/z/system/install/series60v3.2.sis)|exists($${EPOCROOT}epoc32/data/z/system/install/series60v3.2.sis) { - S60_VERSION = 3.2 } else { - S60_VERSION = 3.1 - MMP_RULES -= PAGED BYTEPAIRCOMPRESSTARGET + exists($${EPOCROOT}epoc32/release/winscw/udeb/z/system/install/series60v5.1.sis)|exists($${EPOCROOT}epoc32/data/z/system/install/series60v5.1.sis) { + S60_VERSION = 5.1 symbian2 + } else { + exists($${EPOCROOT}epoc32/release/winscw/udeb/z/system/install/series60v5.0.sis)|exists($${EPOCROOT}epoc32/data/z/system/install/series60v5.0.sis) { + S60_VERSION = 5.0 + } else { + exists($${EPOCROOT}epoc32/release/winscw/udeb/z/system/install/series60v3.2.sis)|exists($${EPOCROOT}epoc32/data/z/system/install/series60v3.2.sis) { + S60_VERSION = 3.2 + } else { + S60_VERSION = 3.1 + MMP_RULES -= PAGED BYTEPAIRCOMPRESSTARGET + } + } + } } QMAKE_CXXFLAGS_FAST_VFP.ARMCC = --fpmode fast |