Revert "Split Symbian bearer plugin into three platform specfic plugins"

This reverts commit cd50f97a9f09eece645c9d7d01cb14c04521a915.

Fails on tb9.2, reverting while working on a fix.

7 files changed, 47 insertions, 81 deletions

diff --git a/src/plugins/bearer/symbian/3_1/3_1.pro b/src/plugins/bearer/symbian/3_1/3_1.pro
deleted file mode 100644
index a60d18b..0000000
--- a/src/plugins/bearer/symbian/3_1/3_1.pro
+++ /dev/null
@@ -1,4 +0,0 @@
-include(../symbian.pri)
-
-LIBS += -lapengine
-TARGET = $${TARGET}_3_1
diff --git a/src/plugins/bearer/symbian/3_2/3_2.pro b/src/plugins/bearer/symbian/3_2/3_2.pro
deleted file mode 100644
index 4e5b416..0000000
--- a/src/plugins/bearer/symbian/3_2/3_2.pro
+++ /dev/null
@@ -1,12 +0,0 @@
-include(../symbian.pri)
-
-exists($${EPOCROOT}epoc32/release/winscw/udeb/cmmanager.lib)| \
-exists($${EPOCROOT}epoc32/release/armv5/lib/cmmanager.lib) {
-   DEFINES += SNAP_FUNCTIONALITY_AVAILABLE
-   LIBS += -lcmmanager
-} else {
-   # Fall back to 3_1 implementation on platforms that do not have cmmanager
-   LIBS += -lapengine
-}
-
-TARGET = $${TARGET}_3_2
diff --git a/src/plugins/bearer/symbian/symbian.pri b/src/plugins/bearer/symbian/symbian.pri
deleted file mode 100644
index bfcd9ed..0000000
--- a/src/plugins/bearer/symbian/symbian.pri
+++ /dev/null
@@ -1,30 +0,0 @@
-TARGET = qsymbianbearer
-include(../../qpluginbase.pri)
-
-QT += network
-
-HEADERS += ../symbianengine.h \
-           ../qnetworksession_impl.h
-
-SOURCES += ../symbianengine.cpp \
-           ../qnetworksession_impl.cpp \
-           ../main.cpp
-
-TARGET.UID3=0x20021319
-
-INCLUDEPATH += $$APP_LAYER_SYSTEMINCLUDE
-symbian-abld:INCLUDEPATH += $$QT_BUILD_TREE/include/QtNetwork/private
-
-LIBS += -lcommdb \
-        -lapsettingshandlerui \
-        -lconnmon \
-        -lcentralrepository \
-        -lesock \
-        -linsock \
-        -lecom \
-        -lefsrv \
-        -lnetmeta
-
-QTDIR_build:DESTDIR = $$QT_BUILD_TREE/plugins/bearer
-target.path += $$[QT_INSTALL_PLUGINS]/bearer
-INSTALLS += target
diff --git a/src/plugins/bearer/symbian/symbian.pro b/src/plugins/bearer/symbian/symbian.pro
index f320eb6..4f1e51c 100644
--- a/src/plugins/bearer/symbian/symbian.pro
+++ b/src/plugins/bearer/symbian/symbian.pro
@@ -1,3 +1,41 @@
-TEMPLATE = subdirs
+TARGET = qsymbianbearer
+include(../../qpluginbase.pri)
 
