diff options
| author | Jason McDonald <jason.mcdonald@nokia.com> | 2011-10-19 13:57:18 +1000 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2011-10-21 04:41:29 +0200 |
| commit | 694ba70a5bf6ea042cc8d6f8cda4fa6b3f9ea26e (patch) | |
| tree | 9ad0b7c7b454944b3375c5e759f9d85973ede897 /tests/auto/xmlpatterns/tst_xmlpatterns.cpp | |
| parent | eea5f7496caa46a40fd609d13a327ae9c887e67e (diff) | |
| download | qtxmlpatterns-694ba70a5bf6ea042cc8d6f8cda4fa6b3f9ea26e.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: I8f5d6488637acd5e38d3c8dd418ff3776b2f3778
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
Diffstat (limited to 'tests/auto/xmlpatterns/tst_xmlpatterns.cpp')
| -rw-r--r-- | tests/auto/xmlpatterns/tst_xmlpatterns.cpp | 15 |
1 files changed, 7 insertions, 8 deletions
diff --git a/tests/auto/xmlpatterns/tst_xmlpatterns.cpp b/tests/auto/xmlpatterns/tst_xmlpatterns.cpp index c1ff307..6d689b0 100644 --- a/tests/auto/xmlpatterns/tst_xmlpatterns.cpp +++ b/tests/auto/xmlpatterns/tst_xmlpatterns.cpp @@ -121,8 +121,7 @@ void tst_XmlPatterns::initTestCase() qPrintable(QString( "The command line tool (%1) could not be run, possibly because Qt was " "incompletely built or installed. No tests will be run." - ).arg(m_command)), - SkipAll + ).arg(m_command)) ); } @@ -131,12 +130,12 @@ void tst_XmlPatterns::initTestCase() void tst_XmlPatterns::xquerySupport() { if(m_dontRun) - QSKIP("The command line utility is not in the path.", SkipAll); + QSKIP("The command line utility is not in the path."); #ifdef Q_OS_WINCE - QSKIP("WinCE: This test uses unsupported WinCE functionality", SkipAll); + QSKIP("WinCE: This test uses unsupported WinCE functionality"); #elif defined(Q_OS_SYMBIAN) - QSKIP("Symbian: This test uses unsupported Symbian functionality (QProcess with std streams)", SkipAll); + QSKIP("Symbian: This test uses unsupported Symbian functionality (QProcess with std streams)"); #endif QFETCH(int, expectedExitCode); @@ -854,12 +853,12 @@ void tst_XmlPatterns::xsltSupport() void tst_XmlPatterns::xsltSupport_data() const { if(m_dontRun) - QSKIP("The command line utility is not in the path.", SkipAll); + QSKIP("The command line utility is not in the path."); #ifdef Q_OS_WINCE - QSKIP("WinCE: This test uses unsupported WinCE functionality", SkipAll); + QSKIP("WinCE: This test uses unsupported WinCE functionality"); #elif defined(Q_OS_SYMBIAN) - QSKIP("Symbian: This test uses unsupported Symbian functionality (QProcess with std streams)", SkipAll); + QSKIP("Symbian: This test uses unsupported Symbian functionality (QProcess with std streams)"); #endif QTest::addColumn<int>("expectedExitCode"); |