diff options
| author | Oliver Wolff <oliver.wolff@qt.io> | 2019-08-20 11:17:20 +0200 |
|---|---|---|
| committer | Oliver Wolff <oliver.wolff@qt.io> | 2019-08-20 11:17:35 +0200 |
| commit | 603074d4895a9802478a7ec1e9173b70e0723bc5 (patch) | |
| tree | 3199ada0ea620ce5ef283ee68ea4643b904af649 /src/bluetooth/qbluetoothserver_android.cpp | |
| parent | ccc1544f5ff929f466df8c790a4e7595e177a720 (diff) | |
| parent | 2b9b462cb81fabcbfc7a94774dae5182101f7c5e (diff) | |
Merge branch 'wip/win' into dev
[ChangeLog][QtBluetooth] Added possibility to build win32 backend which
also works on Windows 7.
Change-Id: I03aabdec781d0e8cef2e500ee94ab423b5ba2b56
Diffstat (limited to 'src/bluetooth/qbluetoothserver_android.cpp')
| -rw-r--r-- | src/bluetooth/qbluetoothserver_android.cpp | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/bluetooth/qbluetoothserver_android.cpp b/src/bluetooth/qbluetoothserver_android.cpp index 4c469c76..eed3a1ea 100644 --- a/src/bluetooth/qbluetoothserver_android.cpp +++ b/src/bluetooth/qbluetoothserver_android.cpp @@ -53,9 +53,10 @@ Q_DECLARE_LOGGING_CATEGORY(QT_BT_ANDROID) QHash<QBluetoothServerPrivate*, int> __fakeServerPorts; -QBluetoothServerPrivate::QBluetoothServerPrivate(QBluetoothServiceInfo::Protocol sType) +QBluetoothServerPrivate::QBluetoothServerPrivate(QBluetoothServiceInfo::Protocol sType, + QBluetoothServer *parent) : socket(0),maxPendingConnections(1), securityFlags(QBluetooth::NoSecurity), serverType(sType), - m_lastError(QBluetoothServer::NoError) + m_lastError(QBluetoothServer::NoError), q_ptr(parent) { thread = new ServerAcceptanceThread(); thread->setMaxPendingConnections(maxPendingConnections); |