diff options
| author | Miikka Heikkinen <miikka.heikkinen@digia.com> | 2010-09-16 13:59:14 (GMT) |
|---|---|---|
| committer | Miikka Heikkinen <miikka.heikkinen@digia.com> | 2010-09-16 14:09:21 (GMT) |
| commit | acc84a9d0d3427155298db3a8c0ad406d078de0e (patch) | |
| tree | fb92fbb12885e3ed33859e8e72d97e255f91c4ee /src/plugins/bearer | |
| parent | 093221ee4ca3b6ca08731c6d7cb71c360ef68a18 (diff) | |
| download | Qt-acc84a9d0d3427155298db3a8c0ad406d078de0e.zip Qt-acc84a9d0d3427155298db3a8c0ad406d078de0e.tar.gz Qt-acc84a9d0d3427155298db3a8c0ad406d078de0e.tar.bz2 | |
Check S60_VERSION instead of existence of certain files in bearer plugin
Checking for existence of files does not work in clean platform builds,
so check the S60_VERSION instead, which can be explicitly set by
those builds to correct value.
Task-number: QT-3949
Reviewed-by: axis
Diffstat (limited to 'src/plugins/bearer')
| -rw-r--r-- | src/plugins/bearer/symbian/3_2/3_2.pro | 12 | ||||
| -rw-r--r-- | src/plugins/bearer/symbian/symbian_3/symbian_3.pro | 18 |
2 files changed, 15 insertions, 15 deletions
diff --git a/src/plugins/bearer/symbian/3_2/3_2.pro b/src/plugins/bearer/symbian/3_2/3_2.pro index 6f3ecaf..ac3b3f8 100644 --- a/src/plugins/bearer/symbian/3_2/3_2.pro +++ b/src/plugins/bearer/symbian/3_2/3_2.pro @@ -1,13 +1,15 @@ include(../symbian.pri) symbian { - exists($${EPOCROOT}epoc32/release/winscw/udeb/cmmanager.lib)| \ - exists($${EPOCROOT}epoc32/release/armv5/lib/cmmanager.lib) { + contains(S60_VERSION, 3.1) { + is_using_gnupoc { + LIBS += -lapengine + } else { + LIBS += -lAPEngine + } + } else { DEFINES += SNAP_FUNCTIONALITY_AVAILABLE LIBS += -lcmmanager - } else { - # Fall back to 3_1 implementation on platforms that do not have cmmanager - LIBS += -lapengine } } diff --git a/src/plugins/bearer/symbian/symbian_3/symbian_3.pro b/src/plugins/bearer/symbian/symbian_3/symbian_3.pro index fd66198..ef90ad2 100644 --- a/src/plugins/bearer/symbian/symbian_3/symbian_3.pro +++ b/src/plugins/bearer/symbian/symbian_3/symbian_3.pro @@ -1,22 +1,20 @@ include(../symbian.pri) symbian { - exists($${EPOCROOT}epoc32/release/winscw/udeb/cmmanager.lib)| \ - exists($${EPOCROOT}epoc32/release/armv5/lib/cmmanager.lib) { + contains(S60_VERSION, 3.1) { + is_using_gnupoc { + LIBS += -lapengine + } else { + LIBS += -lAPEngine + } + } else { DEFINES += SNAP_FUNCTIONALITY_AVAILABLE LIBS += -lcmmanager - exists($$prependEpocroot($$MW_LAYER_PUBLIC_EXPORT_PATH(extendedconnpref.h))) { + !contains(S60_VERSION, 3.2):!contains(S60_VERSION, 5.0) { DEFINES += OCC_FUNCTIONALITY_AVAILABLE LIBS += -lextendedconnpref } - } else { - # Fall back to 3_1 implementation on platforms that do not have cmmanager - is_using_gnupoc { - LIBS += -lapengine - } else { - LIBS += -lAPEngine - } } } |