diff options
| author | Alex Blasche <alexander.blasche@theqtcompany.com> | 2016-08-03 13:35:38 +0200 |
|---|---|---|
| committer | Alex Blasche <alexander.blasche@theqtcompany.com> | 2016-08-03 13:35:38 +0200 |
| commit | bb3f0064e60107c17ba5a90dd35d64116a4a8a89 (patch) | |
| tree | e1d068fdfd205f9051691542aba04882fd80e110 /tests/auto/qbluetoothdevicediscoveryagent/tst_qbluetoothdevicediscoveryagent.cpp | |
| parent | 907c43f83768bf1b7fea89960ff5b60a714007d6 (diff) | |
| parent | 4976498621fb05804201dad52eab2c59d94f0da3 (diff) | |
Merge remote-tracking branch 'gerrit/btle' into dev
Merges Qt Bluetooth Low Energy port on WinRT into mainline.
Change-Id: Ic519955dfee4a57635c525a79b900340fbc5562f
Diffstat (limited to 'tests/auto/qbluetoothdevicediscoveryagent/tst_qbluetoothdevicediscoveryagent.cpp')
| -rw-r--r-- | tests/auto/qbluetoothdevicediscoveryagent/tst_qbluetoothdevicediscoveryagent.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/tests/auto/qbluetoothdevicediscoveryagent/tst_qbluetoothdevicediscoveryagent.cpp b/tests/auto/qbluetoothdevicediscoveryagent/tst_qbluetoothdevicediscoveryagent.cpp index d37a67de..f8ab72f7 100644 --- a/tests/auto/qbluetoothdevicediscoveryagent/tst_qbluetoothdevicediscoveryagent.cpp +++ b/tests/auto/qbluetoothdevicediscoveryagent/tst_qbluetoothdevicediscoveryagent.cpp @@ -471,10 +471,10 @@ void tst_QBluetoothDeviceDiscoveryAgent::tst_deviceDiscovery() } } } -#ifdef Q_OS_IOS - //On iOS, we do not have access to the local device/adapter, numberOfAdapters is 0, +#if defined(Q_OS_IOS) || defined(Q_OS_WINRT) + //On iOS/WinRT, we do not have access to the local device/adapter, numberOfAdapters is 0, //so we skip this test at all. - QSKIP("iOS: no local Bluetooth device available. Skipping remaining part of test."); + QSKIP("iOS/WinRT: no local Bluetooth device available. Skipping remaining part of test."); #endif //For multiple Bluetooth adapter do the check only for GeneralUnlimitedInquiry. |