[usbsettings] Use libusb-moded-qt5 to talk to usb_moded. Contributes …

…to JB#29035
sailfishos · May 27, 2015 · a1a9aad · a1a9aad
1 parent 4d78ad7
commit a1a9aad
Show file tree

Hide file tree

Showing 6 changed files with 8 additions and 264 deletions.
diff --git a/rpm/nemo-qml-plugin-systemsettings.spec b/rpm/nemo-qml-plugin-systemsettings.spec
@@ -15,7 +15,7 @@ BuildRequires:  pkgconfig(timed-qt5)
 BuildRequires:  pkgconfig(profile)
 BuildRequires:  pkgconfig(mce)
 BuildRequires:  pkgconfig(mlite5)
-BuildRequires:  pkgconfig(usb_moded) >= 0.82
+BuildRequires:  pkgconfig(usb-moded-qt5)
 
 %description
 %{summary}.

diff --git a/src/plugin/plugin.cpp b/src/plugin/plugin.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2013 Jolla Ltd. <pekka.vuorela@jollamobile.com>
+ * Copyright (C) 2013-2015 Jolla Ltd. <pekka.vuorela@jollamobile.com>
  *
  * You may use this file under the terms of the BSD license as follows:
  *
@@ -34,12 +34,13 @@
 #include <QQmlEngine>
 #include <QQmlExtensionPlugin>
 
+#include <qusbmoded.h>
+
 #include "languagemodel.h"
 #include "datetimesettings.h"
 #include "profilecontrol.h"
 #include "alarmtonemodel.h"
 #include "displaysettings.h"
-#include "usbsettings.h"
 #include "aboutsettings.h"
 #include "devicelockiface.h"
 #include "developermodesettings.h"
@@ -53,6 +54,7 @@ class SystemSettingsPlugin : public QQmlExtensionPlugin
 public:
     void initializeEngine(QQmlEngine *engine, const char *uri)
     {
+        Q_UNUSED(engine)
         Q_UNUSED(uri)
     }
 
@@ -64,7 +66,7 @@ class SystemSettingsPlugin : public QQmlExtensionPlugin
         qmlRegisterType<ProfileControl>(uri, 1, 0, "ProfileControl");
         qmlRegisterType<AlarmToneModel>(uri, 1, 0, "AlarmToneModel");
         qmlRegisterType<DisplaySettings>(uri, 1, 0, "DisplaySettings");
-        qmlRegisterType<USBSettings>(uri, 1, 0, "USBSettings");
+        qmlRegisterType<QUsbModed>(uri, 1, 0, "USBSettings");
         qmlRegisterType<AboutSettings>(uri, 1, 0, "AboutSettings");
         qmlRegisterType<DeviceLockInterface>(uri, 1, 0, "DeviceLockInterface");
         qmlRegisterType<DeveloperModeSettings>(uri, 1, 0, "DeveloperModeSettings");

diff --git a/src/plugin/plugin.pro b/src/plugin/plugin.pro
@@ -6,7 +6,7 @@ CONFIG += qt plugin hide_symbols link_pkgconfig
 QT += qml dbus network
 QT -= gui
 
-PKGCONFIG += profile
+PKGCONFIG += profile usb-moded-qt5
 
 target.path = $$[QT_INSTALL_QML]/$$PLUGIN_IMPORT_PATH
 INSTALLS += target

diff --git a/src/src.pro b/src/src.pro
@@ -7,7 +7,7 @@ QT += qml dbus systeminfo
 QT -= gui
 
 CONFIG += link_pkgconfig
-PKGCONFIG += profile mlite5 usb_moded timed-qt5
+PKGCONFIG += profile mlite5 timed-qt5
 
 system(qdbusxml2cpp -p mceiface.h:mceiface.cpp mce.xml)
 
@@ -18,7 +18,6 @@ SOURCES += \
     alarmtonemodel.cpp \
     mceiface.cpp \
     displaysettings.cpp \
-    usbsettings.cpp \
     aboutsettings.cpp \
     devicelockiface.cpp \
     developermodesettings.cpp \
@@ -32,7 +31,6 @@ HEADERS += \
     alarmtonemodel.h \
     mceiface.h \
     displaysettings.h \
-    usbsettings.h \
     aboutsettings.h \
     devicelockiface.h \
     developermodesettings.h \

diff --git a/src/usbsettings.cpp b/src/usbsettings.cpp
diff --git a/src/usbsettings.h b/src/usbsettings.h