diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-12-07 03:01:22 +0100 |
|---|---|---|
| committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-12-07 03:01:22 +0100 |
| commit | 7d653dea516ed8e756814532dc4be742f5e0ce78 (patch) | |
| tree | 8304e05c72fc6b71298a8ddb9eb15f551cdee324 /src/bluetooth/qbluetoothdevicediscoveryagent_p.h | |
| parent | eb9ec813e36815d282e14dbdc1451677e575b0fc (diff) | |
| parent | f7075bc4536c9f72663378b94df55e6beb5a86fb (diff) | |
Merge remote-tracking branch 'origin/5.14' into 5.15
Change-Id: I4fb1628743f0e4fe6042e49efa27a7b6b8f68e5b
Diffstat (limited to 'src/bluetooth/qbluetoothdevicediscoveryagent_p.h')
| -rw-r--r-- | src/bluetooth/qbluetoothdevicediscoveryagent_p.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/src/bluetooth/qbluetoothdevicediscoveryagent_p.h b/src/bluetooth/qbluetoothdevicediscoveryagent_p.h index 27220a09..c9a35c3d 100644 --- a/src/bluetooth/qbluetoothdevicediscoveryagent_p.h +++ b/src/bluetooth/qbluetoothdevicediscoveryagent_p.h @@ -142,6 +142,7 @@ public: void _q_discoveryFinished(); void _q_discoveryInterrupted(const QString &path); void _q_PropertiesChanged(const QString &interface, + const QString &path, const QVariantMap &changed_properties, const QStringList &invalidated_properties); void _q_extendedDeviceDiscoveryTimeout(); |