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 | |
parent | c13b8cc4721ca3ddbc7741061480c45c962baa5b (diff) | |
download | qtconnectivity-ae1cbc39bfdbf42a2788e8a94ca1e7f4e1058641.tar.gz |
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>
3 files changed, 5 insertions, 5 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); diff --git a/tests/auto/qbluetoothsocket/tst_qbluetoothsocket.cpp b/tests/auto/qbluetoothsocket/tst_qbluetoothsocket.cpp index 8e848249..6eda9938 100644 --- a/tests/auto/qbluetoothsocket/tst_qbluetoothsocket.cpp +++ b/tests/auto/qbluetoothsocket/tst_qbluetoothsocket.cpp @@ -310,7 +310,7 @@ void tst_QBluetoothSocket::tst_clientConnection() qDebug() << errorSpy.takeFirst().at(0).toInt(); if (loop--) goto tryagain; - QSKIP("Connection error", SkipSingle); + QSKIP("Connection error"); } QCOMPARE(connectedSpy.count(), 1); QCOMPARE(stateSpy.count(), 1); @@ -446,7 +446,7 @@ void tst_QBluetoothSocket::tst_serviceConnection() if (errorSpy.count() != 0) { qDebug() << errorSpy.takeFirst().at(0).toInt(); - QSKIP("Connection error", SkipSingle); + QSKIP("Connection error"); } QCOMPARE(connectedSpy.count(), 1); QCOMPARE(stateSpy.count(), 1); diff --git a/tests/auto/qnearfieldtagtype2/tst_qnearfieldtagtype2.cpp b/tests/auto/qnearfieldtagtype2/tst_qnearfieldtagtype2.cpp index 8ae17d26..9aeb5272 100644 --- a/tests/auto/qnearfieldtagtype2/tst_qnearfieldtagtype2.cpp +++ b/tests/auto/qnearfieldtagtype2/tst_qnearfieldtagtype2.cpp @@ -281,7 +281,7 @@ void tst_QNearFieldTagType2::dynamicMemoryModel() void tst_QNearFieldTagType2::ndefMessages() { - QSKIP("Not implemented", SkipAll); + QSKIP("Not implemented"); QByteArray firstId; forever { |