summaryrefslogtreecommitdiff
path: root/tests/auto/quick
diff options
context:
space:
mode:
authorLars Schmertmann <Lars.Schmertmann@governikus.de>2020-06-26 14:43:02 +0200
committerLars Schmertmann <Lars.Schmertmann@governikus.de>2020-06-26 19:18:03 +0200
commite79281533d61dda90d1c5995345a66e6089c7501 (patch)
tree5033642cb0ae1d76aa0fc0525e153c04eefc921d /tests/auto/quick
parent6d8aca544ccb1e2624a679e2d65622461f643291 (diff)
downloadqtdeclarative-e79281533d61dda90d1c5995345a66e6089c7501.tar.gz
Add ; to Q_UNUSED and UNUSED_PARAM
This is required to remove the ; from the macro with Qt 6. Task-number: QTBUG-82978 Change-Id: Iead53d18fd790fb2d870d80ef2db79666f0d2392 Reviewed-by: Shawn Rutledge <shawn.rutledge@qt.io> Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
Diffstat (limited to 'tests/auto/quick')
-rw-r--r--tests/auto/quick/qquickborderimage/tst_qquickborderimage.cpp2
-rw-r--r--tests/auto/quick/qquickgridview/tst_qquickgridview.cpp2
-rw-r--r--tests/auto/quick/qquickimage/tst_qquickimage.cpp2
-rw-r--r--tests/auto/quick/qquickpixmapcache/tst_qquickpixmapcache.cpp2
-rw-r--r--tests/auto/quick/qquicktableview/testmodel.h4
-rw-r--r--tests/auto/quick/qquickwindow/tst_qquickwindow.cpp2
-rw-r--r--tests/auto/quick/shared/viewtestutil.cpp4
7 files changed, 9 insertions, 9 deletions
diff --git a/tests/auto/quick/qquickborderimage/tst_qquickborderimage.cpp b/tests/auto/quick/qquickborderimage/tst_qquickborderimage.cpp
index 504d476dfa..32b502c6dc 100644
--- a/tests/auto/quick/qquickborderimage/tst_qquickborderimage.cpp
+++ b/tests/auto/quick/qquickborderimage/tst_qquickborderimage.cpp
@@ -623,7 +623,7 @@ void tst_qquickborderimage::multiFrame()
QFETCH(QString, qmlfile);
QFETCH(bool, asynchronous);
- Q_UNUSED(asynchronous)
+ Q_UNUSED(asynchronous);
QQuickView view(testFileUrl(qmlfile));
QQuickBorderImage *image = qobject_cast<QQuickBorderImage*>(view.rootObject());
diff --git a/tests/auto/quick/qquickgridview/tst_qquickgridview.cpp b/tests/auto/quick/qquickgridview/tst_qquickgridview.cpp
index 44a01d7b3c..81b76cec25 100644
--- a/tests/auto/quick/qquickgridview/tst_qquickgridview.cpp
+++ b/tests/auto/quick/qquickgridview/tst_qquickgridview.cpp
@@ -301,7 +301,7 @@ private:
}
void releaseView(QQuickView *view) {
Q_ASSERT(view == m_view);
- Q_UNUSED(view)
+ Q_UNUSED(view);
m_view->setSource(QUrl());
}
#else
diff --git a/tests/auto/quick/qquickimage/tst_qquickimage.cpp b/tests/auto/quick/qquickimage/tst_qquickimage.cpp
index 4c9381d296..f5b0fd7d62 100644
--- a/tests/auto/quick/qquickimage/tst_qquickimage.cpp
+++ b/tests/auto/quick/qquickimage/tst_qquickimage.cpp
@@ -1222,7 +1222,7 @@ void tst_qquickimage::multiFrame()
QFETCH(QString, qmlfile);
QFETCH(bool, asynchronous);
- Q_UNUSED(asynchronous)
+ Q_UNUSED(asynchronous);
QQuickView view(testFileUrl(qmlfile));
QQuickImage *image = qobject_cast<QQuickImage*>(view.rootObject());
diff --git a/tests/auto/quick/qquickpixmapcache/tst_qquickpixmapcache.cpp b/tests/auto/quick/qquickpixmapcache/tst_qquickpixmapcache.cpp
index 8ebbd0d59b..37fa286103 100644
--- a/tests/auto/quick/qquickpixmapcache/tst_qquickpixmapcache.cpp
+++ b/tests/auto/quick/qquickpixmapcache/tst_qquickpixmapcache.cpp
@@ -341,7 +341,7 @@ public:
: QQuickImageProvider(Pixmap) {}
virtual QPixmap requestPixmap(const QString &d, QSize *, const QSize &) {
- Q_UNUSED(d)
+ Q_UNUSED(d);
QPixmap pix(800, 600);
pix.fill(fillColor);
return pix;
diff --git a/tests/auto/quick/qquicktableview/testmodel.h b/tests/auto/quick/qquicktableview/testmodel.h
index 2697b1e801..3db32938be 100644
--- a/tests/auto/quick/qquicktableview/testmodel.h
+++ b/tests/auto/quick/qquicktableview/testmodel.h
@@ -150,7 +150,7 @@ public:
bool canFetchMore(const QModelIndex &parent) const override
{
- Q_UNUSED(parent)
+ Q_UNUSED(parent);
return m_dataCanBeFetched;
}
@@ -167,7 +167,7 @@ public:
void fetchMore(const QModelIndex &parent) override
{
- Q_UNUSED(parent)
+ Q_UNUSED(parent);
addRow(m_rows - 1);
}
diff --git a/tests/auto/quick/qquickwindow/tst_qquickwindow.cpp b/tests/auto/quick/qquickwindow/tst_qquickwindow.cpp
index 39cb911647..ecb2b7a4a9 100644
--- a/tests/auto/quick/qquickwindow/tst_qquickwindow.cpp
+++ b/tests/auto/quick/qquickwindow/tst_qquickwindow.cpp
@@ -2774,7 +2774,7 @@ public:
bool childMouseEventFilter(QQuickItem *item, QEvent *event) override
{
- Q_UNUSED(item)
+ Q_UNUSED(item);
if (event->type() == QEvent::MouseButtonPress && !contains(static_cast<QMouseEvent*>(event)->position().toPoint())) {
// This is an evil hack: in case of items that are not rectangles, we never accept the event.
// Instead the events are now delivered to QDeclarativeGeoMapItemBase which doesn't to anything with them.
diff --git a/tests/auto/quick/shared/viewtestutil.cpp b/tests/auto/quick/shared/viewtestutil.cpp
index 67b73f047c..b17ebebde0 100644
--- a/tests/auto/quick/shared/viewtestutil.cpp
+++ b/tests/auto/quick/shared/viewtestutil.cpp
@@ -66,7 +66,7 @@ void QQuickViewTestUtil::moveMouseAway(QQuickView *window)
#if QT_CONFIG(cursor) // Get the cursor out of the way.
QCursor::setPos(window->geometry().topRight() + QPoint(100, 100));
#else
- Q_UNUSED(window)
+ Q_UNUSED(window);
#endif
}
@@ -489,7 +489,7 @@ namespace QQuickTest {
if (moveMouseOut)
QCursor::setPos(v.geometry().topRight() + QPoint(100, 100));
#else
- Q_UNUSED(moveMouseOut)
+ Q_UNUSED(moveMouseOut);
#endif
return true;
}