summaryrefslogtreecommitdiffstats
path: root/tests/auto/gui
diff options
context:
space:
mode:
authorLars Schmertmann <Lars.Schmertmann@governikus.de>2020-06-27 14:18:09 +0200
committerLars Schmertmann <Lars.Schmertmann@governikus.de>2020-07-07 11:51:48 +0200
commit6ce2f3f26bf08b4c6952f492a3731eb4fe5a42bc (patch)
tree727427eb4c603e74954d4da462484ea7bf5c65bb /tests/auto/gui
parentd9cc1499954829faf9486fb72056e29f1bad58e3 (diff)
Add ; to Q_UNUSED
This is required to remove the ; from the macro with Qt 6. Task-number: QTBUG-82978 Change-Id: I3f0b6717956ca8fa486bed9817b89dfa19f5e0e1 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
Diffstat (limited to 'tests/auto/gui')
-rw-r--r--tests/auto/gui/kernel/qclipboard/tst_qclipboard.cpp6
-rw-r--r--tests/auto/gui/kernel/qkeysequence/tst_qkeysequence.cpp2
-rw-r--r--tests/auto/gui/qopengl/tst_qopengl.cpp2
-rw-r--r--tests/auto/gui/text/qtextdocument/tst_qtextdocument.cpp6
-rw-r--r--tests/auto/gui/text/qtextmarkdownimporter/tst_qtextmarkdownimporter.cpp2
5 files changed, 9 insertions, 9 deletions
diff --git a/tests/auto/gui/kernel/qclipboard/tst_qclipboard.cpp b/tests/auto/gui/kernel/qclipboard/tst_qclipboard.cpp
index e099b4dfc7..d6ce37438b 100644
--- a/tests/auto/gui/kernel/qclipboard/tst_qclipboard.cpp
+++ b/tests/auto/gui/kernel/qclipboard/tst_qclipboard.cpp
@@ -250,9 +250,9 @@ static bool runHelper(const QString &program, const QStringList &arguments, QByt
}
return true;
#else // QT_CONFIG(process)
- Q_UNUSED(program)
- Q_UNUSED(arguments)
- Q_UNUSED(errorMessage)
+ Q_UNUSED(program);
+ Q_UNUSED(arguments);
+ Q_UNUSED(errorMessage);
return false;
#endif // QT_CONFIG(process)
}
diff --git a/tests/auto/gui/kernel/qkeysequence/tst_qkeysequence.cpp b/tests/auto/gui/kernel/qkeysequence/tst_qkeysequence.cpp
index 874468c954..5a0702951e 100644
--- a/tests/auto/gui/kernel/qkeysequence/tst_qkeysequence.cpp
+++ b/tests/auto/gui/kernel/qkeysequence/tst_qkeysequence.cpp
@@ -423,7 +423,7 @@ void tst_QKeySequence::mnemonic()
QFETCH(bool, warning);
#ifdef QT_NO_DEBUG
- Q_UNUSED(warning)
+ Q_UNUSED(warning);
#else
if (warning) {
QString str = QString::fromLatin1("QKeySequence::mnemonic: \"%1\" contains multiple occurrences of '&'").arg(string);
diff --git a/tests/auto/gui/qopengl/tst_qopengl.cpp b/tests/auto/gui/qopengl/tst_qopengl.cpp
index caba2a1409..32c897e172 100644
--- a/tests/auto/gui/qopengl/tst_qopengl.cpp
+++ b/tests/auto/gui/qopengl/tst_qopengl.cpp
@@ -160,7 +160,7 @@ struct SharedResource : public QOpenGLSharedResource
void freeResource(QOpenGLContext *context)
{
Q_ASSERT(context == QOpenGLContext::currentContext());
- Q_UNUSED(context)
+ Q_UNUSED(context);
resource = 0;
if (tracker)
tracker->freeResourceCalls++;
diff --git a/tests/auto/gui/text/qtextdocument/tst_qtextdocument.cpp b/tests/auto/gui/text/qtextdocument/tst_qtextdocument.cpp
index 5d7f41efda..4e51ccea43 100644
--- a/tests/auto/gui/text/qtextdocument/tst_qtextdocument.cpp
+++ b/tests/auto/gui/text/qtextdocument/tst_qtextdocument.cpp
@@ -240,9 +240,9 @@ void tst_QTextDocument::writeActualAndExpected(const char *testTag, const QStrin
out.close();
}
#else
- Q_UNUSED(testTag)
- Q_UNUSED(actual)
- Q_UNUSED(expected)
+ Q_UNUSED(testTag);
+ Q_UNUSED(actual);
+ Q_UNUSED(expected);
#endif
}
diff --git a/tests/auto/gui/text/qtextmarkdownimporter/tst_qtextmarkdownimporter.cpp b/tests/auto/gui/text/qtextmarkdownimporter/tst_qtextmarkdownimporter.cpp
index 78cc1da36e..474b2def60 100644
--- a/tests/auto/gui/text/qtextmarkdownimporter/tst_qtextmarkdownimporter.cpp
+++ b/tests/auto/gui/text/qtextmarkdownimporter/tst_qtextmarkdownimporter.cpp
@@ -382,7 +382,7 @@ void tst_QTextMarkdownImporter::pathological() // avoid crashing on crazy input
QFile f(QFINDTESTDATA(filename));
QVERIFY(f.open(QFile::ReadOnly));
#ifdef QT_NO_DEBUG
- Q_UNUSED(warning)
+ Q_UNUSED(warning);
#else
if (!warning.isEmpty())
QTest::ignoreMessage(QtWarningMsg, warning.toLatin1());