diff options
| author | Alex Blasche <alexander.blasche@qt.io> | 2017-08-07 08:16:45 +0200 |
|---|---|---|
| committer | Alex Blasche <alexander.blasche@qt.io> | 2017-08-07 08:17:26 +0200 |
| commit | c3c3837b02919a26031d917003898e72585e300b (patch) | |
| tree | 02d2166f1e896327efd8a97df3455fd8359fa2be /tests/auto/qlowenergycontroller | |
| parent | aeeae7bc92f19778a73fb10a09b8949b2c384d39 (diff) | |
| parent | 687ec9eb370e9538264280b58bed4d3b1c889579 (diff) | |
Merge remote-tracking branch 'gerrit/5.9' into dev
Change-Id: I0ed4afd881f483a166a7e1400043f116c491f30c
Diffstat (limited to 'tests/auto/qlowenergycontroller')
| -rw-r--r-- | tests/auto/qlowenergycontroller/tst_qlowenergycontroller.cpp | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/tests/auto/qlowenergycontroller/tst_qlowenergycontroller.cpp b/tests/auto/qlowenergycontroller/tst_qlowenergycontroller.cpp index f5e1ec4b..c6fd83e6 100644 --- a/tests/auto/qlowenergycontroller/tst_qlowenergycontroller.cpp +++ b/tests/auto/qlowenergycontroller/tst_qlowenergycontroller.cpp @@ -117,9 +117,13 @@ tst_QLowEnergyController::~tst_QLowEnergyController() void tst_QLowEnergyController::initTestCase() { -#if !defined(Q_OS_MAC) && !defined(Q_OS_WINRT) +#if !defined(Q_OS_MAC) if (remoteDevice.isNull() +#ifndef Q_OS_WINRT || QBluetoothLocalDevice::allDevices().isEmpty()) { +#else + ) { +#endif qWarning("No remote device or local adapter found."); return; } |