4 files changed, 23 insertions, 20 deletions
diff --git a/src/plugins/bearer/symbian/3_2/3_2.pro b/src/plugins/bearer/symbian/3_2/3_2.pro
index 6f3ecaf348..ac3b3f898f 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.pri b/src/plugins/bearer/symbian/symbian.pri
index 9b3f50ccd1..e874945c7a 100644
--- a/src/plugins/bearer/symbian/symbian.pri
+++ b/src/plugins/bearer/symbian/symbian.pri
@@ -22,11 +22,9 @@ LIBS += -lcommdb \
         -lnetmeta
 
 is_using_gnupoc {
-    LIBS += -lconnmon \
-            -lapsettingshandlerui
+    LIBS += -lconnmon
 } else {
-    LIBS += -lConnMon \
-            -lApSettingsHandlerUI
+    LIBS += -lConnMon
 }
 
 QTDIR_build:DESTDIR = $$QT_BUILD_TREE/plugins/bearer
diff --git a/src/plugins/bearer/symbian/symbian.pro b/src/plugins/bearer/symbian/symbian.pro
index f320eb663b..91f8217b2e 100644
--- a/src/plugins/bearer/symbian/symbian.pro
+++ b/src/plugins/bearer/symbian/symbian.pro
@@ -1,3 +1,8 @@
 TEMPLATE = subdirs
 
-SUBDIRS += 3_1 3_2 symbian_3
-\ No newline at end of file
+contains(S60_VERSION, 3.1)|contains(S60_VERSION, 3.2)|contains(S60_VERSION, 5.0) {
+    SUBDIRS += 3_1 3_2
+}
+
+# Symbian3 builds the default plugin for winscw so it is always needed
+SUBDIRS += symbian_3
+\ No newline at end of file
diff --git a/src/plugins/bearer/symbian/symbian_3/symbian_3.pro b/src/plugins/bearer/symbian/symbian_3/symbian_3.pro
index fd66198fe7..ef90ad2b73 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
-        }
     }
 }