diff options
| author | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2014-08-28 16:22:31 +0200 |
|---|---|---|
| committer | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2014-08-28 16:22:31 +0200 |
| commit | 8146a18be0c98751816ffe40661308081a57573d (patch) | |
| tree | 69a2ddc07bad88df0d27d6b9a33ebb1ac522b71a /src/bluetooth/qbluetoothdevicediscoveryagent_p.cpp | |
| parent | 9f4c45b58b82b59740dc60e22cba6894efd6c164 (diff) | |
| parent | 167faeec86ed4d9c9f099f5180784c7b0cb9aa42 (diff) | |
Merge remote-tracking branch 'origin/5.3' into 5.4
Conflicts:
src/bluetooth/qbluetoothdevicediscoveryagent_p.cpp
Change-Id: Ie8bf1903f9c7c1ccd5b05a3f97049ae0882b88b8
Diffstat (limited to 'src/bluetooth/qbluetoothdevicediscoveryagent_p.cpp')
| -rw-r--r-- | src/bluetooth/qbluetoothdevicediscoveryagent_p.cpp | 15 |
1 files changed, 0 insertions, 15 deletions
diff --git a/src/bluetooth/qbluetoothdevicediscoveryagent_p.cpp b/src/bluetooth/qbluetoothdevicediscoveryagent_p.cpp index 0f9d9c62..c89c2d37 100644 --- a/src/bluetooth/qbluetoothdevicediscoveryagent_p.cpp +++ b/src/bluetooth/qbluetoothdevicediscoveryagent_p.cpp @@ -71,21 +71,6 @@ void QBluetoothDeviceDiscoveryAgentPrivate::stop() { } -#ifdef QT_BLUEZ_BLUETOOTH -void QBluetoothDeviceDiscoveryAgentPrivate::_q_deviceFound(const QString &address, - const QVariantMap &dict) -{ - Q_UNUSED(address); - Q_UNUSED(dict); -} - -void QBluetoothDeviceDiscoveryAgentPrivate::_q_propertyChanged(const QString &name, - const QDBusVariant &value) -{ - Q_UNUSED(name); - Q_UNUSED(value); -} -#endif QT_END_NAMESPACE |