diff options
| author | Nedim Hadzic <nhadzic@blackberry.com> | 2014-04-17 17:39:34 +0200 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2014-04-29 10:00:09 +0200 |
| commit | 4c301dfa6b4193115b6cf56ba0206a45d3a43977 (patch) | |
| tree | 89946af06a4e53bb324fb4899a151fdb7ad4e738 /src/bluetooth/qbluetoothserver_p.h | |
| parent | 293af3174c5615978d842603f9a8a4a9b568236c (diff) | |
BlackBerry C API added for OS>10.2.1
With new OS 10.3 some PPS object paths are changed. Therefore BB C API
was used intead of PPS communication in some parts of QtConnectivity.
The BB C API is introduced for OS 10.2.1 and newer.
Change-Id: I94a21ed61a49a94dd2101990df4801a6925a3ce6
Reviewed-by: Alex Blasche <alexander.blasche@digia.com>
Reviewed-by: Fabian Bumberger <fbumberger@rim.com>
Diffstat (limited to 'src/bluetooth/qbluetoothserver_p.h')
| -rw-r--r-- | src/bluetooth/qbluetoothserver_p.h | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/src/bluetooth/qbluetoothserver_p.h b/src/bluetooth/qbluetoothserver_p.h index 4137986a..afd9d50f 100644 --- a/src/bluetooth/qbluetoothserver_p.h +++ b/src/bluetooth/qbluetoothserver_p.h @@ -97,6 +97,10 @@ public: QBluetoothServiceInfo::Protocol serverType; #ifdef QT_QNX_BLUETOOTH +#ifdef QT_QNX_BT_BLUETOOTH + static void btCallback(long param, int socket); + Q_INVOKABLE void setBtCallbackParameters(int receivedSocket); +#endif QList<QBluetoothSocket *> activeSockets; QString m_serviceName; #endif @@ -112,8 +116,10 @@ private: QString nextClientAddress; private Q_SLOTS: +#ifndef QT_QNX_BT_BLUETOOTH void controlReply(ppsResult result); void controlEvent(ppsResult result); +#endif #elif defined(QT_BLUEZ_BLUETOOTH) QSocketNotifier *socketNotifier; #elif defined(QT_ANDROID_BLUETOOTH) |