diff options
| author | Lars Schmertmann <Lars.Schmertmann@governikus.de> | 2020-06-27 14:18:09 +0200 |
|---|---|---|
| committer | Lars Schmertmann <Lars.Schmertmann@governikus.de> | 2020-07-07 11:51:48 +0200 |
| commit | 6ce2f3f26bf08b4c6952f492a3731eb4fe5a42bc (patch) | |
| tree | 727427eb4c603e74954d4da462484ea7bf5c65bb /tests/auto/corelib/tools | |
| parent | d9cc1499954829faf9486fb72056e29f1bad58e3 (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/corelib/tools')
| -rw-r--r-- | tests/auto/corelib/tools/collections/tst_collections.cpp | 10 | ||||
| -rw-r--r-- | tests/auto/corelib/tools/qarraydata/tst_qarraydata.cpp | 4 |
2 files changed, 7 insertions, 7 deletions
diff --git a/tests/auto/corelib/tools/collections/tst_collections.cpp b/tests/auto/corelib/tools/collections/tst_collections.cpp index 61a0db26de..23a734f428 100644 --- a/tests/auto/corelib/tools/collections/tst_collections.cpp +++ b/tests/auto/corelib/tools/collections/tst_collections.cpp @@ -2640,7 +2640,7 @@ void instantiateContainer() constIt = constContainer.end(); constIt = constContainer.cend(); container.constEnd(); - Q_UNUSED(constIt) + Q_UNUSED(constIt); container.clear(); container.contains(value); @@ -2663,7 +2663,7 @@ void instantiateMutableIterationContainer() typename ContainerType::iterator it; it = container.begin(); it = container.end(); - Q_UNUSED(it) + Q_UNUSED(it); } template <typename ContainerType, typename ValueType> @@ -2824,7 +2824,7 @@ void tst_Collections::qtimerList() template <typename Container> void testContainerTypedefs(Container container) { - Q_UNUSED(container) + Q_UNUSED(container); { QVERIFY_TYPE(typename Container::value_type); } { QVERIFY_TYPE(typename Container::iterator); } { QVERIFY_TYPE(typename Container::const_iterator); } @@ -2838,7 +2838,7 @@ void testContainerTypedefs(Container container) template <typename Container> void testPairAssociativeContainerTypedefs(Container container) { - Q_UNUSED(container) + Q_UNUSED(container); // TODO: Not sure how to define value_type for our associative containers // { QVERIFY_TYPE(typename Container::value_type); } @@ -2860,7 +2860,7 @@ void testPairAssociativeContainerTypedefs(Container container) template <typename Container> void testSetContainerTypedefs(Container container) { - Q_UNUSED(container) + Q_UNUSED(container); { QVERIFY_TYPE(typename Container::iterator); } { QVERIFY_TYPE(typename Container::const_iterator); } { QVERIFY_TYPE(typename Container::reference); } diff --git a/tests/auto/corelib/tools/qarraydata/tst_qarraydata.cpp b/tests/auto/corelib/tools/qarraydata/tst_qarraydata.cpp index c7f20ec6a4..ccba312807 100644 --- a/tests/auto/corelib/tools/qarraydata/tst_qarraydata.cpp +++ b/tests/auto/corelib/tools/qarraydata/tst_qarraydata.cpp @@ -736,7 +736,7 @@ size_t CountedObject::liveCount = 0; void tst_QArrayData::arrayOps() { - CountedObject::LeakChecker leakChecker; Q_UNUSED(leakChecker) + CountedObject::LeakChecker leakChecker; Q_UNUSED(leakChecker); const int intArray[5] = { 80, 101, 100, 114, 111 }; const QString stringArray[5] = { @@ -901,7 +901,7 @@ void tst_QArrayData::arrayOps() void tst_QArrayData::arrayOps2() { - CountedObject::LeakChecker leakChecker; Q_UNUSED(leakChecker) + CountedObject::LeakChecker leakChecker; Q_UNUSED(leakChecker); //////////////////////////////////////////////////////////////////////////// // appendInitialize |