diff options
author | Jason McDonald <jason.mcdonald@nokia.com> | 2011-10-19 15:00:28 +1000 |
---|---|---|
committer | Qt by Nokia <qt-info@nokia.com> | 2011-11-09 02:33:53 +0100 |
commit | ae1cbc39bfdbf42a2788e8a94ca1e7f4e1058641 (patch) | |
tree | 1b7d430fc0f2a69d8be26465a6ab73ef4037aeb4 /tests/auto/qbluetoothservicediscoveryagent/tst_qbluetoothservicediscoveryagent.cpp | |
parent | c13b8cc4721ca3ddbc7741061480c45c962baa5b (diff) |
Remove SkipMode parameter from QSKIP.
The SkipMode parameter has been removed from the API in qtbase, so it
must be in all calls to QSKIP.
Task-number: QTBUG-21851, QTBUG-21652
Change-Id: Iae4432e57a12064b86f9a56cad73fecb56bdaaa9
Sanity-Review: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
Reviewed-by: Alex <alex.blasche@nokia.com>
Diffstat (limited to 'tests/auto/qbluetoothservicediscoveryagent/tst_qbluetoothservicediscoveryagent.cpp')
-rw-r--r-- | tests/auto/qbluetoothservicediscoveryagent/tst_qbluetoothservicediscoveryagent.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/tests/auto/qbluetoothservicediscoveryagent/tst_qbluetoothservicediscoveryagent.cpp b/tests/auto/qbluetoothservicediscoveryagent/tst_qbluetoothservicediscoveryagent.cpp index 0e5355f3..4b8f41d6 100644 --- a/tests/auto/qbluetoothservicediscoveryagent/tst_qbluetoothservicediscoveryagent.cpp +++ b/tests/auto/qbluetoothservicediscoveryagent/tst_qbluetoothservicediscoveryagent.cpp @@ -223,7 +223,7 @@ static void dumpServiceInfoAttributes(const QBluetoothServiceInfo &info) void tst_QBluetoothServiceDiscoveryAgent::tst_serviceDiscovery_data() { if (devices.isEmpty()) - QSKIP("This test requires an in-range bluetooth device", SkipAll); + QSKIP("This test requires an in-range bluetooth device"); QTest::addColumn<QBluetoothDeviceInfo>("deviceInfo"); QTest::addColumn<QList<QBluetoothUuid> >("uuidFilter"); @@ -252,7 +252,7 @@ void tst_QBluetoothServiceDiscoveryAgent::tst_serviceDiscovery() static int expected_failures = 0; if (devices.isEmpty()) - QSKIP("This test requires an in-range bluetooth device", SkipAll); + QSKIP("This test requires an in-range bluetooth device"); QFETCH(QBluetoothDeviceInfo, deviceInfo); QFETCH(QList<QBluetoothUuid>, uuidFilter); |