diff options
| author | Alex Blasche <alexander.blasche@digia.com> | 2014-02-17 10:38:48 +0100 |
|---|---|---|
| committer | Alex Blasche <alexander.blasche@digia.com> | 2014-02-17 10:38:48 +0100 |
| commit | 8fe7fbe6b552b0d196967cfea85fede5e7c211b9 (patch) | |
| tree | b90f246cc3b8847cedaf6b5f8dc045cfc563b9be /src/bluetooth/qbluetoothservicediscoveryagent.h | |
| parent | 9bcb79f0c741f7805dad17c467a5c2041227a18a (diff) | |
| parent | b4bde05d8459cc57c25bac3f7be19fcf03908606 (diff) | |
Merge branch 'dev' into btle
Conflicts:
examples/bluetooth/bluetooth.pro
src/bluetooth/doc/src/examples.qdoc
src/bluetooth/qbluetoothdevicediscoveryagent_qnx.cpp
src/bluetooth/qbluetoothservicediscoveryagent_bluez.cpp
src/bluetooth/qbluetoothservicediscoveryagent_p.h
src/bluetooth/qbluetoothservicediscoveryagent_qnx.cpp
Change-Id: Ie1577e4b0f469cd5a6b05a61cbe94f180a64448d
Diffstat (limited to 'src/bluetooth/qbluetoothservicediscoveryagent.h')
| -rw-r--r-- | src/bluetooth/qbluetoothservicediscoveryagent.h | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/src/bluetooth/qbluetoothservicediscoveryagent.h b/src/bluetooth/qbluetoothservicediscoveryagent.h index bbb105fa..90482048 100644 --- a/src/bluetooth/qbluetoothservicediscoveryagent.h +++ b/src/bluetooth/qbluetoothservicediscoveryagent.h @@ -66,6 +66,7 @@ public: NoError = QBluetoothDeviceDiscoveryAgent::NoError, InputOutputError = QBluetoothDeviceDiscoveryAgent::InputOutputError, PoweredOffError = QBluetoothDeviceDiscoveryAgent::PoweredOffError, + InvalidBluetoothAdapterError = QBluetoothDeviceDiscoveryAgent::InvalidBluetoothAdapterError, UnknownError = QBluetoothDeviceDiscoveryAgent::UnknownError //=100 //New Errors must be added after Unknown Error the space before UnknownError is reserved //for future device discovery errors @@ -116,6 +117,12 @@ private: Q_PRIVATE_SLOT(d_func(), void _q_discoveredServices(QDBusPendingCallWatcher*)) Q_PRIVATE_SLOT(d_func(), void _q_createdDevice(QDBusPendingCallWatcher*)) #endif +#ifdef QT_ANDROID_BLUETOOTH + Q_PRIVATE_SLOT(d_func(), void _q_processFetchedUuids(const QBluetoothAddress &address, + const QList<QBluetoothUuid>&)) + Q_PRIVATE_SLOT(d_func(), void _q_fetchUuidsTimeout()) + Q_PRIVATE_SLOT(d_func(), void _q_hostModeStateChanged(QBluetoothLocalDevice::HostMode state)) +#endif }; QT_END_NAMESPACE |