From 27f9f136f7e39b5d612bc02f7ff8778ab424c07d Mon Sep 17 00:00:00 2001 From: Jason McDonald Date: Wed, 19 Oct 2011 12:53:13 +1000 Subject: 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 --- .../widgets/dialogs/qabstractprintdialog/tst_qabstractprintdialog.cpp | 2 +- tests/auto/widgets/dialogs/qdialog/tst_qdialog.cpp | 3 +-- tests/auto/widgets/dialogs/qfiledialog2/tst_qfiledialog2.cpp | 2 +- tests/auto/widgets/dialogs/qfilesystemmodel/tst_qfilesystemmodel.cpp | 4 ++-- tests/auto/widgets/dialogs/qwizard/tst_qwizard.cpp | 4 ++-- 5 files changed, 7 insertions(+), 8 deletions(-) (limited to 'tests/auto/widgets/dialogs') diff --git a/tests/auto/widgets/dialogs/qabstractprintdialog/tst_qabstractprintdialog.cpp b/tests/auto/widgets/dialogs/qabstractprintdialog/tst_qabstractprintdialog.cpp index 5d6165d174..5973dabb99 100644 --- a/tests/auto/widgets/dialogs/qabstractprintdialog/tst_qabstractprintdialog.cpp +++ b/tests/auto/widgets/dialogs/qabstractprintdialog/tst_qabstractprintdialog.cpp @@ -68,7 +68,7 @@ private slots: #if defined(QT_NO_PRINTER) || defined(QT_NO_PRINTDIALOG) void tst_QAbstractPrintDialog::initTestCase() { - QSKIP("This test requires printing and print dialog support", SkipAll); + QSKIP("This test requires printing and print dialog support"); } #else diff --git a/tests/auto/widgets/dialogs/qdialog/tst_qdialog.cpp b/tests/auto/widgets/dialogs/qdialog/tst_qdialog.cpp index 0f4acdcc9e..78458d4531 100644 --- a/tests/auto/widgets/dialogs/qdialog/tst_qdialog.cpp +++ b/tests/auto/widgets/dialogs/qdialog/tst_qdialog.cpp @@ -458,8 +458,7 @@ void tst_QDialog::throwInExec() qPrintable(QString( "Throwing exceptions in exec() won't work if %1 event dispatcher is used.\n" "Try running with QT_NO_GLIB=1 in environment." - ).arg(QString::fromLatin1(dispatcher))), - SkipAll + ).arg(QString::fromLatin1(dispatcher))) ); } #endif diff --git a/tests/auto/widgets/dialogs/qfiledialog2/tst_qfiledialog2.cpp b/tests/auto/widgets/dialogs/qfiledialog2/tst_qfiledialog2.cpp index a2d18eb847..056d748c93 100644 --- a/tests/auto/widgets/dialogs/qfiledialog2/tst_qfiledialog2.cpp +++ b/tests/auto/widgets/dialogs/qfiledialog2/tst_qfiledialog2.cpp @@ -565,7 +565,7 @@ void tst_QFileDialog2::completionOnLevelAfterRoot() fd.setDirectory("/"); QDir etc("/etc"); if (!etc.exists()) - QSKIP("This test requires to have an etc directory under /", SkipAll); + QSKIP("This test requires to have an etc directory under /"); #endif fd.show(); QLineEdit *edit = qFindChild(&fd, "fileNameEdit"); diff --git a/tests/auto/widgets/dialogs/qfilesystemmodel/tst_qfilesystemmodel.cpp b/tests/auto/widgets/dialogs/qfilesystemmodel/tst_qfilesystemmodel.cpp index 26fa58e649..9c587ea1f5 100644 --- a/tests/auto/widgets/dialogs/qfilesystemmodel/tst_qfilesystemmodel.cpp +++ b/tests/auto/widgets/dialogs/qfilesystemmodel/tst_qfilesystemmodel.cpp @@ -450,7 +450,7 @@ void tst_QFileSystemModel::rowsInserted_data() void tst_QFileSystemModel::rowsInserted() { #if defined(Q_OS_WINCE) - QSKIP("Watching directories does not work on CE(see #137910)", SkipAll); + QSKIP("Watching directories does not work on CE(see #137910)"); #endif QString tmp = flatDirTestPath; rowCount(); @@ -505,7 +505,7 @@ void tst_QFileSystemModel::rowsRemoved_data() void tst_QFileSystemModel::rowsRemoved() { #if defined(Q_OS_WINCE) - QSKIP("Watching directories does not work on CE(see #137910)", SkipAll); + QSKIP("Watching directories does not work on CE(see #137910)"); #endif QString tmp = flatDirTestPath; rowCount(); diff --git a/tests/auto/widgets/dialogs/qwizard/tst_qwizard.cpp b/tests/auto/widgets/dialogs/qwizard/tst_qwizard.cpp index 2e05eb5bab..107ddd53aa 100644 --- a/tests/auto/widgets/dialogs/qwizard/tst_qwizard.cpp +++ b/tests/auto/widgets/dialogs/qwizard/tst_qwizard.cpp @@ -989,7 +989,7 @@ void tst_QWizard::setOption_IndependentPages() void tst_QWizard::setOption_IgnoreSubTitles() { #if defined(Q_OS_WINCE) - QSKIP("Skipped because of limited resources and potential crash. (Task: 166824)", SkipAll); + QSKIP("Skipped because of limited resources and potential crash. (Task: 166824)"); #endif QWizard wizard1; wizard1.setButtonLayout(QList() << QWizard::CancelButton); @@ -1087,7 +1087,7 @@ void tst_QWizard::setOption_IgnoreSubTitles() void tst_QWizard::setOption_ExtendedWatermarkPixmap() { #if defined(Q_OS_WINCE) - QSKIP("Skipped because of limited resources and potential crash. (Task: 166824)", SkipAll); + QSKIP("Skipped because of limited resources and potential crash. (Task: 166824)"); #endif QPixmap watermarkPixmap(200, 400); watermarkPixmap.fill(Qt::black); -- cgit v1.2.3