[SCM] kdeconnect packaging branch, master, updated. debian/0.9g-1-1183-g9d69498

[Maximiliano Curia]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/kde-extras/kdeconnect.git;a=commitdiff;h=6d83827

The following commit has been merged in the master branch:
commit 6d83827b18ea207cabbc15db42ccab2f64a9a3ab
Author: Aleix Pol <aleixpol at kde.org>
Date:   Thu Jun 25 04:08:00 2015 +0200

    Don't rely on Q_PROPERTY if we're inheriting QDBusAbstractInterfaceBase
    
    See bug:
    https://bugreports.qt.io/browse/QTBUG-46858
---
 app/qml/main.qml            | 2 +-
 interfaces/dbusinterfaces.h | 4 +---
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/app/qml/main.qml b/app/qml/main.qml
index ccde541..9b4cf82 100644
--- a/app/qml/main.qml
+++ b/app/qml/main.qml
@@ -119,7 +119,7 @@ ApplicationWindow
                             text: i18n("Open Multimedia Remote Control")
                             onClicked: stack.push( {
                                 item: "qrc:/qml/mpris.qml",
-                                properties: { mprisInterface: MprisDbusInterfaceFactory.create(deviceView.currentDevice.id) }
+                                properties: { mprisInterface: MprisDbusInterfaceFactory.create(deviceView.currentDevice.id()) }
                             } );
                         }
                         Button {
diff --git a/interfaces/dbusinterfaces.h b/interfaces/dbusinterfaces.h
index 0b4646b..260a0e6 100644
--- a/interfaces/dbusinterfaces.h
+++ b/interfaces/dbusinterfaces.h
@@ -52,13 +52,11 @@ class KDECONNECTINTERFACES_EXPORT DeviceDbusInterface
 //  the signals for the properties
     Q_PROPERTY(bool isPaired READ isPaired NOTIFY pairingChangedProxy)
 
-    /** @returns an id even if the interface isn't valid */
-    Q_PROPERTY(QString id READ id CONSTANT)
 public:
     DeviceDbusInterface(const QString& deviceId, QObject* parent = 0);
     virtual ~DeviceDbusInterface();
 
-    QString id() const;
+    Q_SCRIPTABLE QString id() const;
     Q_SCRIPTABLE void pluginCall(const QString &plugin, const QString &method);
 
 Q_SIGNALS:

-- 
kdeconnect packaging