diff options
| author | J-P Nurmi <jpnurmi@digia.com> | 2012-09-20 15:35:21 +0200 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2012-10-13 05:51:19 +0200 |
| commit | 6b04ee10e6a17999679de86e80ce66886ceab963 (patch) | |
| tree | a939a0c9466e90d19ffeffc76bbd592ae2d3489a /tests/auto/widgets/styles/qstylesheetstyle/tst_qstylesheetstyle.cpp | |
| parent | dc0d5bf387a0b440c74b9e822c46b09e20e00720 (diff) | |
Auto tests: revise cursor dependant tests
Cursor dependant auto tests are currently skipped in various ways.
Some are checking PlatformQuirks::haveMouseCursor() that tries to
detect if the desktop environment is MeeGo, using obsolete Q_WS_X11.
Some are skipped if QT_NO_CURSOR or Q_OS_WINCE is defined and
some are actually missing the approriate guards.
=> unify by defining QTEST_NO_CURSOR in qtest-config.h when
appropriate ie. for platforms that have no regular mouse cursor
support or when QT_NO_CURSOR is defined.
Task-number: QTBUG-22551
Change-Id: I9a1e0e3156617945ae46226c79268955454c8a9a
Reviewed-by: Laszlo Papp <lpapp@kde.org>
Reviewed-by: Marc Mutz <marc.mutz@kdab.com>
Reviewed-by: Caroline Chao <caroline.chao@digia.com>
Diffstat (limited to 'tests/auto/widgets/styles/qstylesheetstyle/tst_qstylesheetstyle.cpp')
| -rw-r--r-- | tests/auto/widgets/styles/qstylesheetstyle/tst_qstylesheetstyle.cpp | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/tests/auto/widgets/styles/qstylesheetstyle/tst_qstylesheetstyle.cpp b/tests/auto/widgets/styles/qstylesheetstyle/tst_qstylesheetstyle.cpp index 310e43cd53..dc8b1c12f3 100644 --- a/tests/auto/widgets/styles/qstylesheetstyle/tst_qstylesheetstyle.cpp +++ b/tests/auto/widgets/styles/qstylesheetstyle/tst_qstylesheetstyle.cpp @@ -47,7 +47,8 @@ #include <QPlastiqueStyle> #include <private/qstylesheetstyle_p.h> -#include "../../../platformquirks.h" + +#include "../../../qtest-config.h" class tst_QStyleSheetStyle : public QObject { @@ -78,7 +79,9 @@ private slots: void onWidgetDestroyed(); void fontPrecedence(); void focusColors(); +#ifndef QTEST_NO_CURSOR void hoverColors(); +#endif void background(); void tabAlignement(); void attributesList(); @@ -788,10 +791,9 @@ void tst_QStyleSheetStyle::focusColors() } } +#ifndef QTEST_NO_CURSOR void tst_QStyleSheetStyle::hoverColors() { - if (!PlatformQuirks::haveMouseCursor()) - QSKIP("No mouse Cursor on this platform"); QList<QWidget *> widgets; widgets << new QPushButton("TESTING TESTING"); widgets << new QLineEdit("TESTING TESTING"); @@ -880,8 +882,8 @@ void tst_QStyleSheetStyle::hoverColors() (QString::fromLatin1(widget->metaObject()->className()) + " did not contain text color #ff0084").toLocal8Bit().constData()); } - } +#endif class SingleInheritanceDialog : public QDialog { |