summaryrefslogtreecommitdiffstats
path: root/tests/auto/widgets/widgets
diff options
context:
space:
mode:
Diffstat (limited to 'tests/auto/widgets/widgets')
-rw-r--r--tests/auto/widgets/widgets/qabstractbutton/tst_qabstractbutton.cpp2
-rw-r--r--tests/auto/widgets/widgets/qbuttongroup/tst_qbuttongroup.cpp2
-rw-r--r--tests/auto/widgets/widgets/qcombobox/tst_qcombobox.cpp2
-rw-r--r--tests/auto/widgets/widgets/qdatetimeedit/tst_qdatetimeedit.cpp8
-rw-r--r--tests/auto/widgets/widgets/qdockwidget/tst_qdockwidget.cpp2
-rw-r--r--tests/auto/widgets/widgets/qlineedit/tst_qlineedit.cpp4
-rw-r--r--tests/auto/widgets/widgets/qmainwindow/tst_qmainwindow.cpp2
-rw-r--r--tests/auto/widgets/widgets/qmdiarea/tst_qmdiarea.cpp10
-rw-r--r--tests/auto/widgets/widgets/qmdisubwindow/tst_qmdisubwindow.cpp6
-rw-r--r--tests/auto/widgets/widgets/qmenu/tst_qmenu.cpp8
-rw-r--r--tests/auto/widgets/widgets/qmenubar/tst_qmenubar.cpp6
-rw-r--r--tests/auto/widgets/widgets/qplaintextedit/tst_qplaintextedit.cpp12
-rw-r--r--tests/auto/widgets/widgets/qpushbutton/tst_qpushbutton.cpp3
-rw-r--r--tests/auto/widgets/widgets/qscrollbar/tst_qscrollbar.cpp2
-rw-r--r--tests/auto/widgets/widgets/qtabbar/tst_qtabbar.cpp2
-rw-r--r--tests/auto/widgets/widgets/qtabwidget/tst_qtabwidget.cpp2
-rw-r--r--tests/auto/widgets/widgets/qtextedit/tst_qtextedit.cpp14
-rw-r--r--tests/auto/widgets/widgets/qworkspace/tst_qworkspace.cpp2
18 files changed, 44 insertions, 45 deletions
diff --git a/tests/auto/widgets/widgets/qabstractbutton/tst_qabstractbutton.cpp b/tests/auto/widgets/widgets/qabstractbutton/tst_qabstractbutton.cpp
index f5f60c8fd3..526cfff1ee 100644
--- a/tests/auto/widgets/widgets/qabstractbutton/tst_qabstractbutton.cpp
+++ b/tests/auto/widgets/widgets/qabstractbutton/tst_qabstractbutton.cpp
@@ -593,7 +593,7 @@ void tst_QAbstractButton::stopRepeatTimer()
void tst_QAbstractButton::keyNavigation()
{
- QSKIP("Key navigation in QAbstractButton will be fixed/improved as part of task 194373", SkipSingle);
+ QSKIP("Key navigation in QAbstractButton will be fixed/improved as part of task 194373");
QWidget widget;
QGridLayout *layout = new QGridLayout(&widget);
diff --git a/tests/auto/widgets/widgets/qbuttongroup/tst_qbuttongroup.cpp b/tests/auto/widgets/widgets/qbuttongroup/tst_qbuttongroup.cpp
index f9f6ec0a54..c48efcd5eb 100644
--- a/tests/auto/widgets/widgets/qbuttongroup/tst_qbuttongroup.cpp
+++ b/tests/auto/widgets/widgets/qbuttongroup/tst_qbuttongroup.cpp
@@ -131,7 +131,7 @@ QT_END_NAMESPACE
void tst_QButtonGroup::arrowKeyNavigation()
{
if (!qt_tab_all_widgets)
- QSKIP("This test requires full keyboard control to be enabled.", SkipAll);
+ QSKIP("This test requires full keyboard control to be enabled.");
QDialog dlg(0);
QHBoxLayout layout(&dlg);
diff --git a/tests/auto/widgets/widgets/qcombobox/tst_qcombobox.cpp b/tests/auto/widgets/widgets/qcombobox/tst_qcombobox.cpp
index cb4468f6f4..8f6d5bc0e0 100644
--- a/tests/auto/widgets/widgets/qcombobox/tst_qcombobox.cpp
+++ b/tests/auto/widgets/widgets/qcombobox/tst_qcombobox.cpp
@@ -460,7 +460,7 @@ void tst_QComboBox::setPalette()
{
#ifdef Q_WS_MAC
if (qobject_cast<QMacStyle *>(testWidget->style())) {
- QSKIP("This test doesn't make sense for pixmap-based styles", SkipAll);
+ QSKIP("This test doesn't make sense for pixmap-based styles");
}
#endif
QPalette pal = testWidget->palette();
diff --git a/tests/auto/widgets/widgets/qdatetimeedit/tst_qdatetimeedit.cpp b/tests/auto/widgets/widgets/qdatetimeedit/tst_qdatetimeedit.cpp
index c64c9e7019..c83634a6a7 100644
--- a/tests/auto/widgets/widgets/qdatetimeedit/tst_qdatetimeedit.cpp
+++ b/tests/auto/widgets/widgets/qdatetimeedit/tst_qdatetimeedit.cpp
@@ -2537,7 +2537,7 @@ void tst_QDateTimeEdit::newCase()
{
if (QDate::shortMonthName(6) != "Jun" || QDate::shortMonthName(7) != "Jul" ||
QDate::longMonthName(6) != "June" || QDate::longMonthName(7) != "July")
- QSKIP("This test only works in English", SkipAll);
+ QSKIP("This test only works in English");
testWidget->setDisplayFormat("MMMM'a'MbMMMcMM");
testWidget->setDate(QDate(2005, 6, 1));
@@ -2584,7 +2584,7 @@ void tst_QDateTimeEdit::newCase2()
void tst_QDateTimeEdit::newCase3()
{
if (!QDate::longMonthName(1).startsWith("Januar"))
- QSKIP("This test does not work in this locale", SkipAll);
+ QSKIP("This test does not work in this locale");
testWidget->setDisplayFormat("dd MMMM yyyy");
testWidget->setDate(QDate(2000, 1, 1));
@@ -2605,7 +2605,7 @@ void tst_QDateTimeEdit::newCase3()
void tst_QDateTimeEdit::cursorPos()
{
if (QDate::longMonthName(1) != "January")
- QSKIP("This test only works in English", SkipAll);
+ QSKIP("This test only works in English");
testWidget->setDisplayFormat("dd MMMM yyyy");
//testWidget->setGeometry(0, 0, 200, 200);
@@ -3210,7 +3210,7 @@ void tst_QDateTimeEdit::timeSpec()
QVERIFY(edit.minimumDateTime().timeSpec() != min.timeSpec());
QCOMPARE(edit.minimumDateTime().toTime_t(), min.toTime_t());
} else {
- QSKIP("Not tested in the GMT timezone", SkipAll);
+ QSKIP("Not tested in the GMT timezone");
}
}
diff --git a/tests/auto/widgets/widgets/qdockwidget/tst_qdockwidget.cpp b/tests/auto/widgets/widgets/qdockwidget/tst_qdockwidget.cpp
index 2c1f7c0954..cd0b95160d 100644
--- a/tests/auto/widgets/widgets/qdockwidget/tst_qdockwidget.cpp
+++ b/tests/auto/widgets/widgets/qdockwidget/tst_qdockwidget.cpp
@@ -842,7 +842,7 @@ void tst_QDockWidget::taskQTBUG_1665_closableChanged()
QDockWidgetLayout *l = qobject_cast<QDockWidgetLayout*>(dock.layout());
if (l && !l->nativeWindowDeco())
- QSKIP("this machine doesn't support native dock widget", SkipAll);
+ QSKIP("this machine doesn't support native dock widget");
QVERIFY(dock.windowFlags() & Qt::WindowCloseButtonHint);
diff --git a/tests/auto/widgets/widgets/qlineedit/tst_qlineedit.cpp b/tests/auto/widgets/widgets/qlineedit/tst_qlineedit.cpp
index 6e4726e5b5..841fbbd955 100644
--- a/tests/auto/widgets/widgets/qlineedit/tst_qlineedit.cpp
+++ b/tests/auto/widgets/widgets/qlineedit/tst_qlineedit.cpp
@@ -1424,7 +1424,7 @@ static bool nativeClipboardWorking()
void tst_QLineEdit::QTBUG5786_undoPaste()
{
if (!nativeClipboardWorking())
- QSKIP("this machine doesn't support the clipboard", SkipAll);
+ QSKIP("this machine doesn't support the clipboard");
QString initial("initial");
QString string("test");
QString additional("add");
@@ -2803,7 +2803,7 @@ void tst_QLineEdit::cut()
if (status == noErr)
CFRelease(pasteboard);
else
- QSKIP("Autotests run from cron and pasteboard don't get along quite ATM", SkipAll);
+ QSKIP("Autotests run from cron and pasteboard don't get along quite ATM");
}
#endif
// test newlines in cut'n'paste
diff --git a/tests/auto/widgets/widgets/qmainwindow/tst_qmainwindow.cpp b/tests/auto/widgets/widgets/qmainwindow/tst_qmainwindow.cpp
index 9722a3194b..966f5842a0 100644
--- a/tests/auto/widgets/widgets/qmainwindow/tst_qmainwindow.cpp
+++ b/tests/auto/widgets/widgets/qmainwindow/tst_qmainwindow.cpp
@@ -1648,7 +1648,7 @@ void tst_QMainWindow::addToolbarAfterShow()
void tst_QMainWindow::centralWidgetSize()
{
if(PlatformQuirks::isAutoMaximizing())
- QSKIP("The platform is auto maximizing, so the test makes no sense", SkipAll);;
+ QSKIP("The platform is auto maximizing, so the test makes no sense");;
QMainWindow mainWindow;
mainWindow.menuBar()->addMenu("menu");
diff --git a/tests/auto/widgets/widgets/qmdiarea/tst_qmdiarea.cpp b/tests/auto/widgets/widgets/qmdiarea/tst_qmdiarea.cpp
index a4ce94cc3d..59fbdafbaf 100644
--- a/tests/auto/widgets/widgets/qmdiarea/tst_qmdiarea.cpp
+++ b/tests/auto/widgets/widgets/qmdiarea/tst_qmdiarea.cpp
@@ -515,7 +515,7 @@ void tst_QMdiArea::subWindowActivated2()
spy.clear();
if (PlatformQuirks::isAutoMaximizing())
- QSKIP("Platform is auto maximizing, so no showMinimized()", SkipAll);
+ QSKIP("Platform is auto maximizing, so no showMinimized()");
// Check that we only emit _one_ signal and the active window
// is unchanged after showMinimized/showNormal.
@@ -531,7 +531,7 @@ void tst_QMdiArea::subWindowActivated2()
QEXPECT_FAIL("", "task 168682", Abort);
#endif
#ifdef Q_OS_WINCE
- QSKIP("Not fixed yet. See Task 197453", SkipAll);
+ QSKIP("Not fixed yet. See Task 197453");
#endif
QTRY_COMPARE(spy.count(), 1);
QVERIFY(!mdiArea.activeSubWindow());
@@ -1757,7 +1757,7 @@ void tst_QMdiArea::tileSubWindows()
const int spacing = 2 * frameWidth + 2;
const QSize expectedViewportSize(3 * minSize.width() + spacing, 3 * minSize.height() + spacing);
#ifdef Q_OS_WINCE
- QSKIP("Not fixed yet! See task 197453", SkipAll);
+ QSKIP("Not fixed yet! See task 197453");
#endif
QTRY_COMPARE(workspace.viewport()->rect().size(), expectedViewportSize);
@@ -2714,7 +2714,7 @@ void tst_QMdiArea::nativeSubWindows()
#ifndef QT_NO_OPENGL
{
if (!QGLFormat::hasOpenGL())
- QSKIP("QGL not supported on this platform", SkipAll);
+ QSKIP("QGL not supported on this platform");
QMdiArea mdiArea;
QGLWidget *glViewport = new QGLWidget;
@@ -2728,7 +2728,7 @@ void tst_QMdiArea::nativeSubWindows()
const QGLContext *context = glViewport->context();
if (!context || !context->isValid())
- QSKIP("QGL is broken, cannot continue test", SkipAll);
+ QSKIP("QGL is broken, cannot continue test");
// The viewport and all the sub-windows must be native.
QVERIFY(mdiArea.viewport()->internalWinId());
diff --git a/tests/auto/widgets/widgets/qmdisubwindow/tst_qmdisubwindow.cpp b/tests/auto/widgets/widgets/qmdisubwindow/tst_qmdisubwindow.cpp
index f7593336e1..72c6335fdb 100644
--- a/tests/auto/widgets/widgets/qmdisubwindow/tst_qmdisubwindow.cpp
+++ b/tests/auto/widgets/widgets/qmdisubwindow/tst_qmdisubwindow.cpp
@@ -598,7 +598,7 @@ void tst_QMdiSubWindow::showShaded()
QTest::qWait(250);
#ifdef Q_OS_WINCE
- QSKIP("Until we have a QEvent::WindowFlagsChange event, this will skip", SkipAll);
+ QSKIP("Until we have a QEvent::WindowFlagsChange event, this will skip");
#endif
const QSize minimumSizeHint = window->minimumSizeHint();
@@ -907,7 +907,7 @@ void tst_QMdiSubWindow::setWindowFlags_data()
void tst_QMdiSubWindow::setWindowFlags()
{
- QSKIP("Until we have a QEvent::WindowFlagsChange event, this will skip", SkipAll);
+ QSKIP("Until we have a QEvent::WindowFlagsChange event, this will skip");
QFETCH(Qt::WindowType, windowType);
QFETCH(Qt::WindowType, expectedWindowType);
QFETCH(Qt::WindowFlags, customFlags);
@@ -968,7 +968,7 @@ void tst_QMdiSubWindow::mouseDoubleClick()
QCOMPARE(window->geometry(), originalGeometry);
// With Qt::WindowShadeButtonHint flag set
- QSKIP("Until we have a QEvent::WindowFlagsChange event, this will skip", SkipAll);
+ QSKIP("Until we have a QEvent::WindowFlagsChange event, this will skip");
window->setWindowFlags(window->windowFlags() | Qt::WindowShadeButtonHint);
QVERIFY(window->windowFlags() & Qt::WindowShadeButtonHint);
originalGeometry = window->geometry();
diff --git a/tests/auto/widgets/widgets/qmenu/tst_qmenu.cpp b/tests/auto/widgets/widgets/qmenu/tst_qmenu.cpp
index d115da865b..306cd892ed 100644
--- a/tests/auto/widgets/widgets/qmenu/tst_qmenu.cpp
+++ b/tests/auto/widgets/widgets/qmenu/tst_qmenu.cpp
@@ -381,7 +381,7 @@ void tst_QMenu::focus()
#ifdef Q_WS_MAC
if (!qt_tab_all_widgets)
QSKIP("Computer is currently set up to NOT tab to all widgets,"
- " this test assumes you can tab to all widgets", SkipAll);
+ " this test assumes you can tab to all widgets");
#endif
QWidget window;
@@ -675,7 +675,7 @@ void tst_QMenu::task250673_activeMultiColumnSubMenuPosition()
if (sub.style()->styleHint(QStyle::SH_Menu_Scrollable, 0, &sub)) {
//the style prevents the menus from getting columns
- QSKIP("the style doesn't support multiple columns, it makes the menu scrollable", SkipSingle);
+ QSKIP("the style doesn't support multiple columns, it makes the menu scrollable");
}
sub.addAction("Sub-Item1");
@@ -774,7 +774,7 @@ public:
void tst_QMenu::task258920_mouseBorder()
{
#ifdef Q_WS_QPA
- QSKIP("QTBUG-20753 QCursor::setPos() / QTest::mouseMove() doesn't work on qpa", SkipAll);
+ QSKIP("QTBUG-20753 QCursor::setPos() / QTest::mouseMove() doesn't work on qpa");
#endif
Menu258920 menu;
// For styles which inherit from QWindowsStyle, styleHint(QStyle::SH_Menu_MouseTracking) is true.
@@ -842,7 +842,7 @@ void tst_QMenu::pushButtonPopulateOnAboutToShow()
// (kwin in kde4 does, for example, since the button would probably appear behind
// or partially behind the taskbar).
// Your best bet is to run this test _without_ a WM.
- QSKIP("Your window manager won't allow a window against the bottom of the screen", SkipAll);
+ QSKIP("Your window manager won't allow a window against the bottom of the screen");
}
QTimer::singleShot(300,lastMenu, SLOT(hide()));
diff --git a/tests/auto/widgets/widgets/qmenubar/tst_qmenubar.cpp b/tests/auto/widgets/widgets/qmenubar/tst_qmenubar.cpp
index dc3b81920d..4a6123cdc3 100644
--- a/tests/auto/widgets/widgets/qmenubar/tst_qmenubar.cpp
+++ b/tests/auto/widgets/widgets/qmenubar/tst_qmenubar.cpp
@@ -853,7 +853,7 @@ void tst_QMenuBar::check_escKey()
// void tst_QMenuBar::check_mouse1()
// {
// if (QSystem::curStyle() == "Motif")
-// QSKIP("This fails in Motif due to a bug in the testing framework", SkipAll);
+// QSKIP("This fails in Motif due to a bug in the testing framework");
// QFETCH( QString, popup_item );
// QFETCH( int, itemA_count );
// QFETCH( int, itemB_count );
@@ -914,7 +914,7 @@ void tst_QMenuBar::check_escKey()
// void tst_QMenuBar::check_mouse2()
// {
// if (QSystem::curStyle() == "Motif")
-// QSKIP("This fails in Motif due to a bug in the testing framework", SkipAll);
+// QSKIP("This fails in Motif due to a bug in the testing framework");
// QFETCH( QString, label );
// QFETCH( int, itemA_count );
// QFETCH( int, itemB_count );
@@ -991,7 +991,7 @@ void tst_QMenuBar::check_altPress()
{
if ( !qApp->style()->styleHint(QStyle::SH_MenuBar_AltKeyNavigation) ) {
QSKIP( QString( "this is not supposed to work in the %1 style. Skipping." ).
- arg( qApp->style()->objectName() ).toAscii(), SkipAll );
+ arg( qApp->style()->objectName() ).toAscii());
}
initSimpleMenubar();
diff --git a/tests/auto/widgets/widgets/qplaintextedit/tst_qplaintextedit.cpp b/tests/auto/widgets/widgets/qplaintextedit/tst_qplaintextedit.cpp
index d847f295e0..c9b3a3c6f1 100644
--- a/tests/auto/widgets/widgets/qplaintextedit/tst_qplaintextedit.cpp
+++ b/tests/auto/widgets/widgets/qplaintextedit/tst_qplaintextedit.cpp
@@ -307,7 +307,7 @@ void tst_QPlainTextEdit::createSelection()
void tst_QPlainTextEdit::clearMustNotChangeClipboard()
{
if (!nativeClipboardWorking())
- QSKIP("Clipboard not working with cron-started unit tests", SkipAll);
+ QSKIP("Clipboard not working with cron-started unit tests");
ed->textCursor().insertText("Hello World");
QString txt("This is different text");
QApplication::clipboard()->setText(txt);
@@ -340,7 +340,7 @@ void tst_QPlainTextEdit::paragSeparatorOnPlaintextAppend()
void tst_QPlainTextEdit::selectAllSetsNotSelection()
{
if (!QApplication::clipboard()->supportsSelection())
- QSKIP("Test only relevant for systems with selection", SkipAll);
+ QSKIP("Test only relevant for systems with selection");
QApplication::clipboard()->setText(QString("foobar"), QClipboard::Selection);
QVERIFY(QApplication::clipboard()->text(QClipboard::Selection) == QString("foobar"));
@@ -484,7 +484,7 @@ void tst_QPlainTextEdit::setTextCursor()
void tst_QPlainTextEdit::undoAvailableAfterPaste()
{
if (!nativeClipboardWorking())
- QSKIP("Clipboard not working with cron-started unit tests", SkipAll);
+ QSKIP("Clipboard not working with cron-started unit tests");
QSignalSpy spy(ed->document(), SIGNAL(undoAvailable(bool)));
@@ -677,7 +677,7 @@ void tst_QPlainTextEdit::preserveCharFormatInAppend()
void tst_QPlainTextEdit::copyAndSelectAllInReadonly()
{
if (!nativeClipboardWorking())
- QSKIP("Clipboard not working with cron-started unit tests", SkipAll);
+ QSKIP("Clipboard not working with cron-started unit tests");
ed->setReadOnly(true);
ed->setPlainText("Hello World");
@@ -1012,7 +1012,7 @@ void tst_QPlainTextEdit::copyAvailable()
QFETCH(QString, function);
#ifdef Q_WS_MAC
- QSKIP("copyAvailable has never passed on Mac, task to fix is 132482", SkipAll);
+ QSKIP("copyAvailable has never passed on Mac, task to fix is 132482");
#endif
ed->clear();
QApplication::clipboard()->clear();
@@ -1194,7 +1194,7 @@ void tst_QPlainTextEdit::selectWordsFromStringsContainingSeparators()
void tst_QPlainTextEdit::canPaste()
{
if (!nativeClipboardWorking())
- QSKIP("Clipboard not working with cron-started unit tests", SkipAll);
+ QSKIP("Clipboard not working with cron-started unit tests");
QApplication::clipboard()->setText(QString());
QVERIFY(!ed->canPaste());
diff --git a/tests/auto/widgets/widgets/qpushbutton/tst_qpushbutton.cpp b/tests/auto/widgets/widgets/qpushbutton/tst_qpushbutton.cpp
index e5083553e2..c79d157880 100644
--- a/tests/auto/widgets/widgets/qpushbutton/tst_qpushbutton.cpp
+++ b/tests/auto/widgets/widgets/qpushbutton/tst_qpushbutton.cpp
@@ -580,8 +580,7 @@ void tst_QPushButton::sizeHint()
QStyle *style = QStyleFactory::create(stylename);
if (!style)
- QSKIP(qPrintable(QString::fromLatin1("Qt has been compiled without style: %1")
- .arg(stylename)), SkipSingle);
+ QSKIP(qPrintable(QString::fromLatin1("Qt has been compiled without style: %1").arg(stylename)));
QApplication::setStyle(style);
// Test 1
diff --git a/tests/auto/widgets/widgets/qscrollbar/tst_qscrollbar.cpp b/tests/auto/widgets/widgets/qscrollbar/tst_qscrollbar.cpp
index c4b64f3f1e..3bd5da4649 100644
--- a/tests/auto/widgets/widgets/qscrollbar/tst_qscrollbar.cpp
+++ b/tests/auto/widgets/widgets/qscrollbar/tst_qscrollbar.cpp
@@ -94,7 +94,7 @@ void tst_QScrollBar::scrollSingleStep()
QStyle::SC_ScrollBarAddLine, testWidget);
if (!sr.isValid())
- QSKIP("SC_ScrollBarAddLine not valid", SkipAll);
+ QSKIP("SC_ScrollBarAddLine not valid");
QTest::mouseClick(testWidget, Qt::LeftButton, Qt::NoModifier, QPoint(sr.x(), sr.y()));
QTest::qWait(510); // initial delay is 500 for setRepeatAction
diff --git a/tests/auto/widgets/widgets/qtabbar/tst_qtabbar.cpp b/tests/auto/widgets/widgets/qtabbar/tst_qtabbar.cpp
index a1a8f3b0aa..d43e17135a 100644
--- a/tests/auto/widgets/widgets/qtabbar/tst_qtabbar.cpp
+++ b/tests/auto/widgets/widgets/qtabbar/tst_qtabbar.cpp
@@ -283,7 +283,7 @@ void tst_QTabBar::setElideMode()
void tst_QTabBar::sizeHints()
{
QTabBar tabBar;
- QSKIP("To be fixed on Mac (font size below not large enough) and Linux QWS (probably too large for the screen).", SkipSingle);
+ QSKIP("To be fixed on Mac (font size below not large enough) and Linux QWS (probably too large for the screen).");
tabBar.setFont(QFont("Arial", 10));
tabBar.addTab("tab 01");
tabBar.addTab("tab 02");
diff --git a/tests/auto/widgets/widgets/qtabwidget/tst_qtabwidget.cpp b/tests/auto/widgets/widgets/qtabwidget/tst_qtabwidget.cpp
index 6d356dee9b..deaece337d 100644
--- a/tests/auto/widgets/widgets/qtabwidget/tst_qtabwidget.cpp
+++ b/tests/auto/widgets/widgets/qtabwidget/tst_qtabwidget.cpp
@@ -54,7 +54,7 @@
# include <qt_windows.h>
#define Q_CHECK_PAINTEVENTS \
if (::SwitchDesktop(::GetThreadDesktop(::GetCurrentThreadId())) == 0) \
- QSKIP("desktop is not visible, this test would fail", SkipSingle);
+ QSKIP("desktop is not visible, this test would fail");
#else
#define Q_CHECK_PAINTEVENTS
#endif
diff --git a/tests/auto/widgets/widgets/qtextedit/tst_qtextedit.cpp b/tests/auto/widgets/widgets/qtextedit/tst_qtextedit.cpp
index 481bda962a..66ded68a7f 100644
--- a/tests/auto/widgets/widgets/qtextedit/tst_qtextedit.cpp
+++ b/tests/auto/widgets/widgets/qtextedit/tst_qtextedit.cpp
@@ -495,7 +495,7 @@ void tst_QTextEdit::createSelection()
void tst_QTextEdit::clearMustNotChangeClipboard()
{
if (!nativeClipboardWorking())
- QSKIP("Clipboard not working with cron-started unit tests", SkipAll);
+ QSKIP("Clipboard not working with cron-started unit tests");
ed->textCursor().insertText("Hello World");
QString txt("This is different text");
QApplication::clipboard()->setText(txt);
@@ -570,7 +570,7 @@ void tst_QTextEdit::layoutingLoop()
void tst_QTextEdit::selectAllSetsNotSelection()
{
if (!QApplication::clipboard()->supportsSelection()) {
- QSKIP("Test only relevant for systems with selection", SkipAll);
+ QSKIP("Test only relevant for systems with selection");
return;
}
@@ -784,7 +784,7 @@ void tst_QTextEdit::setTextCursor()
void tst_QTextEdit::undoAvailableAfterPaste()
{
if (!nativeClipboardWorking())
- QSKIP("Clipboard not working with cron-started unit tests", SkipAll);
+ QSKIP("Clipboard not working with cron-started unit tests");
QSignalSpy spy(ed->document(), SIGNAL(undoAvailable(bool)));
@@ -1005,7 +1005,7 @@ void tst_QTextEdit::preserveCharFormatInAppend()
void tst_QTextEdit::copyAndSelectAllInReadonly()
{
if (!nativeClipboardWorking())
- QSKIP("Clipboard not working with cron-started unit tests", SkipAll);
+ QSKIP("Clipboard not working with cron-started unit tests");
ed->setReadOnly(true);
ed->setPlainText("Hello World");
@@ -1357,7 +1357,7 @@ void tst_QTextEdit::copyAvailable()
QFETCH(QString, function);
#ifdef Q_WS_MAC
- QSKIP("copyAvailable has never passed on Mac, task to fix is 132482", SkipAll);
+ QSKIP("copyAvailable has never passed on Mac, task to fix is 132482");
#endif
ed->clear();
QApplication::clipboard()->clear();
@@ -1551,7 +1551,7 @@ void tst_QTextEdit::selectWordsFromStringsContainingSeparators()
void tst_QTextEdit::canPaste()
{
if (!nativeClipboardWorking())
- QSKIP("Clipboard not working with cron-started unit tests", SkipAll);
+ QSKIP("Clipboard not working with cron-started unit tests");
QApplication::clipboard()->setText(QString());
QVERIFY(!ed->canPaste());
@@ -1853,7 +1853,7 @@ void tst_QTextEdit::copyPasteBackgroundImage()
{
#ifndef QT_NO_CLIPBOARD
if (!nativeClipboardWorking())
- QSKIP("Native clipboard not working in this setup", SkipAll);
+ QSKIP("Native clipboard not working in this setup");
QImage foo(16, 16, QImage::Format_ARGB32_Premultiplied);
foo.save("foo.png");
diff --git a/tests/auto/widgets/widgets/qworkspace/tst_qworkspace.cpp b/tests/auto/widgets/widgets/qworkspace/tst_qworkspace.cpp
index a996c38438..d93043c12b 100644
--- a/tests/auto/widgets/widgets/qworkspace/tst_qworkspace.cpp
+++ b/tests/auto/widgets/widgets/qworkspace/tst_qworkspace.cpp
@@ -369,7 +369,7 @@ void tst_QWorkspace::showWindows()
void tst_QWorkspace::changeWindowTitle()
{
#ifdef Q_OS_WINCE
- QSKIP( "Test fails on Windows CE due to QWorkspace state handling", SkipAll);
+ QSKIP( "Test fails on Windows CE due to QWorkspace state handling");
#endif
const QString mwc( "MainWindow's Caption" );
const QString mwc2( "MainWindow's New Caption" );
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-03 06:57:47 +0000