summaryrefslogtreecommitdiffstats
path: root/tests
diff options
context:
space:
mode:
authorJason McDonald <jason.mcdonald@nokia.com>2011-10-19 14:59:06 +1000
committerQt by Nokia <qt-info@nokia.com>2011-11-09 01:55:27 +0100
commit4af42257b6890c61ef3e7246f2596a336b50a905 (patch)
treeee8e723e6feafb7c352ffac37cefce731123344e /tests
parenta6291f74e4af1642aad4f59c3f040120c522b3b6 (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: Ib2a86f1bf7ce46a469d4b550ff2f3cef2643e20b Sanity-Review: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
Diffstat (limited to 'tests')
-rw-r--r--tests/auto/qfeedbackhapticseffect/tst_qfeedbackhapticseffect.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/tests/auto/qfeedbackhapticseffect/tst_qfeedbackhapticseffect.cpp b/tests/auto/qfeedbackhapticseffect/tst_qfeedbackhapticseffect.cpp
index d5870a2..b16bf63 100644
--- a/tests/auto/qfeedbackhapticseffect/tst_qfeedbackhapticseffect.cpp
+++ b/tests/auto/qfeedbackhapticseffect/tst_qfeedbackhapticseffect.cpp
@@ -238,7 +238,7 @@ void tst_QFeedbackHapticsEffect::startStop()
{
qRegisterMetaType<QFeedbackEffect::ErrorType>("QFeedbackEffect::ErrorType");
if (QFeedbackActuator::actuators().isEmpty())
- QSKIP("this test requires to have actuators", SkipAll);
+ QSKIP("this test requires to have actuators");
QList<QFeedbackActuator*> actuators = QFeedbackActuator::actuators();
@@ -322,7 +322,7 @@ void tst_QFeedbackHapticsEffect::themeSupport()
const bool supportsTheme = QFeedbackEffect::supportsThemeEffect();
if (!supportsTheme)
- QSKIP("No theme support", SkipAll);
+ QSKIP("No theme support");
int numberOfSupportedThemeEffects = 0;
for (int i = 0; i < QFeedbackEffect::NumberOfThemeEffects; ++i) {
if (QFeedbackEffect::playThemeEffect(QFeedbackEffect::ThemeEffect(i)))