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 --- tests/auto/gui/kernel/qclipboard/tst_qclipboard.cpp | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'tests/auto/gui/kernel/qclipboard/tst_qclipboard.cpp') diff --git a/tests/auto/gui/kernel/qclipboard/tst_qclipboard.cpp b/tests/auto/gui/kernel/qclipboard/tst_qclipboard.cpp index 88506e66a6..bdcfb00ba1 100644 --- a/tests/auto/gui/kernel/qclipboard/tst_qclipboard.cpp +++ b/tests/auto/gui/kernel/qclipboard/tst_qclipboard.cpp @@ -107,7 +107,7 @@ void tst_QClipboard::modes() QClipboard * const clipboard = QApplication::clipboard(); if (!nativeClipboardWorking()) - QSKIP("Native clipboard not working in this setup", SkipAll); + QSKIP("Native clipboard not working in this setup"); const QString defaultMode = "default mode text;"; clipboard->setText(defaultMode); @@ -137,7 +137,7 @@ void tst_QClipboard::testSignals() qRegisterMetaType("QClipboard::Mode"); if (!nativeClipboardWorking()) - QSKIP("Native clipboard not working in this setup", SkipAll); + QSKIP("Native clipboard not working in this setup"); QClipboard * const clipboard = QApplication::clipboard(); @@ -195,7 +195,7 @@ void tst_QClipboard::testSignals() void tst_QClipboard::copy_exit_paste() { if (!nativeClipboardWorking()) - QSKIP("Native clipboard not working in this setup", SkipAll); + QSKIP("Native clipboard not working in this setup"); const QStringList stringArgument = QStringList() << "Test string."; QCOMPARE(QProcess::execute("copier/copier", stringArgument), 0); #ifdef Q_WS_MAC @@ -209,7 +209,7 @@ void tst_QClipboard::copy_exit_paste() void tst_QClipboard::setMimeData() { if (!nativeClipboardWorking()) - QSKIP("Native clipboard not working in this setup", SkipAll); + QSKIP("Native clipboard not working in this setup"); QMimeData *mimeData = new QMimeData; const QString TestName(QLatin1String("tst_QClipboard::setMimeData() mimeData")); mimeData->setObjectName(TestName); @@ -299,7 +299,7 @@ void tst_QClipboard::clearBeforeSetText() QApplication::processEvents(); if (!nativeClipboardWorking()) - QSKIP("Native clipboard not working in this setup", SkipAll); + QSKIP("Native clipboard not working in this setup"); const QString text = "tst_QClipboard::clearBeforeSetText()"; -- cgit v1.2.3