summaryrefslogtreecommitdiffstats
path: root/tests/auto/widgets/styles
diff options
context:
space:
mode:
Diffstat (limited to 'tests/auto/widgets/styles')
-rw-r--r--tests/auto/widgets/styles/qstyle/tst_qstyle.cpp2
-rw-r--r--tests/auto/widgets/styles/qstylesheetstyle/tst_qstylesheetstyle.cpp22
2 files changed, 10 insertions, 14 deletions
diff --git a/tests/auto/widgets/styles/qstyle/tst_qstyle.cpp b/tests/auto/widgets/styles/qstyle/tst_qstyle.cpp
index 0045dbbb52..1f26e42515 100644
--- a/tests/auto/widgets/styles/qstyle/tst_qstyle.cpp
+++ b/tests/auto/widgets/styles/qstyle/tst_qstyle.cpp
@@ -368,7 +368,7 @@ void tst_QStyle::testScrollBarSubControls(QStyle* style)
{
#ifdef Q_OS_WINCE_WM
if (qobject_cast<QWindowsMobileStyle*>(style) && qt_wince_is_smartphone())
- QSKIP("SmartPhone doesn't have scrollbar subcontrols.", SkipAll);
+ QSKIP("SmartPhone doesn't have scrollbar subcontrols.");
#else
Q_UNUSED(style);
#endif
diff --git a/tests/auto/widgets/styles/qstylesheetstyle/tst_qstylesheetstyle.cpp b/tests/auto/widgets/styles/qstylesheetstyle/tst_qstylesheetstyle.cpp
index c5591c48ab..2e5ddb4695 100644
--- a/tests/auto/widgets/styles/qstylesheetstyle/tst_qstylesheetstyle.cpp
+++ b/tests/auto/widgets/styles/qstylesheetstyle/tst_qstylesheetstyle.cpp
@@ -777,9 +777,8 @@ void tst_QStyleSheetStyle::focusColors()
QImage image(frame.width(), frame.height(), QImage::Format_ARGB32);
frame.render(&image);
- if (image.depth() < 24) {
- QSKIP("Test doesn't support color depth < 24", SkipAll);
- }
+ if (image.depth() < 24)
+ QSKIP("Test doesn't support color depth < 24");
QVERIFY2(testForColors(image, QColor(0xe8, 0xff, 0x66)),
(QString::fromLatin1(widget->metaObject()->className())
@@ -798,7 +797,7 @@ void tst_QStyleSheetStyle::focusColors()
void tst_QStyleSheetStyle::hoverColors()
{
if (!PlatformQuirks::haveMouseCursor())
- QSKIP("No mouse Cursor on this platform",SkipAll);
+ QSKIP("No mouse Cursor on this platform");
QList<QWidget *> widgets;
widgets << new QPushButton("TESTING");
widgets << new QLineEdit("TESTING");
@@ -937,9 +936,8 @@ void tst_QStyleSheetStyle::background()
QImage image(widget->width(), widget->height(), QImage::Format_ARGB32);
widget->render(&image);
- if (image.depth() < 24) {
- QSKIP("Test doesn't support color depth < 24", SkipAll);
- }
+ if (image.depth() < 24)
+ QSKIP("Test doesn't support color depth < 24");
QVERIFY2(testForColors(image, QColor(0xe8, 0xff, 0x66)),
(QString::fromLatin1(widget->metaObject()->className())
@@ -1470,9 +1468,8 @@ void tst_QStyleSheetStyle::complexWidgetFocus()
QImage image(frame.width(), frame.height(), QImage::Format_ARGB32);
frame.render(&image);
- if (image.depth() < 24) {
- QSKIP("Test doesn't support color depth < 24", SkipAll);
- }
+ if (image.depth() < 24)
+ QSKIP("Test doesn't support color depth < 24");
QVERIFY2(testForColors(image, QColor(0xff, 0x00, 0x84)),
(QString::fromLatin1(widget->metaObject()->className())
@@ -1547,9 +1544,8 @@ void tst_QStyleSheetStyle::task232085_spinBoxLineEditBg()
QImage image(frame.width(), frame.height(), QImage::Format_ARGB32);
frame.render(&image);
- if (image.depth() < 24) {
- QSKIP("Test doesn't support color depth < 24", SkipAll);
- }
+ if (image.depth() < 24)
+ QSKIP("Test doesn't support color depth < 24");
QVERIFY2(testForColors(image, QColor(0xe8, 0xff, 0x66)),
(QString::fromLatin1(spinbox->metaObject()->className())