diff options
| author | Juha Kukkonen <ext-juha.kukkonen@nokia.com> | 2012-02-13 16:12:43 +0200 |
|---|---|---|
| committer | Juha Kukkonen <ext-juha.kukkonen@nokia.com> | 2012-02-13 16:37:52 +0200 |
| commit | ac04944e5d9264c3d8afa38ee24cbb83b2c64748 (patch) | |
| tree | ceb7995ac5713cc8754fb4c2dba0d4fcc54769da /plugins | |
| parent | 703d96293eb6d0176019931cd43158d68a22bf4b (diff) | |
Fix contacts plugin platform version detection on Symbian
contactsmodel should be build on Symbian 5.3 platform.
Reviewed-by: Pasi Pentikainen
Diffstat (limited to 'plugins')
| -rw-r--r-- | plugins/contacts/symbian/plugin/symbian_defines.pri | 2 | ||||
| -rw-r--r-- | plugins/contacts/symbian/symbian.pro | 8 |
2 files changed, 9 insertions, 1 deletions
diff --git a/plugins/contacts/symbian/plugin/symbian_defines.pri b/plugins/contacts/symbian/plugin/symbian_defines.pri index aa3a24cb11..e1493e9495 100644 --- a/plugins/contacts/symbian/plugin/symbian_defines.pri +++ b/plugins/contacts/symbian/plugin/symbian_defines.pri @@ -1,5 +1,5 @@ symbian: { - exists($${EPOCROOT}epoc32/data/z/system/install/productid_helen.sis) | exists($${EPOCROOT}epoc32/rom/config/ncp110) { + exists($${EPOCROOT}epoc32/data/z/system/install/productid_helen.sis) | exists($${EPOCROOT}epoc32/rom/config/ncp110) | exists($${EPOCROOT}epoc32/release/winscw/udeb/z/system/install/series60v5.3.sis) { DEFINES += SYMBIAN_BACKEND_USE_CNTMODEL_V2 # This will enable signals to be emitted sychronously with every diff --git a/plugins/contacts/symbian/symbian.pro b/plugins/contacts/symbian/symbian.pro index 35e1f2d992..f82613269d 100644 --- a/plugins/contacts/symbian/symbian.pro +++ b/plugins/contacts/symbian/symbian.pro @@ -5,6 +5,7 @@ include(../../../common.pri) ## quick platform check. IS_SYMBIAN_3_PS3 = no + exists($${EPOCROOT}epoc32/data/z/system/install/productid_helen.sis) { IS_SYMBIAN_3_PS3 = yes message(S^3 1.11 hw79 platform) @@ -18,6 +19,13 @@ contains(IS_SYMBIAN_3_PS3, no) { } contains(IS_SYMBIAN_3_PS3, no) { + exists($${EPOCROOT}epoc32/release/winscw/udeb/z/system/install/series60v5.3.sis) { + IS_SYMBIAN_3_PS3 = yes + message(S^3 5.3) + } +} + +contains(IS_SYMBIAN_3_PS3, no) { message(S^3 PS2 or older platform) } |