diff options
| author | Alex Blasche <alexander.blasche@theqtcompany.com> | 2015-02-11 07:44:36 +0100 |
|---|---|---|
| committer | Alex Blasche <alexander.blasche@theqtcompany.com> | 2015-02-11 07:44:46 +0100 |
| commit | 3264db95f965a47f31ffe1ab768467ce827e41e9 (patch) | |
| tree | 43235b62d755f1961de895e5b121362c54c33683 /src/bluetooth/qbluetoothservicediscoveryagent.h | |
| parent | 515ccffb8d56b42c89e9c2c04abe0ef2619ece4e (diff) | |
| parent | b398e069ca8bd01ba7ca67781b7ca21402ffdbbe (diff) | |
Merge remote-tracking branch 'gerrit/5.4' into dev
Change-Id: Ia70c3fe64e2ffcb27181bf912b06e6af59d2bc92
Diffstat (limited to 'src/bluetooth/qbluetoothservicediscoveryagent.h')
| -rw-r--r-- | src/bluetooth/qbluetoothservicediscoveryagent.h | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/src/bluetooth/qbluetoothservicediscoveryagent.h b/src/bluetooth/qbluetoothservicediscoveryagent.h index 787d58e3..d9f005cd 100644 --- a/src/bluetooth/qbluetoothservicediscoveryagent.h +++ b/src/bluetooth/qbluetoothservicediscoveryagent.h @@ -42,6 +42,10 @@ #include <QtBluetooth/QBluetoothUuid> #include <QtBluetooth/QBluetoothDeviceDiscoveryAgent> +#ifdef QT_BLUEZ_BLUETOOTH +#include <QtCore/qprocess.h> +#endif + QT_BEGIN_NAMESPACE class QBluetoothAddress; @@ -108,7 +112,7 @@ private: #ifdef QT_BLUEZ_BLUETOOTH Q_PRIVATE_SLOT(d_func(), void _q_discoveredServices(QDBusPendingCallWatcher*)) Q_PRIVATE_SLOT(d_func(), void _q_createdDevice(QDBusPendingCallWatcher*)) - Q_PRIVATE_SLOT(d_func(), void _q_finishSdpScan(QBluetoothServiceDiscoveryAgent::Error, const QString &, const QStringList &)) + Q_PRIVATE_SLOT(d_func(), void _q_sdpScannerDone(int,QProcess::ExitStatus)) #endif #ifdef QT_ANDROID_BLUETOOTH Q_PRIVATE_SLOT(d_func(), void _q_processFetchedUuids(const QBluetoothAddress &address, |