diff options
| author | Liang Qi <liang.qi@qt.io> | 2016-05-06 09:16:02 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2016-05-06 09:16:02 +0200 |
| commit | caded2edf69e8a60897653ace1e10b72199c7427 (patch) | |
| tree | 1b28cd7578195ca3d7e14c83ccf181adbe2476ec /tests/bttestui/btlocaldevice.cpp | |
| parent | 9677182c07b22f5f1f4fdff3f1fce6a28f76b662 (diff) | |
| parent | 54c9cd9e28bc6f0a2fa5118cfdbe922d71db6623 (diff) | |
Merge remote-tracking branch 'origin/5.6' into 5.7
Conflicts:
examples/nfc/corkboard/corkboard.pro
Change-Id: I5d1ea0a8e21a1b55dbf744c2f4b469bc51f05c7a
Diffstat (limited to 'tests/bttestui/btlocaldevice.cpp')
| -rw-r--r-- | tests/bttestui/btlocaldevice.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/tests/bttestui/btlocaldevice.cpp b/tests/bttestui/btlocaldevice.cpp index b2bcaf1d..5b84794c 100644 --- a/tests/bttestui/btlocaldevice.cpp +++ b/tests/bttestui/btlocaldevice.cpp @@ -411,7 +411,7 @@ void BtLocalDevice::connectToServiceViaSearch() socket->setPreferredSecurityFlags(securityFlags); QBluetoothServiceInfo info = foundTestServers.at(0); - socket->connectToService(info.device().address(), QBluetoothUuid(QString(TEST_SERVICE_UUID))); + socket->connectToService(info); } else { qWarning() << "Perform search for test service before triggering this function"; } |