diff options
| author | Alex Blasche <alexander.blasche@theqtcompany.com> | 2016-06-09 15:00:36 +0200 |
|---|---|---|
| committer | Alex Blasche <alexander.blasche@theqtcompany.com> | 2016-06-09 15:00:43 +0200 |
| commit | 6d9a7006e81fc9ef6140bfc62696d1b270aaae08 (patch) | |
| tree | d7ce8d417f32ab73543740beab3cdee36b4fdfaf /src/bluetooth/qbluetoothservicediscoveryagent_android.cpp | |
| parent | bde54c522b76eeb933296aa1a9e159facbf8e529 (diff) | |
| parent | 74916ede2ff34c2040db9cabbb5a6ee81442a7e8 (diff) | |
Merge remote-tracking branch 'gerrit/5.6' into 5.7
Change-Id: Id8dffff9bb75db396aabf6da2a3acb78505a6476
Diffstat (limited to 'src/bluetooth/qbluetoothservicediscoveryagent_android.cpp')
| -rw-r--r-- | src/bluetooth/qbluetoothservicediscoveryagent_android.cpp | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/src/bluetooth/qbluetoothservicediscoveryagent_android.cpp b/src/bluetooth/qbluetoothservicediscoveryagent_android.cpp index 478efd93..ba5bcb0a 100644 --- a/src/bluetooth/qbluetoothservicediscoveryagent_android.cpp +++ b/src/bluetooth/qbluetoothservicediscoveryagent_android.cpp @@ -54,11 +54,13 @@ QT_BEGIN_NAMESPACE Q_DECLARE_LOGGING_CATEGORY(QT_BT_ANDROID) QBluetoothServiceDiscoveryAgentPrivate::QBluetoothServiceDiscoveryAgentPrivate( - const QBluetoothAddress &/*deviceAdapter*/) + QBluetoothServiceDiscoveryAgent *qp, const QBluetoothAddress &/*deviceAdapter*/) : error(QBluetoothServiceDiscoveryAgent::NoError), state(Inactive), deviceDiscoveryAgent(0), mode(QBluetoothServiceDiscoveryAgent::MinimalDiscovery), - singleDevice(false), receiver(0), localDeviceReceiver(0) + singleDevice(false), receiver(0), localDeviceReceiver(0), + q_ptr(qp) + { QList<QBluetoothHostInfo> devices = QBluetoothLocalDevice::allDevices(); Q_ASSERT(devices.count() <= 1); //Android only supports one device at the moment |