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>

10 files changed, 18 insertions, 18 deletions

diff --git a/src/qml/common/qv4compileddata_p.h b/src/qml/common/qv4compileddata_p.h
index 152c70f107..8c4aa1b12e 100644
--- a/src/qml/common/qv4compileddata_p.h
+++ b/src/qml/common/qv4compileddata_p.h
@@ -1394,7 +1394,7 @@ public:
         errorString->clear();
         return true;
 #else
-        Q_UNUSED(outputFileName)
+        Q_UNUSED(outputFileName);
         *errorString = QStringLiteral("features.temporaryfile is disabled.");
         return false;
 #endif
diff --git a/src/qml/jit/qv4baselineassembler.cpp b/src/qml/jit/qv4baselineassembler.cpp
index dd6a40afe0..69670e1773 100644
--- a/src/qml/jit/qv4baselineassembler.cpp
+++ b/src/qml/jit/qv4baselineassembler.cpp
@@ -888,7 +888,7 @@ void BaselineAssembler::storeReg(int reg)
 void BaselineAssembler::loadLocal(int index, int level)
 {
     Heap::CallContext ctx;
-    Q_UNUSED(ctx)
+    Q_UNUSED(ctx);
     pasm()->loadPointerFromValue(regAddr(CallData::Context), PlatformAssembler::ScratchRegister);
     while (level) {
         pasm()->loadPtr(Address(PlatformAssembler::ScratchRegister, ctx.outer.offset), PlatformAssembler::ScratchRegister);
@@ -900,7 +900,7 @@ void BaselineAssembler::loadLocal(int index, int level)
 void BaselineAssembler::storeLocal(int index, int level)
 {
     Heap::CallContext ctx;
-    Q_UNUSED(ctx)
+    Q_UNUSED(ctx);
     pasm()->loadPtr(regAddr(CallData::Context), PlatformAssembler::ScratchRegister);
     while (level) {
         pasm()->loadPtr(Address(PlatformAssembler::ScratchRegister, ctx.outer.offset), PlatformAssembler::ScratchRegister);
@@ -1592,7 +1592,7 @@ void BaselineAssembler::pushCatchContext(int index, int name)
 void BaselineAssembler::popContext()
 {
     Heap::CallContext ctx;
-    Q_UNUSED(ctx)
+    Q_UNUSED(ctx);
     pasm()->loadPointerFromValue(regAddr(CallData::Context), PlatformAssembler::ScratchRegister);
     pasm()->loadPtr(Address(PlatformAssembler::ScratchRegister, ctx.outer.offset), PlatformAssembler::ScratchRegister);
     pasm()->storeHeapObject(PlatformAssembler::ScratchRegister, regAddr(CallData::Context));
diff --git a/src/qml/jsruntime/qv4qmlcontext.cpp b/src/qml/jsruntime/qv4qmlcontext.cpp
index 9863edead0..b6b268fc9b 100644
--- a/src/qml/jsruntime/qv4qmlcontext.cpp
+++ b/src/qml/jsruntime/qv4qmlcontext.cpp
@@ -501,7 +501,7 @@ ReturnedValue QQmlContextWrapper::resolveQmlContextPropertyLookupGetter(Lookup *
 
 ReturnedValue QQmlContextWrapper::lookupScript(Lookup *l, ExecutionEngine *engine, Value *base)
 {
-    Q_UNUSED(base)
+    Q_UNUSED(base);
     Scope scope(engine);
     Scoped<QmlContext> qmlContext(scope, engine->qmlContext());
     if (!qmlContext)
@@ -519,14 +519,14 @@ ReturnedValue QQmlContextWrapper::lookupScript(Lookup *l, ExecutionEngine *engin
 
 ReturnedValue QQmlContextWrapper::lookupSingleton(Lookup *l, ExecutionEngine *engine, Value *base)
 {
-    Q_UNUSED(engine)
-    Q_UNUSED(base)
+    Q_UNUSED(engine);
+    Q_UNUSED(base);
     return Value::fromHeapObject(l->qmlContextSingletonLookup.singleton).asReturnedValue();
 }
 
 ReturnedValue QQmlContextWrapper::lookupIdObject(Lookup *l, ExecutionEngine *engine, Value *base)
 {
-    Q_UNUSED(base)
+    Q_UNUSED(base);
     Scope scope(engine);
     Scoped<QmlContext> qmlContext(scope, engine->qmlContext());
     if (!qmlContext)
diff --git a/src/qml/jsruntime/qv4regexp.cpp b/src/qml/jsruntime/qv4regexp.cpp
index 76daead842..ea869f982f 100644
--- a/src/qml/jsruntime/qv4regexp.cpp
+++ b/src/qml/jsruntime/qv4regexp.cpp
@@ -224,7 +224,7 @@ void Heap::RegExp::init(ExecutionEngine *engine, const QString &pattern, uint fl
         JSC::Yarr::jitCompile(yarrPattern, JSC::Yarr::Char16, vm, *jitCode);
     }
 #else
-    Q_UNUSED(engine)
+    Q_UNUSED(engine);
 #endif
     if (hasValidJITCode()) {
         valid = true;
diff --git a/src/qml/jsruntime/qv4urlobject.cpp b/src/qml/jsruntime/qv4urlobject.cpp
index 73b1510d2e..7e52c63248 100644
--- a/src/qml/jsruntime/qv4urlobject.cpp
+++ b/src/qml/jsruntime/qv4urlobject.cpp
@@ -62,7 +62,7 @@ void Heap::UrlCtor::init(QV4::ExecutionContext *scope)
 
 void UrlPrototype::init(ExecutionEngine *engine, Object *ctor)
 {
-    Q_UNUSED(ctor)
+    Q_UNUSED(ctor);
 
     Scope scope(engine);
     ScopedObject o(scope);
@@ -721,7 +721,7 @@ void Heap::UrlSearchParamsCtor::init(QV4::ExecutionContext *scope)
 
 void UrlSearchParamsPrototype::init(ExecutionEngine *engine, Object *ctor)
 {
-    Q_UNUSED(ctor)
+    Q_UNUSED(ctor);
 
     Scope scope(engine);
     ScopedObject o(scope);
diff --git a/src/qml/qml/qqmlengine.cpp b/src/qml/qml/qqmlengine.cpp
index c810b26f39..27bc1fa6ba 100644
--- a/src/qml/qml/qqmlengine.cpp
+++ b/src/qml/qml/qqmlengine.cpp
@@ -2572,8 +2572,8 @@ bool QQml_isFileCaseCorrect(const QString &fileName, int lengthIn /* = -1 */)
             return false;
     }
 #else
-    Q_UNUSED(lengthIn)
-    Q_UNUSED(fileName)
+    Q_UNUSED(lengthIn);
+    Q_UNUSED(fileName);
 #endif
     return true;
 }
diff --git a/src/qml/qml/qqmlpropertydata_p.h b/src/qml/qml/qqmlpropertydata_p.h
index 517b865cbb..6f1e1b6e4e 100644
--- a/src/qml/qml/qqmlpropertydata_p.h
+++ b/src/qml/qml/qqmlpropertydata_p.h
@@ -428,7 +428,7 @@ private:
 
 bool QQmlPropertyData::operator==(const QQmlPropertyData &other) const
 {
-    Q_UNUSED(m_reserved)
+    Q_UNUSED(m_reserved);
     return flags() == other.flags() &&
             propType() == other.propType() &&
             coreIndex() == other.coreIndex() &&
diff --git a/src/qml/qml/qqmltype.cpp b/src/qml/qml/qqmltype.cpp
index 1d343b91cc..26c970bf60 100644
--- a/src/qml/qml/qqmltype.cpp
+++ b/src/qml/qml/qqmltype.cpp
@@ -792,7 +792,7 @@ int QQmlType::scopedEnumIndex(QQmlEnginePrivate *engine, const QString &name, bo
 
 int QQmlType::scopedEnumValue(QQmlEnginePrivate *engine, int index, const QV4::String *name, bool *ok) const
 {
-    Q_UNUSED(engine)
+    Q_UNUSED(engine);
     Q_ASSERT(ok);
     *ok = true;
 
@@ -809,7 +809,7 @@ int QQmlType::scopedEnumValue(QQmlEnginePrivate *engine, int index, const QV4::S
 
 int QQmlType::scopedEnumValue(QQmlEnginePrivate *engine, int index, const QString &name, bool *ok) const
 {
-    Q_UNUSED(engine)
+    Q_UNUSED(engine);
     Q_ASSERT(ok);
     *ok = true;
 
diff --git a/src/qml/util/qqmlpropertymap.cpp b/src/qml/util/qqmlpropertymap.cpp
index 82f048d9d9..4681cac864 100644
--- a/src/qml/util/qqmlpropertymap.cpp
+++ b/src/qml/util/qqmlpropertymap.cpp
@@ -337,7 +337,7 @@ QVariant QQmlPropertyMap::operator[](const QString &key) const
 */
 QVariant QQmlPropertyMap::updateValue(const QString &key, const QVariant &input)
 {
-    Q_UNUSED(key)
+    Q_UNUSED(key);
     return input;
 }
 
diff --git a/src/qml/util/qqmlpropertymap.h b/src/qml/util/qqmlpropertymap.h
index cb7ada3d79..d948989833 100644
--- a/src/qml/util/qqmlpropertymap.h
+++ b/src/qml/util/qqmlpropertymap.h
@@ -82,7 +82,7 @@ protected:
     QQmlPropertyMap(DerivedType *derived, QObject *parentObj)
         : QQmlPropertyMap(&DerivedType::staticMetaObject, parentObj)
     {
-        Q_UNUSED(derived)
+        Q_UNUSED(derived);
     }
 
 private: