diff options
| author | Jason McDonald <jason.mcdonald@nokia.com> | 2011-10-19 14:06:49 +1000 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2011-10-21 03:53:00 +0200 |
| commit | 19f7adb15c701c4f8da10a53de79f8c9b234e74e (patch) | |
| tree | f44e62bc42a70cd211e5153ac39e70bb6031fa65 | |
| parent | b15144718961653e976fed4f011bd33359975ef8 (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: I0f23668f3ca715c008869055cd6c3b9b131aad19
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
| -rw-r--r-- | tests/auto/mediaobject/tst_mediaobject.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/tests/auto/mediaobject/tst_mediaobject.cpp b/tests/auto/mediaobject/tst_mediaobject.cpp index dc2fdbc..9016792 100644 --- a/tests/auto/mediaobject/tst_mediaobject.cpp +++ b/tests/auto/mediaobject/tst_mediaobject.cpp @@ -498,7 +498,7 @@ void tst_MediaObject::initTestCase() if (Phonon::ErrorState == s) { #ifdef Q_WS_WIN if (m_media->errorString().contains(QLatin1String("no audio hardware is available"))) - QSKIP("On Windows we need an audio devide to perform the MediaObject tests", SkipAll); + QSKIP("On Windows we need an audio devide to perform the MediaObject tests"); else #endif QFAIL("Loading the URL put the MediaObject into the ErrorState. Check that PHONON_TESTURL is set to a valid URL."); @@ -656,7 +656,7 @@ void tst_MediaObject::playSDP() QVERIFY(errorStringMatch); #else - QSKIP("Unsupported on this platform.", SkipAll); + QSKIP("Unsupported on this platform."); #endif } @@ -827,7 +827,7 @@ Q_DECLARE_METATYPE(Phonon::MediaSource) void tst_MediaObject::testJustInTimeQueuing() { #ifdef Q_OS_WINCE - QSKIP("crashes on Windows CE", SkipAll); + QSKIP("crashes on Windows CE"); #endif qRegisterMetaType<Phonon::MediaSource>("Phonon::MediaSource"); QSignalSpy currentSourceChanged(m_media, SIGNAL(currentSourceChanged(const Phonon::MediaSource &))); |