diff options
| author | Alex Blasche <alexander.blasche@qt.io> | 2017-05-12 13:37:50 +0200 |
|---|---|---|
| committer | Alex Blasche <alexander.blasche@qt.io> | 2017-05-12 16:47:32 +0200 |
| commit | 690f2ffdcfccf982c99c54fddb5757c8980d348b (patch) | |
| tree | aeffc6859f40102199d03e5a22a3568ee19b628a /src/bluetooth/qbluetoothservicediscoveryagent_win.cpp | |
| parent | 6176a2d40b81be68520a3aafb5b4adc709829a69 (diff) | |
| parent | 6b3640d28f2ef47c47ada0f8d44117a1b7a28098 (diff) | |
Merge remote-tracking branch 'gerrit/5.9' into wip/win
Change-Id: Ia247c260a9fa27df79d18e5397eba5918d626684
Diffstat (limited to 'src/bluetooth/qbluetoothservicediscoveryagent_win.cpp')
| -rw-r--r-- | src/bluetooth/qbluetoothservicediscoveryagent_win.cpp | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/src/bluetooth/qbluetoothservicediscoveryagent_win.cpp b/src/bluetooth/qbluetoothservicediscoveryagent_win.cpp index 4e8bdac0..b92025ee 100644 --- a/src/bluetooth/qbluetoothservicediscoveryagent_win.cpp +++ b/src/bluetooth/qbluetoothservicediscoveryagent_win.cpp @@ -340,7 +340,8 @@ static QBluetoothServiceInfo findFirstService(LPHANDLE hSearch, const QBluetooth return findNextService(*hSearch, systemError); } -QBluetoothServiceDiscoveryAgentPrivate::QBluetoothServiceDiscoveryAgentPrivate(const QBluetoothAddress &deviceAdapter) +QBluetoothServiceDiscoveryAgentPrivate::QBluetoothServiceDiscoveryAgentPrivate( + QBluetoothServiceDiscoveryAgent *qp, const QBluetoothAddress &deviceAdapter) : error(QBluetoothServiceDiscoveryAgent::NoError), state(Inactive), deviceDiscoveryAgent(0), @@ -350,7 +351,8 @@ QBluetoothServiceDiscoveryAgentPrivate::QBluetoothServiceDiscoveryAgentPrivate(c pendingStop(false), pendingFinish(false), searchWatcher(Q_NULLPTR), - hSearch(INVALID_HANDLE_VALUE) + hSearch(INVALID_HANDLE_VALUE), + q_ptr(qp) { Q_UNUSED(deviceAdapter); resolveFunctions(bluetoothapis()); |