diff options
| author | axis <qt-info@nokia.com> | 2010-08-02 14:30:32 (GMT) |
|---|---|---|
| committer | axis <qt-info@nokia.com> | 2010-08-03 07:28:02 (GMT) |
| commit | ca3c76a567602533ccdd2f7700ec915f675e6bef (patch) | |
| tree | 3bf869d4214850cbd5e764563450202f6d534db6 /mkspecs | |
| parent | 4e5622a850783264ecb6cb9f944bccc49cc73b86 (diff) | |
| download | Qt-ca3c76a567602533ccdd2f7700ec915f675e6bef.zip Qt-ca3c76a567602533ccdd2f7700ec915f675e6bef.tar.gz Qt-ca3c76a567602533ccdd2f7700ec915f675e6bef.tar.bz2 | |
Added SYMBIAN_VERSION variable to qmake.
In addition, made Symbian^3 detection depend on libstdcppv5, which
seems like the only option in the public Symbian^3 PDK.
RevBy: Miikka Heikkinen
Diffstat (limited to 'mkspecs')
| -rw-r--r-- | mkspecs/common/symbian/symbian.conf | 20 |
1 files changed, 17 insertions, 3 deletions
diff --git a/mkspecs/common/symbian/symbian.conf b/mkspecs/common/symbian/symbian.conf index 161cfe9..6d96b01 100644 --- a/mkspecs/common/symbian/symbian.conf +++ b/mkspecs/common/symbian/symbian.conf @@ -119,11 +119,13 @@ QT_IMPORTS_BASE_DIR = /resource/qt/imports load(qt_config) load(symbian/platform_paths) -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 +# The Symbian^3 PDK does not necessarily contain the required sis files. +# However, libstdcppv5 first appeared in Symbian^3 (S60 5.2), so check for that too. +exists($${EPOCROOT}epoc32/release/winscw/udeb/z/system/install/series60v5.2.sis)|exists($${EPOCROOT}epoc32/data/z/system/install/series60v5.2.sis)|exists($${EPOCROOT}epoc32/release/armv5/lib/libstdcppv5.dso) { + S60_VERSION = 5.2 } 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 + S60_VERSION = 5.1 } 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 @@ -137,6 +139,18 @@ exists($${EPOCROOT}epoc32/release/winscw/udeb/z/system/install/series60v5.2.sis) } } +contains(S60_VERSION, "3\\.1") { + SYMBIAN_VERSION = 9.2 +} else:contains(S60_VERSION, "3\\.2") { + SYMBIAN_VERSION = 9.3 +} else:contains(S60_VERSION, "5\\.0") { + SYMBIAN_VERSION = 9.4 +} else:contains(S60_VERSION, "5\\.1") { + SYMBIAN_VERSION = Symbian2 +} else:contains(S60_VERSION, "5\\.2") { + SYMBIAN_VERSION = Symbian3 +} + # pkg_depends_webkit, pkg_depends_core, and pkg_platform_dependencies can be removed by developer # if multiple languages need to be supported by pkg file. In that case the developer should declare # multiple language compatible dependency statements him/herself. |