[connectionagent] fix merge

Merge branch 'master' into next Conflicts: connd/connd.pro connd/main.cpp connd/qconnectionmanager.cpp connectionagent.pro rpm/connectionagent.spec test/auto/tst_connectionagent/tst_connectionagent.pro
sailfishos · Apr 7, 2014 · 6787bd7 · 6787bd7
2 parents 3c94c24 + f64b17a
commit 6787bd7
Show file tree

Hide file tree

Showing 12 changed files with 28 additions and 320 deletions.
diff --git a/connd/connadaptor.cpp b/connd/connadaptor.cpp
diff --git a/connd/connadaptor.h b/connd/connadaptor.h
diff --git a/connd/connd.pro b/connd/connd.pro
@@ -1,37 +1,30 @@
 
-QT += core network dbus gui
-QT -= gui
+QT = core network dbus
 
-equals(QT_MAJOR_VERSION, 4):  {
-    TARGET = connectionagent
-    PKGCONFIG += connman-qt4 qofono-qt
-
-}
-equals(QT_MAJOR_VERSION, 5):  {
-    TARGET = connectionagent
-    PKGCONFIG += connman-qt5 qofono-qt5
-}
+TARGET = connectionagent
+PKGCONFIG += connman-qt5 qofono-qt5
 
 CONFIG   += console link_pkgconfig
 CONFIG   -= app_bundle
 
 TEMPLATE = app
 
-QT += core network dbus
-
 OTHER_FILES += com.jolla.Connectiond.xml
 
+DBUS_ADAPTORS = connadaptor
+connadaptor.files = com.jollamobile.Connectiond.xml
+connadaptor.header_flags = -c ConnAdaptor
+connadaptor.source_flags = -c ConnAdaptor
+
 # create adaptor
 #system(qdbusxml2cpp -c ConnAdaptor -a connadaptor.h:connadaptor.cpp com.jollamobile.Connectiond.xml)
 
 SOURCES += main.cpp \
     qconnectionagent.cpp \
-    connadaptor.cpp \
     wakeupwatcher.cpp
 
 HEADERS+= \
     qconnectionagent.h \
-    connadaptor.h \
     wakeupwatcher.h
 
 target.path = /usr/bin

diff --git a/connd/main.cpp b/connd/main.cpp
@@ -25,7 +25,7 @@
 #include <sys/stat.h>
 
 #include "qconnectionagent.h"
-#include "connadaptor.h"
+#include "connectiond_adaptor.h"
 
 static void signal_handler(int signum)
 {

diff --git a/connd/qconnectionagent.cpp b/connd/qconnectionagent.cpp
@@ -15,7 +15,7 @@
 ****************************************************************************/
 
 #include "qconnectionagent.h"
-#include "connadaptor.h"
+#include "connectiond_adaptor.h"
 #include "wakeupwatcher.h"
 
 #if QT_VERSION >= QT_VERSION_CHECK(5, 0, 0)

diff --git a/connectionagent.pro b/connectionagent.pro
@@ -1,17 +1,14 @@
 TEMPLATE = subdirs
 
-SUBDIRS += connectionagentplugin
-SUBDIRS += test
+SUBDIRS = \
+    connectionagentplugin \
+    test \
+    config \
+    connd
 
-equals(QT_MAJOR_VERSION, 4):  {
-    SUBDIRS += test/testqml
-    OTHER_FILES += rpm/connectionagent.spec }
+test.depends = connd # xml interface
 
-equals(QT_MAJOR_VERSION, 5):  {
-    SUBDIRS += config
-    SUBDIRS += connd
-
-    OTHER_FILES += rpm/connectionagent-qt5.spec \
-                   rpm/connectionagent.tracing
-}
+OTHER_FILES += rpm/connectionagent-qt5.spec \
+               rpm/connectionagent-qt5.yaml \
+               rpm/connectionagent.tracing
 
diff --git a/connectionagentplugin/connectionagentplugin.cpp b/connectionagentplugin/connectionagentplugin.cpp
@@ -17,15 +17,9 @@
 #include "connectionagentplugin.h"
 #include "connectionamanagerinterface.h"
 
-#if QT_VERSION >= QT_VERSION_CHECK(5, 0, 0)
 #include <connman-qt5/networkmanager.h>
 #include <connman-qt5/networktechnology.h>
 #include <connman-qt5/networkservice.h>
-#else
-#include <connman-qt/networkmanager.h>
-#include <connman-qt/networktechnology.h>
-#include <connman-qt/networkservice.h>
-#endif
 
 #include <qobject.h>
 

diff --git a/connectionagentplugin/connectionagentplugin.pro b/connectionagentplugin/connectionagentplugin.pro
@@ -1,19 +1,13 @@
 TEMPLATE = lib
 TARGET = connectionagentplugin
-QT += dbus
+QT = dbus qml
 CONFIG += qt plugin
 
 uri = com.jolla.connection
 
 #create client
 #system(qdbusxml2cpp ../connd/com.jollamobile.Connectiond.xml -c ConnectionManagerInterface -p connectionamanagerinterface)
-equals(QT_MAJOR_VERSION, 4):  {
-    QT += declarative
-}
-equals(QT_MAJOR_VERSION, 5):  {
-    QT += qml
-    QT -=gui
-}
+
 SOURCES += \
     connectionagentplugin_plugin.cpp \
     connectionagentplugin.cpp \
@@ -27,8 +21,7 @@ HEADERS += \
 OTHER_FILES = qmldir
 
 MODULENAME = com/jolla/connection
-equals(QT_MAJOR_VERSION, 4): TARGETPATH = $$[QT_INSTALL_IMPORTS]/$$MODULENAME
-equals(QT_MAJOR_VERSION, 5): TARGETPATH = $$[QT_INSTALL_QML]/$$MODULENAME
+TARGETPATH = $$[QT_INSTALL_QML]/$$MODULENAME
 
 target.path = $$TARGETPATH
 qmldir.files += qmldir

diff --git a/rpm/connectionagent-qt5.spec b/rpm/connectionagent-qt5.spec
@@ -1,8 +1,3 @@
-#
-# Do NOT Edit the Auto-generated Part!
-# Generated by: spectacle version 0.27
-#
-
 Name:       connectionagent-qt5
 
 # >> macros

diff --git a/rpm/connectionagent.spec b/rpm/connectionagent.spec