diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2018-11-17 03:02:45 +0100 |
|---|---|---|
| committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2018-11-17 03:02:45 +0100 |
| commit | 864536cf3cb50c45f45a9f0b5cebe2c27e550a9f (patch) | |
| tree | 9b208f34a37d2b6ae1a74fbfb4372fad61c88894 /tests/auto | |
| parent | 3824bab02e173f13c616dac4f61900873f0ff89b (diff) | |
| parent | 801def0ca1adb14584a9540069a3d87703d163a7 (diff) | |
Merge remote-tracking branch 'origin/5.12' into dev
Change-Id: I074fa6330aba92ff08980848032941d123493556
Diffstat (limited to 'tests/auto')
| -rw-r--r-- | tests/auto/qbluetoothserver/tst_qbluetoothserver.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/tests/auto/qbluetoothserver/tst_qbluetoothserver.cpp b/tests/auto/qbluetoothserver/tst_qbluetoothserver.cpp index acc498cc..4564cf4d 100644 --- a/tests/auto/qbluetoothserver/tst_qbluetoothserver.cpp +++ b/tests/auto/qbluetoothserver/tst_qbluetoothserver.cpp @@ -185,11 +185,11 @@ void tst_QBluetoothServer::tst_receive() bool localDeviceAvailable = localDev.isValid(); if (localDeviceAvailable) { - // setHostMode is noop on OS X. + // setHostMode is noop on OS X and winrt. setHostMode(address, hostmode); if (hostmode == QBluetoothLocalDevice::HostPoweredOff) { -#ifndef Q_OS_OSX +#if !defined(Q_OS_OSX) && !QT_CONFIG(winrt_bt) QCOMPARE(localDevice.hostMode(), hostmode); #endif } else { |