diff options
| author | Fabian Bumberger <fbumberger@rim.com> | 2013-08-02 18:09:20 +0200 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-08-29 14:06:54 +0200 |
| commit | d8d903826daa8db49e437b76fb80693ab8feb01e (patch) | |
| tree | 8e794636168a3955a5f33c8dbb5a51b11a285b2c /src/bluetooth/qbluetoothserviceinfo_qnx.cpp | |
| parent | bfc49d07b0638927aca3cf63238a80f98ee516a7 (diff) | |
Merge QRfcommServer and QL2capServer to QBluetoothServer
Task-number: QTBUG-32722
Change-Id: Ia75ad5af2f81b737a8cca09dba919a7dc0fa0f8a
Reviewed-by: Alex Blasche <alexander.blasche@digia.com>
Diffstat (limited to 'src/bluetooth/qbluetoothserviceinfo_qnx.cpp')
| -rw-r--r-- | src/bluetooth/qbluetoothserviceinfo_qnx.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/bluetooth/qbluetoothserviceinfo_qnx.cpp b/src/bluetooth/qbluetoothserviceinfo_qnx.cpp index b90a570d..72c4e499 100644 --- a/src/bluetooth/qbluetoothserviceinfo_qnx.cpp +++ b/src/bluetooth/qbluetoothserviceinfo_qnx.cpp @@ -42,8 +42,8 @@ #include "qbluetoothserviceinfo.h" #include "qbluetoothserviceinfo_p.h" -#include "qrfcommserver_p.h" -#include "qrfcommserver.h" +#include "qbluetoothserver_p.h" +#include "qbluetoothserver.h" QT_BEGIN_NAMESPACE_BLUETOOTH @@ -84,7 +84,7 @@ void QBluetoothServiceInfoPrivate::removeRegisteredAttribute(quint16 attributeId registered = false; } -extern QHash<QRfcommServerPrivate*, int> __fakeServerPorts; +extern QHash<QBluetoothServerPrivate*, int> __fakeServerPorts; bool QBluetoothServiceInfoPrivate::registerService() const { |