summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEric Lemanissier <eric.lemanissier@gmail.com>2018-06-19 15:22:03 +0200
committerEric Lemanissier <eric.lemanissier@gmail.com>2018-06-21 07:39:04 +0000
commit11968d018fededb40271978324cda16de4d36941 (patch)
tree66c5f8e3b123feac8728fbb668d6c4b0cbfcc17b
parent62efb446b56bc489c998f90e307aa12e72cb6b8e (diff)
win32: make bluetooth tst_startStopDeviceDiscoveries pass
QVERIFY(discoveryAgent.errorString().isEmpty()) was failing Change-Id: I7b45db5b1af1ee3da75569d8855487c771cb29ed Reviewed-by: Lubomir I. Ivanov <neolit123@gmail.com> Reviewed-by: Oliver Wolff <oliver.wolff@qt.io>
-rw-r--r--src/bluetooth/qbluetoothdevicediscoveryagent_win.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/bluetooth/qbluetoothdevicediscoveryagent_win.cpp b/src/bluetooth/qbluetoothdevicediscoveryagent_win.cpp
index 1192677e..e1c6bea4 100644
--- a/src/bluetooth/qbluetoothdevicediscoveryagent_win.cpp
+++ b/src/bluetooth/qbluetoothdevicediscoveryagent_win.cpp
@@ -507,7 +507,7 @@ void QBluetoothDeviceDiscoveryAgentPrivate::completeClassicDevicesDiscovery(cons
} else {
if (result.systemErrorCode == ERROR_NO_MORE_ITEMS) {
closeClassicSearch(result.hSearch);
- finishDiscovery(QBluetoothDeviceDiscoveryAgent::NoError, qt_error_string(NO_ERROR));
+ finishDiscovery(QBluetoothDeviceDiscoveryAgent::NoError, QString());
} else if (result.systemErrorCode == NO_ERROR) {
if (result.hSearch) {
for (const QBluetoothDeviceInfo &device : result.devices)
@@ -515,7 +515,7 @@ void QBluetoothDeviceDiscoveryAgentPrivate::completeClassicDevicesDiscovery(cons
startClassicDevicesDiscovery(result.hSearch);
} else {
- finishDiscovery(QBluetoothDeviceDiscoveryAgent::NoError, qt_error_string(NO_ERROR));
+ finishDiscovery(QBluetoothDeviceDiscoveryAgent::NoError, QString());
}
} else {
closeClassicSearch(result.hSearch);