-SUBDIRS += 3_1 3_2 symbian_3
\ No newline at end of file
+QT += network
+
+HEADERS += symbianengine.h \
+           qnetworksession_impl.h
+
+SOURCES += symbianengine.cpp \
+           qnetworksession_impl.cpp \
+           main.cpp
+
+symbian {
+    TARGET.UID3=0x20021319
+    exists($${EPOCROOT}epoc32/release/winscw/udeb/cmmanager.lib)| \
+    exists($${EPOCROOT}epoc32/release/armv5/lib/cmmanager.lib) {
+        message("Building with SNAP support")
+        DEFINES += SNAP_FUNCTIONALITY_AVAILABLE
+        LIBS += -lcmmanager
+    } else {
+        message("Building without SNAP support")
+        LIBS += -lapengine
+    }
+}
+
+INCLUDEPATH += $$APP_LAYER_SYSTEMINCLUDE
+symbian-abld:INCLUDEPATH += $$QT_BUILD_TREE/include/QtNetwork/private
+
+LIBS += -lcommdb \
+        -lapsettingshandlerui \
+        -lconnmon \
+        -lcentralrepository \
+        -lesock \
+        -linsock \
+        -lecom \
+        -lefsrv \
+        -lnetmeta
+
+QTDIR_build:DESTDIR = $$QT_BUILD_TREE/plugins/bearer
+target.path += $$[QT_INSTALL_PLUGINS]/bearer
+INSTALLS += target
diff --git a/src/plugins/bearer/symbian/symbian_3/symbian_3.pro b/src/plugins/bearer/symbian/symbian_3/symbian_3.pro
deleted file mode 100644
index 455aa67..0000000
--- a/src/plugins/bearer/symbian/symbian_3/symbian_3.pro
+++ /dev/null
@@ -1,14 +0,0 @@
-include(../symbian.pri)
-
-exists($${EPOCROOT}epoc32/release/winscw/udeb/cmmanager.lib)| \
-exists($${EPOCROOT}epoc32/release/armv5/lib/cmmanager.lib) {
-    DEFINES += SNAP_FUNCTIONALITY_AVAILABLE
-    LIBS += -lcmmanager
-
-    exists($$MW_LAYER_PUBLIC_EXPORT_PATH(extendedconnpref.h)) {
-        DEFINES += OCC_FUNCTIONALITY_AVAILABLE
-    }
-} else {
-   # Fall back to 3_1 implementation on platforms that do not have cmmanager
-   LIBS += -lapengine
-}
diff --git a/src/s60installs/qsymbianbearer.qtplugin b/src/s60installs/qsymbianbearer.qtplugin
deleted file mode 100644
index 5c45bdd..0000000
--- a/src/s60installs/qsymbianbearer.qtplugin
+++ /dev/null
@@ -1 +0,0 @@
-This file is a Qt plugin stub file. The real Qt plugin is located in /sys/bin. Created:2010-06-02T14:02:21
diff --git a/src/s60installs/s60installs.pro b/src/s60installs/s60installs.pro
index 15d7830..90c362b 100644
--- a/src/s60installs/s60installs.pro
+++ b/src/s60installs/s60installs.pro
@@ -51,35 +51,20 @@ symbian: {
 
     symbian-abld|symbian-sbsv2 {
         pluginLocations = $${EPOCROOT}epoc32/release/$(PLATFORM)/$(TARGET)
-        bearerPluginLocation = $${EPOCROOT}epoc32/release/$(PLATFORM)/$(TARGET)
-        bearerStubZ = $${EPOCROOT}$${HW_ZDIR}$${QT_PLUGINS_BASE_DIR}/bearer/qsymbianbearer$${QT_LIBINFIX}.qtplugin
-        BLD_INF_RULES.prj_exports += \
-            "qsymbianbearer.qtplugin $$bearerStubZ" \
-            "qsymbianbearer.qtplugin /epoc32/winscw/c$${QT_PLUGINS_BASE_DIR}/bearer/qsymbianbearer$${QT_LIBINFIX}.qtplugin"
     } else {
         pluginLocations = $$QT_BUILD_TREE/plugins/s60
-        bearerPluginLocation = $$QT_BUILD_TREE/plugins/bearer
-        bearerStubZ = $${PWD}/qsymbianbearer.qtplugin
     }
 
     qts60plugindeployment = \
-        "IF package(0x20022E6D)" \
-        "   \"$$pluginLocations/qts60plugin_5_0$${QT_LIBINFIX}.dll\" - \"c:\\sys\\bin\\qts60plugin_5_0$${QT_LIBINFIX}.dll\"" \
-        "   \"$$bearerPluginLocation/qsymbianbearer$${QT_LIBINFIX}.dll\" - \"c:\\sys\\bin\\qsymbianbearer$${QT_LIBINFIX}.dll\"" \
-        "ELSEIF package(0x1028315F)" \
+        "IF package(0x1028315F)" \
         "   \"$$pluginLocations/qts60plugin_5_0$${QT_LIBINFIX}.dll\" - \"c:\\sys\\bin\\qts60plugin_5_0$${QT_LIBINFIX}.dll\"" \
-        "   \"$$bearerPluginLocation/qsymbianbearer_3_2$${QT_LIBINFIX}.dll\" - \"c:\\sys\\bin\\qsymbianbearer$${QT_LIBINFIX}.dll\"" \
         "ELSEIF package(0x102752AE)" \
         "   \"$$pluginLocations/qts60plugin_3_2$${QT_LIBINFIX}.dll\" - \"c:\\sys\\bin\\qts60plugin_3_2$${QT_LIBINFIX}.dll\"" \
-        "   \"$$bearerPluginLocation/qsymbianbearer_3_2$${QT_LIBINFIX}.dll\" - \"c:\\sys\\bin\\qsymbianbearer$${QT_LIBINFIX}.dll\"" \
         "ELSEIF package(0x102032BE)" \
         "   \"$$pluginLocations/qts60plugin_3_1$${QT_LIBINFIX}.dll\" - \"c:\\sys\\bin\\qts60plugin_3_1$${QT_LIBINFIX}.dll\"" \
-        "   \"$$bearerPluginLocation/qsymbianbearer_3_1$${QT_LIBINFIX}.dll\" - \"c:\\sys\\bin\\qsymbianbearer$${QT_LIBINFIX}.dll\"" \
         "ELSE" \
         "   \"$$pluginLocations/qts60plugin_5_0$${QT_LIBINFIX}.dll\" - \"c:\\sys\\bin\\qts60plugin_5_0$${QT_LIBINFIX}.dll\"" \
-        "   \"$$bearerPluginLocation/qsymbianbearer$${QT_LIBINFIX}.dll\" - \"c:\\sys\\bin\\qsymbianbearer$${QT_LIBINFIX}.dll\"" \
-        "ENDIF" \
-        "   \"$$bearerStubZ\" - \"c:$$replace(QT_PLUGINS_BASE_DIR,/,\\)\\bearer\\qsymbianbearer$${QT_LIBINFIX}.qtplugin\"
+        "ENDIF"
     qtlibraries.pkg_postrules += qts60plugindeployment
 
 
@@ -126,11 +111,15 @@ symbian: {
     qtbackup.sources = backup_registration.xml
     qtbackup.path = c:/private/10202D56/import/packages/$$replace(TARGET.UID3, 0x,)
 
+    bearer_plugins.path = c:$$QT_PLUGINS_BASE_DIR/bearer
+    bearer_plugins.sources += $$QT_BUILD_TREE/plugins/bearer/qsymbianbearer$${QT_LIBINFIX}.dll
+
     DEPLOYMENT += qtlibraries \
                   qtbackup \
                   imageformats_plugins \
                   codecs_plugins \
-                  graphicssystems_plugins
+                  graphicssystems_plugins \
+                  bearer_plugins
 
     contains(QT_CONFIG, svg): {
        qtlibraries.sources += $$QMAKE_LIBDIR_QT/QtSvg$${QT_LIBINFIX}.dll