diff options
author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2020-01-27 14:12:49 +0100 |
---|---|---|
committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2020-01-27 14:12:49 +0100 |
commit | 6e2e909572c8572868ee8020f52429f994df04c1 (patch) | |
tree | 5aabada25d9f6a59d8bbe46c1ba1299a476553a6 | |
parent | 00f7f8514f3415bb68d964af18482f47c0d5c94d (diff) | |
parent | a9b5b10ce113db1c1bb3d42d058caa7b8e1a964a (diff) | |
download | qtconnectivity-6e2e909572c8572868ee8020f52429f994df04c1.tar.gz |
Merge remote-tracking branch 'origin/5.14.1' into 5.14
Change-Id: I0c9cb5225aea489c789a4e40abd164bebff0c73d
-rw-r--r-- | dist/changes-5.14.1 | 25 | ||||
-rw-r--r-- | src/bluetooth/bluez/bluez5_helper.cpp | 9 | ||||
-rw-r--r-- | src/bluetooth/bluez/bluez5_helper_p.h | 3 | ||||
-rw-r--r-- | src/bluetooth/qbluetoothlocaldevice_bluez.cpp | 3 | ||||
-rw-r--r-- | src/bluetooth/qbluetoothlocaldevice_p.h | 3 | ||||
-rw-r--r-- | src/bluetooth/qbluetoothtransferreply_bluez.cpp | 6 | ||||
-rw-r--r-- | src/bluetooth/qbluetoothtransferreply_bluez_p.h | 3 |
7 files changed, 41 insertions, 11 deletions
diff --git a/dist/changes-5.14.1 b/dist/changes-5.14.1 new file mode 100644 index 00000000..be79e803 --- /dev/null +++ b/dist/changes-5.14.1 @@ -0,0 +1,25 @@ +Qt 5.14.1 is a bug-fix release. It maintains both forward and backward +compatibility (source and binary) with Qt 5.14.0. + +For more details, refer to the online documentation included in this +distribution. The documentation is also available online: + +https://doc.qt.io/qt-5/index.html + +The Qt version 5.14 series is binary compatible with the 5.13.x series. +Applications compiled for 5.13 will continue to run with 5.14. + +Some of the changes listed in this file include issue tracking numbers +corresponding to tasks in the Qt Bug Tracker: + +https://bugreports.qt.io/ + +Each of these identifiers can be entered in the bug tracker to obtain more +information about a particular change. + +**************************************************************************** +* QtBluetooth * +**************************************************************************** + + - BlueZ-DBus: + * Invalidate btle service when it has disappeared diff --git a/src/bluetooth/bluez/bluez5_helper.cpp b/src/bluetooth/bluez/bluez5_helper.cpp index 7ce67690..58da1ed3 100644 --- a/src/bluetooth/bluez/bluez5_helper.cpp +++ b/src/bluetooth/bluez/bluez5_helper.cpp @@ -380,8 +380,8 @@ bool QtBluezDiscoveryManager::registerDiscoveryInterest(const QString &adapterPa OrgFreedesktopDBusPropertiesInterface *propIface = new OrgFreedesktopDBusPropertiesInterface( QStringLiteral("org.bluez"), adapterPath, QDBusConnection::systemBus()); - connect(propIface, SIGNAL(PropertiesChanged(QString,QVariantMap,QStringList)), - SLOT(PropertiesChanged(QString,QVariantMap,QStringList))); + connect(propIface, &OrgFreedesktopDBusPropertiesInterface::PropertiesChanged, + this, &QtBluezDiscoveryManager::PropertiesChanged); data->propteryListener = propIface; OrgBluezAdapter1Interface iface(QStringLiteral("org.bluez"), adapterPath, @@ -444,9 +444,10 @@ void QtBluezDiscoveryManager::InterfacesRemoved(const QDBusObjectPath &object_pa void QtBluezDiscoveryManager::PropertiesChanged(const QString &interface, const QVariantMap &changed_properties, - const QStringList &invalidated_properties) + const QStringList &invalidated_properties, + const QDBusMessage &) { - Q_UNUSED(invalidated_properties); + Q_UNUSED(invalidated_properties) OrgFreedesktopDBusPropertiesInterface *propIface = qobject_cast<OrgFreedesktopDBusPropertiesInterface *>(sender()); diff --git a/src/bluetooth/bluez/bluez5_helper_p.h b/src/bluetooth/bluez/bluez5_helper_p.h index 0db6f29f..c7879bdd 100644 --- a/src/bluetooth/bluez/bluez5_helper_p.h +++ b/src/bluetooth/bluez/bluez5_helper_p.h @@ -97,7 +97,8 @@ private slots: const QStringList &interfaces); void PropertiesChanged(const QString &interface, const QVariantMap &changed_properties, - const QStringList &invalidated_properties); + const QStringList &invalidated_properties, + const QDBusMessage &msg); private: void removeAdapterFromMonitoring(const QString &dbusPath); diff --git a/src/bluetooth/qbluetoothlocaldevice_bluez.cpp b/src/bluetooth/qbluetoothlocaldevice_bluez.cpp index f48717a6..05a540da 100644 --- a/src/bluetooth/qbluetoothlocaldevice_bluez.cpp +++ b/src/bluetooth/qbluetoothlocaldevice_bluez.cpp @@ -843,7 +843,8 @@ void QBluetoothLocalDevicePrivate::initializeAdapterBluez5() // Bluez 5 void QBluetoothLocalDevicePrivate::PropertiesChanged(const QString &interface, const QVariantMap &changed_properties, - const QStringList &/*invalidated_properties*/) + const QStringList &/*invalidated_properties*/, + const QDBusMessage &) { //qDebug() << "Change" << interface << changed_properties; if (interface == QStringLiteral("org.bluez.Adapter1")) { diff --git a/src/bluetooth/qbluetoothlocaldevice_p.h b/src/bluetooth/qbluetoothlocaldevice_p.h index d86ab22f..0c88f691 100644 --- a/src/bluetooth/qbluetoothlocaldevice_p.h +++ b/src/bluetooth/qbluetoothlocaldevice_p.h @@ -201,7 +201,8 @@ public slots: private Q_SLOTS: void PropertiesChanged(const QString &interface, const QVariantMap &changed_properties, - const QStringList &invalidated_properties); + const QStringList &invalidated_properties, + const QDBusMessage &signal); void InterfacesAdded(const QDBusObjectPath &object_path, InterfaceList interfaces_and_properties); void InterfacesRemoved(const QDBusObjectPath &object_path, diff --git a/src/bluetooth/qbluetoothtransferreply_bluez.cpp b/src/bluetooth/qbluetoothtransferreply_bluez.cpp index 486e6288..c5e6a4cb 100644 --- a/src/bluetooth/qbluetoothtransferreply_bluez.cpp +++ b/src/bluetooth/qbluetoothtransferreply_bluez.cpp @@ -265,15 +265,15 @@ void QBluetoothTransferReplyBluez::sessionStarted(QDBusPendingCallWatcher *watch OrgFreedesktopDBusPropertiesInterface *properties = new OrgFreedesktopDBusPropertiesInterface( QStringLiteral("org.bluez.obex"), path.path(), QDBusConnection::sessionBus(), this); - connect(properties, SIGNAL(PropertiesChanged(QString,QVariantMap,QStringList)), - SLOT(sessionChanged(QString,QVariantMap,QStringList))); + connect(properties, &OrgFreedesktopDBusPropertiesInterface::PropertiesChanged, + this, &QBluetoothTransferReplyBluez::sessionChanged); watcher->deleteLater(); } void QBluetoothTransferReplyBluez::sessionChanged(const QString &interface, const QVariantMap &changed_properties, - const QStringList &) + const QStringList &, const QDBusMessage &) { if (changed_properties.contains(QStringLiteral("Transferred"))) { emit transferProgress( diff --git a/src/bluetooth/qbluetoothtransferreply_bluez_p.h b/src/bluetooth/qbluetoothtransferreply_bluez_p.h index 48a8d4f0..c604ba17 100644 --- a/src/bluetooth/qbluetoothtransferreply_bluez_p.h +++ b/src/bluetooth/qbluetoothtransferreply_bluez_p.h @@ -118,7 +118,8 @@ private slots: void sessionStarted(QDBusPendingCallWatcher *watcher); void sessionChanged(const QString &interface, const QVariantMap &changed_properties, - const QStringList &invalidated_properties); + const QStringList &invalidated_properties, + const QDBusMessage &); public slots: void abort(); |