summaryrefslogtreecommitdiffstats
path: root/tests/auto/unit/qmediapluginloader/tst_qmediapluginloader.cpp
diff options
context:
space:
mode:
authorJason McDonald <jason.mcdonald@nokia.com>2011-11-09 14:14:08 +1000
committerQt by Nokia <qt-info@nokia.com>2011-11-10 06:45:27 +0100
commit34cdc41a935766a7d773cb7e2bdb7ce27711dd9d (patch)
tree2ee0419423273b8b41b0ea0f1ca748d33d373b17 /tests/auto/unit/qmediapluginloader/tst_qmediapluginloader.cpp
parent23af917dc5b9f6b06bf3cee9741e87394e4f2189 (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: Ib6225572a46eac7881222fdce192750b8b13ee3b Reviewed-by: Steve Schilz <sschilz@pasco.com> Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
Diffstat (limited to 'tests/auto/unit/qmediapluginloader/tst_qmediapluginloader.cpp')
-rw-r--r--tests/auto/unit/qmediapluginloader/tst_qmediapluginloader.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/tests/auto/unit/qmediapluginloader/tst_qmediapluginloader.cpp b/tests/auto/unit/qmediapluginloader/tst_qmediapluginloader.cpp
index 198d950a2..138fc1eb2 100644
--- a/tests/auto/unit/qmediapluginloader/tst_qmediapluginloader.cpp
+++ b/tests/auto/unit/qmediapluginloader/tst_qmediapluginloader.cpp
@@ -83,7 +83,7 @@ void tst_QMediaPluginLoader::testInstance()
const QStringList keys = loader->keys();
if (keys.isEmpty()) // Test is invalidated, skip.
- QSKIP("No plug-ins available", SkipAll);
+ QSKIP("No plug-ins available");
foreach (const QString &key, keys)
QVERIFY(loader->instance(key) != 0);
@@ -94,7 +94,7 @@ void tst_QMediaPluginLoader::testInstances()
const QStringList keys = loader->keys();
if (keys.isEmpty()) // Test is invalidated, skip.
- QSKIP("No plug-ins available", SkipAll);
+ QSKIP("No plug-ins available");
foreach (const QString &key, keys)
QVERIFY(loader->instances(key).size() > 0);
@@ -107,7 +107,7 @@ void tst_QMediaPluginLoader::testInvalidKey()
// This test assumes there is no 'invalid-key' in the key list, verify that.
if (loader->keys().contains(key))
- QSKIP("a plug-in includes the invalid key", SkipAll);
+ QSKIP("a plug-in includes the invalid key");
QVERIFY(loader->instance(key) == 0);