diff options
| author | Alex Blasche <alexander.blasche@theqtcompany.com> | 2015-09-24 07:23:23 +0200 |
|---|---|---|
| committer | Alex Blasche <alexander.blasche@theqtcompany.com> | 2015-09-24 07:23:23 +0200 |
| commit | 86a716072ee6ccf59dba8a474d15558eb1438966 (patch) | |
| tree | 1d51bd72017c984984f2c08fc22e20b15a8c0e0c /src/bluetooth/qbluetoothlocaldevice_p.h | |
| parent | fba05edde4fd6699da731ffc05660364df613502 (diff) | |
| parent | 4ff26a9993b9a797a3e7dcdcd82e13b7b513bc30 (diff) | |
Merge branch 'dev' into win
Conflicts:
src/bluetooth/qbluetooth.cpp
src/bluetooth/qbluetoothdevicediscoveryagent_p.h
src/bluetooth/qbluetoothlocaldevice_p.h
Change-Id: I20fa8968db6c6461014899698c17aa86cd969189
Diffstat (limited to 'src/bluetooth/qbluetoothlocaldevice_p.h')
| -rw-r--r-- | src/bluetooth/qbluetoothlocaldevice_p.h | 41 |
1 files changed, 1 insertions, 40 deletions
diff --git a/src/bluetooth/qbluetoothlocaldevice_p.h b/src/bluetooth/qbluetoothlocaldevice_p.h index 9cf79c86..844be01b 100644 --- a/src/bluetooth/qbluetoothlocaldevice_p.h +++ b/src/bluetooth/qbluetoothlocaldevice_p.h @@ -70,11 +70,8 @@ class OrgBluezManagerInterface; QT_BEGIN_NAMESPACE class QDBusPendingCallWatcher; QT_END_NAMESPACE - -#elif defined(QT_QNX_BLUETOOTH) -#include <QSocketNotifier> -#include "qnx/ppshelpers_p.h" #endif + #ifdef QT_ANDROID_BLUETOOTH #include <jni.h> #include <QtAndroidExtras/QAndroidJniEnvironment> @@ -207,42 +204,6 @@ private: void initializeAdapterBluez5(); }; -#elif defined(QT_QNX_BLUETOOTH) - -class QBluetoothLocalDevicePrivate : public QObject -{ - Q_OBJECT - Q_DECLARE_PUBLIC(QBluetoothLocalDevice) -public: - QBluetoothLocalDevicePrivate(QBluetoothLocalDevice *); - ~QBluetoothLocalDevicePrivate(); - - static QString name(); - static QBluetoothAddress address(); - - void powerOn(); - void powerOff(); - - void setHostMode(QBluetoothLocalDevice::HostMode mode); - QBluetoothLocalDevice::HostMode hostMode() const; - - void requestPairing(const QBluetoothAddress &address, QBluetoothLocalDevice::Pairing pairing); - - void setAccess(int); - // This method will be used for emitting signals. - void connectedDevices(); - - Q_INVOKABLE void controlReply(ppsResult res); - Q_INVOKABLE void controlEvent(ppsResult res); - - bool isValid() const; - -private: - QBluetoothLocalDevice *q_ptr; - bool isValidDevice; - QList<QBluetoothAddress> connectedDevicesSet; -}; - #elif defined(Q_OS_WIN32) class QBluetoothLocalDevicePrivate : public QObject |