Make backend selection easy

Allow the backend to be selected on the qmake command line,
which allows for easier testing. Use by specifiying
SFW_BACKEND=unix, localsocket or dbus.

Change-Id: I699737a7d2c97b564ebb5dc6b6d7c87dec8b6eb5
Reviewed-by: Zsolt Simon <zsolt.simon@nokia.com>
Reviewed-by: Alex <alex.blasche@nokia.com>

2 files changed, 35 insertions, 24 deletions

diff --git a/src/serviceframework/ipc/ipc.pri b/src/serviceframework/ipc/ipc.pri
index 81cf02a1..7e42f332 100644
--- a/src/serviceframework/ipc/ipc.pri
+++ b/src/serviceframework/ipc/ipc.pri
@@ -5,29 +5,41 @@ win32 {
 
 QT += core-private
 
-contains(DEFINES, QT_ADDON_JSONDB_LIB): {
+isEmpty(SFW_BACKEND) {
+    contains(DEFINES, QT_ADDON_JSONDB_LIB) {
+        SFW_BACKEND = unix
+    } else {
+        !jsondb:!contains(config_test_jsondb, yes):contains(QT_CONFIG,dbus) {
+            SFW_BACKEND = dbus
+        } else {
+            SFW_BACKEND = localsocket
+        }
+    }
+}
+
+equals(SFW_BACKEND,unix) {
     PRIVATE_HEADERS += ipc/qremoteserviceregister_unix_p.h \
         ipc/objectendpoint_p.h
     SOURCES += ipc/qremoteserviceregister_unix_p.cpp \
         ipc/objectendpoint.cpp
+} else:equals(SFW_BACKEND,dbus) {
+    DEFINES += SFW_USE_DBUS_BACKEND
+    QT += dbus \
+        network
+    PRIVATE_HEADERS += ipc/qremoteserviceregister_dbus_p.h \
+        ipc/objectendpoint_dbus_p.h \
+        ipc/qservicemetaobject_dbus_p.h
+    SOURCES += ipc/qremoteserviceregister_dbus_p.cpp \
+        ipc/objectendpoint_dbus.cpp \
+        ipc/qservicemetaobject_dbus.cpp
+} else:equals(SFW_BACKEND,localsocket) {
+    QT += network
+    PRIVATE_HEADERS += ipc/qremoteserviceregister_ls_p.h \
+        ipc/objectendpoint_p.h
+    SOURCES += ipc/qremoteserviceregister_ls_p.cpp \
+        ipc/objectendpoint.cpp
 } else {
-    !jsondb:!contains(config_test_jsondb, yes):contains(QT_CONFIG,dbus) {
-        DEFINES += SFW_USE_DBUS_BACKEND
-        QT += dbus \
-            network
-        PRIVATE_HEADERS += ipc/qremoteserviceregister_dbus_p.h \
-            ipc/objectendpoint_dbus_p.h \
-            ipc/qservicemetaobject_dbus_p.h
-        SOURCES += ipc/qremoteserviceregister_dbus_p.cpp \
-            ipc/objectendpoint_dbus.cpp \
-            ipc/qservicemetaobject_dbus.cpp
-    } else {
-        QT += network
-        PRIVATE_HEADERS += ipc/qremoteserviceregister_ls_p.h \
-            ipc/objectendpoint_p.h
-        SOURCES += ipc/qremoteserviceregister_ls_p.cpp \
-            ipc/objectendpoint.cpp
-    }
+    error("Unkown SFW_BACKEND $$SFW_BACKEND")
 }
 
 PRIVATE_HEADERS += ipc/qslotinvoker_p.h \
diff --git a/src/serviceframework/serviceframework.pro b/src/serviceframework/serviceframework.pro
index a8732eaf..c05df66f 100644
--- a/src/serviceframework/serviceframework.pro
+++ b/src/serviceframework/serviceframework.pro
@@ -14,13 +14,12 @@ load(qt_module_config)
 
 sfwdebug: {
     DEFINES += QT_SFW_IPC_DEBUG
+    QT += network
 }
 
-jsondb|contains(QT_CONFIG, jsondb): {
-    mtlib|contains(config_test_mtlib, yes): {
-        DEFINES += QT_NO_DBUS QT_ADDON_JSONDB_LIB QT_MTCLIENT_PRESENT
-        QT += jsondb
-    }
+jsondb {
+    DEFINES += QT_NO_DBUS QT_ADDON_JSONDB_LIB QT_MTCLIENT_PRESENT
+    QT += jsondb
 }
 
 include(ipc/ipc.pri)
@@ -51,7 +50,7 @@ SOURCES += servicemetadata.cpp \
     qservicereply.cpp \
     qservicerequest.cpp
 
-contains(DEFINES, QT_ADDON_JSONDB_LIB): {
+jsondb {
     SOURCES += databasemanager_jsondb.cpp
     PRIVATE_HEADERS += databasemanager_jsondb_p.h
 } else {