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/qnx | |
| 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/qnx')
| -rw-r--r-- | src/bluetooth/qnx/ppshelpers.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/bluetooth/qnx/ppshelpers.cpp b/src/bluetooth/qnx/ppshelpers.cpp index 0028ba95..6f6ba344 100644 --- a/src/bluetooth/qnx/ppshelpers.cpp +++ b/src/bluetooth/qnx/ppshelpers.cpp @@ -42,7 +42,7 @@ #include "ppshelpers_p.h" #include <QtCore/private/qcore_unix_p.h> #include <QDebug> -#include "../qrfcommserver_p.h" +#include "../qbluetoothserver_p.h" #include <QTimer> QT_BEGIN_NAMESPACE_BLUETOOTH @@ -66,7 +66,7 @@ static QList<QPair<int, QObject*> > waitingCtrlMsgs; static BBSocketNotifier bbSocketNotifier; -QHash<QRfcommServerPrivate*, int> __fakeServerPorts; +QHash<QBluetoothServerPrivate*, int> __fakeServerPorts; QList<QPair<QString, QObject*> > evtRegistration; |