3 files changed, 17 insertions, 6 deletions
diff --git a/src/plugins/bearer/symbian/symbian.pri b/src/plugins/bearer/symbian/symbian.pri
index 9b3f50c..e874945 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 f320eb6..91f8217 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/s60/s60.pro b/src/plugins/s60/s60.pro
index 8ae639c..c999fff 100644
--- a/src/plugins/s60/s60.pro
+++ b/src/plugins/s60/s60.pro
@@ -1,3 +1,11 @@
 TEMPLATE = subdirs
 
-symbian:SUBDIRS = 3_1 3_2 5_0
+
+symbian {
+    contains(S60_VERSION, 3.1)|contains(S60_VERSION, 3.2)|contains(S60_VERSION, 5.0) {
+        SUBDIRS += 3_1 3_2
+    }
+
+    # 5.0 is used also for Symbian3 and later
+    SUBDIRS += 5_0
+}
+\ No newline at end of file