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/qbluetoothdevicediscoveryagent_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/qbluetoothdevicediscoveryagent_p.h')
| -rw-r--r-- | src/bluetooth/qbluetoothdevicediscoveryagent_p.h | 29 |
1 files changed, 1 insertions, 28 deletions
diff --git a/src/bluetooth/qbluetoothdevicediscoveryagent_p.h b/src/bluetooth/qbluetoothdevicediscoveryagent_p.h index 814f6a37..0d220ef9 100644 --- a/src/bluetooth/qbluetoothdevicediscoveryagent_p.h +++ b/src/bluetooth/qbluetoothdevicediscoveryagent_p.h @@ -71,9 +71,6 @@ class OrgBluezDevice1Interface; QT_BEGIN_NAMESPACE class QDBusVariant; QT_END_NAMESPACE -#elif defined(QT_QNX_BLUETOOTH) -#include "qnx/ppshelpers_p.h" -#include <QTimer> #endif #ifdef Q_OS_WIN32 @@ -85,7 +82,7 @@ QT_END_NAMESPACE QT_BEGIN_NAMESPACE class QBluetoothDeviceDiscoveryAgentPrivate -#if defined(QT_QNX_BLUETOOTH) || defined(QT_ANDROID_BLUETOOTH) || defined(Q_OS_WIN32) +#if defined(QT_ANDROID_BLUETOOTH) || defined(Q_OS_WIN32) : public QObject { Q_OBJECT @@ -157,30 +154,6 @@ private: bool useExtendedDiscovery; QTimer extendedDiscoveryTimer; - -#elif defined(QT_QNX_BLUETOOTH) -private slots: - void finished(); - void remoteDevicesChanged(int); - void controlReply(ppsResult result); - void controlEvent(ppsResult result); - void startDeviceSearch(); - -private: - QSocketNotifier *m_rdNotifier; - QTimer m_finishedTimer; - - int m_rdfd; - bool m_active; - enum Ops { - None, - Cancel, - Start - }; - Ops m_nextOp; - Ops m_currentOp; - void processNextOp(); - bool isFinished; #endif #ifdef Q_OS_WIN32 |