diff options
| author | Miikka Heikkinen <miikka.heikkinen@digia.com> | 2010-09-17 10:29:33 (GMT) |
|---|---|---|
| committer | Miikka Heikkinen <miikka.heikkinen@digia.com> | 2010-09-17 10:38:46 (GMT) |
| commit | 4aea5ebee1ddaa9c05471b0562443d0bab079e68 (patch) | |
| tree | 97802a6e59679448a07f50a0016b41755fae30a8 | |
| parent | 9d9fc57b4af91eab681abb07c0924c71c1374537 (diff) | |
| download | Qt-4aea5ebee1ddaa9c05471b0562443d0bab079e68.zip Qt-4aea5ebee1ddaa9c05471b0562443d0bab079e68.tar.gz Qt-4aea5ebee1ddaa9c05471b0562443d0bab079e68.tar.bz2 | |
Load environment.prf from Symbian SDK if it exists there
Environment.prf can contain SDK specific variable settings such as
SYMBIAN_VERSION.
Task-number: QT-3949
Reviewed-by: Janne Koskinen
| -rw-r--r-- | mkspecs/common/symbian/symbian.conf | 55 |
1 files changed, 33 insertions, 22 deletions
diff --git a/mkspecs/common/symbian/symbian.conf b/mkspecs/common/symbian/symbian.conf index beef193..679731f 100644 --- a/mkspecs/common/symbian/symbian.conf +++ b/mkspecs/common/symbian/symbian.conf @@ -125,36 +125,47 @@ QT_IMPORTS_BASE_DIR = /resource/qt/imports load(symbian/platform_paths) -# 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 +# If environment.prf is provided by platform, load that. +# It is used for platform specific variable settings, such as SYMBIAN_VERSION. +exists($${EPOCROOT}epoc32/tools/qt/mkspecs/features/environment.prf) { + load($${EPOCROOT}epoc32/tools/qt/mkspecs/features/environment.prf) +} + +# Try to detect SDK version if it wasn't set by environment.prf +isEmpty(S60_VERSION) { + # 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.0.sis)|exists($${EPOCROOT}epoc32/data/z/system/install/series60v5.0.sis) { - S60_VERSION = 5.0 + 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 } 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 + 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 { - S60_VERSION = 3.1 + 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 + } } } } } -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 +isEmpty(SYMBIAN_VERSION) { + 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 |