summaryrefslogtreecommitdiffstats
path: root/tests/auto/gui/painting/qprinterinfo
diff options
context:
space:
mode:
authorJason McDonald <jason.mcdonald@nokia.com>2011-10-19 12:53:13 +1000
committerQt by Nokia <qt-info@nokia.com>2011-10-21 01:20:29 +0200
commit27f9f136f7e39b5d612bc02f7ff8778ab424c07d (patch)
tree3c72358e3d1e42fbf0c386365e76db259e180bd7 /tests/auto/gui/painting/qprinterinfo
parent016cd01846539404a0eff1e3823fa2206fe2c9a9 (diff)
Remove SkipMode parameter from QSKIP calls.
The previous commit removed SkipMode from the testlib APi. This commit removes the parameter from all calls to QSKIP. Task-number: QTBUG-21851, QTBUG-21652 Change-Id: I21c0ee6731c1bc6ac6d962590d9b31d7459dfbc5 Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
Diffstat (limited to 'tests/auto/gui/painting/qprinterinfo')
-rw-r--r--tests/auto/gui/painting/qprinterinfo/tst_qprinterinfo.cpp8
1 files changed, 4 insertions, 4 deletions
diff --git a/tests/auto/gui/painting/qprinterinfo/tst_qprinterinfo.cpp b/tests/auto/gui/painting/qprinterinfo/tst_qprinterinfo.cpp
index 297664978e..e039347801 100644
--- a/tests/auto/gui/painting/qprinterinfo/tst_qprinterinfo.cpp
+++ b/tests/auto/gui/painting/qprinterinfo/tst_qprinterinfo.cpp
@@ -86,7 +86,7 @@ private:
#ifdef QT_NO_PRINTER
void tst_QPrinterInfo::initTestCase()
{
- QSKIP("This test requires printing support", SkipAll);
+ QSKIP("This test requires printing support");
}
#else
@@ -215,7 +215,7 @@ void tst_QPrinterInfo::testForDefaultPrinter()
if (QHostInfo::localHostName() == "fantomet" || QHostInfo::localHostName() == "bobo") {
QWARN("Test is hardcoded to \"fantomet\" and \"bobo\" on Windows and may fail");
} else {
- QSKIP("Test is hardcoded to \"fantomet\" and \"bobo\" on Windows", SkipAll);
+ QSKIP("Test is hardcoded to \"fantomet\" and \"bobo\" on Windows");
}
QString defSysPrinter;
if (QHostInfo::localHostName() == "fantomet") {
@@ -252,7 +252,7 @@ void tst_QPrinterInfo::testForPrinters()
if (QHostInfo::localHostName() == "fantomet" || QHostInfo::localHostName() == "bobo") {
QWARN("Test is hardcoded to \"fantomet\" and \"bobo\" on Windows and may fail");
} else {
- QSKIP("Test is hardcoded to \"fantomet\" and \"bobo\" on Windows", SkipAll);
+ QSKIP("Test is hardcoded to \"fantomet\" and \"bobo\" on Windows");
}
QStringList sysPrinters;
if (QHostInfo::localHostName() == "fantomet") {
@@ -296,7 +296,7 @@ void tst_QPrinterInfo::testForPrinters()
void tst_QPrinterInfo::testForPaperSizes()
{
-QSKIP("PaperSize feature doesn't work on Windows, fails on Mac, and is unstable on Linux", SkipAll);
+QSKIP("PaperSize feature doesn't work on Windows, fails on Mac, and is unstable on Linux");
// This test is based on common printers found at the Oslo
// office. It is likely to be skipped or fail for other locations.
QStringList hardPrinters;