Avoid warning on empty expressions

For some reason, Q_UNUSED includes already a semicolon, adding one on the user side creates an additional empty statement. Change-Id: I9c5e8fac381345a60792cb75e2938fd53958d3b0 Reviewed-by: Christian Stenger <christian.stenger@qt.io>
author: hjk <hjk@qt.io> 2019-07-23 10:58:00 +0200
committer: hjk <hjk@qt.io> 2019-07-23 11:55:59 +0000
commit: 251287f0d35dd82e68dabed8214ef8af893aff91 (patch)
tree: a3ba843c1c23f4aea06bc01bf7ab0dd69d6fc741
parent: 2b26eca80f9ebcdc2f1dc0d890a39a4fbc2d129c (diff)
283 files changed, 781 insertions, 781 deletions
diff --git a/share/qtcreator/qml/qmlpuppet/qmlprivategate/metaobject.cpp b/share/qtcreator/qml/qmlpuppet/qmlprivategate/metaobject.cpp
index 08caa70368..86049c9654 100644
--- a/share/qtcreator/qml/qmlpuppet/qmlprivategate/metaobject.cpp
+++ b/share/qtcreator/qml/qmlpuppet/qmlprivategate/metaobject.cpp
@@ -183,7 +183,7 @@ void MetaObject::createNewDynamicProperty(const QString &name)
     copyTypeMetaObject();
     setValue(id, QVariant());
     Q_ASSERT(id >= 0);
-    Q_UNUSED(id);
+    Q_UNUSED(id)
 
     //Updating cache
     QQmlPropertyCache *oldParent = m_cache->parent();
diff --git a/src/libs/cplusplus/ResolveExpression.cpp b/src/libs/cplusplus/ResolveExpression.cpp
index 034ea6fcc1..a513a02693 100644
--- a/src/libs/cplusplus/ResolveExpression.cpp
+++ b/src/libs/cplusplus/ResolveExpression.cpp
@@ -963,8 +963,8 @@ bool ResolveExpression::visit(ArrayAccessAST *ast)
 
 QList<LookupItem> ResolveExpression::getMembers(ClassOrNamespace *binding, const Name *memberName) const
 {
-    Q_UNUSED(binding);
-    Q_UNUSED(memberName);
+    Q_UNUSED(binding)
+    Q_UNUSED(memberName)
 
     // ### port me
     QList<LookupItem> members;
diff --git a/src/libs/cplusplus/cppmodelmanagerbase.cpp b/src/libs/cplusplus/cppmodelmanagerbase.cpp
index 19703e4fd9..28b4100777 100644
--- a/src/libs/cplusplus/cppmodelmanagerbase.cpp
+++ b/src/libs/cplusplus/cppmodelmanagerbase.cpp
@@ -58,9 +58,9 @@ bool CppModelManagerBase::trySetExtraDiagnostics(const QString &fileName, const
 bool CppModelManagerBase::setExtraDiagnostics(const QString &fileName, const QString &kind,
                                               const QList<CPlusPlus::Document::DiagnosticMessage> &diagnostics)
 {
-    Q_UNUSED(fileName);
-    Q_UNUSED(kind);
-    Q_UNUSED(diagnostics);
+    Q_UNUSED(fileName)
+    Q_UNUSED(kind)
+    Q_UNUSED(diagnostics)
     return false;
 }
 
diff --git a/src/libs/glsl/glslsemantic.cpp b/src/libs/glsl/glslsemantic.cpp
index ae03ca148a..0b4643cfe8 100644
--- a/src/libs/glsl/glslsemantic.cpp
+++ b/src/libs/glsl/glslsemantic.cpp
@@ -156,21 +156,21 @@ void Semantic::parameterDeclaration(ParameterDeclarationAST *ast, Function *fun)
 
 bool Semantic::visit(TranslationUnitAST *ast)
 {
-    Q_UNUSED(ast);
+    Q_UNUSED(ast)
     Q_ASSERT(!"unreachable");
     return false;
 }
 
 bool Semantic::visit(FunctionIdentifierAST *ast)
 {
-    Q_UNUSED(ast);
+    Q_UNUSED(ast)
     Q_ASSERT(!"unreachable");
     return false;
 }
 
 bool Semantic::visit(StructTypeAST::Field *ast)
 {
-    Q_UNUSED(ast);
+    Q_UNUSED(ast)
     Q_ASSERT(!"unreachable");
     return false;
 }
@@ -413,7 +413,7 @@ bool Semantic::visit(FunctionCallExpressionAST *ast)
 bool Semantic::visit(DeclarationExpressionAST *ast)
 {
     const Type *ty = type(ast->type);
-    Q_UNUSED(ty);
+    Q_UNUSED(ty)
     // ast->name
     ExprResult initializer = expression(ast->initializer);
     return false;
@@ -473,7 +473,7 @@ bool Semantic::visit(ForStatementAST *ast)
 
 bool Semantic::visit(JumpStatementAST *ast)
 {
-    Q_UNUSED(ast);
+    Q_UNUSED(ast)
     return false;
 }
 
@@ -750,7 +750,7 @@ bool Semantic::visit(NamedTypeAST *ast)
 bool Semantic::visit(ArrayTypeAST *ast)
 {
     const Type *elementType = type(ast->elementType);
-    Q_UNUSED(elementType);
+    Q_UNUSED(elementType)
     ExprResult size = expression(ast->size);
     _type = _engine->arrayType(elementType); // ### ignore the size for now
     return false;
@@ -780,7 +780,7 @@ bool Semantic::visit(QualifiedTypeAST *ast)
         LayoutQualifierAST *q = it->value;
         // q->name;
         // q->number;
-        Q_UNUSED(q);
+        Q_UNUSED(q)
     }
     return false;
 }
@@ -790,13 +790,13 @@ bool Semantic::visit(QualifiedTypeAST *ast)
 bool Semantic::visit(PrecisionDeclarationAST *ast)
 {
     const Type *ty = type(ast->type);
-    Q_UNUSED(ty);
+    Q_UNUSED(ty)
     return false;
 }
 
 bool Semantic::visit(ParameterDeclarationAST *ast)
 {
-    Q_UNUSED(ast);
+    Q_UNUSED(ast)
     Q_ASSERT(!"unreachable");
     return false;
 }
@@ -822,7 +822,7 @@ bool Semantic::visit(VariableDeclarationAST *ast)
 bool Semantic::visit(TypeDeclarationAST *ast)
 {
     const Type *ty = type(ast->type);
-    Q_UNUSED(ty);
+    Q_UNUSED(ty)
     return false;
 }
 
@@ -835,7 +835,7 @@ bool Semantic::visit(TypeAndVariableDeclarationAST *ast)
 
 bool Semantic::visit(InvariantDeclarationAST *ast)
 {
-    Q_UNUSED(ast);
+    Q_UNUSED(ast)
     return false;
 }
 
diff --git a/src/libs/glsl/glsltypes.cpp b/src/libs/glsl/glsltypes.cpp
index 6bd4cd4552..50081dd1e9 100644
--- a/src/libs/glsl/glsltypes.cpp
+++ b/src/libs/glsl/glsltypes.cpp
@@ -39,7 +39,7 @@ bool UndefinedType::isEqualTo(const Type *other) const
 
 bool UndefinedType::isLessThan(const Type *other) const
 {
-    Q_UNUSED(other);
+    Q_UNUSED(other)
     Q_ASSERT(other != 0);
     Q_ASSERT(other->asUndefinedType() != 0);
     return false;
@@ -54,7 +54,7 @@ bool VoidType::isEqualTo(const Type *other) const
 
 bool VoidType::isLessThan(const Type *other) const
 {
-    Q_UNUSED(other);
+    Q_UNUSED(other)
     Q_ASSERT(other != 0);
     Q_ASSERT(other->asVoidType() != 0);
     return false;
@@ -69,7 +69,7 @@ bool BoolType::isEqualTo(const Type *other) const
 
 bool BoolType::isLessThan(const Type *other) const
 {
-    Q_UNUSED(other);
+    Q_UNUSED(other)
     Q_ASSERT(other != 0);
     Q_ASSERT(other->asBoolType() != 0);
     return false;
@@ -84,7 +84,7 @@ bool IntType::isEqualTo(const Type *other) const
 
 bool IntType::isLessThan(const Type *other) const
 {
-    Q_UNUSED(other);
+    Q_UNUSED(other)
     Q_ASSERT(other != 0);
     Q_ASSERT(other->asIntType() != 0);
     return false;
@@ -99,7 +99,7 @@ bool UIntType::isEqualTo(const Type *other) const
 
 bool UIntType::isLessThan(const Type *other) const
 {
-    Q_UNUSED(other);
+    Q_UNUSED(other)
     Q_ASSERT(other != 0);
     Q_ASSERT(other->asUIntType() != 0);
     return false;
@@ -114,7 +114,7 @@ bool FloatType::isEqualTo(const Type *other) const
 
 bool FloatType::isLessThan(const Type *other) const
 {
-    Q_UNUSED(other);
+    Q_UNUSED(other)
     Q_ASSERT(other != 0);
     Q_ASSERT(other->asFloatType() != 0);
     return false;
@@ -129,7 +129,7 @@ bool DoubleType::isEqualTo(const Type *other) const
 
 bool DoubleType::isLessThan(const Type *other) const
 {
-    Q_UNUSED(other);
+    Q_UNUSED(other)
     Q_ASSERT(other != 0);
     Q_ASSERT(other->asDoubleType() != 0);
     return false;
@@ -353,13 +353,13 @@ Symbol *Struct::find(const QString &name) const
 
 bool Struct::isEqualTo(const Type *other) const
 {
-    Q_UNUSED(other);
+    Q_UNUSED(other)
     return false;
 }
 
 bool Struct::isLessThan(const Type *other) const
 {
-    Q_UNUSED(other);
+    Q_UNUSED(other)
     return false;
 }
 
@@ -420,13 +420,13 @@ Argument *Function::argumentAt(int index) const
 
 bool Function::isEqualTo(const Type *other) const
 {
-    Q_UNUSED(other);
+    Q_UNUSED(other)
     return false;
 }
 
 bool Function::isLessThan(const Type *other) const
 {
-    Q_UNUSED(other);
+    Q_UNUSED(other)
     return false;
 }
 
@@ -506,12 +506,12 @@ void OverloadSet::add(Symbol *symbol)
 
 bool OverloadSet::isEqualTo(const Type *other) const
 {
-    Q_UNUSED(other);
+    Q_UNUSED(other)
     return false;
 }
 
 bool OverloadSet::isLessThan(const Type *other) const
 {
-    Q_UNUSED(other);
+    Q_UNUSED(other)
     return false;
 }
diff --git a/src/libs/modelinglib/qmt/config/textscanner.cpp b/src/libs/modelinglib/qmt/config/textscanner.cpp
index d9652e346c..23173789c5 100644
--- a/src/libs/modelinglib/qmt/config/textscanner.cpp
+++ b/src/libs/modelinglib/qmt/config/textscanner.cpp
@@ -296,7 +296,7 @@ Token TextScanner::scanOperator(const SourceChar &firstChar)
                 unreadChar(extraChars.pop());
             }
             QMT_CHECK(haveOperator);
-            Q_UNUSED(haveOperator); // avoid warning in release mode
+            Q_UNUSED(haveOperator) // avoid warning in release mode
             return Token(Token::TokenOperator, subtype, op, firstChar.pos);
         }
         text += sourceChar.ch;
diff --git a/src/libs/modelinglib/qmt/controller/undocommand.cpp b/src/libs/modelinglib/qmt/controller/undocommand.cpp
index 40348d3f86..130f201e03 100644
--- a/src/libs/modelinglib/qmt/controller/undocommand.cpp
+++ b/src/libs/modelinglib/qmt/controller/undocommand.cpp
@@ -58,7 +58,7 @@ bool UndoCommand::mergeWith(const QUndoCommand *other)
 
 bool UndoCommand::mergeWith(const UndoCommand *other)
 {
-    Q_UNUSED(other);
+    Q_UNUSED(other)
 
     return false;
 }
diff --git a/src/libs/modelinglib/qmt/diagram_controller/dclonevisitor.cpp b/src/libs/modelinglib/qmt/diagram_controller/dclonevisitor.cpp
index d882c81eef..805e96eafd 100644
--- a/src/libs/modelinglib/qmt/diagram_controller/dclonevisitor.cpp
+++ b/src/libs/modelinglib/qmt/diagram_controller/dclonevisitor.cpp
@@ -50,7 +50,7 @@ DCloneVisitor::DCloneVisitor()
 
 void DCloneVisitor::visitDElement(const DElement *element)
 {
-    Q_UNUSED(element);
+    Q_UNUSED(element)
     QMT_CHECK(m_cloned);
 }
 
@@ -158,7 +158,7 @@ DCloneDeepVisitor::DCloneDeepVisitor()
 
 void DCloneDeepVisitor::visitDElement(const DElement *element)
 {
-    Q_UNUSED(element);
+    Q_UNUSED(element)
     QMT_CHECK(m_cloned);
 }
 
diff --git a/src/libs/modelinglib/qmt/diagram_controller/dfactory.cpp b/src/libs/modelinglib/qmt/diagram_controller/dfactory.cpp
index e87fb8ce5e..1d6a770b77 100644
--- a/src/libs/modelinglib/qmt/diagram_controller/dfactory.cpp
+++ b/src/libs/modelinglib/qmt/diagram_controller/dfactory.cpp
@@ -59,7 +59,7 @@ DFactory::DFactory()
 
 void DFactory::visitMElement(const MElement *element)
 {
-    Q_UNUSED(element);
+    Q_UNUSED(element)
     QMT_CHECK(m_product);
 }
 
diff --git a/src/libs/modelinglib/qmt/diagram_controller/dflatassignmentvisitor.cpp b/src/libs/modelinglib/qmt/diagram_controller/dflatassignmentvisitor.cpp
index 20531bb85c..baf7adea65 100644
--- a/src/libs/modelinglib/qmt/diagram_controller/dflatassignmentvisitor.cpp
+++ b/src/libs/modelinglib/qmt/diagram_controller/dflatassignmentvisitor.cpp
@@ -54,7 +54,7 @@ DFlatAssignmentVisitor::DFlatAssignmentVisitor(DElement *target)
 
 void DFlatAssignmentVisitor::visitDElement(const DElement *element)
 {
-    Q_UNUSED(element);
+    Q_UNUSED(element)
 }
 
 void DFlatAssignmentVisitor::visitDObject(const DObject *object)
diff --git a/src/libs/modelinglib/qmt/diagram_controller/diagramcontroller.cpp b/src/libs/modelinglib/qmt/diagram_controller/diagramcontroller.cpp
index aa8ad153b1..f7d7e702e5 100644
--- a/src/libs/modelinglib/qmt/diagram_controller/diagramcontroller.cpp
+++ b/src/libs/modelinglib/qmt/diagram_controller/diagramcontroller.cpp
@@ -576,8 +576,8 @@ void DiagramController::onEndResetModel()
 
 void DiagramController::onBeginUpdateObject(int row, const MObject *parent)
 {
-    Q_UNUSED(row);
-    Q_UNUSED(parent);
+    Q_UNUSED(row)
+    Q_UNUSED(parent)
 
     // nothing to do
 }
@@ -608,8 +608,8 @@ void DiagramController::onEndUpdateObject(int row, const MObject *parent)
 
 void DiagramController::onBeginInsertObject(int row, const MObject *owner)
 {
-    Q_UNUSED(row);
-    Q_UNUSED(owner);
+    Q_UNUSED(row)
+    Q_UNUSED(owner)
 }
 
 void DiagramController::onEndInsertObject(int row, const MObject *owner)
@@ -634,14 +634,14 @@ void DiagramController::onBeginRemoveObject(int row, const MObject *parent)
 
 void DiagramController::onEndRemoveObject(int row, const MObject *parent)
 {
-    Q_UNUSED(row);
-    Q_UNUSED(parent);
+    Q_UNUSED(row)
+    Q_UNUSED(parent)
 }
 
 void DiagramController::onBeginMoveObject(int formerRow, const MObject *formerOwner)
 {
-    Q_UNUSED(formerRow);
-    Q_UNUSED(formerOwner);
+    Q_UNUSED(formerRow)
+    Q_UNUSED(formerOwner)
 }
 
 void DiagramController::onEndMoveObject(int row, const MObject *owner)
@@ -663,8 +663,8 @@ void DiagramController::onEndMoveObject(int row, const MObject *owner)
 
 void DiagramController::onBeginUpdateRelation(int row, const MObject *owner)
 {
-    Q_UNUSED(row);
-    Q_UNUSED(owner);
+    Q_UNUSED(row)
+    Q_UNUSED(owner)
 
     // nothing to do
 }
@@ -691,14 +691,14 @@ void DiagramController::onBeginRemoveRelation(int row, const MObject *owner)
 
 void DiagramController::onEndRemoveRelation(int row, const MObject *owner)
 {
-    Q_UNUSED(row);
-    Q_UNUSED(owner);
+    Q_UNUSED(row)
+    Q_UNUSED(owner)
 }
 
 void DiagramController::onBeginMoveRelation(int formerRow, const MObject *formerOwner)
 {
-    Q_UNUSED(formerRow);
-    Q_UNUSED(formerOwner);
+    Q_UNUSED(formerRow)
+    Q_UNUSED(formerOwner)
 
     // nothing to do
 }
diff --git a/src/libs/modelinglib/qmt/diagram_controller/dupdatevisitor.cpp b/src/libs/modelinglib/qmt/diagram_controller/dupdatevisitor.cpp
index 6b3695f1ba..cc1ffa681a 100644
--- a/src/libs/modelinglib/qmt/diagram_controller/dupdatevisitor.cpp
+++ b/src/libs/modelinglib/qmt/diagram_controller/dupdatevisitor.cpp
@@ -65,7 +65,7 @@ void DUpdateVisitor::setCheckNeedsUpdate(bool checkNeedsUpdate)
 
 void DUpdateVisitor::visitMElement(const MElement *element)
 {
-    Q_UNUSED(element);
+    Q_UNUSED(element)
 
     QMT_CHECK(m_target);
 }
diff --git a/src/libs/modelinglib/qmt/diagram_controller/dvoidvisitor.cpp b/src/libs/modelinglib/qmt/diagram_controller/dvoidvisitor.cpp
index 56fdfe2cb4..f182eb993d 100644
--- a/src/libs/modelinglib/qmt/diagram_controller/dvoidvisitor.cpp
+++ b/src/libs/modelinglib/qmt/diagram_controller/dvoidvisitor.cpp
@@ -49,7 +49,7 @@ DVoidVisitor::DVoidVisitor()
 
 void DVoidVisitor::visitDElement(DElement *element)
 {
-    Q_UNUSED(element);
+    Q_UNUSED(element)
 }
 
 void DVoidVisitor::visitDObject(DObject *object)
@@ -128,7 +128,7 @@ DConstVoidVisitor::DConstVoidVisitor()
 
 void DConstVoidVisitor::visitDElement(const DElement *element)
 {
-    Q_UNUSED(element);
+    Q_UNUSED(element)
 }
 
 void DConstVoidVisitor::visitDObject(const DObject *object)
diff --git a/src/libs/modelinglib/qmt/diagram_scene/diagramscenemodel.cpp b/src/libs/modelinglib/qmt/diagram_scene/diagramscenemodel.cpp
index 3587fc366b..182c251b5d 100644
--- a/src/libs/modelinglib/qmt/diagram_scene/diagramscenemodel.cpp
+++ b/src/libs/modelinglib/qmt/diagram_scene/diagramscenemodel.cpp
@@ -85,8 +85,8 @@ public:
 
     void paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget)
     {
-        Q_UNUSED(option);
-        Q_UNUSED(widget);
+        Q_UNUSED(option)
+        Q_UNUSED(widget)
 
         QPen pen(QBrush(Qt::gray), 1.0, Qt::DotLine);
         painter->setPen(pen);
@@ -539,7 +539,7 @@ void DiagramSceneModel::selectItem(QGraphicsItem *item, bool multiSelect)
 
 void DiagramSceneModel::moveSelectedItems(QGraphicsItem *grabbedItem, const QPointF &delta)
 {
-    Q_UNUSED(grabbedItem);
+    Q_UNUSED(grabbedItem)
 
     if (delta != QPointF(0.0, 0.0)) {
         foreach (QGraphicsItem *item, m_selectedItems) {
@@ -754,8 +754,8 @@ void DiagramSceneModel::onEndResetDiagram(const MDiagram *diagram)
 
 void DiagramSceneModel::onBeginUpdateElement(int row, const MDiagram *diagram)
 {
-    Q_UNUSED(row);
-    Q_UNUSED(diagram);
+    Q_UNUSED(row)
+    Q_UNUSED(diagram)
     QMT_CHECK(m_busyState == NotBusy);
     m_busyState = UpdateElement;
 
@@ -775,8 +775,8 @@ void DiagramSceneModel::onEndUpdateElement(int row, const MDiagram *diagram)
 
 void DiagramSceneModel::onBeginInsertElement(int row, const MDiagram *diagram)
 {
-    Q_UNUSED(row);
-    Q_UNUSED(diagram);
+    Q_UNUSED(row)
+    Q_UNUSED(diagram)
     QMT_CHECK(m_busyState == NotBusy);
     m_busyState = InsertElement;
 }
@@ -825,8 +825,8 @@ void DiagramSceneModel::onBeginRemoveElement(int row, const MDiagram *diagram)
 
 void DiagramSceneModel::onEndRemoveElement(int row, const MDiagram *diagram)
 {
-    Q_UNUSED(row);
-    Q_UNUSED(diagram);
+    Q_UNUSED(row)
+    Q_UNUSED(diagram)
     QMT_CHECK(m_busyState == RemoveElement);
     // update elements from store (see above)
     for (const Uid &end_uid : m_relationEndsUid) {
diff --git a/src/libs/modelinglib/qmt/diagram_scene/diagramscenemodelitemvisitors.cpp b/src/libs/modelinglib/qmt/diagram_scene/diagramscenemodelitemvisitors.cpp
index 2a0a557190..91633b18bb 100644
--- a/src/libs/modelinglib/qmt/diagram_scene/diagramscenemodelitemvisitors.cpp
+++ b/src/libs/modelinglib/qmt/diagram_scene/diagramscenemodelitemvisitors.cpp
@@ -63,13 +63,13 @@ DiagramSceneModel::CreationVisitor::CreationVisitor(DiagramSceneModel *diagramSc
 
 void DiagramSceneModel::CreationVisitor::visitDElement(DElement *element)
 {
-    Q_UNUSED(element);
+    Q_UNUSED(element)
     QMT_CHECK(false);
 }
 
 void DiagramSceneModel::CreationVisitor::visitDObject(DObject *object)
 {
-    Q_UNUSED(object);
+    Q_UNUSED(object)
     QMT_CHECK(false);
 }
 
@@ -159,7 +159,7 @@ DiagramSceneModel::UpdateVisitor::UpdateVisitor(QGraphicsItem *item, DiagramScen
 
 void DiagramSceneModel::UpdateVisitor::visitDElement(DElement *element)
 {
-    Q_UNUSED(element);
+    Q_UNUSED(element)
     QMT_CHECK(false);
 }
 
@@ -284,7 +284,7 @@ void DiagramSceneModel::UpdateVisitor::visitDConnection(DConnection *connection)
 
 void DiagramSceneModel::UpdateVisitor::visitDAnnotation(DAnnotation *annotation)
 {
-    Q_UNUSED(annotation); // avoid warning in release mode
+    Q_UNUSED(annotation) // avoid warning in release mode
     QMT_ASSERT(m_graphicsItem, return);
 
     AnnotationItem *annotationItem = qgraphicsitem_cast<AnnotationItem *>(m_graphicsItem);
@@ -295,7 +295,7 @@ void DiagramSceneModel::UpdateVisitor::visitDAnnotation(DAnnotation *annotation)
 
 void DiagramSceneModel::UpdateVisitor::visitDBoundary(DBoundary *boundary)
 {
-    Q_UNUSED(boundary); // avoid warning in release mode
+    Q_UNUSED(boundary) // avoid warning in release mode
     QMT_ASSERT(m_graphicsItem, return);
 
     BoundaryItem *boundaryItem = qgraphicsitem_cast<BoundaryItem *>(m_graphicsItem);
@@ -306,7 +306,7 @@ void DiagramSceneModel::UpdateVisitor::visitDBoundary(DBoundary *boundary)
 
 void DiagramSceneModel::UpdateVisitor::visitDSwimlane(DSwimlane *swimlane)
 {
-    Q_UNUSED(swimlane); // avoid warning in release mode
+    Q_UNUSED(swimlane) // avoid warning in release mode
     QMT_ASSERT(m_graphicsItem, return);
 
     SwimlaneItem *swimlaneItem = qgraphicsitem_cast<SwimlaneItem *>(m_graphicsItem);
diff --git a/src/libs/modelinglib/qmt/diagram_scene/items/annotationitem.cpp b/src/libs/modelinglib/qmt/diagram_scene/items/annotationitem.cpp
index 6169f4cad8..6759378b3c 100644
--- a/src/libs/modelinglib/qmt/diagram_scene/items/annotationitem.cpp
+++ b/src/libs/modelinglib/qmt/diagram_scene/items/annotationitem.cpp
@@ -87,9 +87,9 @@ QRectF AnnotationItem::boundingRect() const
 
 void AnnotationItem::paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget)
 {
-    Q_UNUSED(painter);
-    Q_UNUSED(option);
-    Q_UNUSED(widget);
+    Q_UNUSED(painter)
+    Q_UNUSED(option)
+    Q_UNUSED(widget)
 }
 
 void AnnotationItem::update()
@@ -161,10 +161,10 @@ void AnnotationItem::setPosAndRect(const QPointF &originalPos, const QRectF &ori
 void AnnotationItem::alignItemSizeToRaster(Side adjustHorizontalSide, Side adjustVerticalSide,
                                            double rasterWidth, double rasterHeight)
 {
-    Q_UNUSED(adjustHorizontalSide);
-    Q_UNUSED(adjustVerticalSide);
-    Q_UNUSED(rasterWidth);
-    Q_UNUSED(rasterHeight);
+    Q_UNUSED(adjustHorizontalSide)
+    Q_UNUSED(adjustVerticalSide)
+    Q_UNUSED(rasterWidth)
+    Q_UNUSED(rasterHeight)
 }
 
 void AnnotationItem::moveDelta(const QPointF &delta)
diff --git a/src/libs/modelinglib/qmt/diagram_scene/items/associationitem.cpp b/src/libs/modelinglib/qmt/diagram_scene/items/associationitem.cpp
index 1aee12d465..109819a569 100644
--- a/src/libs/modelinglib/qmt/diagram_scene/items/associationitem.cpp
+++ b/src/libs/modelinglib/qmt/diagram_scene/items/associationitem.cpp
@@ -75,7 +75,7 @@ void AssociationItem::updateEndLabels(const DAssociationEnd &end, const DAssocia
                                       QGraphicsSimpleTextItem **endName, QGraphicsSimpleTextItem **endCardinality,
                                       const Style *style)
 {
-    Q_UNUSED(end);
+    Q_UNUSED(end)
 
     if (!otherEnd.name().isEmpty()) {
         if (!*endName)
diff --git a/src/libs/modelinglib/qmt/diagram_scene/items/boundaryitem.cpp b/src/libs/modelinglib/qmt/diagram_scene/items/boundaryitem.cpp
index e437f4c3ec..cb5aab1a6a 100644
--- a/src/libs/modelinglib/qmt/diagram_scene/items/boundaryitem.cpp
+++ b/src/libs/modelinglib/qmt/diagram_scene/items/boundaryitem.cpp
@@ -89,9 +89,9 @@ QRectF BoundaryItem::boundingRect() const
 
 void BoundaryItem::paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget)
 {
-    Q_UNUSED(painter);
-    Q_UNUSED(option);
-    Q_UNUSED(widget);
+    Q_UNUSED(painter)
+    Q_UNUSED(option)
+    Q_UNUSED(widget)
 }
 
 void BoundaryItem::update()
diff --git a/src/libs/modelinglib/qmt/diagram_scene/items/connectionitem.cpp b/src/libs/modelinglib/qmt/diagram_scene/items/connectionitem.cpp
index d8e3a37df5..e59865d1ba 100644
--- a/src/libs/modelinglib/qmt/diagram_scene/items/connectionitem.cpp
+++ b/src/libs/modelinglib/qmt/diagram_scene/items/connectionitem.cpp
@@ -75,7 +75,7 @@ void ConnectionItem::updateEndLabels(const DConnectionEnd &end, const DConnectio
                                       QGraphicsSimpleTextItem **endName, QGraphicsSimpleTextItem **endCardinality,
                                       const Style *style)
 {
-    Q_UNUSED(end);
+    Q_UNUSED(end)
 
     if (!otherEnd.name().isEmpty()) {
         if (!*endName)
diff --git a/src/libs/modelinglib/qmt/diagram_scene/items/itemitem.cpp b/src/libs/modelinglib/qmt/diagram_scene/items/itemitem.cpp
index a2e3a54df7..e3b50bab1b 100644
--- a/src/libs/modelinglib/qmt/diagram_scene/items/itemitem.cpp
+++ b/src/libs/modelinglib/qmt/diagram_scene/items/itemitem.cpp
@@ -69,7 +69,7 @@ void ItemItem::update()
     updateStereotypeIconDisplay();
 
     auto diagramItem = dynamic_cast<DItem *>(object());
-    Q_UNUSED(diagramItem); // avoid warning about unsed variable
+    Q_UNUSED(diagramItem) // avoid warning about unsed variable
     QMT_ASSERT(diagramItem, return);
 
     const Style *style = adaptedStyle(shapeIconId());
diff --git a/src/libs/modelinglib/qmt/diagram_scene/items/objectitem.cpp b/src/libs/modelinglib/qmt/diagram_scene/items/objectitem.cpp
index f00ed98b96..b68ed9a4f7 100644
--- a/src/libs/modelinglib/qmt/diagram_scene/items/objectitem.cpp
+++ b/src/libs/modelinglib/qmt/diagram_scene/items/objectitem.cpp
@@ -83,9 +83,9 @@ QRectF ObjectItem::boundingRect() const
 
 void ObjectItem::paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget)
 {
-    Q_UNUSED(painter);
-    Q_UNUSED(option);
-    Q_UNUSED(widget);
+    Q_UNUSED(painter)
+    Q_UNUSED(option)
+    Q_UNUSED(widget)
 }
 
 QPointF ObjectItem::pos() const
@@ -273,7 +273,7 @@ ILatchable::Action ObjectItem::verticalLatchAction() const
 
 QList<ILatchable::Latch> ObjectItem::horizontalLatches(ILatchable::Action action, bool grabbedItem) const
 {
-    Q_UNUSED(grabbedItem);
+    Q_UNUSED(grabbedItem)
 
     QRectF rect = mapRectToScene(this->rect());
     QList<ILatchable::Latch> result;
@@ -301,7 +301,7 @@ QList<ILatchable::Latch> ObjectItem::horizontalLatches(ILatchable::Action action
 
 QList<ILatchable::Latch> ObjectItem::verticalLatches(ILatchable::Action action, bool grabbedItem) const
 {
-    Q_UNUSED(grabbedItem);
+    Q_UNUSED(grabbedItem)
 
     QRectF rect = mapRectToScene(this->rect());
     QList<ILatchable::Latch> result;
@@ -394,7 +394,7 @@ void ObjectItem::relationDrawn(const QString &id, ObjectItem *targetItem, const
 
 void ObjectItem::align(IAlignable::AlignType alignType, const QString &identifier)
 {
-    Q_UNUSED(identifier); // avoid warning in release mode
+    Q_UNUSED(identifier) // avoid warning in release mode
 
     // subclasses may support other identifiers than the standard ones.
     // but this implementation does not. So assert the names.
@@ -541,7 +541,7 @@ void ObjectItem::updateStereotypes(const QString &stereotypeIconId, StereotypeIc
 QSizeF ObjectItem::stereotypeIconMinimumSize(const StereotypeIcon &stereotypeIcon,
                                              qreal minimumWidth, qreal minimumHeight) const
 {
-    Q_UNUSED(minimumWidth);
+    Q_UNUSED(minimumWidth)
 
     qreal width = 0.0;
     qreal height = 0.0;
@@ -946,14 +946,14 @@ bool ObjectItem::showContext() const
 
 bool ObjectItem::extendContextMenu(QMenu *menu)
 {
-    Q_UNUSED(menu);
+    Q_UNUSED(menu)
 
     return false;
 }
 
 bool ObjectItem::handleSelectedContextMenuAction(const QString &id)
 {
-    Q_UNUSED(id);
+    Q_UNUSED(id)
 
     return false;
 }
diff --git a/src/libs/modelinglib/qmt/diagram_scene/items/relationitem.cpp b/src/libs/modelinglib/qmt/diagram_scene/items/relationitem.cpp
index c383a21a32..b778441a70 100644
--- a/src/libs/modelinglib/qmt/diagram_scene/items/relationitem.cpp
+++ b/src/libs/modelinglib/qmt/diagram_scene/items/relationitem.cpp
@@ -238,9 +238,9 @@ QRectF RelationItem::boundingRect() const
 
 void RelationItem::paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget)
 {
-    Q_UNUSED(painter);
-    Q_UNUSED(option);
-    Q_UNUSED(widget);
+    Q_UNUSED(painter)
+    Q_UNUSED(option)
+    Q_UNUSED(widget)
 
 #ifdef DEBUG_PAINT_SHAPE
     painter->save();
@@ -518,12 +518,12 @@ void RelationItem::mousePressEvent(QGraphicsSceneMouseEvent *event)
 
 void RelationItem::mouseMoveEvent(QGraphicsSceneMouseEvent *event)
 {
-    Q_UNUSED(event);
+    Q_UNUSED(event)
 }
 
 void RelationItem::mouseReleaseEvent(QGraphicsSceneMouseEvent *event)
 {
-    Q_UNUSED(event);
+    Q_UNUSED(event)
 }
 
 const Style *RelationItem::adaptedStyle()
diff --git a/src/libs/modelinglib/qmt/diagram_scene/items/swimlaneitem.cpp b/src/libs/modelinglib/qmt/diagram_scene/items/swimlaneitem.cpp
index 6d38cc71ef..bdc68476b3 100644
--- a/src/libs/modelinglib/qmt/diagram_scene/items/swimlaneitem.cpp
+++ b/src/libs/modelinglib/qmt/diagram_scene/items/swimlaneitem.cpp
@@ -68,9 +68,9 @@ QRectF SwimlaneItem::boundingRect() const
 
 void SwimlaneItem::paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget)
 {
-    Q_UNUSED(painter);
-    Q_UNUSED(option);
-    Q_UNUSED(widget);
+    Q_UNUSED(painter)
+    Q_UNUSED(option)
+    Q_UNUSED(widget)
 }
 
 void SwimlaneItem::update()
@@ -81,7 +81,7 @@ void SwimlaneItem::update()
     prepareGeometryChange();
 
     const Style *style = adaptedStyle();
-    Q_UNUSED(style);
+    Q_UNUSED(style)
 
     // swimline line
     if (!m_lineItem)
@@ -137,7 +137,7 @@ bool SwimlaneItem::isFocusSelected() const
 
 void SwimlaneItem::setFocusSelected(bool focusSelected)
 {
-    Q_UNUSED(focusSelected);
+    Q_UNUSED(focusSelected)
 }
 
 QRectF SwimlaneItem::getSecondarySelectionBoundary()
diff --git a/src/libs/modelinglib/qmt/diagram_scene/latchcontroller.cpp b/src/libs/modelinglib/qmt/diagram_scene/latchcontroller.cpp
index 0209fdf2a2..ff0da88abb 100644
--- a/src/libs/modelinglib/qmt/diagram_scene/latchcontroller.cpp
+++ b/src/libs/modelinglib/qmt/diagram_scene/latchcontroller.cpp
@@ -75,7 +75,7 @@ void LatchController::addToGraphicsScene(QGraphicsScene *graphicsScene)
 
 void LatchController::removeFromGraphicsScene(QGraphicsScene *graphicsScene)
 {
-    Q_UNUSED(graphicsScene); // avoid warning in release mode
+    Q_UNUSED(graphicsScene) // avoid warning in release mode
 
     if (m_verticalAlignLine->scene()) {
         QMT_CHECK(graphicsScene == m_verticalAlignLine->scene());
diff --git a/src/libs/modelinglib/qmt/diagram_scene/parts/alignbuttonsitem.cpp b/src/libs/modelinglib/qmt/diagram_scene/parts/alignbuttonsitem.cpp
index 6a68f5fdc7..d675db9ef6 100644
--- a/src/libs/modelinglib/qmt/diagram_scene/parts/alignbuttonsitem.cpp
+++ b/src/libs/modelinglib/qmt/diagram_scene/parts/alignbuttonsitem.cpp
@@ -54,8 +54,8 @@ public:
 
     void paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget)
     {
-        Q_UNUSED(option);
-        Q_UNUSED(widget);
+        Q_UNUSED(option)
+        Q_UNUSED(widget)
 
         painter->save();
         painter->setPen(pen());
@@ -66,7 +66,7 @@ public:
 
     void mousePressEvent(QGraphicsSceneMouseEvent *event)
     {
-        Q_UNUSED(event);
+        Q_UNUSED(event)
     }
 
     void mouseReleaseEvent(QGraphicsSceneMouseEvent *event)
@@ -107,9 +107,9 @@ QRectF AlignButtonsItem::boundingRect() const
 
 void AlignButtonsItem::paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget)
 {
-    Q_UNUSED(painter);
-    Q_UNUSED(option);
-    Q_UNUSED(widget);
+    Q_UNUSED(painter)
+    Q_UNUSED(option)
+    Q_UNUSED(widget)
 }
 
 void AlignButtonsItem::clear()
diff --git a/src/libs/modelinglib/qmt/diagram_scene/parts/alignlineitem.cpp b/src/libs/modelinglib/qmt/diagram_scene/parts/alignlineitem.cpp
index 998f23b079..835e959fa6 100644
--- a/src/libs/modelinglib/qmt/diagram_scene/parts/alignlineitem.cpp
+++ b/src/libs/modelinglib/qmt/diagram_scene/parts/alignlineitem.cpp
@@ -77,9 +77,9 @@ QRectF AlignLineItem::boundingRect() const
 
 void AlignLineItem::paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget)
 {
-    Q_UNUSED(painter);
-    Q_UNUSED(option);
-    Q_UNUSED(widget);
+    Q_UNUSED(painter)
+    Q_UNUSED(option)
+    Q_UNUSED(widget)
 }
 
 } // namespace qmt
diff --git a/src/libs/modelinglib/qmt/diagram_scene/parts/arrowitem.cpp b/src/libs/modelinglib/qmt/diagram_scene/parts/arrowitem.cpp
index 93a4a10f19..6782723ce4 100644
--- a/src/libs/modelinglib/qmt/diagram_scene/parts/arrowitem.cpp
+++ b/src/libs/modelinglib/qmt/diagram_scene/parts/arrowitem.cpp
@@ -79,9 +79,9 @@ public:
 
     void paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget) override
     {
-        Q_UNUSED(painter);
-        Q_UNUSED(option);
-        Q_UNUSED(widget);
+        Q_UNUSED(painter)
+        Q_UNUSED(option)
+        Q_UNUSED(widget)
 
 #ifdef DEBUG_PAINT_SHAPE
         painter->setPen(QPen(Qt::blue));
@@ -323,9 +323,9 @@ QRectF ArrowItem::boundingRect() const
 
 void ArrowItem::paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget)
 {
-    Q_UNUSED(painter);
-    Q_UNUSED(option);
-    Q_UNUSED(widget);
+    Q_UNUSED(painter)
+    Q_UNUSED(option)
+    Q_UNUSED(widget)
 
 #ifdef DEBUG_PAINT_SHAPE
     painter->setPen(QPen(Qt::blue));
diff --git a/src/libs/modelinglib/qmt/diagram_scene/parts/customiconitem.cpp b/src/libs/modelinglib/qmt/diagram_scene/parts/customiconitem.cpp
index 9f8c429cd5..374f1e786a 100644
--- a/src/libs/modelinglib/qmt/diagram_scene/parts/customiconitem.cpp
+++ b/src/libs/modelinglib/qmt/diagram_scene/parts/customiconitem.cpp
@@ -96,8 +96,8 @@ QRectF CustomIconItem::boundingRect() const
 
 void CustomIconItem::paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget)
 {
-    Q_UNUSED(option);
-    Q_UNUSED(widget);
+    Q_UNUSED(option)
+    Q_UNUSED(widget)
 
     painter->save();
     painter->setBrush(m_brush);
diff --git a/src/libs/modelinglib/qmt/diagram_scene/parts/pathselectionitem.cpp b/src/libs/modelinglib/qmt/diagram_scene/parts/pathselectionitem.cpp
index 78fa4fff80..4b613c0465 100644
--- a/src/libs/modelinglib/qmt/diagram_scene/parts/pathselectionitem.cpp
+++ b/src/libs/modelinglib/qmt/diagram_scene/parts/pathselectionitem.cpp
@@ -157,9 +157,9 @@ QRectF PathSelectionItem::boundingRect() const
 
 void PathSelectionItem::paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget)
 {
-    Q_UNUSED(painter);
-    Q_UNUSED(option);
-    Q_UNUSED(widget);
+    Q_UNUSED(painter)
+    Q_UNUSED(option)
+    Q_UNUSED(widget)
 
 #ifdef DEBUG_PAINT_SHAPE
     painter->save();
diff --git a/src/libs/modelinglib/qmt/diagram_scene/parts/rectangularselectionitem.cpp b/src/libs/modelinglib/qmt/diagram_scene/parts/rectangularselectionitem.cpp
index 64936fb773..6478e41f1e 100644
--- a/src/libs/modelinglib/qmt/diagram_scene/parts/rectangularselectionitem.cpp
+++ b/src/libs/modelinglib/qmt/diagram_scene/parts/rectangularselectionitem.cpp
@@ -111,9 +111,9 @@ QRectF RectangularSelectionItem::boundingRect() const
 
 void RectangularSelectionItem::paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget)
 {
-    Q_UNUSED(painter);
-    Q_UNUSED(option);
-    Q_UNUSED(widget);
+    Q_UNUSED(painter)
+    Q_UNUSED(option)
+    Q_UNUSED(widget)
 }
 
 void RectangularSelectionItem::setRect(const QRectF &rectangle)
@@ -226,7 +226,7 @@ void RectangularSelectionItem::update()
 
 void RectangularSelectionItem::moveHandle(Handle handle, const QPointF &deltaMove, HandleStatus handleStatus, HandleQualifier handleQualifier)
 {
-    Q_UNUSED(handleQualifier);
+    Q_UNUSED(handleQualifier)
 
     switch (handleStatus) {
     case Press:
diff --git a/src/libs/modelinglib/qmt/diagram_scene/parts/relationstarter.cpp b/src/libs/modelinglib/qmt/diagram_scene/parts/relationstarter.cpp
index 705f673ac5..ab07d7f2b3 100644
--- a/src/libs/modelinglib/qmt/diagram_scene/parts/relationstarter.cpp
+++ b/src/libs/modelinglib/qmt/diagram_scene/parts/relationstarter.cpp
@@ -59,8 +59,8 @@ QRectF RelationStarter::boundingRect() const
 
 void RelationStarter::paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget)
 {
-    Q_UNUSED(option);
-    Q_UNUSED(widget);
+    Q_UNUSED(option)
+    Q_UNUSED(widget)
 
     painter->save();
     painter->setPen(pen());
@@ -153,7 +153,7 @@ void RelationStarter::keyPressEvent(QKeyEvent *event)
 
 void RelationStarter::focusOutEvent(QFocusEvent *event)
 {
-    Q_UNUSED(event);
+    Q_UNUSED(event)
     if (m_currentPreviewArrow) {
         m_currentPreviewArrow->scene()->removeItem(m_currentPreviewArrow);
         delete m_currentPreviewArrow;
diff --git a/src/libs/modelinglib/qmt/diagram_widgets_ui/stackeddiagramsview.cpp b/src/libs/modelinglib/qmt/diagram_widgets_ui/stackeddiagramsview.cpp
index 7592bc57db..62253e626c 100644
--- a/src/libs/modelinglib/qmt/diagram_widgets_ui/stackeddiagramsview.cpp
+++ b/src/libs/modelinglib/qmt/diagram_widgets_ui/stackeddiagramsview.cpp
@@ -102,7 +102,7 @@ void StackedDiagramsView::onCurrentChanged(int tabIndex)
 
 void StackedDiagramsView::onDiagramRenamed(const MDiagram *diagram)
 {
-    Q_UNUSED(diagram);
+    Q_UNUSED(diagram)
 
     // nothing to do!
 }
diff --git a/src/libs/modelinglib/qmt/model/melement.cpp b/src/libs/modelinglib/qmt/model/melement.cpp
index f73a56ad94..8ffb57d4a5 100644
--- a/src/libs/modelinglib/qmt/model/melement.cpp
+++ b/src/libs/modelinglib/qmt/model/melement.cpp
@@ -39,7 +39,7 @@ void MExpansion::assign(MElement *lhs, const MElement &rhs)
 
 void MExpansion::destroy(MElement *element)
 {
-    Q_UNUSED(element);
+    Q_UNUSED(element)
 
     delete this;
 }
diff --git a/src/libs/modelinglib/qmt/model_controller/mchildrenvisitor.cpp b/src/libs/modelinglib/qmt/model_controller/mchildrenvisitor.cpp
index f8ed8800f0..4542a5a3af 100644
--- a/src/libs/modelinglib/qmt/model_controller/mchildrenvisitor.cpp
+++ b/src/libs/modelinglib/qmt/model_controller/mchildrenvisitor.cpp
@@ -40,7 +40,7 @@ namespace qmt {
 
 void MChildrenVisitor::visitMElement(MElement *element)
 {
-    Q_UNUSED(element);
+    Q_UNUSED(element)
 }
 
 void MChildrenVisitor::visitMObject(MObject *object)
diff --git a/src/libs/modelinglib/qmt/model_controller/mclonevisitor.cpp b/src/libs/modelinglib/qmt/model_controller/mclonevisitor.cpp
index a8d431a87e..a2a6e3392f 100644
--- a/src/libs/modelinglib/qmt/model_controller/mclonevisitor.cpp
+++ b/src/libs/modelinglib/qmt/model_controller/mclonevisitor.cpp
@@ -50,7 +50,7 @@ MCloneVisitor::MCloneVisitor()
 
 void MCloneVisitor::visitMElement(const MElement *element)
 {
-    Q_UNUSED(element);
+    Q_UNUSED(element)
     QMT_CHECK(m_cloned);
 }
 
@@ -149,7 +149,7 @@ MCloneDeepVisitor::MCloneDeepVisitor()
 
 void MCloneDeepVisitor::visitMElement(const MElement *element)
 {
-    Q_UNUSED(element);
+    Q_UNUSED(element)
     QMT_CHECK(m_cloned);
 }
 
diff --git a/src/libs/modelinglib/qmt/model_controller/mvoidvisitor.cpp b/src/libs/modelinglib/qmt/model_controller/mvoidvisitor.cpp
index 4e475ce3dd..329f6ed0c7 100644
--- a/src/libs/modelinglib/qmt/model_controller/mvoidvisitor.cpp
+++ b/src/libs/modelinglib/qmt/model_controller/mvoidvisitor.cpp
@@ -45,7 +45,7 @@ namespace qmt {
 
 void MVoidVisitor::visitMElement(MElement *element)
 {
-    Q_UNUSED(element);
+    Q_UNUSED(element)
 }
 
 void MVoidVisitor::visitMObject(MObject *object)
@@ -110,7 +110,7 @@ void MVoidVisitor::visitMConnection(MConnection *connection)
 
 void MVoidConstVisitor::visitMElement(const MElement *element)
 {
-    Q_UNUSED(element);
+    Q_UNUSED(element)
 }
 
 void MVoidConstVisitor::visitMObject(const MObject *object)
diff --git a/src/libs/modelinglib/qmt/model_ui/sortedtreemodel.cpp b/src/libs/modelinglib/qmt/model_ui/sortedtreemodel.cpp
index 56a7524b66..6f47b26938 100644
--- a/src/libs/modelinglib/qmt/model_ui/sortedtreemodel.cpp
+++ b/src/libs/modelinglib/qmt/model_ui/sortedtreemodel.cpp
@@ -79,9 +79,9 @@ bool SortedTreeModel::lessThan(const QModelIndex &left, const QModelIndex &right
 
 void SortedTreeModel::onTreeModelRowsInserted(const QModelIndex &parent, int start, int end)
 {
-    Q_UNUSED(parent);
-    Q_UNUSED(start);
-    Q_UNUSED(end);
+    Q_UNUSED(parent)
+    Q_UNUSED(start)
+    Q_UNUSED(end)
 
     startDelayedSortTimer();
 }
diff --git a/src/libs/modelinglib/qmt/model_ui/treemodel.cpp b/src/libs/modelinglib/qmt/model_ui/treemodel.cpp
index 18d1cb2c23..ce7bb0504e 100644
--- a/src/libs/modelinglib/qmt/model_ui/treemodel.cpp
+++ b/src/libs/modelinglib/qmt/model_ui/treemodel.cpp
@@ -80,13 +80,13 @@ public:
 
     void visitMElement(const MElement *element)
     {
-        Q_UNUSED(element);
+        Q_UNUSED(element)
         QMT_CHECK(false);
     }
 
     void visitMObject(const MObject *object)
     {
-        Q_UNUSED(object);
+        Q_UNUSED(object)
         QMT_ASSERT(m_item, return);
         m_item->setEditable(false);
     }
@@ -156,7 +156,7 @@ public:
 
     void visitMRelation(const MRelation *relation)
     {
-        Q_UNUSED(relation);
+        Q_UNUSED(relation)
         QMT_ASSERT(m_item, return);
         m_item->setEditable(false);
         m_item->setData(TreeModel::Relation, TreeModel::RoleItemType);
@@ -216,7 +216,7 @@ public:
 
     void visitMElement(const MElement *element)
     {
-        Q_UNUSED(element);
+        Q_UNUSED(element)
         QMT_CHECK(false);
     }
 
@@ -502,8 +502,8 @@ void TreeModel::onEndResetModel()
 
 void TreeModel::onBeginUpdateObject(int row, const MObject *parent)
 {
-    Q_UNUSED(row);
-    Q_UNUSED(parent);
+    Q_UNUSED(row)
+    Q_UNUSED(parent)
     QMT_CHECK(m_busyState == NotBusy);
     m_busyState = UpdateElement;
 }
@@ -536,8 +536,8 @@ void TreeModel::onEndUpdateObject(int row, const MObject *parent)
 
 void TreeModel::onBeginInsertObject(int row, const MObject *parent)
 {
-    Q_UNUSED(row);
-    Q_UNUSED(parent);
+    Q_UNUSED(row)
+    Q_UNUSED(parent)
     QMT_CHECK(m_busyState == NotBusy);
     m_busyState = InsertElement;
 }
@@ -569,8 +569,8 @@ void TreeModel::onBeginRemoveObject(int row, const MObject *parent)
 
 void TreeModel::onEndRemoveObject(int row, const MObject *parent)
 {
-    Q_UNUSED(row);
-    Q_UNUSED(parent);
+    Q_UNUSED(row)
+    Q_UNUSED(parent)
     QMT_CHECK(m_busyState == RemoveElement);
     m_busyState = NotBusy;
 }
@@ -602,8 +602,8 @@ void TreeModel::onEndMoveObject(int row, const MObject *owner)
 
 void TreeModel::onBeginUpdateRelation(int row, const MObject *parent)
 {
-    Q_UNUSED(row);
-    Q_UNUSED(parent);
+    Q_UNUSED(row)
+    Q_UNUSED(parent)
     QMT_CHECK(m_busyState == NotBusy);
     m_busyState = UpdateRelation;
 }
@@ -637,8 +637,8 @@ void TreeModel::onEndUpdateRelation(int row, const MObject *parent)
 
 void TreeModel::onBeginInsertRelation(int row, const MObject *parent)
 {
-    Q_UNUSED(row);
-    Q_UNUSED(parent);
+    Q_UNUSED(row)
+    Q_UNUSED(parent)
     QMT_CHECK(m_busyState == NotBusy);
     m_busyState = InsertRelation;
 }
@@ -668,8 +668,8 @@ void TreeModel::onBeginRemoveRelation(int row, const MObject *parent)
 
 void TreeModel::onEndRemoveRelation(int row, const MObject *parent)
 {
-    Q_UNUSED(row);
-    Q_UNUSED(parent);
+    Q_UNUSED(row)
+    Q_UNUSED(parent)
     QMT_CHECK(m_busyState == RemoveRelation);
     m_busyState = NotBusy;
 }
@@ -699,7 +699,7 @@ void TreeModel::onEndMoveRelation(int row, const MObject *owner)
 
 void TreeModel::onRelationEndChanged(MRelation *relation, MObject *endObject)
 {
-    Q_UNUSED(endObject);
+    Q_UNUSED(endObject)
     QMT_CHECK(m_busyState == NotBusy);
 
     MObject *parent = relation->owner();
@@ -725,8 +725,8 @@ void TreeModel::onRelationEndChanged(MRelation *relation, MObject *endObject)
 
 void TreeModel::onModelDataChanged(const QModelIndex &topleft, const QModelIndex &bottomright)
 {
-    Q_UNUSED(topleft);
-    Q_UNUSED(bottomright);
+    Q_UNUSED(topleft)
+    Q_UNUSED(bottomright)
     // TODO fix editing object name in model tree
     // item->text() no longer returns a simple object name
     // classes contains namespace label
diff --git a/src/libs/modelinglib/qmt/model_widgets_ui/modeltreeview.cpp b/src/libs/modelinglib/qmt/model_widgets_ui/modeltreeview.cpp
index 3bcc0727fb..b3cfc13a0b 100644
--- a/src/libs/modelinglib/qmt/model_widgets_ui/modeltreeview.cpp
+++ b/src/libs/modelinglib/qmt/model_widgets_ui/modeltreeview.cpp
@@ -108,7 +108,7 @@ void ModelTreeView::selectFromSourceModelIndex(const QModelIndex &index)
 
 void ModelTreeView::startDrag(Qt::DropActions supportedActions)
 {
-    Q_UNUSED(supportedActions);
+    Q_UNUSED(supportedActions)
 
     TreeModel *treeModel = m_sortedTreeModel->treeModel();
     QMT_ASSERT(treeModel, return);
@@ -231,7 +231,7 @@ void ModelTreeView::dropEvent(QDropEvent *event)
 
 void ModelTreeView::focusInEvent(QFocusEvent *event)
 {
-    Q_UNUSED(event);
+    Q_UNUSED(event)
 
     emit treeViewActivated();
 }
diff --git a/src/libs/modelinglib/qmt/model_widgets_ui/palettebox.cpp b/src/libs/modelinglib/qmt/model_widgets_ui/palettebox.cpp
index 2f5f8d8487..109427b7c2 100644
--- a/src/libs/modelinglib/qmt/model_widgets_ui/palettebox.cpp
+++ b/src/libs/modelinglib/qmt/model_widgets_ui/palettebox.cpp
@@ -92,7 +92,7 @@ void PaletteBox::setCurrentIndex(int index)
 
 void PaletteBox::paintEvent(QPaintEvent *event)
 {
-    Q_UNUSED(event);
+    Q_UNUSED(event)
 
     QPainter painter(this);
     qreal w = static_cast<qreal>(width()) / static_cast<qreal>(m_brushes.size());
diff --git a/src/libs/modelinglib/qmt/model_widgets_ui/propertiesview.cpp b/src/libs/modelinglib/qmt/model_widgets_ui/propertiesview.cpp
index 350803d168..a63a409494 100644
--- a/src/libs/modelinglib/qmt/model_widgets_ui/propertiesview.cpp
+++ b/src/libs/modelinglib/qmt/model_widgets_ui/propertiesview.cpp
@@ -209,8 +209,8 @@ void PropertiesView::onEndResetModel()
 
 void PropertiesView::onBeginUpdateObject(int row, const MObject *parent)
 {
-    Q_UNUSED(row);
-    Q_UNUSED(parent);
+    Q_UNUSED(row)
+    Q_UNUSED(parent)
 }
 
 void PropertiesView::onEndUpdateObject(int row, const MObject *parent)
@@ -222,14 +222,14 @@ void PropertiesView::onEndUpdateObject(int row, const MObject *parent)
 
 void PropertiesView::onBeginInsertObject(int row, const MObject *parent)
 {
-    Q_UNUSED(row);
-    Q_UNUSED(parent);
+    Q_UNUSED(row)
+    Q_UNUSED(parent)
 }
 
 void PropertiesView::onEndInsertObject(int row, const MObject *parent)
 {
-    Q_UNUSED(row);
-    Q_UNUSED(parent);
+    Q_UNUSED(row)
+    Q_UNUSED(parent)
 }
 
 void PropertiesView::onBeginRemoveObject(int row, const MObject *parent)
@@ -241,14 +241,14 @@ void PropertiesView::onBeginRemoveObject(int row, const MObject *parent)
 
 void PropertiesView::onEndRemoveObject(int row, const MObject *parent)
 {
-    Q_UNUSED(row);
-    Q_UNUSED(parent);
+    Q_UNUSED(row)
+    Q_UNUSED(parent)
 }
 
 void PropertiesView::onBeginMoveObject(int formerRow, const MObject *formerOwner)
 {
-    Q_UNUSED(formerRow);
-    Q_UNUSED(formerOwner);
+    Q_UNUSED(formerRow)
+    Q_UNUSED(formerOwner)
 }
 
 void PropertiesView::onEndMoveObject(int row, const MObject *owner)
@@ -260,8 +260,8 @@ void PropertiesView::onEndMoveObject(int row, const MObject *owner)
 
 void PropertiesView::onBeginUpdateRelation(int row, const MObject *parent)
 {
-    Q_UNUSED(row);
-    Q_UNUSED(parent);
+    Q_UNUSED(row)
+    Q_UNUSED(parent)
 }
 
 void PropertiesView::onEndUpdateRelation(int row, const MObject *parent)
@@ -273,14 +273,14 @@ void PropertiesView::onEndUpdateRelation(int row, const MObject *parent)
 
 void PropertiesView::onBeginInsertRelation(int row, const MObject *parent)
 {
-    Q_UNUSED(row);
-    Q_UNUSED(parent);
+    Q_UNUSED(row)
+    Q_UNUSED(parent)
 }
 
 void PropertiesView::onEndInsertRelation(int row, const MObject *parent)
 {
-    Q_UNUSED(row);
-    Q_UNUSED(parent);
+    Q_UNUSED(row)
+    Q_UNUSED(parent)
 }
 
 void PropertiesView::onBeginRemoveRelation(int row, const MObject *parent)
@@ -292,14 +292,14 @@ void PropertiesView::onBeginRemoveRelation(int row, const MObject *parent)
 
 void PropertiesView::onEndRemoveRelation(int row, const MObject *parent)
 {
-    Q_UNUSED(row);
-    Q_UNUSED(parent);
+    Q_UNUSED(row)
+    Q_UNUSED(parent)
 }
 
 void PropertiesView::onBeginMoveRelation(int formerRow, const MObject *formerOwner)
 {
-    Q_UNUSED(formerRow);
-    Q_UNUSED(formerOwner);
+    Q_UNUSED(formerRow)
+    Q_UNUSED(formerOwner)
 }
 
 void PropertiesView::onEndMoveRelation(int row, const MObject *owner)
@@ -311,7 +311,7 @@ void PropertiesView::onEndMoveRelation(int row, const MObject *owner)
 
 void PropertiesView::onRelationEndChanged(MRelation *relation, MObject *endObject)
 {
-    Q_UNUSED(endObject);
+    Q_UNUSED(endObject)
     if (relation && m_selectedModelElements.contains(relation))
         m_mview->update(m_selectedModelElements);
 }
@@ -327,7 +327,7 @@ void PropertiesView::onEndResetAllDiagrams()
 
 void PropertiesView::onBeginResetDiagram(const MDiagram *diagram)
 {
-    Q_UNUSED(diagram);
+    Q_UNUSED(diagram)
 }
 
 void PropertiesView::onEndResetDiagram(const MDiagram *diagram)
@@ -338,8 +338,8 @@ void PropertiesView::onEndResetDiagram(const MDiagram *diagram)
 
 void PropertiesView::onBeginUpdateElement(int row, const MDiagram *diagram)
 {
-    Q_UNUSED(row);
-    Q_UNUSED(diagram);
+    Q_UNUSED(row)
+    Q_UNUSED(diagram)
 }
 
 void PropertiesView::onEndUpdateElement(int row, const MDiagram *diagram)
@@ -353,14 +353,14 @@ void PropertiesView::onEndUpdateElement(int row, const MDiagram *diagram)
 
 void PropertiesView::onBeginInsertElement(int row, const MDiagram *diagram)
 {
-    Q_UNUSED(row);
-    Q_UNUSED(diagram);
+    Q_UNUSED(row)
+    Q_UNUSED(diagram)
 }
 
 void PropertiesView::onEndInsertElement(int row, const MDiagram *diagram)
 {
-    Q_UNUSED(row);
-    Q_UNUSED(diagram);
+    Q_UNUSED(row)
+    Q_UNUSED(diagram)
 }
 
 void PropertiesView::onBeginRemoveElement(int row, const MDiagram *diagram)
@@ -374,8 +374,8 @@ void PropertiesView::onBeginRemoveElement(int row, const MDiagram *diagram)
 
 void PropertiesView::onEndRemoveElement(int row, const MDiagram *diagram)
 {
-    Q_UNUSED(row);
-    Q_UNUSED(diagram);
+    Q_UNUSED(row)
+    Q_UNUSED(diagram)
 }
 
 void PropertiesView::beginUpdate(MElement *modelElement)
diff --git a/src/libs/modelinglib/qmt/model_widgets_ui/propertiesviewmview.cpp b/src/libs/modelinglib/qmt/model_widgets_ui/propertiesviewmview.cpp
index c8b11d44e1..81c71501c2 100644
--- a/src/libs/modelinglib/qmt/model_widgets_ui/propertiesviewmview.cpp
+++ b/src/libs/modelinglib/qmt/model_widgets_ui/propertiesviewmview.cpp
@@ -341,7 +341,7 @@ void PropertiesView::MView::edit()
 
 void PropertiesView::MView::visitMElement(const MElement *element)
 {
-    Q_UNUSED(element);
+    Q_UNUSED(element)
 
     prepare();
     if (!m_stereotypeComboBox) {
@@ -848,7 +848,7 @@ void PropertiesView::MView::visitMConnection(const MConnection *connection)
 
 void PropertiesView::MView::visitDElement(const DElement *element)
 {
-    Q_UNUSED(element);
+    Q_UNUSED(element)
 
     if (m_modelElements.size() > 0 && m_modelElements.at(0)) {
         m_propertiesTitle.clear();
diff --git a/src/libs/modelinglib/qmt/style/defaultstyleengine.cpp b/src/libs/modelinglib/qmt/style/defaultstyleengine.cpp
index 1f1eaab643..f2da9a9292 100644
--- a/src/libs/modelinglib/qmt/style/defaultstyleengine.cpp
+++ b/src/libs/modelinglib/qmt/style/defaultstyleengine.cpp
@@ -144,15 +144,15 @@ class BoundaryStyleKey
 
 uint qHash(const BoundaryStyleKey &styleKey)
 {
-    Q_UNUSED(styleKey);
+    Q_UNUSED(styleKey)
 
     return 1;
 }
 
 bool operator==(const BoundaryStyleKey &lhs, const BoundaryStyleKey &rhs)
 {
-    Q_UNUSED(lhs);
-    Q_UNUSED(rhs);
+    Q_UNUSED(lhs)
+    Q_UNUSED(rhs)
 
     return true;
 }
@@ -164,15 +164,15 @@ class SwimlaneStyleKey
 
 uint qHash(const SwimlaneStyleKey &styleKey)
 {
-    Q_UNUSED(styleKey);
+    Q_UNUSED(styleKey)
 
     return 1;
 }
 
 bool operator==(const SwimlaneStyleKey &lhs, const SwimlaneStyleKey &rhs)
 {
-    Q_UNUSED(lhs);
-    Q_UNUSED(rhs);
+    Q_UNUSED(lhs)
+    Q_UNUSED(rhs)
 
     return true;
 }
@@ -344,7 +344,7 @@ const Style *DefaultStyleEngine::applyObjectStyle(const Style *baseStyle, const
 const Style *DefaultStyleEngine::applyRelationStyle(const Style *baseStyle, const StyledRelation &styledRelation,
                                                     const Parameters *parameters)
 {
-    Q_UNUSED(parameters);
+    Q_UNUSED(parameters)
 
     ElementType elementType = objectType(styledRelation.endA());
     RelationStyleKey key(elementType, styledRelation.endA() ? styledRelation.endA()->visualPrimaryRole() : DObject::PrimaryRoleNormal);
@@ -391,14 +391,14 @@ const Style *DefaultStyleEngine::applyAnnotationStyle(const Style *baseStyle, co
 const Style *DefaultStyleEngine::applyBoundaryStyle(const Style *baseStyle, const DBoundary *boundary,
                                                     const Parameters *parameters)
 {
-    Q_UNUSED(boundary);
+    Q_UNUSED(boundary)
 
     return applyBoundaryStyle(baseStyle, parameters);
 }
 
 const Style *DefaultStyleEngine::applySwimlaneStyle(const Style *baseStyle, const DSwimlane *swimlane, const StyleEngine::Parameters *parameters)
 {
-    Q_UNUSED(swimlane);
+    Q_UNUSED(swimlane)
 
     return applySwimlaneStyle(baseStyle, parameters);
 }
@@ -406,7 +406,7 @@ const Style *DefaultStyleEngine::applySwimlaneStyle(const Style *baseStyle, cons
 const Style *DefaultStyleEngine::applyAnnotationStyle(const Style *baseStyle, DAnnotation::VisualRole visualRole,
                                                       const StyleEngine::Parameters *parameters)
 {
-    Q_UNUSED(parameters);
+    Q_UNUSED(parameters)
 
     AnnotationStyleKey key(visualRole);
     const Style *derivedStyle = m_annotationStyleMap.value(key);
@@ -447,7 +447,7 @@ const Style *DefaultStyleEngine::applyAnnotationStyle(const Style *baseStyle, DA
 
 const Style *DefaultStyleEngine::applyBoundaryStyle(const Style *baseStyle, const StyleEngine::Parameters *parameters)
 {
-    Q_UNUSED(parameters);
+    Q_UNUSED(parameters)
 
     BoundaryStyleKey key;
     const Style *derivedStyle = m_boundaryStyleMap.value(key);
@@ -463,7 +463,7 @@ const Style *DefaultStyleEngine::applyBoundaryStyle(const Style *baseStyle, cons
 
 const Style *DefaultStyleEngine::applySwimlaneStyle(const Style *baseStyle, const StyleEngine::Parameters *parameters)
 {
-    Q_UNUSED(parameters);
+    Q_UNUSED(parameters)
 
     SwimlaneStyleKey key;
     const Style *derivedStyle = m_swimlaneStyleMap.value(key);
@@ -614,7 +614,7 @@ QColor DefaultStyleEngine::fillColor(ElementType elementType, const ObjectVisual
 
 QColor DefaultStyleEngine::textColor(const DObject *object, int depth)
 {
-    Q_UNUSED(depth);
+    Q_UNUSED(depth)
 
     QColor textColor;
     DObject::VisualPrimaryRole visualRole = object ? object->visualPrimaryRole() : DObject::PrimaryRoleNormal;
@@ -627,7 +627,7 @@ QColor DefaultStyleEngine::textColor(const DObject *object, int depth)
 
 QColor DefaultStyleEngine::textColor(ElementType elementType, const ObjectVisuals &objectVisuals)
 {
-    Q_UNUSED(elementType);
+    Q_UNUSED(elementType)
 
     QColor textColor;
     if (objectVisuals.visualSecondaryRole() == DObject::SecondaryRoleSoften)
diff --git a/src/libs/modelinglib/qmt/tasks/alignonrastervisitor.cpp b/src/libs/modelinglib/qmt/tasks/alignonrastervisitor.cpp
index e896f08462..f36060cbed 100644
--- a/src/libs/modelinglib/qmt/tasks/alignonrastervisitor.cpp
+++ b/src/libs/modelinglib/qmt/tasks/alignonrastervisitor.cpp
@@ -73,7 +73,7 @@ void AlignOnRasterVisitor::setDiagram(MDiagram *diagram)
 
 void AlignOnRasterVisitor::visitDElement(DElement *element)
 {
-    Q_UNUSED(element);
+    Q_UNUSED(element)
 
     QMT_CHECK(false);
 }
@@ -116,7 +116,7 @@ void AlignOnRasterVisitor::visitDItem(DItem *item)
 
 void AlignOnRasterVisitor::visitDRelation(DRelation *relation)
 {
-    Q_UNUSED(relation);
+    Q_UNUSED(relation)
 }
 
 void AlignOnRasterVisitor::visitDInheritance(DInheritance *inheritance)
diff --git a/src/libs/modelinglib/qmt/tasks/diagramscenecontroller.cpp b/src/libs/modelinglib/qmt/tasks/diagramscenecontroller.cpp
index 6cdc299472..ec15b0f7d8 100644
--- a/src/libs/modelinglib/qmt/tasks/diagramscenecontroller.cpp
+++ b/src/libs/modelinglib/qmt/tasks/diagramscenecontroller.cpp
@@ -90,7 +90,7 @@ public:
 
     void visitMObject(const MObject *object) override
     {
-        Q_UNUSED(object);
+        Q_UNUSED(object)
         if (auto connection = dynamic_cast<const MConnection *>(m_relation)) {
             CustomRelation customRelation = m_stereotypeController->findCustomRelation(connection->customRelationId());
             if (!customRelation.isNull()) {
@@ -594,7 +594,7 @@ QRectF alignObjectHeight(DObject *object, const QSizeF &size)
 
 QRectF alignObjectSize(DObject *object, const QSizeF &size)
 {
-    Q_UNUSED(object);
+    Q_UNUSED(object)
 
     QRectF rect;
     rect.setX(-size.width() / 2.0);
diff --git a/src/libs/modelinglib/qtserialization/inc/qark/typeregistry.h b/src/libs/modelinglib/qtserialization/inc/qark/typeregistry.h
index e9b2f0699a..a706bbc66d 100644
--- a/src/libs/modelinglib/qtserialization/inc/qark/typeregistry.h
+++ b/src/libs/modelinglib/qtserialization/inc/qark/typeregistry.h
@@ -246,7 +246,7 @@ QString typeUid()
 template<class T>
 QString typeUid(const T &t)
 {
-    Q_UNUSED(t); // avoid warning in some compilers
+    Q_UNUSED(t) // avoid warning in some compilers
 #if !defined(QT_NO_DEBUG) // avoid warning about unused function ::hasNameToUidMap in Qt >= 5.5
     QMT_CHECK_X((registry::TypeNameRegistry<T>::hasNameToUidMap()),
                 "typeUid<T>()", "type maps are not correctly initialized");
@@ -260,7 +260,7 @@ QString typeUid(const T &t)
 template<class Archive, class T>
 typename registry::TypeRegistry<Archive, T>::TypeInfo typeInfo(const T &t)
 {
-    Q_UNUSED(t); // avoid warning in some compilers
+    Q_UNUSED(t) // avoid warning in some compilers
 #if !defined(QT_NO_DEBUG) // avoid warning about unused function ::hasNameToUidMap in Qt >= 5.5
     QMT_CHECK_X((registry::TypeRegistry<Archive,T>::hasMap()),
                 qPrintable(QString(QLatin1String("TypeRegistry<Archive, %1>::typeInfo(const T&)")).arg(typeUid<T>())),
diff --git a/src/libs/qmldebug/qmldebugconnection.cpp b/src/libs/qmldebug/qmldebugconnection.cpp
index 629360a8bc..b06a88f947 100644
--- a/src/libs/qmldebug/qmldebugconnection.cpp
+++ b/src/libs/qmldebug/qmldebugconnection.cpp
@@ -250,7 +250,7 @@ QmlDebugConnection::QmlDebugConnection(QObject *parent)
         qRegisterMetaType<QAbstractSocket::SocketError>(),
         qRegisterMetaType<QLocalSocket::LocalSocketError>()
     };
-    Q_UNUSED(metaTypes);
+    Q_UNUSED(metaTypes)
 }
 
 QmlDebugConnection::~QmlDebugConnection()
diff --git a/src/libs/qmldebug/qmldebugconnectionmanager.cpp b/src/libs/qmldebug/qmldebugconnectionmanager.cpp
index 217260d8d2..173bbb2d97 100644
--- a/src/libs/qmldebug/qmldebugconnectionmanager.cpp
+++ b/src/libs/qmldebug/qmldebugconnectionmanager.cpp
@@ -158,7 +158,7 @@ void QmlDebugConnectionManager::retryConnect()
 
 void QmlDebugConnectionManager::logState(const QString &message)
 {
-    Q_UNUSED(message);
+    Q_UNUSED(message)
 }
 
 QmlDebugConnection *QmlDebugConnectionManager::connection() const
diff --git a/src/libs/qmldebug/qpacketprotocol.cpp b/src/libs/qmldebug/qpacketprotocol.cpp
index dbe4088ed2..3bbabc1cf7 100644
--- a/src/libs/qmldebug/qpacketprotocol.cpp
+++ b/src/libs/qmldebug/qpacketprotocol.cpp
@@ -164,7 +164,7 @@ public:
                 qint32 inProgressSizeLE;
                 const qint64 read = dev->read((char *)&inProgressSizeLE, sizeof(qint32));
                 Q_ASSERT(read == sizeof(qint32));
-                Q_UNUSED(read);
+                Q_UNUSED(read)
                 inProgressSize = qFromLittleEndian(inProgressSizeLE);
 
                 // Check sizing constraints
diff --git a/src/libs/qmljs/parser/qmljsengine_p.h b/src/libs/qmljs/parser/qmljsengine_p.h
index 093f68bac5..2321c5aa8f 100644
--- a/src/libs/qmljs/parser/qmljsengine_p.h
+++ b/src/libs/qmljs/parser/qmljsengine_p.h
@@ -61,19 +61,19 @@ public:
 
     virtual void importFile(const QString &jsfile, const QString &module, int line, int column)
     {
-        Q_UNUSED(jsfile);
-        Q_UNUSED(module);
-        Q_UNUSED(line);
-        Q_UNUSED(column);
+        Q_UNUSED(jsfile)
+        Q_UNUSED(module)
+        Q_UNUSED(line)
+        Q_UNUSED(column)
     }
 
     virtual void importModule(const QString &uri, const QString &version, const QString &module, int line, int column)
     {
-        Q_UNUSED(uri);
-        Q_UNUSED(version);
-        Q_UNUSED(module);
-        Q_UNUSED(line);
-        Q_UNUSED(column);
+        Q_UNUSED(uri)
+        Q_UNUSED(version)
+        Q_UNUSED(module)
+        Q_UNUSED(line)
+        Q_UNUSED(column)
     }
 };
 
diff --git a/src/libs/qmljs/qmljsimportdependencies.cpp b/src/libs/qmljs/qmljsimportdependencies.cpp
index 3f17846dab..5a48c42a4d 100644
--- a/src/libs/qmljs/qmljsimportdependencies.cpp
+++ b/src/libs/qmljs/qmljsimportdependencies.cpp
@@ -717,8 +717,8 @@ ImportDependencies::ImportElements ImportDependencies::candidateImports(
 QList<DependencyInfo::ConstPtr> ImportDependencies::createDependencyInfos(
         const ImportKey &mainDoc, const ViewerContext &vContext) const
 {
-    Q_UNUSED(mainDoc);
-    Q_UNUSED(vContext);
+    Q_UNUSED(mainDoc)
+    Q_UNUSED(vContext)
     QList<DependencyInfo::ConstPtr> res;
     QTC_CHECK(false);
     return res;
@@ -897,8 +897,8 @@ public:
                     const Export &e,
                     const CoreImport &cI) const
     {
-        Q_UNUSED(m);
-        Q_UNUSED(cI);
+        Q_UNUSED(m)
+        Q_UNUSED(cI)
         imports.insert(e.exportName.flatKey());
         return true;
     }
@@ -931,7 +931,7 @@ void ImportDependencies::checkConsistency() const
             foreach (const Export &e, m_coreImports.value(s).possibleExports)
                 if (e.exportName == j.key())
                     found = true;
-            Q_ASSERT(found); Q_UNUSED(found);
+            Q_ASSERT(found); Q_UNUSED(found)
         }
     }
     QMapIterator<QString,CoreImport> i(m_coreImports);
diff --git a/src/libs/qmljs/qmljsmodelmanagerinterface.cpp b/src/libs/qmljs/qmljsmodelmanagerinterface.cpp
index 6bb1bc8ff9..2270d0a5b6 100644
--- a/src/libs/qmljs/qmljsmodelmanagerinterface.cpp
+++ b/src/libs/qmljs/qmljsmodelmanagerinterface.cpp
@@ -237,7 +237,7 @@ ModelManagerInterface::WorkingCopy ModelManagerInterface::workingCopyInternal()
 void ModelManagerInterface::addTaskInternal(QFuture<void> result, const QString &msg,
                                             const char *taskId) const
 {
-    Q_UNUSED(result);
+    Q_UNUSED(result)
     qCDebug(qmljsLog) << "started " << taskId << " " << msg;
 }
 
diff --git a/src/libs/ssh/sftpfilesystemmodel.cpp b/src/libs/ssh/sftpfilesystemmodel.cpp
index 0e9eb48e5e..572c39de2f 100644
--- a/src/libs/ssh/sftpfilesystemmodel.cpp
+++ b/src/libs/ssh/sftpfilesystemmodel.cpp
@@ -157,7 +157,7 @@ SftpJobId SftpFileSystemModel::downloadFile(const QModelIndex &index, const QStr
 
 int SftpFileSystemModel::columnCount(const QModelIndex &parent) const
 {
-    Q_UNUSED(parent);
+    Q_UNUSED(parent)
     return 2; // type + name
 }
 
diff --git a/src/libs/tracing/flamegraph.cpp b/src/libs/tracing/flamegraph.cpp
index 67329209ac..b7afef4551 100644
--- a/src/libs/tracing/flamegraph.cpp
+++ b/src/libs/tracing/flamegraph.cpp
@@ -198,18 +198,18 @@ void FlameGraph::rebuild()
 
 void FlameGraph::mousePressEvent(QMouseEvent *event)
 {
-    Q_UNUSED(event);
+    Q_UNUSED(event)
 }
 
 void FlameGraph::mouseReleaseEvent(QMouseEvent *event)
 {
-    Q_UNUSED(event);
+    Q_UNUSED(event)
     setSelectedTypeId(-1);
 }
 
 void FlameGraph::mouseDoubleClickEvent(QMouseEvent *event)
 {
-    Q_UNUSED(event);
+    Q_UNUSED(event)
     setSelectedTypeId(-1);
     resetRoot();
 }
diff --git a/src/libs/tracing/timelineformattime.cpp b/src/libs/tracing/timelineformattime.cpp
index 54f12d90dd..97344dfb5f 100644
--- a/src/libs/tracing/timelineformattime.cpp
+++ b/src/libs/tracing/timelineformattime.cpp
@@ -88,8 +88,8 @@ QString formatTime(qint64 timestamp, qint64 reference)
 
 static QObject *createFormatter(QQmlEngine *engine, QJSEngine *scriptEngine)
 {
-    Q_UNUSED(engine);
-    Q_UNUSED(scriptEngine);
+    Q_UNUSED(engine)
+    Q_UNUSED(scriptEngine)
     return new TimeFormatter;
 }
 
@@ -97,7 +97,7 @@ void TimeFormatter::setupTimeFormatter()
 {
     static const int typeIndex = qmlRegisterSingletonType<TimeFormatter>(
                 "TimelineTimeFormatter", 1, 0, "TimeFormatter", createFormatter);
-    Q_UNUSED(typeIndex);
+    Q_UNUSED(typeIndex)
 }
 
 }
diff --git a/src/libs/tracing/timelineitemsrenderpass.cpp b/src/libs/tracing/timelineitemsrenderpass.cpp
index a4f89dc64d..00de497292 100644
--- a/src/libs/tracing/timelineitemsrenderpass.cpp
+++ b/src/libs/tracing/timelineitemsrenderpass.cpp
@@ -269,7 +269,7 @@ OpaqueColoredPoint2DWithSize *OpaqueColoredPoint2DWithSize::fromVertexData(QSGGe
     Q_ASSERT(attributes[3].position == 3);
     Q_ASSERT(attributes[3].tupleSize == 4);
     Q_ASSERT(attributes[3].type == GL_UNSIGNED_BYTE);
-    Q_UNUSED(attributes);
+    Q_UNUSED(attributes)
     return static_cast<OpaqueColoredPoint2DWithSize *>(geometry->vertexData());
 }
 
@@ -383,7 +383,7 @@ TimelineRenderPass::State *TimelineItemsRenderPass::update(const TimelineAbstrac
                                                            int indexTo, bool stateChanged,
                                                            float spacing) const
 {
-    Q_UNUSED(stateChanged);
+    Q_UNUSED(stateChanged)
     const TimelineModel *model = renderer->model();
     if (!model || indexFrom < 0 || indexTo > model->count() || indexFrom >= indexTo)
         return oldState;
diff --git a/src/libs/tracing/timelinemodel.cpp b/src/libs/tracing/timelinemodel.cpp
index c7b7c98904..f17af456eb 100644
--- a/src/libs/tracing/timelinemodel.cpp
+++ b/src/libs/tracing/timelinemodel.cpp
@@ -170,7 +170,7 @@ int TimelineModel::modelId() const
 
 int TimelineModel::collapsedRowHeight(int rowNumber) const
 {
-    Q_UNUSED(rowNumber);
+    Q_UNUSED(rowNumber)
     return TimelineModelPrivate::DefaultRowHeight;
 }
 
@@ -367,7 +367,7 @@ int TimelineModel::parentIndex(int index) const
 
 QVariantMap TimelineModel::location(int index) const
 {
-    Q_UNUSED(index);
+    Q_UNUSED(index)
     QVariantMap map;
     return map;
 }
@@ -379,25 +379,25 @@ QVariantMap TimelineModel::location(int index) const
  */
 bool TimelineModel::handlesTypeId(int typeIndex) const
 {
-    Q_UNUSED(typeIndex);
+    Q_UNUSED(typeIndex)
     return false;
 }
 
 float TimelineModel::relativeHeight(int index) const
 {
-    Q_UNUSED(index);
+    Q_UNUSED(index)
     return 1.0f;
 }
 
 qint64 TimelineModel::rowMinValue(int rowNumber) const
 {
-    Q_UNUSED(rowNumber);
+    Q_UNUSED(rowNumber)
     return 0;
 }
 
 qint64 TimelineModel::rowMaxValue(int rowNumber) const
 {
-    Q_UNUSED(rowNumber);
+    Q_UNUSED(rowNumber)
     return 0;
 }
 
@@ -516,7 +516,7 @@ int TimelineModel::rowCount() const
 
 QRgb TimelineModel::color(int index) const
 {
-    Q_UNUSED(index);
+    Q_UNUSED(index)
     return QRgb();
 }
 
@@ -527,19 +527,19 @@ QVariantList TimelineModel::labels() const
 
 QVariantMap TimelineModel::details(int index) const
 {
-    Q_UNUSED(index);
+    Q_UNUSED(index)
     return QVariantMap();
 }
 
 int TimelineModel::expandedRow(int index) const
 {
-    Q_UNUSED(index);
+    Q_UNUSED(index)
     return 0;
 }
 
 int TimelineModel::collapsedRow(int index) const
 {
-    Q_UNUSED(index);
+    Q_UNUSED(index)
     return 0;
 }
 
diff --git a/src/libs/tracing/timelinenotesrenderpass.cpp b/src/libs/tracing/timelinenotesrenderpass.cpp
index 0aa36a1762..e9bd80a0e9 100644
--- a/src/libs/tracing/timelinenotesrenderpass.cpp
+++ b/src/libs/tracing/timelinenotesrenderpass.cpp
@@ -106,9 +106,9 @@ TimelineRenderPass::State *TimelineNotesRenderPass::update(const TimelineAbstrac
                                                            int lastIndex, bool stateChanged,
                                                            float spacing) const
 {
-    Q_UNUSED(firstIndex);
-    Q_UNUSED(lastIndex);
-    Q_UNUSED(spacing);
+    Q_UNUSED(firstIndex)
+    Q_UNUSED(lastIndex)
+    Q_UNUSED(spacing)
 
     const TimelineNotesModel *notes = renderer->notes();
     const TimelineModel *model = renderer->model();
diff --git a/src/libs/tracing/timelinerenderer.cpp b/src/libs/tracing/timelinerenderer.cpp
index 182a7aadd6..a59f3c95c9 100644
--- a/src/libs/tracing/timelinerenderer.cpp
+++ b/src/libs/tracing/timelinerenderer.cpp
@@ -158,7 +158,7 @@ QSGNode *TimelineRenderer::updatePaintNode(QSGNode *node, UpdatePaintNodeData *u
 
 void TimelineRenderer::mousePressEvent(QMouseEvent *event)
 {
-    Q_UNUSED(event);
+    Q_UNUSED(event)
 }
 
 int TimelineRenderer::TimelineRendererPrivate::rowFromPosition(int y) const
diff --git a/src/libs/tracing/timelineselectionrenderpass.cpp b/src/libs/tracing/timelineselectionrenderpass.cpp
index b8d6c2991a..4493187357 100644
--- a/src/libs/tracing/timelineselectionrenderpass.cpp
+++ b/src/libs/tracing/timelineselectionrenderpass.cpp
@@ -66,7 +66,7 @@ TimelineRenderPass::State *TimelineSelectionRenderPass::update(
         const TimelineAbstractRenderer *renderer, const TimelineRenderState *parentState,
         State *oldState, int firstIndex, int lastIndex, bool stateChanged, float spacing) const
 {
-    Q_UNUSED(stateChanged);
+    Q_UNUSED(stateChanged)
 
     const TimelineModel *model = renderer->model();
     if (!model || model->isEmpty())
diff --git a/src/libs/tracing/timelinetheme.cpp b/src/libs/tracing/timelinetheme.cpp
index 22d8697b78..a8a7c874e1 100644
--- a/src/libs/tracing/timelinetheme.cpp
+++ b/src/libs/tracing/timelinetheme.cpp
@@ -105,8 +105,8 @@ public:
 
 static QObject *singletonProvider(QQmlEngine *engine, QJSEngine *scriptEngine)
 {
-    Q_UNUSED(engine);
-    Q_UNUSED(scriptEngine);
+    Q_UNUSED(engine)
+    Q_UNUSED(scriptEngine)
     return Utils::proxyTheme();
 }
 
@@ -114,7 +114,7 @@ void TimelineTheme::setupTheme(QQmlEngine *engine)
 {
     static const int typeIndex = qmlRegisterSingletonType<Utils::Theme>("TimelineTheme", 1, 0,
                                                                         "Theme", singletonProvider);
-    Q_UNUSED(typeIndex);
+    Q_UNUSED(typeIndex)
     engine->addImageProvider(QLatin1String("icons"), new TimelineImageIconProvider);
 }
 
diff --git a/src/libs/utils/basetreeview.cpp b/src/libs/utils/basetreeview.cpp
index 352b17bb4b..00b73002f8 100644
--- a/src/libs/utils/basetreeview.cpp
+++ b/src/libs/utils/basetreeview.cpp
@@ -345,7 +345,7 @@ public:
     QWidget *createEditor(QWidget *parent, const QStyleOptionViewItem &option,
                           const QModelIndex &index) const override
     {
-        Q_UNUSED(option);
+        Q_UNUSED(option)
         QLabel *label = new QLabel(parent);
         label->setAutoFillBackground(true);
         label->setTextInteractionFlags(Qt::TextSelectableByMouse
diff --git a/src/libs/utils/delegates.cpp b/src/libs/utils/delegates.cpp
index 2240e8a6a4..1eb281e3af 100644
--- a/src/libs/utils/delegates.cpp
+++ b/src/libs/utils/delegates.cpp
@@ -131,8 +131,8 @@ void PathChooserDelegate::setPromptDialogFilter(const QString &filter)
 
 QWidget *PathChooserDelegate::createEditor(QWidget *parent, const QStyleOptionViewItem &option, const QModelIndex &index) const
 {
-    Q_UNUSED(option);
-    Q_UNUSED(index);
+    Q_UNUSED(option)
+    Q_UNUSED(index)
 
     auto editor = new Utils::PathChooser(parent);
 
@@ -167,7 +167,7 @@ void PathChooserDelegate::setModelData(QWidget *editor, QAbstractItemModel *mode
 
 void PathChooserDelegate::updateEditorGeometry(QWidget *editor, const QStyleOptionViewItem &option, const QModelIndex &index) const
 {
-    Q_UNUSED(index);
+    Q_UNUSED(index)
 
     editor->setGeometry(option.rect);
 }
@@ -200,8 +200,8 @@ QWidget *CompleterDelegate::createEditor(QWidget *parent,
                                          const QStyleOptionViewItem &option,
                                          const QModelIndex &index) const
 {
-    Q_UNUSED(option);
-    Q_UNUSED(index);
+    Q_UNUSED(option)
+    Q_UNUSED(index)
 
     auto edit = new CompletingLineEdit(parent);
 
@@ -229,7 +229,7 @@ void CompleterDelegate::updateEditorGeometry(QWidget *editor,
                                              const QStyleOptionViewItem &option,
                                              const QModelIndex &index) const
 {
-    Q_UNUSED(index);
+    Q_UNUSED(index)
 
     editor->setGeometry(option.rect);
 }
diff --git a/src/libs/utils/fancylineedit.cpp b/src/libs/utils/fancylineedit.cpp
index 6b5b11995c..205de0dcc9 100644
--- a/src/libs/utils/fancylineedit.cpp
+++ b/src/libs/utils/fancylineedit.cpp
@@ -416,7 +416,7 @@ FancyLineEdit::ValidationFunction FancyLineEdit::defaultValidationFunction()
 
 bool FancyLineEdit::validateWithValidator(FancyLineEdit *edit, QString *errorMessage)
 {
-    Q_UNUSED(errorMessage);
+    Q_UNUSED(errorMessage)
     if (const QValidator *v = edit->validator()) {
         QString tmp = edit->text();
         int pos = edit->cursorPosition();
diff --git a/src/libs/utils/outputformatter.cpp b/src/libs/utils/outputformatter.cpp
index 7926422da6..475d8596e6 100644
--- a/src/libs/utils/outputformatter.cpp
+++ b/src/libs/utils/outputformatter.cpp
@@ -151,7 +151,7 @@ void OutputFormatter::initFormats()
 
 void OutputFormatter::handleLink(const QString &href)
 {
-    Q_UNUSED(href);
+    Q_UNUSED(href)
 }
 
 void OutputFormatter::setBoldFontEnabled(bool enabled)
diff --git a/src/libs/utils/qtcprocess.cpp b/src/libs/utils/qtcprocess.cpp
index 992e1817c0..7080d218a5 100644
--- a/src/libs/utils/qtcprocess.cpp
+++ b/src/libs/utils/qtcprocess.cpp
@@ -672,8 +672,8 @@ QtcProcess::QtcProcess(QObject *parent)
 {
     static int qProcessExitStatusMeta = qRegisterMetaType<QProcess::ExitStatus>();
     static int qProcessProcessErrorMeta = qRegisterMetaType<QProcess::ProcessError>();
-    Q_UNUSED(qProcessExitStatusMeta);
-    Q_UNUSED(qProcessProcessErrorMeta);
+    Q_UNUSED(qProcessExitStatusMeta)
+    Q_UNUSED(qProcessProcessErrorMeta)
 }
 
 void QtcProcess::setUseCtrlCStub(bool enabled)
diff --git a/src/libs/utils/settingsaccessor.cpp b/src/libs/utils/settingsaccessor.cpp
index 881652f5ea..bc34ec7f93 100644
--- a/src/libs/utils/settingsaccessor.cpp
+++ b/src/libs/utils/settingsaccessor.cpp
@@ -100,7 +100,7 @@ bool SettingsAccessor::saveSettings(const QVariantMap &data, QWidget *parent) co
  */
 SettingsAccessor::RestoreData SettingsAccessor::readData(const FilePath &path, QWidget *parent) const
 {
-    Q_UNUSED(parent);
+    Q_UNUSED(parent)
     RestoreData result = readFile(path);
     if (!result.data.isEmpty())
         result.data = preprocessReadSettings(result.data);
@@ -113,7 +113,7 @@ SettingsAccessor::RestoreData SettingsAccessor::readData(const FilePath &path, Q
 optional<SettingsAccessor::Issue>
 SettingsAccessor::writeData(const FilePath &path, const QVariantMap &data, QWidget *parent) const
 {
-    Q_UNUSED(parent);
+    Q_UNUSED(parent)
     return writeFile(path, prepareToWriteSettings(data));
 }
 
@@ -365,7 +365,7 @@ int VersionedBackUpStrategy::compare(const SettingsAccessor::RestoreData &data1,
 optional<FilePath>
 VersionedBackUpStrategy::backupName(const QVariantMap &oldData, const FilePath &path, const QVariantMap &data) const
 {
-    Q_UNUSED(data);
+    Q_UNUSED(data)
     FilePath backupName = path;
     const QByteArray oldEnvironmentId = settingsIdFromMap(oldData);
     const int oldVersion = versionFromMap(oldData);
@@ -707,8 +707,8 @@ QVariantMap MergingSettingsAccessor::postprocessMerge(const QVariantMap &main,
                                                       const QVariantMap &secondary,
                                                       const QVariantMap &result) const
 {
-    Q_UNUSED(main);
-    Q_UNUSED(secondary);
+    Q_UNUSED(main)
+    Q_UNUSED(secondary)
     return result;
 }
 
diff --git a/src/libs/utils/shellcommand.cpp b/src/libs/utils/shellcommand.cpp
index 99b0b0ace6..060c4003fa 100644
--- a/src/libs/utils/shellcommand.cpp
+++ b/src/libs/utils/shellcommand.cpp
@@ -238,7 +238,7 @@ unsigned ShellCommand::processFlags() const
 
 void ShellCommand::addTask(QFuture<void> &future)
 {
-    Q_UNUSED(future);
+    Q_UNUSED(future)
 }
 
 int ShellCommand::timeoutS() const
diff --git a/src/libs/utils/tooltip/tips.cpp b/src/libs/utils/tooltip/tips.cpp
index f6927efef5..116b0832ad 100644
--- a/src/libs/utils/tooltip/tips.cpp
+++ b/src/libs/utils/tooltip/tips.cpp
@@ -283,7 +283,7 @@ void WidgetTip::pinToolTipWidget(QWidget *parent)
 bool WidgetTip::canHandleContentReplacement(int typeId) const
 {
     // Always create a new widget.
-    Q_UNUSED(typeId);
+    Q_UNUSED(typeId)
     return false;
 }
 
diff --git a/src/libs/utils/treemodel.cpp b/src/libs/utils/treemodel.cpp
index 1f8fbd5756..89c8d5aa4c 100644
--- a/src/libs/utils/treemodel.cpp
+++ b/src/libs/utils/treemodel.cpp
@@ -521,7 +521,7 @@ void ModelTest::data()
  */
 void ModelTest::rowsAboutToBeInserted(const QModelIndex &parent, int start, int end)
 {
-    Q_UNUSED(end);
+    Q_UNUSED(end)
     Changing c;
     c.parent = parent;
     c.oldSize = model->rowCount(parent);
@@ -628,22 +628,22 @@ int TreeItem::indexOf(const TreeItem *item) const
 
 QVariant TreeItem::data(int column, int role) const
 {
-    Q_UNUSED(column);
-    Q_UNUSED(role);
+    Q_UNUSED(column)
+    Q_UNUSED(role)
     return QVariant();
 }
 
 bool TreeItem::setData(int column, const QVariant &data, int role)
 {
-    Q_UNUSED(column);
-    Q_UNUSED(data);
-    Q_UNUSED(role);
+    Q_UNUSED(column)
+    Q_UNUSED(data)
+    Q_UNUSED(role)
     return false;
 }
 
 Qt::ItemFlags TreeItem::flags(int column) const
 {
-    Q_UNUSED(column);
+    Q_UNUSED(column)
     return Qt::ItemIsEnabled | Qt::ItemIsSelectable;
 }
 
@@ -1195,7 +1195,7 @@ QVariant StaticTreeItem::data(int column, int role) const
 
 Qt::ItemFlags StaticTreeItem::flags(int column) const
 {
-    Q_UNUSED(column);
+    Q_UNUSED(column)
     return Qt::ItemIsEnabled;
 }
 
diff --git a/src/libs/utils/winutils.cpp b/src/libs/utils/winutils.cpp
index 5190e11fca..69eb0d11e8 100644
--- a/src/libs/utils/winutils.cpp
+++ b/src/libs/utils/winutils.cpp
@@ -131,9 +131,9 @@ QTCREATOR_UTILS_EXPORT QString winGetDLLVersion(WinDLLVersionType t,
     }
     return rc;
 #endif
-    Q_UNUSED(t);
-    Q_UNUSED(name);
-    Q_UNUSED(errorMessage);
+    Q_UNUSED(t)
+    Q_UNUSED(name)
+    Q_UNUSED(errorMessage)
     return QString();
 }
 
@@ -182,7 +182,7 @@ QTCREATOR_UTILS_EXPORT QString imageName(quint32 processId)
         result = QString::fromUtf16(reinterpret_cast<const ushort*>(path));
     CloseHandle(handle);
 #else
-    Q_UNUSED(processId);
+    Q_UNUSED(processId)
 #endif
     return result;
 }
diff --git a/src/plugins/android/androiddevicedialog.cpp b/src/plugins/android/androiddevicedialog.cpp
index 9311f9a5a5..ce4505521a 100644
--- a/src/plugins/android/androiddevicedialog.cpp
+++ b/src/plugins/android/androiddevicedialog.cpp
@@ -316,7 +316,7 @@ int AndroidDeviceModel::rowCount(const QModelIndex &parent) const
 
 int AndroidDeviceModel::columnCount(const QModelIndex &parent) const
 {
-    Q_UNUSED(parent);
+    Q_UNUSED(parent)
     return 1;
 }
 
diff --git a/src/plugins/android/androiderrormessage.cpp b/src/plugins/android/androiderrormessage.cpp
index 5d87c5ba73..f3d6fbf122 100644
--- a/src/plugins/android/androiderrormessage.cpp
+++ b/src/plugins/android/androiderrormessage.cpp
@@ -32,7 +32,7 @@ namespace Internal {
 
 QString AndroidErrorMessage::getMessage(ErrorCode errorCode, const QVariantList &parameters)
 {
-    Q_UNUSED(parameters);
+    Q_UNUSED(parameters)
     switch (errorCode) {
     case SDKInstallationError:
         return tr("Android: SDK installation error 0x%1").arg(errorCode, 0, 16);
diff --git a/src/plugins/android/androidplugin.cpp b/src/plugins/android/androidplugin.cpp
index 6999162914..61c4b62252 100644
--- a/src/plugins/android/androidplugin.cpp
+++ b/src/plugins/android/androidplugin.cpp
@@ -171,8 +171,8 @@ AndroidPlugin::~AndroidPlugin()
 
 bool AndroidPlugin::initialize(const QStringList &arguments, QString *errorMessage)
 {
-    Q_UNUSED(arguments);
-    Q_UNUSED(errorMessage);
+    Q_UNUSED(arguments)
+    Q_UNUSED(errorMessage)
 
     d = new AndroidPluginPrivate;
 
diff --git a/src/plugins/android/androidrunner.cpp b/src/plugins/android/androidrunner.cpp
index 24ac13a4f1..ed8fe5ace7 100644
--- a/src/plugins/android/androidrunner.cpp
+++ b/src/plugins/android/androidrunner.cpp
@@ -127,7 +127,7 @@ AndroidRunner::AndroidRunner(RunControl *runControl, const QString &intentName)
         qRegisterMetaType<Utils::Port>("Utils::Port"),
         qRegisterMetaType<AndroidDeviceInfo>("Android::AndroidDeviceInfo")
     };
-    Q_UNUSED(metaTypes);
+    Q_UNUSED(metaTypes)
 
     m_checkAVDTimer.setInterval(2000);
     connect(&m_checkAVDTimer, &QTimer::timeout, this, &AndroidRunner::checkAVD);
diff --git a/src/plugins/android/androidsignaloperation.cpp b/src/plugins/android/androidsignaloperation.cpp
index 2410ed4732..6a43b03062 100644
--- a/src/plugins/android/androidsignaloperation.cpp
+++ b/src/plugins/android/androidsignaloperation.cpp
@@ -127,7 +127,7 @@ void Android::Internal::AndroidSignalOperation::killProcess(qint64 pid)
 
 void Android::Internal::AndroidSignalOperation::killProcess(const QString &filePath)
 {
-    Q_UNUSED(filePath);
+    Q_UNUSED(filePath)
     m_errorMessage = QLatin1String("The android signal operation does "
                                    "not support killing by filepath.");
     emit finished(m_errorMessage);
@@ -140,7 +140,7 @@ void Android::Internal::AndroidSignalOperation::interruptProcess(qint64 pid)
 
 void Android::Internal::AndroidSignalOperation::interruptProcess(const QString &filePath)
 {
-    Q_UNUSED(filePath);
+    Q_UNUSED(filePath)
     m_errorMessage = QLatin1String("The android signal operation does "
                                    "not support interrupting by filepath.");
     emit finished(m_errorMessage);
diff --git a/src/plugins/android/androidtoolchain.cpp b/src/plugins/android/androidtoolchain.cpp
index c0709d374d..c5317e9eea 100644
--- a/src/plugins/android/androidtoolchain.cpp
+++ b/src/plugins/android/androidtoolchain.cpp
@@ -120,7 +120,7 @@ QStringList AndroidToolChain::suggestedMkspecList() const
 
 FilePath AndroidToolChain::makeCommand(const Environment &env) const
 {
-    Q_UNUSED(env);
+    Q_UNUSED(env)
     FilePath makePath = AndroidConfigurations::currentConfig().makePath();
     return makePath.exists() ? makePath : FilePath::fromString("make");
 }
diff --git a/src/plugins/autotest/itestframework.h b/src/plugins/autotest/itestframework.h
index abcc218406..b90a0823d6 100644
--- a/src/plugins/autotest/itestframework.h
+++ b/src/plugins/autotest/itestframework.h
@@ -50,7 +50,7 @@ public:
     virtual IFrameworkSettings *createFrameworkSettings() const { return nullptr; }
     virtual ITestSettingsPage *createSettingsPage(QSharedPointer<IFrameworkSettings> settings) const
     {
-        Q_UNUSED(settings);
+        Q_UNUSED(settings)
         return nullptr;
     }
 
diff --git a/src/plugins/autotest/itestparser.cpp b/src/plugins/autotest/itestparser.cpp
index b7e1f15245..27000748ad 100644
--- a/src/plugins/autotest/itestparser.cpp
+++ b/src/plugins/autotest/itestparser.cpp
@@ -41,8 +41,8 @@ CppParser::CppParser()
 
 void CppParser::init(const QStringList &filesToParse, bool fullParse)
 {
-    Q_UNUSED(filesToParse);
-    Q_UNUSED(fullParse);
+    Q_UNUSED(filesToParse)
+    Q_UNUSED(fullParse)
     m_cppSnapshot = CppTools::CppModelManager::instance()->snapshot();
     m_workingCopy = CppTools::CppModelManager::instance()->workingCopy();
 }
diff --git a/src/plugins/autotoolsprojectmanager/autotoolsproject.cpp b/src/plugins/autotoolsprojectmanager/autotoolsproject.cpp
index 64629c3142..89350e62cb 100644
--- a/src/plugins/autotoolsprojectmanager/autotoolsproject.cpp
+++ b/src/plugins/autotoolsprojectmanager/autotoolsproject.cpp
@@ -220,7 +220,7 @@ void AutotoolsProject::makefileParsingFinished()
 
 void AutotoolsProject::onFileChanged(const QString &file)
 {
-    Q_UNUSED(file);
+    Q_UNUSED(file)
     loadProjectTree();
 }
 
diff --git a/src/plugins/baremetal/gdbserverproviderchooser.cpp b/src/plugins/baremetal/gdbserverproviderchooser.cpp
index 764a9ee0cd..768c2d205f 100644
--- a/src/plugins/baremetal/gdbserverproviderchooser.cpp
+++ b/src/plugins/baremetal/gdbserverproviderchooser.cpp
@@ -87,7 +87,7 @@ void GdbServerProviderChooser::manageButtonClicked()
 
 void GdbServerProviderChooser::currentIndexChanged(int index)
 {
-    Q_UNUSED(index);
+    Q_UNUSED(index)
     emit providerChanged();
 }
 
diff --git a/src/plugins/baremetal/iarewtoolchain.cpp b/src/plugins/baremetal/iarewtoolchain.cpp
index 2f4faf0c8a..c4c03e7d7c 100644
--- a/src/plugins/baremetal/iarewtoolchain.cpp
+++ b/src/plugins/baremetal/iarewtoolchain.cpp
@@ -284,7 +284,7 @@ Utils::LanguageExtensions IarToolChain::languageExtensions(const QStringList &)
 
 WarningFlags IarToolChain::warningFlags(const QStringList &cxxflags) const
 {
-    Q_UNUSED(cxxflags);
+    Q_UNUSED(cxxflags)
     return WarningFlags::Default;
 }
 
diff --git a/src/plugins/baremetal/keiltoolchain.cpp b/src/plugins/baremetal/keiltoolchain.cpp
index c40d43faa3..eb6afe8e0e 100644
--- a/src/plugins/baremetal/keiltoolchain.cpp
+++ b/src/plugins/baremetal/keiltoolchain.cpp
@@ -294,7 +294,7 @@ Utils::LanguageExtensions KeilToolchain::languageExtensions(const QStringList &)
 
 WarningFlags KeilToolchain::warningFlags(const QStringList &cxxflags) const
 {
-    Q_UNUSED(cxxflags);
+    Q_UNUSED(cxxflags)
     return WarningFlags::Default;
 }
 
diff --git a/src/plugins/baremetal/sdcctoolchain.cpp b/src/plugins/baremetal/sdcctoolchain.cpp
index ebaa4d1093..adc8716c1d 100644
--- a/src/plugins/baremetal/sdcctoolchain.cpp
+++ b/src/plugins/baremetal/sdcctoolchain.cpp
@@ -270,7 +270,7 @@ Utils::LanguageExtensions SdccToolChain::languageExtensions(const QStringList &)
 
 WarningFlags SdccToolChain::warningFlags(const QStringList &cxxflags) const
 {
-    Q_UNUSED(cxxflags);
+    Q_UNUSED(cxxflags)
     return WarningFlags::Default;
 }
 
diff --git a/src/plugins/bazaar/bazaarplugin.cpp b/src/plugins/bazaar/bazaarplugin.cpp
index a35b2ede62..c2990c9232 100644
--- a/src/plugins/bazaar/bazaarplugin.cpp
+++ b/src/plugins/bazaar/bazaarplugin.cpp
@@ -145,8 +145,8 @@ BazaarPlugin::~BazaarPlugin()
 
 bool BazaarPlugin::initialize(const QStringList &arguments, QString *errorMessage)
 {
-    Q_UNUSED(arguments);
-    Q_UNUSED(errorMessage);
+    Q_UNUSED(arguments)
+    Q_UNUSED(errorMessage)
 
     Context context(Constants::BAZAAR_CONTEXT);
 
diff --git a/src/plugins/bookmarks/bookmarkfilter.cpp b/src/plugins/bookmarks/bookmarkfilter.cpp
index a148e69955..0c74ceafeb 100644
--- a/src/plugins/bookmarks/bookmarkfilter.cpp
+++ b/src/plugins/bookmarks/bookmarkfilter.cpp
@@ -46,7 +46,7 @@ BookmarkFilter::BookmarkFilter(BookmarkManager *manager)
 QList<LocatorFilterEntry> BookmarkFilter::matchesFor(QFutureInterface<LocatorFilterEntry> &future,
                                                      const QString &entry)
 {
-    Q_UNUSED(future);
+    Q_UNUSED(future)
     if (m_manager->rowCount() == 0)
         return QList<LocatorFilterEntry>();
 
@@ -120,9 +120,9 @@ QList<LocatorFilterEntry> BookmarkFilter::matchesFor(QFutureInterface<LocatorFil
 void BookmarkFilter::accept(LocatorFilterEntry selection, QString *newText,
                             int *selectionStart, int *selectionLength) const
 {
-    Q_UNUSED(newText);
-    Q_UNUSED(selectionStart);
-    Q_UNUSED(selectionLength);
+    Q_UNUSED(newText)
+    Q_UNUSED(selectionStart)
+    Q_UNUSED(selectionLength)
     if (const Bookmark *bookmark = m_manager->bookmarkForIndex(
                 selection.internalData.toModelIndex())) {
         m_manager->gotoBookmark(bookmark);
@@ -131,5 +131,5 @@ void BookmarkFilter::accept(LocatorFilterEntry selection, QString *newText,
 
 void BookmarkFilter::refresh(QFutureInterface<void> &future)
 {
-    Q_UNUSED(future);
+    Q_UNUSED(future)
 }
diff --git a/src/plugins/clangcodemodel/clangcodemodelplugin.cpp b/src/plugins/clangcodemodel/clangcodemodelplugin.cpp
index 403433aec6..51aaa6ba7a 100644
--- a/src/plugins/clangcodemodel/clangcodemodelplugin.cpp
+++ b/src/plugins/clangcodemodel/clangcodemodelplugin.cpp
@@ -95,8 +95,8 @@ ClangCodeModelPlugin::~ClangCodeModelPlugin()
 
 bool ClangCodeModelPlugin::initialize(const QStringList &arguments, QString *errorMessage)
 {
-    Q_UNUSED(arguments);
-    Q_UNUSED(errorMessage);
+    Q_UNUSED(arguments)
+    Q_UNUSED(errorMessage)
 
     ProjectExplorer::TaskHub::addCategory(Constants::TASK_CATEGORY_DIAGNOSTICS,
                                           tr("Clang Code Model"));
diff --git a/src/plugins/clangtools/clangtoolsplugin.cpp b/src/plugins/clangtools/clangtoolsplugin.cpp
index fa0d6589d2..436fc3242a 100644
--- a/src/plugins/clangtools/clangtoolsplugin.cpp
+++ b/src/plugins/clangtools/clangtoolsplugin.cpp
@@ -118,8 +118,8 @@ ClangToolsPlugin::~ClangToolsPlugin()
 
 bool ClangToolsPlugin::initialize(const QStringList &arguments, QString *errorString)
 {
-    Q_UNUSED(arguments);
-    Q_UNUSED(errorString);
+    Q_UNUSED(arguments)
+    Q_UNUSED(errorString)
 
     d = new ClangToolsPluginPrivate;
 
diff --git a/src/plugins/clearcase/clearcasecontrol.cpp b/src/plugins/clearcase/clearcasecontrol.cpp
index c3fdbc8d64..a9dd295518 100644
--- a/src/plugins/clearcase/clearcasecontrol.cpp
+++ b/src/plugins/clearcase/clearcasecontrol.cpp
@@ -51,7 +51,7 @@ Core::Id ClearCaseControl::id() const
 
 bool ClearCaseControl::isVcsFileOrDirectory(const Utils::FilePath &fileName) const
 {
-    Q_UNUSED(fileName);
+    Q_UNUSED(fileName)
     return false; // ClearCase has no files/directories littering the sources
 }
 
diff --git a/src/plugins/cmakeprojectmanager/cmakebuildsettingswidget.cpp b/src/plugins/cmakeprojectmanager/cmakebuildsettingswidget.cpp
index cf94cbf23d..4bc65937b9 100644
--- a/src/plugins/cmakeprojectmanager/cmakebuildsettingswidget.cpp
+++ b/src/plugins/cmakeprojectmanager/cmakebuildsettingswidget.cpp
@@ -408,7 +408,7 @@ void CMakeBuildSettingsWidget::setConfigurationForCMake()
 
 void CMakeBuildSettingsWidget::updateSelection(const QModelIndex &current, const QModelIndex &previous)
 {
-    Q_UNUSED(previous);
+    Q_UNUSED(previous)
 
     m_editButton->setEnabled(current.isValid() && current.flags().testFlag(Qt::ItemIsEditable));
     m_unsetButton->setEnabled(current.isValid() && current.flags().testFlag(Qt::ItemIsSelectable));
diff --git a/src/plugins/cmakeprojectmanager/cmakekitinformation.cpp b/src/plugins/cmakeprojectmanager/cmakekitinformation.cpp
index efe0dccc57..5ed53c265d 100644
--- a/src/plugins/cmakeprojectmanager/cmakekitinformation.cpp
+++ b/src/plugins/cmakeprojectmanager/cmakekitinformation.cpp
@@ -928,7 +928,7 @@ void CMakeConfigurationKitAspect::fromStringList(Kit *k, const QStringList &in)
 
 CMakeConfig CMakeConfigurationKitAspect::defaultConfiguration(const Kit *k)
 {
-    Q_UNUSED(k);
+    Q_UNUSED(k)
     CMakeConfig config;
     // Qt4:
     config << CMakeConfigItem(CMAKE_QMAKE_KEY, "%{Qt:qmakeExecutable}");
@@ -943,7 +943,7 @@ CMakeConfig CMakeConfigurationKitAspect::defaultConfiguration(const Kit *k)
 
 QVariant CMakeConfigurationKitAspect::defaultValue(const Kit *k) const
 {
-    Q_UNUSED(k);
+    Q_UNUSED(k)
 
     // FIXME: Convert preload scripts
     CMakeConfig config = defaultConfiguration(k);
@@ -1058,7 +1058,7 @@ void CMakeConfigurationKitAspect::setup(Kit *k)
 
 void CMakeConfigurationKitAspect::fix(Kit *k)
 {
-    Q_UNUSED(k);
+    Q_UNUSED(k)
 }
 
 KitAspect::ItemList CMakeConfigurationKitAspect::toUserOutput(const Kit *k) const
diff --git a/src/plugins/cmakeprojectmanager/cmakerunconfiguration.cpp b/src/plugins/cmakeprojectmanager/cmakerunconfiguration.cpp
index 30514b70a5..50bfeb7b3a 100644
--- a/src/plugins/cmakeprojectmanager/cmakerunconfiguration.cpp
+++ b/src/plugins/cmakeprojectmanager/cmakerunconfiguration.cpp
@@ -72,7 +72,7 @@ CMakeRunConfiguration::CMakeRunConfiguration(Target *target, Core::Id id)
 
 void CMakeRunConfiguration::doAdditionalSetup(const RunConfigurationCreationInfo &info)
 {
-    Q_UNUSED(info);
+    Q_UNUSED(info)
     updateTargetInformation();
 }
 
diff --git a/src/plugins/cmakeprojectmanager/configmodelitemdelegate.cpp b/src/plugins/cmakeprojectmanager/configmodelitemdelegate.cpp
index 588855d345..72d5561556 100644
--- a/src/plugins/cmakeprojectmanager/configmodelitemdelegate.cpp
+++ b/src/plugins/cmakeprojectmanager/configmodelitemdelegate.cpp
@@ -126,8 +126,8 @@ void ConfigModelItemDelegate::setModelData(QWidget *editor, QAbstractItemModel *
 QSize CMakeProjectManager::ConfigModelItemDelegate::sizeHint(const QStyleOptionViewItem &option,
                                                              const QModelIndex &index) const
 {
-    Q_UNUSED(option);
-    Q_UNUSED(index);
+    Q_UNUSED(option)
+    Q_UNUSED(index)
     return QSize(100, m_measurement.sizeHint().height());
 }
 
diff --git a/src/plugins/cmakeprojectmanager/servermode.cpp b/src/plugins/cmakeprojectmanager/servermode.cpp
index bd37c4f6fe..64448a149e 100644
--- a/src/plugins/cmakeprojectmanager/servermode.cpp
+++ b/src/plugins/cmakeprojectmanager/servermode.cpp
@@ -453,7 +453,7 @@ void ServerMode::parseJson(const QVariantMap &data)
 
 void ServerMode::handleHello(const QVariantMap &data)
 {
-    Q_UNUSED(data);
+    Q_UNUSED(data)
     QVariantMap extra;
     QVariantMap version;
     version.insert("major", m_majorProtocol);
diff --git a/src/plugins/compilationdatabaseprojectmanager/compilationdatabaseprojectmanagerplugin.cpp b/src/plugins/compilationdatabaseprojectmanager/compilationdatabaseprojectmanagerplugin.cpp
index 5da42c8bfd..0eca37325c 100644
--- a/src/plugins/compilationdatabaseprojectmanager/compilationdatabaseprojectmanagerplugin.cpp
+++ b/src/plugins/compilationdatabaseprojectmanager/compilationdatabaseprojectmanagerplugin.cpp
@@ -47,8 +47,8 @@ const char COMPILE_COMMANDS_JSON[] = "compile_commands.json";
 
 bool CompilationDatabaseProjectManagerPlugin::initialize(const QStringList &arguments, QString *errorMessage)
 {
-    Q_UNUSED(arguments);
-    Q_UNUSED(errorMessage);
+    Q_UNUSED(arguments)
+    Q_UNUSED(errorMessage)
     Core::FileIconProvider::registerIconOverlayForFilename(
                 Utils::Icons::PROJECT.imageFileName(),
                 COMPILE_COMMANDS_JSON);
diff --git a/src/plugins/coreplugin/externaltool.cpp b/src/plugins/coreplugin/externaltool.cpp
index 93a688324d..97e0e003be 100644
--- a/src/plugins/coreplugin/externaltool.cpp
+++ b/src/plugins/coreplugin/externaltool.cpp
@@ -697,7 +697,7 @@ void ExternalToolRunner::error(QProcess::ProcessError error)
     if (m_tool->modifiesCurrentDocument())
         DocumentManager::unexpectFileChange(m_expectedFileName);
     // TODO inform about errors
-    Q_UNUSED(error);
+    Q_UNUSED(error)
     deleteLater();
 }
 
diff --git a/src/plugins/coreplugin/iversioncontrol.cpp b/src/plugins/coreplugin/iversioncontrol.cpp
index 3bc7ddd6f8..4a2ade10e7 100644
--- a/src/plugins/coreplugin/iversioncontrol.cpp
+++ b/src/plugins/coreplugin/iversioncontrol.cpp
@@ -83,10 +83,10 @@ ShellCommand *IVersionControl::createInitialCheckoutCommand(const QString &url,
                                                             const QString &localName,
                                                             const QStringList &extraArgs)
 {
-    Q_UNUSED(url);
-    Q_UNUSED(baseDirectory);
-    Q_UNUSED(localName);
-    Q_UNUSED(extraArgs);
+    Q_UNUSED(url)
+    Q_UNUSED(baseDirectory)
+    Q_UNUSED(localName)
+    Q_UNUSED(extraArgs)
     return nullptr;
 }
 
@@ -102,7 +102,7 @@ IVersionControl::~IVersionControl()
 
 IVersionControl::OpenSupportMode IVersionControl::openSupportMode(const QString &fileName) const
 {
-    Q_UNUSED(fileName);
+    Q_UNUSED(fileName)
     return NoOpen;
 }
 
diff --git a/src/plugins/coreplugin/iversioncontrol.h b/src/plugins/coreplugin/iversioncontrol.h
index 0846793b5a..338bab86d8 100644
--- a/src/plugins/coreplugin/iversioncontrol.h
+++ b/src/plugins/coreplugin/iversioncontrol.h
@@ -246,7 +246,7 @@ public:
     ~TestVersionControl() override;
 
     bool isVcsFileOrDirectory(const Utils::FilePath &fileName) const final
-    { Q_UNUSED(fileName); return false; }
+    { Q_UNUSED(fileName) return false; }
 
     void setManagedDirectories(const QHash<QString, QString> &dirs);
     void setManagedFiles(const QSet<QString> &files);
diff --git a/src/plugins/coreplugin/locator/javascriptfilter.cpp b/src/plugins/coreplugin/locator/javascriptfilter.cpp
index 58a119047b..ab6727b8a2 100644
--- a/src/plugins/coreplugin/locator/javascriptfilter.cpp
+++ b/src/plugins/coreplugin/locator/javascriptfilter.cpp
@@ -59,7 +59,7 @@ JavaScriptFilter::~JavaScriptFilter()
 
 void JavaScriptFilter::prepareSearch(const QString &entry)
 {
-    Q_UNUSED(entry);
+    Q_UNUSED(entry)
 
     if (!m_engine)
         setupEngine();
@@ -70,7 +70,7 @@ void JavaScriptFilter::prepareSearch(const QString &entry)
 QList<LocatorFilterEntry> JavaScriptFilter::matchesFor(
         QFutureInterface<Core::LocatorFilterEntry> &future, const QString &entry)
 {
-    Q_UNUSED(future);
+    Q_UNUSED(future)
 
     QList<LocatorFilterEntry> entries;
     if (entry.trimmed().isEmpty()) {
@@ -94,9 +94,9 @@ QList<LocatorFilterEntry> JavaScriptFilter::matchesFor(
 void JavaScriptFilter::accept(Core::LocatorFilterEntry selection, QString *newText,
                               int *selectionStart, int *selectionLength) const
 {
-    Q_UNUSED(newText);
-    Q_UNUSED(selectionStart);
-    Q_UNUSED(selectionLength);
+    Q_UNUSED(newText)
+    Q_UNUSED(selectionStart)
+    Q_UNUSED(selectionLength)
 
     if (selection.internalData.isNull())
         return;
@@ -112,7 +112,7 @@ void JavaScriptFilter::accept(Core::LocatorFilterEntry selection, QString *newTe
 
 void JavaScriptFilter::refresh(QFutureInterface<void> &future)
 {
-    Q_UNUSED(future);
+    Q_UNUSED(future)
     // Nothing to refresh
 }
 
diff --git a/src/plugins/coreplugin/locator/locatorsettingspage.cpp b/src/plugins/coreplugin/locator/locatorsettingspage.cpp
index 5e35f2058c..68b263a8d5 100644
--- a/src/plugins/coreplugin/locator/locatorsettingspage.cpp
+++ b/src/plugins/coreplugin/locator/locatorsettingspage.cpp
@@ -74,7 +74,7 @@ class CategoryItem : public TreeItem
 public:
     CategoryItem(const QString &name, int order);
     QVariant data(int column, int role) const override;
-    Qt::ItemFlags flags(int column) const override { Q_UNUSED(column); return Qt::ItemIsEnabled; }
+    Qt::ItemFlags flags(int column) const override { Q_UNUSED(column) return Qt::ItemIsEnabled; }
 
 private:
     QString m_name;
@@ -154,7 +154,7 @@ CategoryItem::CategoryItem(const QString &name, int order)
 
 QVariant CategoryItem::data(int column, int role) const
 {
-    Q_UNUSED(column);
+    Q_UNUSED(column)
     if (role == SortRole)
         return m_order;
     if (role == Qt::DisplayRole)
diff --git a/src/plugins/coreplugin/menubarfilter.cpp b/src/plugins/coreplugin/menubarfilter.cpp
index 7791bb1f1e..dc8de54614 100644
--- a/src/plugins/coreplugin/menubarfilter.cpp
+++ b/src/plugins/coreplugin/menubarfilter.cpp
@@ -71,17 +71,17 @@ static const QList<QAction *> menuBarActions()
 QList<LocatorFilterEntry> MenuBarFilter::matchesFor(QFutureInterface<LocatorFilterEntry> &future,
                                                     const QString &entry)
 {
-    Q_UNUSED(future);
-    Q_UNUSED(entry);
+    Q_UNUSED(future)
+    Q_UNUSED(entry)
     return std::move(m_entries);
 }
 
 void MenuBarFilter::accept(LocatorFilterEntry selection, QString *newText,
                            int *selectionStart, int *selectionLength) const
 {
-    Q_UNUSED(newText);
-    Q_UNUSED(selectionStart);
-    Q_UNUSED(selectionLength);
+    Q_UNUSED(newText)
+    Q_UNUSED(selectionStart)
+    Q_UNUSED(selectionLength)
     if (auto action = selection.internalData.value<QPointer<QAction>>()) {
         QTimer::singleShot(0, action, [action] {
             if (action->isEnabled())
@@ -92,7 +92,7 @@ void MenuBarFilter::accept(LocatorFilterEntry selection, QString *newText,
 
 void MenuBarFilter::refresh(QFutureInterface<void> &future)
 {
-    Q_UNUSED(future);
+    Q_UNUSED(future)
 }
 
 QList<LocatorFilterEntry> MenuBarFilter::matchesForAction(QAction *action,
@@ -182,7 +182,7 @@ void MenuBarFilter::updateEnabledActionCache()
 
 void Core::Internal::MenuBarFilter::prepareSearch(const QString &entry)
 {
-    Q_UNUSED(entry);
+    Q_UNUSED(entry)
     static const QString separators = ". >/";
     static const QRegularExpression seperatorRegExp(QString("[%1]").arg(separators));
     QString normalized = entry;
diff --git a/src/plugins/coreplugin/navigationwidget.cpp b/src/plugins/coreplugin/navigationwidget.cpp
index aae3a618f9..40fa487e5f 100644
--- a/src/plugins/coreplugin/navigationwidget.cpp
+++ b/src/plugins/coreplugin/navigationwidget.cpp
@@ -542,7 +542,7 @@ QString NavigationWidget::settingsKey(const QString &key) const
 
 void NavigationWidget::onSubWidgetFactoryIndexChanged(int factoryIndex)
 {
-    Q_UNUSED(factoryIndex);
+    Q_UNUSED(factoryIndex)
     auto subWidget = qobject_cast<Internal::NavigationSubWidget *>(sender());
     QTC_ASSERT(subWidget, return);
     Id factoryId = subWidget->factory()->id();
diff --git a/src/plugins/coreplugin/variablechooser.cpp b/src/plugins/coreplugin/variablechooser.cpp
index f2e0edef02..46466623c4 100644
--- a/src/plugins/coreplugin/variablechooser.cpp
+++ b/src/plugins/coreplugin/variablechooser.cpp
@@ -466,7 +466,7 @@ void VariableChooserPrivate::updateButtonGeometry()
 
 void VariableChooserPrivate::updateCurrentEditor(QWidget *old, QWidget *widget)
 {
-    Q_UNUSED(old);
+    Q_UNUSED(old)
     if (!widget) // we might loose focus, but then keep the previous state
         return;
     // prevent children of the chooser itself, and limit to children of chooser's parent
diff --git a/src/plugins/cpaster/pastebindotcomprotocol.cpp b/src/plugins/cpaster/pastebindotcomprotocol.cpp
index 86ae8f3f97..fb3d60ba92 100644
--- a/src/plugins/cpaster/pastebindotcomprotocol.cpp
+++ b/src/plugins/cpaster/pastebindotcomprotocol.cpp
@@ -105,8 +105,8 @@ void PasteBinDotComProtocol::paste(const QString &text,
                                    const QString &comment,
                                    const QString &description)
 {
-    Q_UNUSED(comment);
-    Q_UNUSED(description);
+    Q_UNUSED(comment)
+    Q_UNUSED(description)
     QTC_ASSERT(!m_pasteReply, return);
 
     // Format body
diff --git a/src/plugins/cpaster/pastecodedotxyzprotocol.cpp b/src/plugins/cpaster/pastecodedotxyzprotocol.cpp
index 5bd2b869ad..8ca7d5c547 100644
--- a/src/plugins/cpaster/pastecodedotxyzprotocol.cpp
+++ b/src/plugins/cpaster/pastecodedotxyzprotocol.cpp
@@ -86,7 +86,7 @@ void PasteCodeDotXyzProtocol::paste(const QString &text, Protocol::ContentType c
         return QByteArray(); // Crutch for compiler.
     };
     data += "&lang=" + langValue(ct);
-    Q_UNUSED(comment);
+    Q_UNUSED(comment)
 
     QNetworkReply * const reply = httpPost(apiUrl() + "/create", data);
     connect(reply, &QNetworkReply::finished, this, [this, reply] {
diff --git a/src/plugins/cpaster/stickynotespasteprotocol.cpp b/src/plugins/cpaster/stickynotespasteprotocol.cpp
index 3ec958d99c..9c8ad232eb 100644
--- a/src/plugins/cpaster/stickynotespasteprotocol.cpp
+++ b/src/plugins/cpaster/stickynotespasteprotocol.cpp
@@ -106,7 +106,7 @@ void StickyNotesPasteProtocol::paste(const QString &text,
     enum { maxDescriptionLength = 30 }; // Length of description is limited.
 
     Q_UNUSED(username)
-    Q_UNUSED(comment);
+    Q_UNUSED(comment)
     QTC_ASSERT(!m_pasteReply, return);
 
     // Format body
diff --git a/src/plugins/cppcheck/cppcheckplugin.cpp b/src/plugins/cppcheck/cppcheckplugin.cpp
index 983955ef39..5b96452f4e 100644
--- a/src/plugins/cppcheck/cppcheckplugin.cpp
+++ b/src/plugins/cppcheck/cppcheckplugin.cpp
@@ -55,8 +55,8 @@ CppcheckPlugin::~CppcheckPlugin() = default;
 
 bool CppcheckPlugin::initialize(const QStringList &arguments, QString *errorString)
 {
-    Q_UNUSED(arguments);
-    Q_UNUSED(errorString);
+    Q_UNUSED(arguments)
+    Q_UNUSED(errorString)
 
     d.reset(new CppcheckPluginPrivate);
 
diff --git a/src/plugins/cppeditor/cppeditordocument.cpp b/src/plugins/cppeditor/cppeditordocument.cpp
index 9574ed0e8d..e2d85d0f41 100644
--- a/src/plugins/cppeditor/cppeditordocument.cpp
+++ b/src/plugins/cppeditor/cppeditordocument.cpp
@@ -234,7 +234,7 @@ void CppEditorDocument::reparseWithPreferredParseContext(const QString &parseCon
 void CppEditorDocument::onFilePathChanged(const Utils::FilePath &oldPath,
                                           const Utils::FilePath &newPath)
 {
-    Q_UNUSED(oldPath);
+    Q_UNUSED(oldPath)
 
     if (!newPath.isEmpty()) {
         indenter()->setFileName(newPath);
diff --git a/src/plugins/cppeditor/cppincludehierarchy.cpp b/src/plugins/cppeditor/cppincludehierarchy.cpp
index eaa1b064c8..856703199c 100644
--- a/src/plugins/cppeditor/cppincludehierarchy.cpp
+++ b/src/plugins/cppeditor/cppincludehierarchy.cpp
@@ -180,7 +180,7 @@ private:
 
 QVariant CppIncludeHierarchyItem::data(int column, int role) const
 {
-    Q_UNUSED(column);
+    Q_UNUSED(column)
     if (role == Qt::DisplayRole) {
         if (isPhony() && childCount() == 0)
             return QString(m_fileName + ' ' + CppIncludeHierarchyModel::tr("(none)"));
diff --git a/src/plugins/cppeditor/cppuseselections_test.cpp b/src/plugins/cppeditor/cppuseselections_test.cpp
index 99674b2e3c..f917c59461 100644
--- a/src/plugins/cppeditor/cppuseselections_test.cpp
+++ b/src/plugins/cppeditor/cppuseselections_test.cpp
@@ -165,7 +165,7 @@ void CppEditorPlugin::test_useSelections_data()
                 );
 
     QTest::newRow("local use as macro argument 1 - argument expanded")
-            << _("#define Q_UNUSED(x) (void)x;\n"
+            << _("#define Q_UNUSED(x) (void)x\n"
                  "void f(int arg)\n"
                  "{\n"
                  "    Q_UNUSED(@arg)\n"
diff --git a/src/plugins/cpptools/baseeditordocumentparser.cpp b/src/plugins/cpptools/baseeditordocumentparser.cpp
index 91c6a3aa79..0616182376 100644
--- a/src/plugins/cpptools/baseeditordocumentparser.cpp
+++ b/src/plugins/cpptools/baseeditordocumentparser.cpp
@@ -55,7 +55,7 @@ BaseEditorDocumentParser::BaseEditorDocumentParser(const QString &filePath)
     : m_filePath(filePath)
 {
     static int meta = qRegisterMetaType<ProjectPartInfo>("CppTools::ProjectPartInfo");
-    Q_UNUSED(meta);
+    Q_UNUSED(meta)
 }
 
 BaseEditorDocumentParser::~BaseEditorDocumentParser() = default;
diff --git a/src/plugins/cpptools/cppmodelmanager_test.cpp b/src/plugins/cpptools/cppmodelmanager_test.cpp
index 02586943da..fad91b3d4a 100644
--- a/src/plugins/cpptools/cppmodelmanager_test.cpp
+++ b/src/plugins/cpptools/cppmodelmanager_test.cpp
@@ -1009,7 +1009,7 @@ void CppToolsPlugin::test_modelmanager_renameIncludes()
     struct ModelManagerGCHelper {
         ~ModelManagerGCHelper() { CppModelManager::instance()->GC(); }
     } GCHelper;
-    Q_UNUSED(GCHelper); // do not warn about being unused
+    Q_UNUSED(GCHelper) // do not warn about being unused
 
     TemporaryDir tmpDir;
     QVERIFY(tmpDir.isValid());
@@ -1055,7 +1055,7 @@ void CppToolsPlugin::test_modelmanager_renameIncludesInEditor()
     struct ModelManagerGCHelper {
         ~ModelManagerGCHelper() { CppModelManager::instance()->GC(); }
     } GCHelper;
-    Q_UNUSED(GCHelper); // do not warn about being unused
+    Q_UNUSED(GCHelper) // do not warn about being unused
 
     TemporaryDir tmpDir;
     QVERIFY(tmpDir.isValid());
diff --git a/src/plugins/cpptools/headerpathfilter.cpp b/src/plugins/cpptools/headerpathfilter.cpp
index e2d1e6a4ca..d401f547f5 100644
--- a/src/plugins/cpptools/headerpathfilter.cpp
+++ b/src/plugins/cpptools/headerpathfilter.cpp
@@ -86,8 +86,8 @@ QString clangIncludeDirectory(const QString &clangVersion, const QString &clangR
 #ifndef UNIT_TESTS
     return Core::ICore::clangIncludeDirectory(clangVersion, clangResourceDirectory);
 #else
-    Q_UNUSED(clangVersion);
-    Q_UNUSED(clangResourceDirectory);
+    Q_UNUSED(clangVersion)
+    Q_UNUSED(clangResourceDirectory)
     return CLANG_RESOURCE_DIR;
 #endif
 }
diff --git a/src/plugins/cvs/cvscontrol.cpp b/src/plugins/cvs/cvscontrol.cpp
index 0a88fff266..1c8bf3c8e1 100644
--- a/src/plugins/cvs/cvscontrol.cpp
+++ b/src/plugins/cvs/cvscontrol.cpp
@@ -90,7 +90,7 @@ bool CvsControl::supportsOperation(Operation operation) const
 
 Core::IVersionControl::OpenSupportMode CvsControl::openSupportMode(const QString &fileName) const
 {
-    Q_UNUSED(fileName);
+    Q_UNUSED(fileName)
     return OpenOptional;
 }
 
@@ -114,8 +114,8 @@ bool CvsControl::vcsDelete(const QString &fileName)
 
 bool CvsControl::vcsMove(const QString &from, const QString &to)
 {
-    Q_UNUSED(from);
-    Q_UNUSED(to);
+    Q_UNUSED(from)
+    Q_UNUSED(to)
     return false;
 }
 
diff --git a/src/plugins/debugger/cdb/cdbengine.cpp b/src/plugins/debugger/cdb/cdbengine.cpp
index a77493c450..80e5668823 100644
--- a/src/plugins/debugger/cdb/cdbengine.cpp
+++ b/src/plugins/debugger/cdb/cdbengine.cpp
@@ -277,7 +277,7 @@ void CdbEngine::adjustOperateByInstruction(bool operateByInstruction)
 
 bool CdbEngine::canHandleToolTip(const DebuggerToolTipContext &context) const
 {
-    Q_UNUSED(context);
+    Q_UNUSED(context)
     // Tooltips matching local variables are already handled in the
     // base class. We don't handle anything else here in CDB
     // as it can slow debugging down.
diff --git a/src/plugins/debugger/console/consoleview.cpp b/src/plugins/debugger/console/consoleview.cpp
index c6387cc9e0..823e37ae6b 100644
--- a/src/plugins/debugger/console/consoleview.cpp
+++ b/src/plugins/debugger/console/consoleview.cpp
@@ -208,7 +208,7 @@ void ConsoleView::contextMenuEvent(QContextMenuEvent *event)
 
 void ConsoleView::focusInEvent(QFocusEvent *event)
 {
-    Q_UNUSED(event);
+    Q_UNUSED(event)
     selectionModel()->setCurrentIndex(model()->index(model()->rowCount() - 1, 0),
                                       QItemSelectionModel::ClearAndSelect);
 }
diff --git a/src/plugins/debugger/debuggerengine.cpp b/src/plugins/debugger/debuggerengine.cpp
index 240a2ad80f..48487bcd06 100644
--- a/src/plugins/debugger/debuggerengine.cpp
+++ b/src/plugins/debugger/debuggerengine.cpp
@@ -977,20 +977,20 @@ DisassemblerAgent *DebuggerEngine::disassemblerAgent() const
 
 void DebuggerEngine::fetchMemory(MemoryAgent *, quint64 addr, quint64 length)
 {
-    Q_UNUSED(addr);
-    Q_UNUSED(length);
+    Q_UNUSED(addr)
+    Q_UNUSED(length)
 }
 
 void DebuggerEngine::changeMemory(MemoryAgent *, quint64 addr, const QByteArray &data)
 {
-    Q_UNUSED(addr);
-    Q_UNUSED(data);
+    Q_UNUSED(addr)
+    Q_UNUSED(data)
 }
 
 void DebuggerEngine::setRegisterValue(const QString &name, const QString &value)
 {
-    Q_UNUSED(name);
-    Q_UNUSED(value);
+    Q_UNUSED(name)
+    Q_UNUSED(value)
 }
 
 void DebuggerEngine::setRunParameters(const DebuggerRunParameters &runParameters)
diff --git a/src/plugins/debugger/debuggerkitinformation.cpp b/src/plugins/debugger/debuggerkitinformation.cpp
index 64153abec2..356dd9ed95 100644
--- a/src/plugins/debugger/debuggerkitinformation.cpp
+++ b/src/plugins/debugger/debuggerkitinformation.cpp
@@ -115,7 +115,7 @@ private:
 
     void currentDebuggerChanged(int idx)
     {
-        Q_UNUSED(idx);
+        Q_UNUSED(idx)
         if (m_ignoreChanges)
             return;
 
diff --git a/src/plugins/debugger/debuggerplugin.cpp b/src/plugins/debugger/debuggerplugin.cpp
index 79f779a295..c7ccd5d961 100644
--- a/src/plugins/debugger/debuggerplugin.cpp
+++ b/src/plugins/debugger/debuggerplugin.cpp
@@ -977,7 +977,7 @@ void DebuggerPluginPrivate::parseCommandLineArguments()
 bool DebuggerPluginPrivate::initialize(const QStringList &arguments,
     QString *errorMessage)
 {
-    Q_UNUSED(errorMessage);
+    Q_UNUSED(errorMessage)
 
     const Context debuggerNotRunning(C_DEBUGGER_NOTRUNNING);
     ICore::addAdditionalContext(debuggerNotRunning);
@@ -2287,8 +2287,8 @@ QObject *DebuggerPlugin::remoteCommand(const QStringList &options,
                                        const QString &workingDirectory,
                                        const QStringList &list)
 {
-    Q_UNUSED(workingDirectory);
-    Q_UNUSED(list);
+    Q_UNUSED(workingDirectory)
+    Q_UNUSED(list)
     dd->remoteCommand(options);
     return nullptr;
 }
diff --git a/src/plugins/debugger/debuggertooltipmanager.cpp b/src/plugins/debugger/debuggertooltipmanager.cpp
index 611e714abd..4526bf9e9d 100644
--- a/src/plugins/debugger/debuggertooltipmanager.cpp
+++ b/src/plugins/debugger/debuggertooltipmanager.cpp
@@ -359,7 +359,7 @@ QVariant ToolTipWatchItem::data(int column, int role) const
 
 void ToolTipModel::restoreTreeModel(QXmlStreamReader &r)
 {
-    Q_UNUSED(r);
+    Q_UNUSED(r)
 #if 0
 // Helper for building a QStandardItemModel of a tree form (see TreeModelVisitor).
 // The recursion/building is based on the scheme: \code
diff --git a/src/plugins/debugger/enginemanager.cpp b/src/plugins/debugger/enginemanager.cpp
index 5715eb7f33..8c2bbca146 100644
--- a/src/plugins/debugger/enginemanager.cpp
+++ b/src/plugins/debugger/enginemanager.cpp
@@ -275,7 +275,7 @@ QVariant EngineItem::data(int column, int role) const
 
 bool EngineItem::setData(int row, const QVariant &value, int role)
 {
-    Q_UNUSED(row);
+    Q_UNUSED(row)
     if (!m_engine)
         return false;
 
diff --git a/src/plugins/debugger/gdb/gdbengine.cpp b/src/plugins/debugger/gdb/gdbengine.cpp
index 3bc6656f2e..1d0b219172 100644
--- a/src/plugins/debugger/gdb/gdbengine.cpp
+++ b/src/plugins/debugger/gdb/gdbengine.cpp
@@ -4720,7 +4720,7 @@ void GdbEngine::handleTargetCore(const DebuggerResponse &response)
 void GdbEngine::handleCoreRoundTrip(const DebuggerResponse &response)
 {
     CHECK_STATE(InferiorUnrunnable);
-    Q_UNUSED(response);
+    Q_UNUSED(response)
     loadSymbolsForStack();
     handleStop3();
     QTimer::singleShot(1000, this, &GdbEngine::loadAllSymbols);
diff --git a/src/plugins/debugger/lldb/lldbengine.cpp b/src/plugins/debugger/lldb/lldbengine.cpp
index 2ab109c77d..a5483aacef 100644
--- a/src/plugins/debugger/lldb/lldbengine.cpp
+++ b/src/plugins/debugger/lldb/lldbengine.cpp
@@ -1048,7 +1048,7 @@ void LldbEngine::changeMemory(MemoryAgent *agent, quint64 addr, const QByteArray
     DebuggerCommand cmd("writeMemory");
     cmd.arg("address", addr);
     cmd.arg("data", QString::fromUtf8(data.toHex()));
-    cmd.callback = [](const DebuggerResponse &response) { Q_UNUSED(response); };
+    cmd.callback = [](const DebuggerResponse &response) { Q_UNUSED(response) };
     runCommand(cmd);
 }
 
diff --git a/src/plugins/debugger/pdb/pdbengine.cpp b/src/plugins/debugger/pdb/pdbengine.cpp
index 39acf7df96..defd54050b 100644
--- a/src/plugins/debugger/pdb/pdbengine.cpp
+++ b/src/plugins/debugger/pdb/pdbengine.cpp
@@ -389,7 +389,7 @@ void PdbEngine::assignValueInDebugger(WatchItem *, const QString &expression, co
 
 void PdbEngine::updateItem(const QString &iname)
 {
-    Q_UNUSED(iname);
+    Q_UNUSED(iname)
     updateAll();
 }
 
diff --git a/src/plugins/debugger/qml/qmlengine.cpp b/src/plugins/debugger/qml/qmlengine.cpp
index ed957a210b..6b3dd37193 100644
--- a/src/plugins/debugger/qml/qmlengine.cpp
+++ b/src/plugins/debugger/qml/qmlengine.cpp
@@ -970,7 +970,7 @@ void QmlEngine::quitDebugger()
 
 void QmlEngine::doUpdateLocals(const UpdateParameters &params)
 {
-    Q_UNUSED(params);
+    Q_UNUSED(params)
     d->updateLocals();
 }
 
diff --git a/src/plugins/debugger/registerhandler.cpp b/src/plugins/debugger/registerhandler.cpp
index 7614bc413c..d35abc5c65 100644
--- a/src/plugins/debugger/registerhandler.cpp
+++ b/src/plugins/debugger/registerhandler.cpp
@@ -434,7 +434,7 @@ public:
     {
         //return column == 1 ? Qt::ItemIsSelectable|Qt::ItemIsEnabled|Qt::ItemIsEditable
         //                   : Qt::ItemIsSelectable|Qt::ItemIsEnabled;
-        Q_UNUSED(column);
+        Q_UNUSED(column)
         return Qt::ItemIsSelectable|Qt::ItemIsEnabled;
     }
 
diff --git a/src/plugins/debugger/registerpostmortemaction.cpp b/src/plugins/debugger/registerpostmortemaction.cpp
index 0b74bbabab..be37504a70 100644
--- a/src/plugins/debugger/registerpostmortemaction.cpp
+++ b/src/plugins/debugger/registerpostmortemaction.cpp
@@ -75,7 +75,7 @@ RegisterPostMortemAction::RegisterPostMortemAction(QObject *parent) : Utils::Sav
 
 void RegisterPostMortemAction::readSettings(const QSettings *)
 {
-    Q_UNUSED(debuggerRegistryValueNameC); // avoid warning from MinGW
+    Q_UNUSED(debuggerRegistryValueNameC) // avoid warning from MinGW
 
     bool registered = false;
     HKEY handle = NULL;
diff --git a/src/plugins/debugger/terminal.cpp b/src/plugins/debugger/terminal.cpp
index f9fcb2a7a3..e9faa11062 100644
--- a/src/plugins/debugger/terminal.cpp
+++ b/src/plugins/debugger/terminal.cpp
@@ -128,7 +128,7 @@ int Terminal::write(const QByteArray &msg)
 #ifdef DEBUGGER_USE_TERMINAL
     return ::write(m_masterFd, msg.constData(), msg.size());
 #else
-    Q_UNUSED(msg);
+    Q_UNUSED(msg)
     return -1;
 #endif
 }
@@ -164,7 +164,7 @@ void Terminal::onSlaveReaderActivated(int fd)
     if (got >= 0)
         stdOutReady(QString::fromUtf8(buffer));
 #else
-    Q_UNUSED(fd);
+    Q_UNUSED(fd)
 #endif
 }
 
diff --git a/src/plugins/designer/formtemplatewizardpage.cpp b/src/plugins/designer/formtemplatewizardpage.cpp
index fb01ddc5f4..89c3efcd0e 100644
--- a/src/plugins/designer/formtemplatewizardpage.cpp
+++ b/src/plugins/designer/formtemplatewizardpage.cpp
@@ -55,8 +55,8 @@ FormPageFactory::FormPageFactory()
 Utils::WizardPage *FormPageFactory::create(ProjectExplorer::JsonWizard *wizard, Core::Id typeId,
                                            const QVariant &data)
 {
-    Q_UNUSED(wizard);
-    Q_UNUSED(data);
+    Q_UNUSED(wizard)
+    Q_UNUSED(data)
 
     QTC_ASSERT(canCreate(typeId), return 0);
 
diff --git a/src/plugins/diffeditor/diffeditor.cpp b/src/plugins/diffeditor/diffeditor.cpp
index 0c1d6563dd..516dd89c82 100644
--- a/src/plugins/diffeditor/diffeditor.cpp
+++ b/src/plugins/diffeditor/diffeditor.cpp
@@ -138,7 +138,7 @@ void DescriptionEditorWidget::setDisplaySettings(const DisplaySettings &ds)
 
 void DescriptionEditorWidget::setMarginSettings(const MarginSettings &ms)
 {
-    Q_UNUSED(ms);
+    Q_UNUSED(ms)
     TextEditorWidget::setMarginSettings(MarginSettings());
 }
 
diff --git a/src/plugins/diffeditor/diffeditordocument.cpp b/src/plugins/diffeditor/diffeditordocument.cpp
index 8c24d09424..ac10f9bf53 100644
--- a/src/plugins/diffeditor/diffeditordocument.cpp
+++ b/src/plugins/diffeditor/diffeditordocument.cpp
@@ -181,7 +181,7 @@ bool DiffEditorDocument::ignoreWhitespace() const
 
 bool DiffEditorDocument::setContents(const QByteArray &contents)
 {
-    Q_UNUSED(contents);
+    Q_UNUSED(contents)
     return true;
 }
 
diff --git a/src/plugins/diffeditor/diffview.cpp b/src/plugins/diffeditor/diffview.cpp
index c4919692f9..7c7086f52d 100644
--- a/src/plugins/diffeditor/diffview.cpp
+++ b/src/plugins/diffeditor/diffview.cpp
@@ -164,7 +164,7 @@ void UnifiedView::setCurrentDiffFileIndex(int index)
 
 void UnifiedView::setSync(bool sync)
 {
-    Q_UNUSED(sync);
+    Q_UNUSED(sync)
 }
 
 SideBySideView::SideBySideView()
diff --git a/src/plugins/fakevim/fakevimhandler.cpp b/src/plugins/fakevim/fakevimhandler.cpp
index adb77c7c0d..e8f622df8d 100644
--- a/src/plugins/fakevim/fakevimhandler.cpp
+++ b/src/plugins/fakevim/fakevimhandler.cpp
@@ -8263,7 +8263,7 @@ void FakeVimHandler::Private::selectWORDTextObject(bool inner)
 
 void FakeVimHandler::Private::selectSentenceTextObject(bool inner)
 {
-    Q_UNUSED(inner);
+    Q_UNUSED(inner)
 }
 
 void FakeVimHandler::Private::selectParagraphTextObject(bool inner)
diff --git a/src/plugins/fakevim/fakevimplugin.cpp b/src/plugins/fakevim/fakevimplugin.cpp
index bb73e18141..c5e4dcca96 100644
--- a/src/plugins/fakevim/fakevimplugin.cpp
+++ b/src/plugins/fakevim/fakevimplugin.cpp
@@ -970,7 +970,7 @@ public:
 
     void setActive(const QString &needle, bool forward, FakeVimHandler *handler)
     {
-        Q_UNUSED(forward);
+        Q_UNUSED(forward)
         m_handler = handler;
         if (!m_handler)
             return;
diff --git a/src/plugins/genericprojectmanager/genericproject.cpp b/src/plugins/genericprojectmanager/genericproject.cpp
index 4c6be63f8d..ffb1c7a3d6 100644
--- a/src/plugins/genericprojectmanager/genericproject.cpp
+++ b/src/plugins/genericprojectmanager/genericproject.cpp
@@ -99,8 +99,8 @@ public:
 
     bool reload(QString *errorString, ReloadFlag flag, ChangeType type) override
     {
-        Q_UNUSED(errorString);
-        Q_UNUSED(flag);
+        Q_UNUSED(errorString)
+        Q_UNUSED(flag)
         if (type == TypePermissions)
             return true;
         m_project->refresh(m_options);
diff --git a/src/plugins/genericprojectmanager/genericprojectwizard.cpp b/src/plugins/genericprojectmanager/genericprojectwizard.cpp
index 204a6e4f43..31776f274a 100644
--- a/src/plugins/genericprojectmanager/genericprojectwizard.cpp
+++ b/src/plugins/genericprojectmanager/genericprojectwizard.cpp
@@ -211,7 +211,7 @@ Core::GeneratedFiles GenericProjectWizard::generateFiles(const QWizard *w,
 bool GenericProjectWizard::postGenerateFiles(const QWizard *w, const Core::GeneratedFiles &l,
                                              QString *errorMessage) const
 {
-    Q_UNUSED(w);
+    Q_UNUSED(w)
     return ProjectExplorer::CustomProjectWizard::postGenerateOpen(l, errorMessage);
 }
 
diff --git a/src/plugins/git/branchmodel.cpp b/src/plugins/git/branchmodel.cpp
index 8af16f80ee..3899b7dcd1 100644
--- a/src/plugins/git/branchmodel.cpp
+++ b/src/plugins/git/branchmodel.cpp
@@ -298,7 +298,7 @@ int BranchModel::rowCount(const QModelIndex &parentIdx) const
 
 int BranchModel::columnCount(const QModelIndex &parent) const
 {
-    Q_UNUSED(parent);
+    Q_UNUSED(parent)
     return 2;
 }
 
diff --git a/src/plugins/git/remotemodel.cpp b/src/plugins/git/remotemodel.cpp
index 62d9930577..0a0f30c1b4 100644
--- a/src/plugins/git/remotemodel.cpp
+++ b/src/plugins/git/remotemodel.cpp
@@ -110,13 +110,13 @@ int RemoteModel::remoteCount() const
 
 int RemoteModel::rowCount(const QModelIndex &parent) const
 {
-    Q_UNUSED(parent);
+    Q_UNUSED(parent)
     return remoteCount();
 }
 
 int RemoteModel::columnCount(const QModelIndex &parent) const
 {
-    Q_UNUSED(parent);
+    Q_UNUSED(parent)
     return 2;
 }
 
@@ -167,7 +167,7 @@ bool RemoteModel::setData(const QModelIndex &index, const QVariant &value, int r
 
 Qt::ItemFlags RemoteModel::flags(const QModelIndex &index) const
 {
-    Q_UNUSED(index);
+    Q_UNUSED(index)
     return m_flags;
 }
 
diff --git a/src/plugins/ios/iosdeploystep.cpp b/src/plugins/ios/iosdeploystep.cpp
index 2a0da618af..ba18d7eb7f 100644
--- a/src/plugins/ios/iosdeploystep.cpp
+++ b/src/plugins/ios/iosdeploystep.cpp
@@ -145,7 +145,7 @@ void IosDeployStep::handleIsTransferringApp(IosToolHandler *handler, const QStri
                                             const QString &deviceId, int progress, int maxProgress,
                                             const QString &info)
 {
-    Q_UNUSED(handler); Q_UNUSED(bundlePath); Q_UNUSED(deviceId);
+    Q_UNUSED(handler); Q_UNUSED(bundlePath); Q_UNUSED(deviceId)
     QTC_CHECK(m_transferStatus == TransferInProgress);
     emit this->progress(progress * 100 / maxProgress, info);
 }
@@ -153,7 +153,7 @@ void IosDeployStep::handleIsTransferringApp(IosToolHandler *handler, const QStri
 void IosDeployStep::handleDidTransferApp(IosToolHandler *handler, const QString &bundlePath,
                                          const QString &deviceId, IosToolHandler::OpStatus status)
 {
-    Q_UNUSED(handler); Q_UNUSED(bundlePath); Q_UNUSED(deviceId);
+    Q_UNUSED(handler); Q_UNUSED(bundlePath); Q_UNUSED(deviceId)
     QTC_CHECK(m_transferStatus == TransferInProgress);
     if (status == IosToolHandler::Success) {
         m_transferStatus = TransferOk;
@@ -188,7 +188,7 @@ void IosDeployStep::handleFinished(IosToolHandler *handler)
 
 void IosDeployStep::handleErrorMsg(IosToolHandler *handler, const QString &msg)
 {
-    Q_UNUSED(handler);
+    Q_UNUSED(handler)
     if (msg.contains(QLatin1String("AMDeviceInstallApplication returned -402653103")))
         TaskHub::addTask(Task::Warning,
                          tr("The Info.plist might be incorrect."),
diff --git a/src/plugins/ios/iosplugin.cpp b/src/plugins/ios/iosplugin.cpp
index 080f9dcde7..da41cbb109 100644
--- a/src/plugins/ios/iosplugin.cpp
+++ b/src/plugins/ios/iosplugin.cpp
@@ -110,8 +110,8 @@ IosPlugin::~IosPlugin()
 
 bool IosPlugin::initialize(const QStringList &arguments, QString *errorMessage)
 {
-    Q_UNUSED(arguments);
-    Q_UNUSED(errorMessage);
+    Q_UNUSED(arguments)
+    Q_UNUSED(errorMessage)
 
     qRegisterMetaType<Ios::IosToolHandler::Dict>("Ios::IosToolHandler::Dict");
 
diff --git a/src/plugins/ios/iosqtversion.cpp b/src/plugins/ios/iosqtversion.cpp
index e508c53cfe..23fb2c5dde 100644
--- a/src/plugins/ios/iosqtversion.cpp
+++ b/src/plugins/ios/iosqtversion.cpp
@@ -74,8 +74,8 @@ Abis IosQtVersion::detectQtAbis() const
 
 void IosQtVersion::addToEnvironment(const Kit *k, Utils::Environment &env) const
 {
-    Q_UNUSED(k);
-    Q_UNUSED(env);
+    Q_UNUSED(k)
+    Q_UNUSED(env)
 }
 
 QString IosQtVersion::description() const
diff --git a/src/plugins/ios/iosrunner.cpp b/src/plugins/ios/iosrunner.cpp
index 8c2ab2bb63..e0fb0d39ed 100644
--- a/src/plugins/ios/iosrunner.cpp
+++ b/src/plugins/ios/iosrunner.cpp
@@ -218,7 +218,7 @@ void IosRunner::handleGotServerPorts(IosToolHandler *handler, const QString &bun
                                      Port qmlPort)
 {
     // Called when debugging on Device.
-    Q_UNUSED(bundlePath); Q_UNUSED(deviceId);
+    Q_UNUSED(bundlePath); Q_UNUSED(deviceId)
 
     if (m_toolHandler != handler)
         return;
@@ -247,7 +247,7 @@ void IosRunner::handleGotInferiorPid(IosToolHandler *handler, const QString &bun
                                      const QString &deviceId, qint64 pid)
 {
     // Called when debugging on Simulator.
-    Q_UNUSED(bundlePath); Q_UNUSED(deviceId);
+    Q_UNUSED(bundlePath); Q_UNUSED(deviceId)
 
     if (m_toolHandler != handler)
         return;
@@ -272,7 +272,7 @@ void IosRunner::handleGotInferiorPid(IosToolHandler *handler, const QString &bun
 
 void IosRunner::handleAppOutput(IosToolHandler *handler, const QString &output)
 {
-    Q_UNUSED(handler);
+    Q_UNUSED(handler)
     QRegExp qmlPortRe("QML Debugger: Waiting for connection on port ([0-9]+)...");
     int index = qmlPortRe.indexIn(output);
     QString res(output);
@@ -284,7 +284,7 @@ void IosRunner::handleAppOutput(IosToolHandler *handler, const QString &output)
 
 void IosRunner::handleErrorMsg(IosToolHandler *handler, const QString &msg)
 {
-    Q_UNUSED(handler);
+    Q_UNUSED(handler)
     QString res(msg);
     QString lockedErr ="Unexpected reply: ELocked (454c6f636b6564) vs OK (4f4b)";
     if (msg.contains("AMDeviceStartService returned -402653150")) {
@@ -308,7 +308,7 @@ void IosRunner::handleErrorMsg(IosToolHandler *handler, const QString &msg)
 
 void IosRunner::handleToolExited(IosToolHandler *handler, int code)
 {
-    Q_UNUSED(handler);
+    Q_UNUSED(handler)
     m_cleanExit = (code == 0);
 }
 
diff --git a/src/plugins/ios/iostoolhandler.cpp b/src/plugins/ios/iostoolhandler.cpp
index 646183db05..e78ec72db4 100644
--- a/src/plugins/ios/iostoolhandler.cpp
+++ b/src/plugins/ios/iostoolhandler.cpp
@@ -818,7 +818,7 @@ IosSimulatorToolHandlerPrivate::~IosSimulatorToolHandlerPrivate()
 void IosSimulatorToolHandlerPrivate::requestTransferApp(const QString &appBundlePath,
                                                         const QString &deviceIdentifier, int timeout)
 {
-    Q_UNUSED(timeout);
+    Q_UNUSED(timeout)
     m_bundlePath = appBundlePath;
     m_deviceId = deviceIdentifier;
     isTransferringApp(m_bundlePath, m_deviceId, 0, 100, "");
@@ -847,8 +847,8 @@ void IosSimulatorToolHandlerPrivate::requestRunApp(const QString &appBundlePath,
                                                    IosToolHandler::RunKind runType,
                                                    const QString &deviceIdentifier, int timeout)
 {
-    Q_UNUSED(timeout);
-    Q_UNUSED(deviceIdentifier);
+    Q_UNUSED(timeout)
+    Q_UNUSED(deviceIdentifier)
     m_bundlePath = appBundlePath;
     m_deviceId = m_devType.identifier;
     m_runKind = runType;
@@ -880,8 +880,8 @@ void IosSimulatorToolHandlerPrivate::requestRunApp(const QString &appBundlePath,
 
 void IosSimulatorToolHandlerPrivate::requestDeviceInfo(const QString &deviceId, int timeout)
 {
-    Q_UNUSED(timeout);
-    Q_UNUSED(deviceId);
+    Q_UNUSED(timeout)
+    Q_UNUSED(deviceId)
 }
 
 bool IosSimulatorToolHandlerPrivate::isRunning() const
@@ -962,7 +962,7 @@ void IosSimulatorToolHandlerPrivate::launchAppOnSimulator(const QStringList &ext
             QThread::msleep(1000);
         } while (!fi.isCanceled() && kill(pid, 0) == 0);
 #else
-    Q_UNUSED(pid);
+    Q_UNUSED(pid)
 #endif
         // Future is cancelled if the app is stopped from the qt creator.
         if (!fi.isCanceled())
diff --git a/src/plugins/languageclient/client.cpp b/src/plugins/languageclient/client.cpp
index 430e03091c..df32cf9f76 100644
--- a/src/plugins/languageclient/client.cpp
+++ b/src/plugins/languageclient/client.cpp
@@ -772,7 +772,7 @@ void Client::handleCodeActionResponse(const CodeActionRequest::Response &respons
                 if (auto action = Utils::get_if<CodeAction>(&item))
                     updateCodeActionRefactoringMarker(this, *action, uri);
                 else if (auto command = Utils::get_if<Command>(&item)) {
-                    Q_UNUSED(command); // todo
+                    Q_UNUSED(command) // todo
                 }
             }
         }
diff --git a/src/plugins/macros/macrosplugin.cpp b/src/plugins/macros/macrosplugin.cpp
index 4dbc46905e..bb8f086914 100644
--- a/src/plugins/macros/macrosplugin.cpp
+++ b/src/plugins/macros/macrosplugin.cpp
@@ -63,8 +63,8 @@ MacrosPlugin::~MacrosPlugin()
 
 bool MacrosPlugin::initialize(const QStringList &arguments, QString *errorMessage)
 {
-    Q_UNUSED(arguments);
-    Q_UNUSED(errorMessage);
+    Q_UNUSED(arguments)
+    Q_UNUSED(errorMessage)
 
     d = new MacrosPluginPrivate;
 
diff --git a/src/plugins/macros/texteditormacrohandler.cpp b/src/plugins/macros/texteditormacrohandler.cpp
index c1e06c76bf..fac0796e7d 100644
--- a/src/plugins/macros/texteditormacrohandler.cpp
+++ b/src/plugins/macros/texteditormacrohandler.cpp
@@ -136,7 +136,7 @@ void TextEditorMacroHandler::changeEditor(Core::IEditor *editor)
 
 void TextEditorMacroHandler::closeEditor(Core::IEditor *editor)
 {
-    Q_UNUSED(editor);
+    Q_UNUSED(editor)
     if (isRecording() && m_currentEditor && m_currentEditor->widget())
         m_currentEditor->widget()->removeEventFilter(this);
     m_currentEditor = nullptr;
diff --git a/src/plugins/mercurial/mercurialclient.cpp b/src/plugins/mercurial/mercurialclient.cpp
index 0f1ee2f510..2740ce7ae4 100644
--- a/src/plugins/mercurial/mercurialclient.cpp
+++ b/src/plugins/mercurial/mercurialclient.cpp
@@ -170,8 +170,8 @@ bool MercurialClient::synchronousClone(const QString &workingDir,
                                        const QString &dstLocation,
                                        const QStringList &extraOptions)
 {
-    Q_UNUSED(workingDir);
-    Q_UNUSED(extraOptions);
+    Q_UNUSED(workingDir)
+    Q_UNUSED(extraOptions)
     QDir workingDirectory(srcLocation);
     const unsigned flags = VcsCommand::SshPasswordPrompt |
             VcsCommand::ShowStdOut |
@@ -391,7 +391,7 @@ void MercurialClient::commit(const QString &repositoryRoot, const QStringList &f
 void MercurialClient::diff(const QString &workingDir, const QStringList &files,
                            const QStringList &extraOptions)
 {
-    Q_UNUSED(extraOptions);
+    Q_UNUSED(extraOptions)
 
     QString fileName;
 
diff --git a/src/plugins/modeleditor/dragtool.cpp b/src/plugins/modeleditor/dragtool.cpp
index f7ece9c487..fd4d75fca0 100644
--- a/src/plugins/modeleditor/dragtool.cpp
+++ b/src/plugins/modeleditor/dragtool.cpp
@@ -95,7 +95,7 @@ QSize DragTool::sizeHint() const
 
 void DragTool::paintEvent(QPaintEvent *event)
 {
-    Q_UNUSED(event);
+    Q_UNUSED(event)
     QMargins margins = contentsMargins();
     QPixmap pixmap = d->icon.pixmap(d->iconSize, isEnabled() ? QIcon::Normal : QIcon::Disabled, QIcon::Off);
     QPainter painter(this);
@@ -122,13 +122,13 @@ void DragTool::paintEvent(QPaintEvent *event)
 
 void DragTool::enterEvent(QEvent *event)
 {
-    Q_UNUSED(event);
+    Q_UNUSED(event)
     update();
 }
 
 void DragTool::leaveEvent(QEvent *event)
 {
-    Q_UNUSED(event);
+    Q_UNUSED(event)
     update();
 }
 
@@ -157,7 +157,7 @@ void DragTool::mousePressEvent(QMouseEvent *event)
             d->disableFrame = true;
             update();
             Qt::DropAction dropAction = drag->exec();
-            Q_UNUSED(dropAction);
+            Q_UNUSED(dropAction)
             d->disableFrame = false;
             update();
         }
@@ -166,7 +166,7 @@ void DragTool::mousePressEvent(QMouseEvent *event)
 
 void DragTool::mouseMoveEvent(QMouseEvent *event)
 {
-    Q_UNUSED(event);
+    Q_UNUSED(event)
     const bool containsMouse = rect().contains(QWidget::mapFromGlobal(QCursor::pos()));
     if ((d->framePainted && !containsMouse) || (!d->framePainted && containsMouse))
         update();
diff --git a/src/plugins/modeleditor/elementtasks.cpp b/src/plugins/modeleditor/elementtasks.cpp
index f20134fb28..1dca6d0d55 100644
--- a/src/plugins/modeleditor/elementtasks.cpp
+++ b/src/plugins/modeleditor/elementtasks.cpp
@@ -93,7 +93,7 @@ void ElementTasks::openElement(const qmt::MElement *element)
 
 void ElementTasks::openElement(const qmt::DElement *element, const qmt::MDiagram *diagram)
 {
-    Q_UNUSED(diagram);
+    Q_UNUSED(diagram)
 
     OpenDiagramElementVisitor visitor;
     visitor.setModelController(d->documentController->modelController());
@@ -129,7 +129,7 @@ bool ElementTasks::hasClassDefinition(const qmt::MElement *element) const
 bool ElementTasks::hasClassDefinition(const qmt::DElement *element,
                                       const qmt::MDiagram *diagram) const
 {
-    Q_UNUSED(diagram);
+    Q_UNUSED(diagram)
 
     qmt::MElement *melement = d->documentController->modelController()->findElement(
                 element->modelUid());
@@ -164,7 +164,7 @@ void ElementTasks::openClassDefinition(const qmt::MElement *element)
 
 void ElementTasks::openClassDefinition(const qmt::DElement *element, const qmt::MDiagram *diagram)
 {
-    Q_UNUSED(diagram);
+    Q_UNUSED(diagram)
 
     qmt::MElement *melement = d->documentController->modelController()->findElement(element->modelUid());
     if (!melement)
@@ -175,13 +175,13 @@ void ElementTasks::openClassDefinition(const qmt::DElement *element, const qmt::
 bool ElementTasks::hasHeaderFile(const qmt::MElement *element) const
 {
     // TODO implement
-    Q_UNUSED(element);
+    Q_UNUSED(element)
     return false;
 }
 
 bool ElementTasks::hasHeaderFile(const qmt::DElement *element, const qmt::MDiagram *diagram) const
 {
-    Q_UNUSED(diagram);
+    Q_UNUSED(diagram)
 
     qmt::MElement *melement = d->documentController->modelController()->findElement(element->modelUid());
     if (!melement)
@@ -192,13 +192,13 @@ bool ElementTasks::hasHeaderFile(const qmt::DElement *element, const qmt::MDiagr
 bool ElementTasks::hasSourceFile(const qmt::MElement *element) const
 {
     // TODO implement
-    Q_UNUSED(element);
+    Q_UNUSED(element)
     return false;
 }
 
 bool ElementTasks::hasSourceFile(const qmt::DElement *element, const qmt::MDiagram *diagram) const
 {
-    Q_UNUSED(diagram);
+    Q_UNUSED(diagram)
 
     qmt::MElement *melement = d->documentController->modelController()->findElement(element->modelUid());
     if (!melement)
@@ -209,12 +209,12 @@ bool ElementTasks::hasSourceFile(const qmt::DElement *element, const qmt::MDiagr
 void ElementTasks::openHeaderFile(const qmt::MElement *element)
 {
     // TODO implement
-    Q_UNUSED(element);
+    Q_UNUSED(element)
 }
 
 void ElementTasks::openHeaderFile(const qmt::DElement *element, const qmt::MDiagram *diagram)
 {
-    Q_UNUSED(diagram);
+    Q_UNUSED(diagram)
 
     qmt::MElement *melement = d->documentController->modelController()->findElement(element->modelUid());
     if (!melement)
@@ -225,12 +225,12 @@ void ElementTasks::openHeaderFile(const qmt::DElement *element, const qmt::MDiag
 void ElementTasks::openSourceFile(const qmt::MElement *element)
 {
     // TODO implement
-    Q_UNUSED(element);
+    Q_UNUSED(element)
 }
 
 void ElementTasks::openSourceFile(const qmt::DElement *element, const qmt::MDiagram *diagram)
 {
-    Q_UNUSED(diagram);
+    Q_UNUSED(diagram)
 
     qmt::MElement *melement = d->documentController->modelController()->findElement(element->modelUid());
     if (!melement)
@@ -241,13 +241,13 @@ void ElementTasks::openSourceFile(const qmt::DElement *element, const qmt::MDiag
 bool ElementTasks::hasFolder(const qmt::MElement *element) const
 {
     // TODO implement
-    Q_UNUSED(element);
+    Q_UNUSED(element)
     return false;
 }
 
 bool ElementTasks::hasFolder(const qmt::DElement *element, const qmt::MDiagram *diagram) const
 {
-    Q_UNUSED(diagram);
+    Q_UNUSED(diagram)
 
     qmt::MElement *melement = d->documentController->modelController()->findElement(element->modelUid());
     if (!melement)
@@ -258,12 +258,12 @@ bool ElementTasks::hasFolder(const qmt::DElement *element, const qmt::MDiagram *
 void ElementTasks::showFolder(const qmt::MElement *element)
 {
     // TODO implement
-    Q_UNUSED(element);
+    Q_UNUSED(element)
 }
 
 void ElementTasks::showFolder(const qmt::DElement *element, const qmt::MDiagram *diagram)
 {
-    Q_UNUSED(diagram);
+    Q_UNUSED(diagram)
 
     qmt::MElement *melement = d->documentController->modelController()->findElement(element->modelUid());
     if (!melement)
@@ -281,7 +281,7 @@ bool ElementTasks::hasDiagram(const qmt::MElement *element) const
 
 bool ElementTasks::hasDiagram(const qmt::DElement *element, const qmt::MDiagram *diagram) const
 {
-    Q_UNUSED(diagram);
+    Q_UNUSED(diagram)
 
     qmt::MElement *melement = d->documentController->modelController()->findElement(element->modelUid());
     if (!melement)
@@ -303,7 +303,7 @@ void ElementTasks::openDiagram(const qmt::MElement *element)
 
 void ElementTasks::openDiagram(const qmt::DElement *element, const qmt::MDiagram *diagram)
 {
-    Q_UNUSED(diagram);
+    Q_UNUSED(diagram)
 
     qmt::MElement *melement = d->documentController->modelController()->findElement(element->modelUid());
     if (!melement)
@@ -330,7 +330,7 @@ bool ElementTasks::hasParentDiagram(const qmt::MElement *element) const
 
 bool ElementTasks::hasParentDiagram(const qmt::DElement *element, const qmt::MDiagram *diagram) const
 {
-    Q_UNUSED(diagram);
+    Q_UNUSED(diagram)
 
     if (!element)
         return false;
@@ -362,7 +362,7 @@ void ElementTasks::openParentDiagram(const qmt::MElement *element)
 
 void ElementTasks::openParentDiagram(const qmt::DElement *element, const qmt::MElement *diagram)
 {
-    Q_UNUSED(diagram);
+    Q_UNUSED(diagram)
 
     if (!element)
         return;
@@ -381,7 +381,7 @@ bool ElementTasks::mayCreateDiagram(const qmt::MElement *element) const
 bool ElementTasks::mayCreateDiagram(const qmt::DElement *element,
                                     const qmt::MDiagram *diagram) const
 {
-    Q_UNUSED(diagram);
+    Q_UNUSED(diagram)
 
     qmt::MElement *melement = d->documentController->modelController()->findElement(element->modelUid());
     if (!melement)
@@ -414,7 +414,7 @@ void ElementTasks::createAndOpenDiagram(const qmt::MElement *element)
 
 void ElementTasks::createAndOpenDiagram(const qmt::DElement *element, const qmt::MDiagram *diagram)
 {
-    Q_UNUSED(diagram);
+    Q_UNUSED(diagram)
 
     qmt::MElement *melement = d->documentController->modelController()->findElement(element->modelUid());
     if (!melement)
diff --git a/src/plugins/modeleditor/modeldocument.cpp b/src/plugins/modeleditor/modeldocument.cpp
index 875a8bc5c3..a84bdd6863 100644
--- a/src/plugins/modeleditor/modeldocument.cpp
+++ b/src/plugins/modeleditor/modeldocument.cpp
@@ -69,7 +69,7 @@ ModelDocument::~ModelDocument()
 Core::IDocument::OpenResult ModelDocument::open(QString *errorString, const QString &fileName,
                                                 const QString &realFileName)
 {
-    Q_UNUSED(fileName);
+    Q_UNUSED(fileName)
 
     OpenResult result = load(errorString, realFileName);
     return result;
diff --git a/src/plugins/modeleditor/modeleditor.cpp b/src/plugins/modeleditor/modeleditor.cpp
index 67ee3a6294..8e68152189 100644
--- a/src/plugins/modeleditor/modeleditor.cpp
+++ b/src/plugins/modeleditor/modeleditor.cpp
@@ -830,7 +830,7 @@ void ModelEditor::clearProperties()
     d->propertiesView->clearSelection();
     if (d->propertiesGroupWidget) {
         QWidget *scrollWidget = d->propertiesScrollArea->takeWidget();
-        Q_UNUSED(scrollWidget); // avoid warning in release mode
+        Q_UNUSED(scrollWidget) // avoid warning in release mode
         QMT_CHECK(scrollWidget == d->propertiesGroupWidget);
         d->propertiesGroupWidget->deleteLater();
         d->propertiesGroupWidget = nullptr;
@@ -952,8 +952,8 @@ void ModelEditor::onTreeModelReset()
 void ModelEditor::onTreeViewSelectionChanged(const QItemSelection &selected,
                                              const QItemSelection &deselected)
 {
-    Q_UNUSED(selected);
-    Q_UNUSED(deselected);
+    Q_UNUSED(selected)
+    Q_UNUSED(deselected)
 
     synchronizeDiagramWithBrowser();
     updateSelectedArea(SelectedArea::TreeView);
@@ -986,14 +986,14 @@ void ModelEditor::onCurrentDiagramChanged(const qmt::MDiagram *diagram)
 
 void ModelEditor::onDiagramActivated(const qmt::MDiagram *diagram)
 {
-    Q_UNUSED(diagram);
+    Q_UNUSED(diagram)
 
     updateSelectedArea(SelectedArea::Diagram);
 }
 
 void ModelEditor::onDiagramClipboardChanged(bool isEmpty)
 {
-    Q_UNUSED(isEmpty);
+    Q_UNUSED(isEmpty)
 
     if (this == Core::EditorManager::currentEditor())
         updateSelectedArea(d->selectedArea);
@@ -1021,15 +1021,15 @@ void ModelEditor::onDiagramSelectionChanged(const qmt::MDiagram *diagram)
 
 void ModelEditor::onDiagramModified(const qmt::MDiagram *diagram)
 {
-    Q_UNUSED(diagram);
+    Q_UNUSED(diagram)
 
     updateSelectedArea(d->selectedArea);
 }
 
 void ModelEditor::onRightSplitterMoved(int pos, int index)
 {
-    Q_UNUSED(pos);
-    Q_UNUSED(index);
+    Q_UNUSED(pos)
+    Q_UNUSED(index)
 
     d->uiController->onRightSplitterChanged(d->rightSplitter->saveState());
 }
@@ -1041,8 +1041,8 @@ void ModelEditor::onRightSplitterChanged(const QByteArray &state)
 
 void ModelEditor::onRightHorizSplitterMoved(int pos, int index)
 {
-    Q_UNUSED(pos);
-    Q_UNUSED(index);
+    Q_UNUSED(pos)
+    Q_UNUSED(index)
 
     d->uiController->onRightHorizSplitterChanged(d->rightHorizSplitter->saveState());
 }
diff --git a/src/plugins/modeleditor/modeleditor_plugin.cpp b/src/plugins/modeleditor/modeleditor_plugin.cpp
index 8e08854f4d..de80992032 100644
--- a/src/plugins/modeleditor/modeleditor_plugin.cpp
+++ b/src/plugins/modeleditor/modeleditor_plugin.cpp
@@ -84,8 +84,8 @@ ModelEditorPlugin::~ModelEditorPlugin()
 
 bool ModelEditorPlugin::initialize(const QStringList &arguments, QString *errorString)
 {
-    Q_UNUSED(arguments);
-    Q_UNUSED(errorString);
+    Q_UNUSED(arguments)
+    Q_UNUSED(errorString)
 
     d->modelsManager = new ModelsManager(this);
     d->uiController = new UiController(this);
diff --git a/src/plugins/modeleditor/modelindexer.cpp b/src/plugins/modeleditor/modelindexer.cpp
index 71358c2657..163c0d9c5a 100644
--- a/src/plugins/modeleditor/modelindexer.cpp
+++ b/src/plugins/modeleditor/modelindexer.cpp
@@ -356,7 +356,7 @@ QString ModelIndexer::findModel(const qmt::Uid &modelUid)
 
 QString ModelIndexer::findDiagram(const qmt::Uid &modelUid, const qmt::Uid &diagramUid)
 {
-    Q_UNUSED(modelUid); // avoid warning in release mode
+    Q_UNUSED(modelUid) // avoid warning in release mode
 
     QMutexLocker locker(&d->indexerMutex);
     QSet<IndexedDiagramReference *> indexedDiagramReferences = d->indexedDiagramReferencesByDiagramUid.value(diagramUid);
diff --git a/src/plugins/modeleditor/modelsmanager.cpp b/src/plugins/modeleditor/modelsmanager.cpp
index 768d65b2b3..e2eb9d2e9f 100644
--- a/src/plugins/modeleditor/modelsmanager.cpp
+++ b/src/plugins/modeleditor/modelsmanager.cpp
@@ -230,7 +230,7 @@ void ModelsManager::setDiagramClipboard(ExtDocumentController *documentControlle
 void ModelsManager::onAboutToShowContextMenu(ProjectExplorer::Project *project,
                                              ProjectExplorer::Node *node)
 {
-    Q_UNUSED(project);
+    Q_UNUSED(project)
 
     bool canOpenDiagram = false;
 
diff --git a/src/plugins/modeleditor/openelementvisitor.cpp b/src/plugins/modeleditor/openelementvisitor.cpp
index 2429297528..1b5c043263 100644
--- a/src/plugins/modeleditor/openelementvisitor.cpp
+++ b/src/plugins/modeleditor/openelementvisitor.cpp
@@ -129,17 +129,17 @@ void OpenDiagramElementVisitor::visitDConnection(const qmt::DConnection *connect
 
 void OpenDiagramElementVisitor::visitDAnnotation(const qmt::DAnnotation *annotation)
 {
-    Q_UNUSED(annotation);
+    Q_UNUSED(annotation)
 }
 
 void OpenDiagramElementVisitor::visitDBoundary(const qmt::DBoundary *boundary)
 {
-    Q_UNUSED(boundary);
+    Q_UNUSED(boundary)
 }
 
 void OpenDiagramElementVisitor::visitDSwimlane(const qmt::DSwimlane *swimlane)
 {
-    Q_UNUSED(swimlane);
+    Q_UNUSED(swimlane)
 }
 
 void OpenModelElementVisitor::setElementTasks(ElementTasks *elementTasks)
@@ -149,12 +149,12 @@ void OpenModelElementVisitor::setElementTasks(ElementTasks *elementTasks)
 
 void OpenModelElementVisitor::visitMElement(const qmt::MElement *element)
 {
-    Q_UNUSED(element);
+    Q_UNUSED(element)
 }
 
 void OpenModelElementVisitor::visitMObject(const qmt::MObject *object)
 {
-    Q_UNUSED(object);
+    Q_UNUSED(object)
 }
 
 void OpenModelElementVisitor::visitMPackage(const qmt::MPackage *package)
@@ -192,27 +192,27 @@ void OpenModelElementVisitor::visitMItem(const qmt::MItem *item)
 
 void OpenModelElementVisitor::visitMRelation(const qmt::MRelation *relation)
 {
-    Q_UNUSED(relation);
+    Q_UNUSED(relation)
 }
 
 void OpenModelElementVisitor::visitMDependency(const qmt::MDependency *dependency)
 {
-    Q_UNUSED(dependency);
+    Q_UNUSED(dependency)
 }
 
 void OpenModelElementVisitor::visitMInheritance(const qmt::MInheritance *inheritance)
 {
-    Q_UNUSED(inheritance);
+    Q_UNUSED(inheritance)
 }
 
 void OpenModelElementVisitor::visitMAssociation(const qmt::MAssociation *association)
 {
-    Q_UNUSED(association);
+    Q_UNUSED(association)
 }
 
 void OpenModelElementVisitor::visitMConnection(const qmt::MConnection *connection)
 {
-    Q_UNUSED(connection);
+    Q_UNUSED(connection)
 }
 
 } // namespace Internal
diff --git a/src/plugins/nim/editor/nimindenter.cpp b/src/plugins/nim/editor/nimindenter.cpp
index 84dad703b1..7cf24f3c0f 100644
--- a/src/plugins/nim/editor/nimindenter.cpp
+++ b/src/plugins/nim/editor/nimindenter.cpp
@@ -51,8 +51,8 @@ void NimIndenter::indentBlock(const QTextBlock &block,
                               const TextEditor::TabSettings &settings,
                               int cursorPositionInEditor)
 {
-    Q_UNUSED(typedChar);
-    Q_UNUSED(cursorPositionInEditor);
+    Q_UNUSED(typedChar)
+    Q_UNUSED(cursorPositionInEditor)
 
     const QString currentLine = block.text();
 
diff --git a/src/plugins/nim/project/nimcompilerbuildstepconfigwidget.cpp b/src/plugins/nim/project/nimcompilerbuildstepconfigwidget.cpp
index fa72bfb594..720ec13f6f 100644
--- a/src/plugins/nim/project/nimcompilerbuildstepconfigwidget.cpp
+++ b/src/plugins/nim/project/nimcompilerbuildstepconfigwidget.cpp
@@ -75,7 +75,7 @@ NimCompilerBuildStepConfigWidget::~NimCompilerBuildStepConfigWidget() = default;
 
 void NimCompilerBuildStepConfigWidget::onTargetChanged(int index)
 {
-    Q_UNUSED(index);
+    Q_UNUSED(index)
     auto data = m_ui->targetComboBox->currentData();
     FilePath path = FilePath::fromString(data.toString());
     m_buildStep->setTargetNimFile(path);
diff --git a/src/plugins/nim/suggest/server.cpp b/src/plugins/nim/suggest/server.cpp
index 8e9b79b827..bd8a9fb1a4 100644
--- a/src/plugins/nim/suggest/server.cpp
+++ b/src/plugins/nim/suggest/server.cpp
@@ -107,7 +107,7 @@ void NimSuggestServer::onFinished(int exitCode, QProcess::ExitStatus exitStatus)
 {
     clearState();
 
-    Q_UNUSED(exitCode);
+    Q_UNUSED(exitCode)
     if (exitStatus == QProcess::ExitStatus::CrashExit)
         emit crashed();
     else
diff --git a/src/plugins/perforce/perforceversioncontrol.cpp b/src/plugins/perforce/perforceversioncontrol.cpp
index 87d08806b5..b8cc77d069 100644
--- a/src/plugins/perforce/perforceversioncontrol.cpp
+++ b/src/plugins/perforce/perforceversioncontrol.cpp
@@ -51,7 +51,7 @@ Core::Id PerforceVersionControl::id() const
 
 bool PerforceVersionControl::isVcsFileOrDirectory(const Utils::FilePath &fileName) const
 {
-    Q_UNUSED(fileName);
+    Q_UNUSED(fileName)
     return false; // Perforce does not seem to litter its files into the source tree.
 }
 
@@ -83,7 +83,7 @@ bool PerforceVersionControl::supportsOperation(Operation operation) const
 
 Core::IVersionControl::OpenSupportMode PerforceVersionControl::openSupportMode(const QString &fileName) const
 {
-    Q_UNUSED(fileName);
+    Q_UNUSED(fileName)
     return OpenOptional;
 }
 
diff --git a/src/plugins/perfprofiler/perfconfigwidget.cpp b/src/plugins/perfprofiler/perfconfigwidget.cpp
index b7c72065d0..bdf2a0540e 100644
--- a/src/plugins/perfprofiler/perfconfigwidget.cpp
+++ b/src/plugins/perfprofiler/perfconfigwidget.cpp
@@ -246,7 +246,7 @@ void PerfConfigWidget::handleProcessError(QProcess::ProcessError error)
 QWidget *SettingsDelegate::createEditor(QWidget *parent, const QStyleOptionViewItem &option,
                                         const QModelIndex &index) const
 {
-    Q_UNUSED(option);
+    Q_UNUSED(option)
     const int row = index.row();
     const int column = index.column();
     const PerfConfigEventsModel *model = qobject_cast<const PerfConfigEventsModel *>(index.model());
@@ -406,7 +406,7 @@ void SettingsDelegate::setModelData(QWidget *editor, QAbstractItemModel *model,
 void SettingsDelegate::updateEditorGeometry(QWidget *editor, const QStyleOptionViewItem &option,
                                             const QModelIndex &index) const
 {
-    Q_UNUSED(index);
+    Q_UNUSED(index)
     editor->setGeometry(option.rect);
 }
 
diff --git a/src/plugins/perfprofiler/perfprofilerflamegraphmodel.cpp b/src/plugins/perfprofiler/perfprofilerflamegraphmodel.cpp
index 79ebb32ba1..d9f4cc3052 100644
--- a/src/plugins/perfprofiler/perfprofilerflamegraphmodel.cpp
+++ b/src/plugins/perfprofiler/perfprofilerflamegraphmodel.cpp
@@ -149,7 +149,7 @@ int PerfProfilerFlameGraphModel::rowCount(const QModelIndex &parent) const
 
 int PerfProfilerFlameGraphModel::columnCount(const QModelIndex &parent) const
 {
-    Q_UNUSED(parent);
+    Q_UNUSED(parent)
     return 1;
 }
 
@@ -227,7 +227,7 @@ void PerfProfilerFlameGraphData::updateTraceData(const PerfEvent &event, const P
                                                  PerfProfilerFlameGraphModel::Data *data,
                                                  int numSamples)
 {
-    Q_UNUSED(type);
+    Q_UNUSED(type)
     for (int i = 0, end = event.numAttributes(); i < end; ++i) {
         const PerfEventType::Attribute &attribute = manager->attribute(event.attributeId(i));
         if (attribute.type != PerfEventType::TypeTracepoint)
diff --git a/src/plugins/perfprofiler/perfprofilerstatisticsmodel.cpp b/src/plugins/perfprofiler/perfprofilerstatisticsmodel.cpp
index f33b570a25..134f88be98 100644
--- a/src/plugins/perfprofiler/perfprofilerstatisticsmodel.cpp
+++ b/src/plugins/perfprofiler/perfprofilerstatisticsmodel.cpp
@@ -108,7 +108,7 @@ PerfProfilerStatisticsModel::PerfProfilerStatisticsModel(Relation relation, QObj
 
 int PerfProfilerStatisticsModel::columnCount(const QModelIndex &parent) const
 {
-    Q_UNUSED(parent);
+    Q_UNUSED(parent)
     return m_columns.length();
 }
 
@@ -163,7 +163,7 @@ void PerfProfilerStatisticsMainModel::finalize(PerfProfilerStatisticsData *data)
 
 int PerfProfilerStatisticsMainModel::rowCount(const QModelIndex &parent) const
 {
-    Q_UNUSED(parent);
+    Q_UNUSED(parent)
     return m_data.length();
 }
 
@@ -213,7 +213,7 @@ void PerfProfilerStatisticsData::loadEvent(const PerfEvent &event, const PerfEve
     if (event.timestamp() < 0)
         return;
 
-    Q_UNUSED(type);
+    Q_UNUSED(type)
     ++totalSamples;
     auto data = mainData.end();
     const QVector<qint32> &stack = event.frames();
@@ -370,7 +370,7 @@ PerfProfilerStatisticsRelativesModel::PerfProfilerStatisticsRelativesModel(
 
 int PerfProfilerStatisticsRelativesModel::rowCount(const QModelIndex &parent) const
 {
-    Q_UNUSED(parent);
+    Q_UNUSED(parent)
     return m_data.value(m_currentRelative).data.length();
 }
 
diff --git a/src/plugins/perfprofiler/perfprofilerstatisticsview.cpp b/src/plugins/perfprofiler/perfprofilerstatisticsview.cpp
index 3b60e682f4..d023444b2e 100644
--- a/src/plugins/perfprofiler/perfprofilerstatisticsview.cpp
+++ b/src/plugins/perfprofiler/perfprofilerstatisticsview.cpp
@@ -57,7 +57,7 @@ public:
 
     QString displayText(const QVariant &value, const QLocale &locale) const
     {
-        Q_UNUSED(locale);
+        Q_UNUSED(locale)
         return QString::fromLatin1("0x%1").arg(value.toULongLong(), 16, 16, QLatin1Char('0'));
     }
 };
diff --git a/src/plugins/perfprofiler/perfprofilertracefile.cpp b/src/plugins/perfprofiler/perfprofilertracefile.cpp
index c6ea883c79..9b58f21f62 100644
--- a/src/plugins/perfprofiler/perfprofilertracefile.cpp
+++ b/src/plugins/perfprofiler/perfprofilertracefile.cpp
@@ -497,7 +497,7 @@ void PerfProfilerTraceFile::writeToDevice()
         CompressedDataStream bufferStream(m_device.data());
         int i = 0;
         traceManager->replayPerfEvents([&](const PerfEvent &event, const PerfEventType &type) {
-            Q_UNUSED(type);
+            Q_UNUSED(type)
             Packet packet(&bufferStream);
             packet << event;
 
diff --git a/src/plugins/perfprofiler/perftimelinemodelmanager.cpp b/src/plugins/perfprofiler/perftimelinemodelmanager.cpp
index 85171e85dd..48af0ccf37 100644
--- a/src/plugins/perfprofiler/perftimelinemodelmanager.cpp
+++ b/src/plugins/perfprofiler/perftimelinemodelmanager.cpp
@@ -113,7 +113,7 @@ void PerfTimelineModelManager::finalize()
 
 void PerfTimelineModelManager::loadEvent(const PerfEvent &event, const PerfEventType &type)
 {
-    Q_UNUSED(type);
+    Q_UNUSED(type)
     const int parallel = m_traceManager->threads().size();
     auto i = m_unfinished.find(event.tid());
     if (i == m_unfinished.end()) {
diff --git a/src/plugins/perfprofiler/perftimelineresourcesrenderpass.cpp b/src/plugins/perfprofiler/perftimelineresourcesrenderpass.cpp
index d53c6f162e..ba88f4b462 100644
--- a/src/plugins/perfprofiler/perftimelineresourcesrenderpass.cpp
+++ b/src/plugins/perfprofiler/perftimelineresourcesrenderpass.cpp
@@ -140,8 +140,8 @@ Timeline::TimelineRenderPass::State *PerfTimelineResourcesRenderPass::update(
         Timeline::TimelineRenderPass::State *oldState, int indexFrom, int indexTo,
         bool stateChanged, float spacing) const
 {
-    Q_UNUSED(stateChanged);
-    Q_UNUSED(spacing);
+    Q_UNUSED(stateChanged)
+    Q_UNUSED(spacing)
 
     const PerfTimelineModel *model = qobject_cast<const PerfTimelineModel *>(renderer->model());
 
diff --git a/src/plugins/projectexplorer/buildconfiguration.cpp b/src/plugins/projectexplorer/buildconfiguration.cpp
index ef460eef58..48493b27ec 100644
--- a/src/plugins/projectexplorer/buildconfiguration.cpp
+++ b/src/plugins/projectexplorer/buildconfiguration.cpp
@@ -313,7 +313,7 @@ void BuildConfiguration::setUseSystemEnvironment(bool b)
 
 void BuildConfiguration::addToEnvironment(Utils::Environment &env) const
 {
-    Q_UNUSED(env);
+    Q_UNUSED(env)
 }
 
 bool BuildConfiguration::useSystemEnvironment() const
@@ -346,7 +346,7 @@ QString BuildConfiguration::disabledReason() const
 
 bool BuildConfiguration::regenerateBuildFiles(Node *node)
 {
-    Q_UNUSED(node);
+    Q_UNUSED(node)
     return false;
 }
 
diff --git a/src/plugins/projectexplorer/buildstep.cpp b/src/plugins/projectexplorer/buildstep.cpp
index df94768f5a..fc6019ed67 100644
--- a/src/plugins/projectexplorer/buildstep.cpp
+++ b/src/plugins/projectexplorer/buildstep.cpp
@@ -237,7 +237,7 @@ void BuildStep::setWidgetExpandedByDefault(bool widgetExpandedByDefault)
 
 QVariant BuildStep::data(Core::Id id) const
 {
-    Q_UNUSED(id);
+    Q_UNUSED(id)
     return {};
 }
 
diff --git a/src/plugins/projectexplorer/configtaskhandler.cpp b/src/plugins/projectexplorer/configtaskhandler.cpp
index 5ad2a11a81..e3c5ed58d5 100644
--- a/src/plugins/projectexplorer/configtaskhandler.cpp
+++ b/src/plugins/projectexplorer/configtaskhandler.cpp
@@ -50,7 +50,7 @@ bool ConfigTaskHandler::canHandle(const Task &task) const
 
 void ConfigTaskHandler::handle(const Task &task)
 {
-    Q_UNUSED(task);
+    Q_UNUSED(task)
     Core::ICore::showOptionsDialog(m_targetPage);
 }
 
diff --git a/src/plugins/projectexplorer/customtoolchain.cpp b/src/plugins/projectexplorer/customtoolchain.cpp
index d86bbff0ca..654337ab2c 100644
--- a/src/plugins/projectexplorer/customtoolchain.cpp
+++ b/src/plugins/projectexplorer/customtoolchain.cpp
@@ -138,7 +138,7 @@ Utils::LanguageExtensions CustomToolChain::languageExtensions(const QStringList
 
 WarningFlags CustomToolChain::warningFlags(const QStringList &cxxflags) const
 {
-    Q_UNUSED(cxxflags);
+    Q_UNUSED(cxxflags)
     return WarningFlags::Default;
 }
 
diff --git a/src/plugins/projectexplorer/devicesupport/devicemanagermodel.cpp b/src/plugins/projectexplorer/devicesupport/devicemanagermodel.cpp
index 0aa0ac12d6..b5ff411f4f 100644
--- a/src/plugins/projectexplorer/devicesupport/devicemanagermodel.cpp
+++ b/src/plugins/projectexplorer/devicesupport/devicemanagermodel.cpp
@@ -154,7 +154,7 @@ void DeviceManagerModel::handleDeviceListChanged()
 
 int DeviceManagerModel::rowCount(const QModelIndex &parent) const
 {
-    Q_UNUSED(parent);
+    Q_UNUSED(parent)
     return d->devices.count();
 }
 
diff --git a/src/plugins/projectexplorer/devicesupport/idevice.cpp b/src/plugins/projectexplorer/devicesupport/idevice.cpp
index 9978fc61e3..07d85970e0 100644
--- a/src/plugins/projectexplorer/devicesupport/idevice.cpp
+++ b/src/plugins/projectexplorer/devicesupport/idevice.cpp
@@ -289,7 +289,7 @@ PortsGatheringMethod::Ptr IDevice::portsGatheringMethod() const
 
 DeviceProcessList *IDevice::createProcessListModel(QObject *parent) const
 {
-    Q_UNUSED(parent);
+    Q_UNUSED(parent)
     QTC_ASSERT(false, qDebug("This should not have been called..."); return nullptr);
     return nullptr;
 }
diff --git a/src/plugins/projectexplorer/extracompiler.cpp b/src/plugins/projectexplorer/extracompiler.cpp
index 5c65198486..7123ff38e2 100644
--- a/src/plugins/projectexplorer/extracompiler.cpp
+++ b/src/plugins/projectexplorer/extracompiler.cpp
@@ -376,13 +376,13 @@ QStringList ProcessExtraCompiler::arguments() const
 
 bool ProcessExtraCompiler::prepareToRun(const QByteArray &sourceContents)
 {
-    Q_UNUSED(sourceContents);
+    Q_UNUSED(sourceContents)
     return true;
 }
 
 Tasks ProcessExtraCompiler::parseIssues(const QByteArray &stdErr)
 {
-    Q_UNUSED(stdErr);
+    Q_UNUSED(stdErr)
     return {};
 }
 
diff --git a/src/plugins/projectexplorer/extracompiler.h b/src/plugins/projectexplorer/extracompiler.h
index ba9c6774f7..e6eae13f5c 100644
--- a/src/plugins/projectexplorer/extracompiler.h
+++ b/src/plugins/projectexplorer/extracompiler.h
@@ -118,9 +118,9 @@ protected:
 
     virtual bool prepareToRun(const QByteArray &sourceContents);
 
-    virtual void handleProcessError(QProcess *process) { Q_UNUSED(process); }
+    virtual void handleProcessError(QProcess *process) { Q_UNUSED(process) }
     virtual void handleProcessStarted(QProcess *process, const QByteArray &sourceContents)
-    { Q_UNUSED(process); Q_UNUSED(sourceContents); }
+    { Q_UNUSED(process); Q_UNUSED(sourceContents) }
     virtual FileNameToContentsHash handleProcessFinished(QProcess *process) = 0;
 
     virtual Tasks parseIssues(const QByteArray &stdErr);
diff --git a/src/plugins/projectexplorer/jsonwizard/jsonfieldpage.cpp b/src/plugins/projectexplorer/jsonwizard/jsonfieldpage.cpp
index 835f3a0429..749c660e01 100644
--- a/src/plugins/projectexplorer/jsonwizard/jsonfieldpage.cpp
+++ b/src/plugins/projectexplorer/jsonwizard/jsonfieldpage.cpp
@@ -383,8 +383,8 @@ bool LabelField::parseData(const QVariant &data, QString *errorMessage)
 
 QWidget *LabelField::createWidget(const QString &displayName, JsonFieldPage *page)
 {
-    Q_UNUSED(displayName);
-    Q_UNUSED(page);
+    Q_UNUSED(displayName)
+    Q_UNUSED(page)
     auto w = new QLabel;
     w->setWordWrap(m_wordWrap);
     w->setText(m_text);
@@ -426,8 +426,8 @@ bool SpacerField::parseData(const QVariant &data, QString *errorMessage)
 
 QWidget *SpacerField::createWidget(const QString &displayName, JsonFieldPage *page)
 {
-    Q_UNUSED(displayName);
-    Q_UNUSED(page);
+    Q_UNUSED(displayName)
+    Q_UNUSED(page)
     int size = QApplication::style()->pixelMetric(QStyle::PM_DefaultLayoutSpacing) * m_factor;
 
     auto w = new QWidget();
@@ -481,7 +481,7 @@ bool LineEditField::parseData(const QVariant &data, QString *errorMessage)
 
 QWidget *LineEditField::createWidget(const QString &displayName, JsonFieldPage *page)
 {
-    Q_UNUSED(displayName);
+    Q_UNUSED(displayName)
     auto w = new FancyLineEdit;
 
     if (m_validatorRegExp.isValid()) {
@@ -581,8 +581,8 @@ bool TextEditField::parseData(const QVariant &data, QString *errorMessage)
 QWidget *TextEditField::createWidget(const QString &displayName, JsonFieldPage *page)
 {
     // TODO: Set up modification monitoring...
-    Q_UNUSED(displayName);
-    Q_UNUSED(page);
+    Q_UNUSED(displayName)
+    Q_UNUSED(page)
     auto w = new QTextEdit;
     w->setAcceptRichText(m_acceptRichText);
     return w;
@@ -673,8 +673,8 @@ bool PathChooserField::parseData(const QVariant &data, QString *errorMessage)
 
 QWidget *PathChooserField::createWidget(const QString &displayName, JsonFieldPage *page)
 {
-    Q_UNUSED(displayName);
-    Q_UNUSED(page);
+    Q_UNUSED(displayName)
+    Q_UNUSED(page)
     auto w = new PathChooser;
     if (!m_historyId.isEmpty())
         w->setHistoryCompleter(m_historyId);
@@ -754,7 +754,7 @@ bool CheckBoxField::parseData(const QVariant &data, QString *errorMessage)
 
 QWidget *CheckBoxField::createWidget(const QString &displayName, JsonFieldPage *page)
 {
-    Q_UNUSED(page);
+    Q_UNUSED(page)
     return new QCheckBox(displayName);
 }
 
diff --git a/src/plugins/projectexplorer/jsonwizard/jsonfieldpage.h b/src/plugins/projectexplorer/jsonwizard/jsonfieldpage.h
index 487dbd1a64..16da75c4ad 100644
--- a/src/plugins/projectexplorer/jsonwizard/jsonfieldpage.h
+++ b/src/plugins/projectexplorer/jsonwizard/jsonfieldpage.h
@@ -74,7 +74,7 @@ public:
         virtual bool validate(Utils::MacroExpander *expander, QString *message);
 
         void initialize(Utils::MacroExpander *expander);
-        virtual void cleanup(Utils::MacroExpander *expander) {  Q_UNUSED(expander); }
+        virtual void cleanup(Utils::MacroExpander *expander) {  Q_UNUSED(expander) }
 
         virtual bool suppressName() const { return false; }
 
@@ -89,10 +89,10 @@ public:
     protected:
         QWidget *widget() const;
         virtual bool parseData(const QVariant &data, QString *errorMessage) = 0;
-        virtual void initializeData(Utils::MacroExpander *expander) { Q_UNUSED(expander); }
+        virtual void initializeData(Utils::MacroExpander *expander) { Q_UNUSED(expander) }
         virtual QWidget *createWidget(const QString &displayName, JsonFieldPage *page) = 0;
         virtual void setup(JsonFieldPage *page, const QString &name)
-        { Q_UNUSED(page); Q_UNUSED(name); }
+        { Q_UNUSED(page); Q_UNUSED(name) }
 
         QString type();
 
diff --git a/src/plugins/projectexplorer/jsonwizard/jsonwizardfilegenerator.cpp b/src/plugins/projectexplorer/jsonwizard/jsonwizardfilegenerator.cpp
index c8ae9aa013..d510e187fa 100644
--- a/src/plugins/projectexplorer/jsonwizard/jsonwizardfilegenerator.cpp
+++ b/src/plugins/projectexplorer/jsonwizard/jsonwizardfilegenerator.cpp
@@ -227,7 +227,7 @@ Core::GeneratedFiles JsonWizardFileGenerator::fileList(Utils::MacroExpander *exp
 
 bool JsonWizardFileGenerator::writeFile(const JsonWizard *wizard, Core::GeneratedFile *file, QString *errorMessage)
 {
-    Q_UNUSED(wizard);
+    Q_UNUSED(wizard)
     if (!(file->attributes() & Core::GeneratedFile::KeepExistingFileAttribute)) {
         if (!file->write(errorMessage))
             return false;
diff --git a/src/plugins/projectexplorer/jsonwizard/jsonwizardgeneratorfactory.cpp b/src/plugins/projectexplorer/jsonwizard/jsonwizardgeneratorfactory.cpp
index ae3e6aaa52..4f4f8882f7 100644
--- a/src/plugins/projectexplorer/jsonwizard/jsonwizardgeneratorfactory.cpp
+++ b/src/plugins/projectexplorer/jsonwizard/jsonwizardgeneratorfactory.cpp
@@ -80,7 +80,7 @@ static ICodeStylePreferences *codeStylePreferences(Project *project, Id language
 
 bool JsonWizardGenerator::formatFile(const JsonWizard *wizard, GeneratedFile *file, QString *errorMessage)
 {
-    Q_UNUSED(errorMessage);
+    Q_UNUSED(errorMessage)
 
     if (file->isBinary() || file->contents().isEmpty())
         return true; // nothing to do
@@ -124,33 +124,33 @@ bool JsonWizardGenerator::formatFile(const JsonWizard *wizard, GeneratedFile *fi
 
 bool JsonWizardGenerator::writeFile(const JsonWizard *wizard, GeneratedFile *file, QString *errorMessage)
 {
-    Q_UNUSED(wizard);
-    Q_UNUSED(file);
-    Q_UNUSED(errorMessage);
+    Q_UNUSED(wizard)
+    Q_UNUSED(file)
+    Q_UNUSED(errorMessage)
     return true;
 }
 
 bool JsonWizardGenerator::postWrite(const JsonWizard *wizard, GeneratedFile *file, QString *errorMessage)
 {
-    Q_UNUSED(wizard);
-    Q_UNUSED(file);
-    Q_UNUSED(errorMessage);
+    Q_UNUSED(wizard)
+    Q_UNUSED(file)
+    Q_UNUSED(errorMessage)
     return true;
 }
 
 bool JsonWizardGenerator::polish(const JsonWizard *wizard, GeneratedFile *file, QString *errorMessage)
 {
-    Q_UNUSED(wizard);
-    Q_UNUSED(file);
-    Q_UNUSED(errorMessage);
+    Q_UNUSED(wizard)
+    Q_UNUSED(file)
+    Q_UNUSED(errorMessage)
     return true;
 }
 
 bool JsonWizardGenerator::allDone(const JsonWizard *wizard, GeneratedFile *file, QString *errorMessage)
 {
-    Q_UNUSED(wizard);
-    Q_UNUSED(file);
-    Q_UNUSED(errorMessage);
+    Q_UNUSED(wizard)
+    Q_UNUSED(file)
+    Q_UNUSED(errorMessage)
     return true;
 }
 
@@ -309,9 +309,9 @@ JsonWizardGenerator *FileGeneratorFactory::create(Id typeId, const QVariant &dat
                                                   const QString &path, Id platform,
                                                   const QVariantMap &variables)
 {
-    Q_UNUSED(path);
-    Q_UNUSED(platform);
-    Q_UNUSED(variables);
+    Q_UNUSED(path)
+    Q_UNUSED(platform)
+    Q_UNUSED(variables)
 
     QTC_ASSERT(canCreate(typeId), return nullptr);
 
@@ -349,9 +349,9 @@ JsonWizardGenerator *ScannerGeneratorFactory::create(Id typeId, const QVariant &
                                                      const QString &path, Id platform,
                                                      const QVariantMap &variables)
 {
-    Q_UNUSED(path);
-    Q_UNUSED(platform);
-    Q_UNUSED(variables);
+    Q_UNUSED(path)
+    Q_UNUSED(platform)
+    Q_UNUSED(variables)
 
     QTC_ASSERT(canCreate(typeId), return nullptr);
 
diff --git a/src/plugins/projectexplorer/jsonwizard/jsonwizardpagefactory_p.cpp b/src/plugins/projectexplorer/jsonwizard/jsonwizardpagefactory_p.cpp
index 2e7c93b514..774b63376e 100644
--- a/src/plugins/projectexplorer/jsonwizard/jsonwizardpagefactory_p.cpp
+++ b/src/plugins/projectexplorer/jsonwizard/jsonwizardpagefactory_p.cpp
@@ -62,7 +62,7 @@ FieldPageFactory::FieldPageFactory()
 
 Utils::WizardPage *FieldPageFactory::create(JsonWizard *wizard, Core::Id typeId, const QVariant &data)
 {
-    Q_UNUSED(wizard);
+    Q_UNUSED(wizard)
 
     QTC_ASSERT(canCreate(typeId), return nullptr);
 
@@ -109,8 +109,8 @@ FilePageFactory::FilePageFactory()
 
 Utils::WizardPage *FilePageFactory::create(JsonWizard *wizard, Core::Id typeId, const QVariant &data)
 {
-    Q_UNUSED(wizard);
-    Q_UNUSED(data);
+    Q_UNUSED(wizard)
+    Q_UNUSED(data)
     QTC_ASSERT(canCreate(typeId), return nullptr);
 
     return new JsonFilePage;
@@ -143,7 +143,7 @@ KitsPageFactory::KitsPageFactory()
 
 Utils::WizardPage *KitsPageFactory::create(JsonWizard *wizard, Core::Id typeId, const QVariant &data)
 {
-    Q_UNUSED(wizard);
+    Q_UNUSED(wizard)
     QTC_ASSERT(canCreate(typeId), return nullptr);
 
     auto page = new JsonKitsPage;
@@ -203,8 +203,8 @@ ProjectPageFactory::ProjectPageFactory()
 
 Utils::WizardPage *ProjectPageFactory::create(JsonWizard *wizard, Core::Id typeId, const QVariant &data)
 {
-    Q_UNUSED(wizard);
-    Q_UNUSED(data);
+    Q_UNUSED(wizard)
+    Q_UNUSED(data)
     QTC_ASSERT(canCreate(typeId), return nullptr);
 
     auto page = new JsonProjectPage;
@@ -226,7 +226,7 @@ Utils::WizardPage *ProjectPageFactory::create(JsonWizard *wizard, Core::Id typeI
 
 bool ProjectPageFactory::validateData(Core::Id typeId, const QVariant &data, QString *errorMessage)
 {
-    Q_UNUSED(errorMessage);
+    Q_UNUSED(errorMessage)
 
     QTC_ASSERT(canCreate(typeId), return false);
     if (!data.isNull() && data.type() != QVariant::Map) {
@@ -263,8 +263,8 @@ SummaryPageFactory::SummaryPageFactory()
 
 Utils::WizardPage *SummaryPageFactory::create(JsonWizard *wizard, Core::Id typeId, const QVariant &data)
 {
-    Q_UNUSED(wizard);
-    Q_UNUSED(data);
+    Q_UNUSED(wizard)
+    Q_UNUSED(data)
     QTC_ASSERT(canCreate(typeId), return nullptr);
 
     auto page = new JsonSummaryPage;
diff --git a/src/plugins/projectexplorer/jsonwizard/jsonwizardscannergenerator.cpp b/src/plugins/projectexplorer/jsonwizard/jsonwizardscannergenerator.cpp
index 9f24f00718..ff0fcde7d4 100644
--- a/src/plugins/projectexplorer/jsonwizard/jsonwizardscannergenerator.cpp
+++ b/src/plugins/projectexplorer/jsonwizard/jsonwizardscannergenerator.cpp
@@ -80,7 +80,7 @@ Core::GeneratedFiles JsonWizardScannerGenerator::fileList(Utils::MacroExpander *
                                                           const QString &projectDir,
                                                           QString *errorMessage)
 {
-    Q_UNUSED(wizardDir);
+    Q_UNUSED(wizardDir)
     errorMessage->clear();
 
     QDir project(projectDir);
diff --git a/src/plugins/projectexplorer/kitinformation.cpp b/src/plugins/projectexplorer/kitinformation.cpp
index c091d0d870..39d3275034 100644
--- a/src/plugins/projectexplorer/kitinformation.cpp
+++ b/src/plugins/projectexplorer/kitinformation.cpp
@@ -739,7 +739,7 @@ void ToolChainKitAspect::toolChainUpdated(ToolChain *tc)
 
 void ToolChainKitAspect::toolChainRemoved(ToolChain *tc)
 {
-    Q_UNUSED(tc);
+    Q_UNUSED(tc)
     foreach (Kit *k, KitManager::kits())
         fix(k);
 }
@@ -811,7 +811,7 @@ void DeviceTypeKitAspect::setup(Kit *k)
 
 Tasks DeviceTypeKitAspect::validate(const Kit *k) const
 {
-    Q_UNUSED(k);
+    Q_UNUSED(k)
     return {};
 }
 
diff --git a/src/plugins/projectexplorer/kitmanager.cpp b/src/plugins/projectexplorer/kitmanager.cpp
index 91d04b6f5d..5fe68c38ab 100644
--- a/src/plugins/projectexplorer/kitmanager.cpp
+++ b/src/plugins/projectexplorer/kitmanager.cpp
@@ -580,38 +580,38 @@ int KitAspect::weight(const Kit *k) const
 
 void KitAspect::addToEnvironment(const Kit *k, Environment &env) const
 {
-    Q_UNUSED(k);
-    Q_UNUSED(env);
+    Q_UNUSED(k)
+    Q_UNUSED(env)
 }
 
 IOutputParser *KitAspect::createOutputParser(const Kit *k) const
 {
-    Q_UNUSED(k);
+    Q_UNUSED(k)
     return nullptr;
 }
 
 QString KitAspect::displayNamePostfix(const Kit *k) const
 {
-    Q_UNUSED(k);
+    Q_UNUSED(k)
     return QString();
 }
 
 QSet<Id> KitAspect::supportedPlatforms(const Kit *k) const
 {
-    Q_UNUSED(k);
+    Q_UNUSED(k)
     return QSet<Id>();
 }
 
 QSet<Id> KitAspect::availableFeatures(const Kit *k) const
 {
-    Q_UNUSED(k);
+    Q_UNUSED(k)
     return QSet<Id>();
 }
 
 void KitAspect::addToMacroExpander(Kit *k, MacroExpander *expander) const
 {
-    Q_UNUSED(k);
-    Q_UNUSED(expander);
+    Q_UNUSED(k)
+    Q_UNUSED(expander)
 }
 
 void KitAspect::notifyAboutUpdate(Kit *k)
diff --git a/src/plugins/projectexplorer/kitmanagerconfigwidget.cpp b/src/plugins/projectexplorer/kitmanagerconfigwidget.cpp
index f49c61824f..f5319b7c67 100644
--- a/src/plugins/projectexplorer/kitmanagerconfigwidget.cpp
+++ b/src/plugins/projectexplorer/kitmanagerconfigwidget.cpp
@@ -410,7 +410,7 @@ void KitManagerConfigWidget::kitWasUpdated(Kit *k)
 
 void KitManagerConfigWidget::showEvent(QShowEvent *event)
 {
-    Q_UNUSED(event);
+    Q_UNUSED(event)
     foreach (KitAspectWidget *widget, m_widgets)
         widget->refresh();
 }
diff --git a/src/plugins/projectexplorer/outputparser_test.cpp b/src/plugins/projectexplorer/outputparser_test.cpp
index 765a087650..17834ff5c8 100644
--- a/src/plugins/projectexplorer/outputparser_test.cpp
+++ b/src/plugins/projectexplorer/outputparser_test.cpp
@@ -137,7 +137,7 @@ void OutputParserTester::appendOutputParser(IOutputParser *parser)
 
 void OutputParserTester::outputAdded(const QString &line, BuildStep::OutputFormat format)
 {
-    Q_UNUSED(format);
+    Q_UNUSED(format)
     if (!m_receivedOutput.isEmpty())
         m_receivedOutput.append('\n');
     m_receivedOutput.append(line);
@@ -145,8 +145,8 @@ void OutputParserTester::outputAdded(const QString &line, BuildStep::OutputForma
 
 void OutputParserTester::taskAdded(const Task &task, int linkedLines, int skipLines)
 {
-    Q_UNUSED(linkedLines);
-    Q_UNUSED(skipLines);
+    Q_UNUSED(linkedLines)
+    Q_UNUSED(skipLines)
     m_receivedTasks.append(task);
 }
 
diff --git a/src/plugins/projectexplorer/panelswidget.cpp b/src/plugins/projectexplorer/panelswidget.cpp
index 882f4d0f44..6e6e1f0177 100644
--- a/src/plugins/projectexplorer/panelswidget.cpp
+++ b/src/plugins/projectexplorer/panelswidget.cpp
@@ -64,7 +64,7 @@ public:
     }
     void paintEvent(QPaintEvent *e) override
     {
-        Q_UNUSED(e);
+        Q_UNUSED(e)
         QPainter p(this);
         QColor fillColor = creatorTheme()->color(Theme::PanelsWidgetSeparatorLineColor);
         p.fillRect(contentsRect(), fillColor);
diff --git a/src/plugins/projectexplorer/project.cpp b/src/plugins/projectexplorer/project.cpp
index 721d392d13..946b4d663b 100644
--- a/src/plugins/projectexplorer/project.cpp
+++ b/src/plugins/projectexplorer/project.cpp
@@ -130,17 +130,17 @@ Core::IDocument::ReloadBehavior
 ProjectDocument::reloadBehavior(Core::IDocument::ChangeTrigger state,
                                 Core::IDocument::ChangeType type) const
 {
-    Q_UNUSED(state);
-    Q_UNUSED(type);
+    Q_UNUSED(state)
+    Q_UNUSED(type)
     return BehaviorSilent;
 }
 
 bool ProjectDocument::reload(QString *errorString, Core::IDocument::ReloadFlag flag,
                              Core::IDocument::ChangeType type)
 {
-    Q_UNUSED(errorString);
-    Q_UNUSED(flag);
-    Q_UNUSED(type);
+    Q_UNUSED(errorString)
+    Q_UNUSED(flag)
+    Q_UNUSED(type)
 
     if (m_callback)
         m_callback();
@@ -702,7 +702,7 @@ ContainerNode *Project::containerNode() const
 
 Project::RestoreResult Project::fromMap(const QVariantMap &map, QString *errorMessage)
 {
-    Q_UNUSED(errorMessage);
+    Q_UNUSED(errorMessage)
     if (map.contains(QLatin1String(EDITOR_SETTINGS_KEY))) {
         QVariantMap values(map.value(QLatin1String(EDITOR_SETTINGS_KEY)).toMap());
         d->m_editorConfiguration.fromMap(values);
@@ -756,7 +756,7 @@ EditorConfiguration *Project::editorConfiguration() const
 
 QStringList Project::filesGeneratedFrom(const QString &file) const
 {
-    Q_UNUSED(file);
+    Q_UNUSED(file)
     return QStringList();
 }
 
@@ -912,8 +912,8 @@ Utils::MacroExpander *Project::macroExpander() const
 
 QVariant Project::additionalData(Core::Id id, const Target *target) const
 {
-    Q_UNUSED(id);
-    Q_UNUSED(target);
+    Q_UNUSED(id)
+    Q_UNUSED(target)
     return QVariant();
 }
 
diff --git a/src/plugins/projectexplorer/projectexplorer.cpp b/src/plugins/projectexplorer/projectexplorer.cpp
index 8baf336810..8355267925 100644
--- a/src/plugins/projectexplorer/projectexplorer.cpp
+++ b/src/plugins/projectexplorer/projectexplorer.cpp
@@ -622,7 +622,7 @@ ProjectExplorerPlugin *ProjectExplorerPlugin::instance()
 
 bool ProjectExplorerPlugin::initialize(const QStringList &arguments, QString *error)
 {
-    Q_UNUSED(error);
+    Q_UNUSED(error)
 
     dd = new ProjectExplorerPluginPrivate;
 
@@ -2914,7 +2914,7 @@ void ProjectExplorerPluginPrivate::projectAdded(Project *pro)
 
 void ProjectExplorerPluginPrivate::projectRemoved(Project *pro)
 {
-    Q_UNUSED(pro);
+    Q_UNUSED(pro)
     m_projectsMode.setEnabled(SessionManager::hasProjects());
 }
 
diff --git a/src/plugins/projectexplorer/projectmodels.cpp b/src/plugins/projectexplorer/projectmodels.cpp
index ca8c7115f4..3e99eba356 100644
--- a/src/plugins/projectexplorer/projectmodels.cpp
+++ b/src/plugins/projectexplorer/projectmodels.cpp
@@ -533,7 +533,7 @@ private:
 bool FlatModel::dropMimeData(const QMimeData *data, Qt::DropAction action, int row, int column,
                              const QModelIndex &parent)
 {
-    Q_UNUSED(action);
+    Q_UNUSED(action)
 
     const auto * const dropData = dynamic_cast<const DropMimeData *>(data);
     QTC_ASSERT(dropData, return false);
diff --git a/src/plugins/projectexplorer/projectnodes.cpp b/src/plugins/projectexplorer/projectnodes.cpp
index 9407af7be6..452d3939a2 100644
--- a/src/plugins/projectexplorer/projectnodes.cpp
+++ b/src/plugins/projectexplorer/projectnodes.cpp
@@ -746,7 +746,7 @@ bool FolderNode::addDependencies(const QStringList &dependencies)
 
 FolderNode::AddNewInformation FolderNode::addNewInformation(const QStringList &files, Node *context) const
 {
-    Q_UNUSED(files);
+    Q_UNUSED(files)
     return AddNewInformation(displayName(), context == this ? 120 : 100);
 }
 
@@ -864,8 +864,8 @@ bool ProjectNode::deleteFiles(const QStringList &filePaths)
 
 bool ProjectNode::canRenameFile(const QString &filePath, const QString &newFilePath)
 {
-    Q_UNUSED(filePath);
-    Q_UNUSED(newFilePath);
+    Q_UNUSED(filePath)
+    Q_UNUSED(newFilePath)
     return true;
 }
 
@@ -889,7 +889,7 @@ bool ProjectNode::supportsAction(ProjectAction, const Node *) const
 
 bool ProjectNode::deploysFolder(const QString &folder) const
 {
-    Q_UNUSED(folder);
+    Q_UNUSED(folder)
     return false;
 }
 
@@ -905,14 +905,14 @@ ProjectNode *ProjectNode::projectNode(const Utils::FilePath &file) const
 
 QVariant ProjectNode::data(Core::Id role) const
 {
-    Q_UNUSED(role);
+    Q_UNUSED(role)
     return QVariant();
 }
 
 bool ProjectNode::setData(Core::Id role, const QVariant &value) const
 {
-    Q_UNUSED(role);
-    Q_UNUSED(value);
+    Q_UNUSED(role)
+    Q_UNUSED(value)
     return false;
 }
 
diff --git a/src/plugins/projectexplorer/projecttreewidget.cpp b/src/plugins/projectexplorer/projecttreewidget.cpp
index 5e4b19f8c9..eb4513b5cd 100644
--- a/src/plugins/projectexplorer/projecttreewidget.cpp
+++ b/src/plugins/projectexplorer/projecttreewidget.cpp
@@ -460,7 +460,7 @@ void ProjectTreeWidget::editCurrentItem()
 void ProjectTreeWidget::renamed(const FilePath &oldPath, const FilePath &newPath)
 {
     update();
-    Q_UNUSED(oldPath);
+    Q_UNUSED(oldPath)
     if (!currentNode() || currentNode()->filePath() != newPath) {
         // try to find the node
         Node *node = nodeForFile(newPath);
@@ -503,7 +503,7 @@ void ProjectTreeWidget::setCurrentItem(Node *node)
 
 void ProjectTreeWidget::handleCurrentItemChange(const QModelIndex &current)
 {
-    Q_UNUSED(current);
+    Q_UNUSED(current)
     ProjectTree::nodeChanged(this);
 }
 
diff --git a/src/plugins/projectexplorer/runcontrol.cpp b/src/plugins/projectexplorer/runcontrol.cpp
index 35faccf5d3..0af6282b1c 100644
--- a/src/plugins/projectexplorer/runcontrol.cpp
+++ b/src/plugins/projectexplorer/runcontrol.cpp
@@ -442,13 +442,13 @@ void RunControl::registerWorkerCreator(Core::Id id, const WorkerCreator &workerC
 {
     theWorkerCreators().insert(id, workerCreator);
     auto keys = theWorkerCreators().keys();
-    Q_UNUSED(keys);
+    Q_UNUSED(keys)
 }
 
 RunWorker *RunControl::createWorker(Core::Id id)
 {
     auto keys = theWorkerCreators().keys();
-    Q_UNUSED(keys);
+    Q_UNUSED(keys)
     WorkerCreator creator = theWorkerCreators().value(id);
     if (creator)
         return creator(this);
diff --git a/src/plugins/projectexplorer/selectablefilesmodel.cpp b/src/plugins/projectexplorer/selectablefilesmodel.cpp
index 71077cf570..cfb99c4b68 100644
--- a/src/plugins/projectexplorer/selectablefilesmodel.cpp
+++ b/src/plugins/projectexplorer/selectablefilesmodel.cpp
@@ -298,7 +298,7 @@ void SelectableFilesModel::propagateDown(const QModelIndex &idx)
 
 Qt::ItemFlags SelectableFilesModel::flags(const QModelIndex &index) const
 {
-    Q_UNUSED(index);
+    Q_UNUSED(index)
     return Qt::ItemIsSelectable | Qt::ItemIsEnabled | Qt::ItemIsUserCheckable;
 }
 
diff --git a/src/plugins/projectexplorer/targetsettingspanel.cpp b/src/plugins/projectexplorer/targetsettingspanel.cpp
index cc6d37413c..539c59a094 100644
--- a/src/plugins/projectexplorer/targetsettingspanel.cpp
+++ b/src/plugins/projectexplorer/targetsettingspanel.cpp
@@ -805,13 +805,13 @@ TargetItem *TargetGroupItem::targetItem(Target *target) const
 
 void TargetGroupItemPrivate::handleRemovedKit(Kit *kit)
 {
-    Q_UNUSED(kit);
+    Q_UNUSED(kit)
     rebuildContents();
 }
 
 void TargetGroupItemPrivate::handleUpdatedKit(Kit *kit)
 {
-    Q_UNUSED(kit);
+    Q_UNUSED(kit)
     rebuildContents();
 }
 
diff --git a/src/plugins/projectexplorer/taskmodel.cpp b/src/plugins/projectexplorer/taskmodel.cpp
index c6d27bd7d4..763ec4074c 100644
--- a/src/plugins/projectexplorer/taskmodel.cpp
+++ b/src/plugins/projectexplorer/taskmodel.cpp
@@ -372,7 +372,7 @@ void TaskFilterModel::updateFilterProperties(const QString &filterText,
 
 bool TaskFilterModel::filterAcceptsRow(int source_row, const QModelIndex &source_parent) const
 {
-    Q_UNUSED(source_parent);
+    Q_UNUSED(source_parent)
     return filterAcceptsTask(taskModel()->tasks().at(source_row));
 }
 
diff --git a/src/plugins/projectexplorer/toolchainsettingsaccessor.cpp b/src/plugins/projectexplorer/toolchainsettingsaccessor.cpp
index 707e88bc10..ea5a07f0fe 100644
--- a/src/plugins/projectexplorer/toolchainsettingsaccessor.cpp
+++ b/src/plugins/projectexplorer/toolchainsettingsaccessor.cpp
@@ -315,13 +315,13 @@ public:
     Abi targetAbi() const override { return Abi::hostAbi(); }
     bool isValid() const override { return m_valid; }
     MacroInspectionRunner createMacroInspectionRunner() const override { return MacroInspectionRunner(); }
-    Macros predefinedMacros(const QStringList &cxxflags) const override { Q_UNUSED(cxxflags); return Macros(); }
-    LanguageExtensions languageExtensions(const QStringList &cxxflags) const override { Q_UNUSED(cxxflags); return LanguageExtension::None; }
-    WarningFlags warningFlags(const QStringList &cflags) const override { Q_UNUSED(cflags); return WarningFlags::NoWarnings; }
+    Macros predefinedMacros(const QStringList &cxxflags) const override { Q_UNUSED(cxxflags) return Macros(); }
+    LanguageExtensions languageExtensions(const QStringList &cxxflags) const override { Q_UNUSED(cxxflags) return LanguageExtension::None; }
+    WarningFlags warningFlags(const QStringList &cflags) const override { Q_UNUSED(cflags) return WarningFlags::NoWarnings; }
     BuiltInHeaderPathsRunner createBuiltInHeaderPathsRunner(const Utils::Environment &) const override { return BuiltInHeaderPathsRunner(); }
     HeaderPaths builtInHeaderPaths(const QStringList &cxxflags, const FilePath &sysRoot, const Utils::Environment &) const override
-    { Q_UNUSED(cxxflags); Q_UNUSED(sysRoot); return {}; }
-    void addToEnvironment(Environment &env) const override { Q_UNUSED(env); }
+    { Q_UNUSED(cxxflags) Q_UNUSED(sysRoot) return {}; }
+    void addToEnvironment(Environment &env) const override { Q_UNUSED(env) }
     FilePath makeCommand(const Environment &) const override { return FilePath::fromString("make"); }
     FilePath compilerCommand() const override { return Utils::FilePath::fromString("/tmp/test/gcc"); }
     IOutputParser *outputParser() const override { return nullptr; }
diff --git a/src/plugins/qbsprojectmanager/qbsbuildstep.cpp b/src/plugins/qbsprojectmanager/qbsbuildstep.cpp
index c195ff6a90..230b6378a4 100644
--- a/src/plugins/qbsprojectmanager/qbsbuildstep.cpp
+++ b/src/plugins/qbsprojectmanager/qbsbuildstep.cpp
@@ -389,7 +389,7 @@ void QbsBuildStep::handleProgress(int value)
 
 void QbsBuildStep::handleCommandDescriptionReport(const QString &highlight, const QString &message)
 {
-    Q_UNUSED(highlight);
+    Q_UNUSED(highlight)
     emit addOutput(message, OutputFormat::Stdout);
 }
 
diff --git a/src/plugins/qbsprojectmanager/qbscleanstep.cpp b/src/plugins/qbsprojectmanager/qbscleanstep.cpp
index 119c61450e..7b64b888ce 100644
--- a/src/plugins/qbsprojectmanager/qbscleanstep.cpp
+++ b/src/plugins/qbsprojectmanager/qbscleanstep.cpp
@@ -138,7 +138,7 @@ void QbsCleanStep::cleaningDone(bool success)
 
 void QbsCleanStep::handleTaskStarted(const QString &desciption, int max)
 {
-    Q_UNUSED(desciption);
+    Q_UNUSED(desciption)
     m_maxProgress = max;
 }
 
diff --git a/src/plugins/qbsprojectmanager/qbslogsink.cpp b/src/plugins/qbsprojectmanager/qbslogsink.cpp
index 9e635c2958..d73f844052 100644
--- a/src/plugins/qbsprojectmanager/qbslogsink.cpp
+++ b/src/plugins/qbsprojectmanager/qbslogsink.cpp
@@ -77,7 +77,7 @@ void QbsLogSink::doPrintWarning(const qbs::ErrorInfo &warning)
 
 void QbsLogSink::doPrintMessage(qbs::LoggerLevel level, const QString &message, const QString &tag)
 {
-    Q_UNUSED(tag);
+    Q_UNUSED(tag)
 
     {
         QMutexLocker l(&m_mutex);
diff --git a/src/plugins/qbsprojectmanager/qbsprojectmanagerplugin.cpp b/src/plugins/qbsprojectmanager/qbsprojectmanagerplugin.cpp
index c30add24d9..037437959d 100644
--- a/src/plugins/qbsprojectmanager/qbsprojectmanagerplugin.cpp
+++ b/src/plugins/qbsprojectmanager/qbsprojectmanagerplugin.cpp
@@ -104,8 +104,8 @@ QbsProjectManagerPlugin::~QbsProjectManagerPlugin()
 
 bool QbsProjectManagerPlugin::initialize(const QStringList &arguments, QString *errorMessage)
 {
-    Q_UNUSED(arguments);
-    Q_UNUSED(errorMessage);
+    Q_UNUSED(arguments)
+    Q_UNUSED(errorMessage)
 
     d = new QbsProjectManagerPluginPrivate;
 
diff --git a/src/plugins/qbsprojectmanager/qbsprojectparser.cpp b/src/plugins/qbsprojectmanager/qbsprojectparser.cpp
index ce3ceb893e..10196cbd37 100644
--- a/src/plugins/qbsprojectmanager/qbsprojectparser.cpp
+++ b/src/plugins/qbsprojectmanager/qbsprojectparser.cpp
@@ -187,7 +187,7 @@ void QbsProjectParser::handleQbsParsingProgress(int progress)
 
 void QbsProjectParser::handleQbsParsingTaskSetup(const QString &description, int maximumProgressValue)
 {
-    Q_UNUSED(description);
+    Q_UNUSED(description)
     if (m_fi) {
         m_currentProgressBase = m_fi->progressValue();
         m_fi->setProgressRange(0, m_currentProgressBase + maximumProgressValue);
diff --git a/src/plugins/qmakeprojectmanager/addlibrarywizard.cpp b/src/plugins/qmakeprojectmanager/addlibrarywizard.cpp
index bfef5875e3..998a33fddd 100644
--- a/src/plugins/qmakeprojectmanager/addlibrarywizard.cpp
+++ b/src/plugins/qmakeprojectmanager/addlibrarywizard.cpp
@@ -58,7 +58,7 @@ static bool validateLibraryPath(const Utils::FilePath &filePath,
                                 const Utils::PathChooser *pathChooser,
                                 QString *errorMessage)
 {
-    Q_UNUSED(errorMessage);
+    Q_UNUSED(errorMessage)
     if (!filePath.exists())
         return false;
 
diff --git a/src/plugins/qmakeprojectmanager/qmakeprojectimporter.cpp b/src/plugins/qmakeprojectmanager/qmakeprojectimporter.cpp
index d7871f4cc3..d082961d52 100644
--- a/src/plugins/qmakeprojectmanager/qmakeprojectimporter.cpp
+++ b/src/plugins/qmakeprojectmanager/qmakeprojectimporter.cpp
@@ -296,7 +296,7 @@ Kit *QmakeProjectImporter::createTemporaryKit(const QtProjectImporter::QtVersion
                                               const QMakeStepConfig::TargetArchConfig &archConfig,
                                               const QMakeStepConfig::OsType &osType) const
 {
-    Q_UNUSED(osType); // TODO use this to select the right toolchain?
+    Q_UNUSED(osType) // TODO use this to select the right toolchain?
     return QtProjectImporter::createTemporaryKit(data,
                                                  [&data, parsedSpec, archConfig](Kit *k) -> void {
         for (ToolChain * const tc : preferredToolChains(data.qt, parsedSpec, archConfig))
diff --git a/src/plugins/qmakeprojectmanager/wizards/simpleprojectwizard.cpp b/src/plugins/qmakeprojectmanager/wizards/simpleprojectwizard.cpp
index 77c6fdd10f..ffb85af92c 100644
--- a/src/plugins/qmakeprojectmanager/wizards/simpleprojectwizard.cpp
+++ b/src/plugins/qmakeprojectmanager/wizards/simpleprojectwizard.cpp
@@ -221,7 +221,7 @@ GeneratedFiles SimpleProjectWizard::generateFiles(const QWizard *w,
 bool SimpleProjectWizard::postGenerateFiles(const QWizard *w, const GeneratedFiles &l,
                                              QString *errorMessage) const
 {
-    Q_UNUSED(w);
+    Q_UNUSED(w)
     return CustomProjectWizard::postGenerateOpen(l, errorMessage);
 }
 
diff --git a/src/plugins/qmldesigner/components/componentcore/theme.cpp b/src/plugins/qmldesigner/components/componentcore/theme.cpp
index d7eba033ca..ec4128479f 100644
--- a/src/plugins/qmldesigner/components/componentcore/theme.cpp
+++ b/src/plugins/qmldesigner/components/componentcore/theme.cpp
@@ -93,7 +93,7 @@ void Theme::setupTheme(QQmlEngine *engine)
         "Theme", [](QQmlEngine *, QJSEngine *) {
             return qobject_cast<QObject*>(new Theme(Utils::creatorTheme(), nullptr));
     });
-    Q_UNUSED(typeIndex);
+    Q_UNUSED(typeIndex)
 
     engine->addImageProvider(QLatin1String("icons"), new QmlDesignerIconProvider());
 }
diff --git a/src/plugins/qmldesigner/components/curveeditor/detail/handleitem.cpp b/src/plugins/qmldesigner/components/curveeditor/detail/handleitem.cpp
index c54b26e279..1499763a53 100644
--- a/src/plugins/qmldesigner/components/curveeditor/detail/handleitem.cpp
+++ b/src/plugins/qmldesigner/components/curveeditor/detail/handleitem.cpp
@@ -75,8 +75,8 @@ QRectF HandleItem::boundingRect() const
 
 void HandleItem::paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget)
 {
-    Q_UNUSED(option);
-    Q_UNUSED(widget);
+    Q_UNUSED(option)
+    Q_UNUSED(widget)
 
     QColor handleColor(isSelected() ? m_style.selectionColor : m_style.color);
 
diff --git a/src/plugins/qmldesigner/components/curveeditor/detail/keyframeitem.cpp b/src/plugins/qmldesigner/components/curveeditor/detail/keyframeitem.cpp
index 94cdbbcbb1..3bff0a348e 100644
--- a/src/plugins/qmldesigner/components/curveeditor/detail/keyframeitem.cpp
+++ b/src/plugins/qmldesigner/components/curveeditor/detail/keyframeitem.cpp
@@ -80,8 +80,8 @@ QRectF KeyframeItem::boundingRect() const
 
 void KeyframeItem::paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget)
 {
-    Q_UNUSED(option);
-    Q_UNUSED(widget);
+    Q_UNUSED(option)
+    Q_UNUSED(widget)
 
     QPen pen = painter->pen();
     pen.setColor(Qt::black);
diff --git a/src/plugins/qmldesigner/components/curveeditor/detail/selector.cpp b/src/plugins/qmldesigner/components/curveeditor/detail/selector.cpp
index 633c1ddd39..879ba6e934 100644
--- a/src/plugins/qmldesigner/components/curveeditor/detail/selector.cpp
+++ b/src/plugins/qmldesigner/components/curveeditor/detail/selector.cpp
@@ -108,7 +108,7 @@ void Selector::mouseMove(QMouseEvent *event, GraphicsView *view, Playhead &playh
 
 void Selector::mouseRelease(QMouseEvent *event, GraphicsView *view)
 {
-    Q_UNUSED(event);
+    Q_UNUSED(event)
 
     applyPreSelection(view);
 
diff --git a/src/plugins/qmldesigner/components/curveeditor/detail/treemodel.cpp b/src/plugins/qmldesigner/components/curveeditor/detail/treemodel.cpp
index 1ea037091d..3e437bda96 100644
--- a/src/plugins/qmldesigner/components/curveeditor/detail/treemodel.cpp
+++ b/src/plugins/qmldesigner/components/curveeditor/detail/treemodel.cpp
@@ -121,7 +121,7 @@ int TreeModel::rowCount(const QModelIndex &parent) const
 
 int TreeModel::columnCount(const QModelIndex &parent) const
 {
-    Q_UNUSED(parent);
+    Q_UNUSED(parent)
     return m_root->columnCount();
 }
 
diff --git a/src/plugins/qmldesigner/components/curveeditor/detail/treeview.cpp b/src/plugins/qmldesigner/components/curveeditor/detail/treeview.cpp
index 3b9a4ef7c5..4daa6d3e3e 100644
--- a/src/plugins/qmldesigner/components/curveeditor/detail/treeview.cpp
+++ b/src/plugins/qmldesigner/components/curveeditor/detail/treeview.cpp
@@ -91,8 +91,8 @@ void TreeView::changeCurve(unsigned int id, const AnimationCurve &curve)
 
 void TreeView::changeSelection(const QItemSelection &selected, const QItemSelection &deselected)
 {
-    Q_UNUSED(selected);
-    Q_UNUSED(deselected);
+    Q_UNUSED(selected)
+    Q_UNUSED(deselected)
 
     std::vector<CurveItem *> curves;
     for (auto index : selectedIndexes()) {
diff --git a/src/plugins/qmldesigner/components/curveeditor/treeitem.cpp b/src/plugins/qmldesigner/components/curveeditor/treeitem.cpp
index beed419e54..6bc0ce57bf 100644
--- a/src/plugins/qmldesigner/components/curveeditor/treeitem.cpp
+++ b/src/plugins/qmldesigner/components/curveeditor/treeitem.cpp
@@ -190,7 +190,7 @@ NodeTreeItem::NodeTreeItem(const QString &name, const QIcon &icon)
     : TreeItem(name)
     , m_icon(icon)
 {
-    Q_UNUSED(icon);
+    Q_UNUSED(icon)
 }
 
 NodeTreeItem *NodeTreeItem::asNodeItem()
diff --git a/src/plugins/qmldesigner/components/navigator/nameitemdelegate.cpp b/src/plugins/qmldesigner/components/navigator/nameitemdelegate.cpp
index 8739ec64a8..3119dbaca3 100644
--- a/src/plugins/qmldesigner/components/navigator/nameitemdelegate.cpp
+++ b/src/plugins/qmldesigner/components/navigator/nameitemdelegate.cpp
@@ -258,7 +258,7 @@ static void setId(const QModelIndex &index, const QString &newId)
 
 void NameItemDelegate::setModelData(QWidget *editor, QAbstractItemModel *model, const QModelIndex &index) const
 {
-    Q_UNUSED(model);
+    Q_UNUSED(model)
     auto lineEdit = static_cast<QLineEdit*>(editor);
     setId(index,lineEdit->text());
     lineEdit->clearFocus();
diff --git a/src/plugins/qmldesigner/components/propertyeditor/gradientpresetitem.cpp b/src/plugins/qmldesigner/components/propertyeditor/gradientpresetitem.cpp
index 9d2454c4e9..518dea7b8b 100644
--- a/src/plugins/qmldesigner/components/propertyeditor/gradientpresetitem.cpp
+++ b/src/plugins/qmldesigner/components/propertyeditor/gradientpresetitem.cpp
@@ -169,7 +169,7 @@ QGradient GradientPresetItem::createGradientFromPreset(Preset value)
 #if QT_VERSION >= QT_VERSION_CHECK(5, 12, 0)
     return QGradient(value);
 #else
-    Q_UNUSED(value);
+    Q_UNUSED(value)
     return {};
 #endif
 }
diff --git a/src/plugins/qmldesigner/components/propertyeditor/propertyeditorview.cpp b/src/plugins/qmldesigner/components/propertyeditor/propertyeditorview.cpp
index 9dd0a2da24..8958c1833c 100644
--- a/src/plugins/qmldesigner/components/propertyeditor/propertyeditorview.cpp
+++ b/src/plugins/qmldesigner/components/propertyeditor/propertyeditorview.cpp
@@ -529,7 +529,7 @@ void PropertyEditorView::removePropertyFromModel(const PropertyName &propertyNam
 void PropertyEditorView::selectedNodesChanged(const QList<ModelNode> &selectedNodeList,
                                           const QList<ModelNode> &lastSelectedNodeList)
 {
-    Q_UNUSED(lastSelectedNodeList);
+    Q_UNUSED(lastSelectedNodeList)
 
     if (selectedNodeList.isEmpty())
         select(ModelNode());
diff --git a/src/plugins/qmldesigner/components/timelineeditor/timelinemovetool.cpp b/src/plugins/qmldesigner/components/timelineeditor/timelinemovetool.cpp
index 0384d7c0a3..0e68a63ff4 100644
--- a/src/plugins/qmldesigner/components/timelineeditor/timelinemovetool.cpp
+++ b/src/plugins/qmldesigner/components/timelineeditor/timelinemovetool.cpp
@@ -67,14 +67,14 @@ TimelineMoveTool::TimelineMoveTool(TimelineGraphicsScene *scene, TimelineToolDel
 void TimelineMoveTool::mousePressEvent(TimelineMovableAbstractItem *item,
                                        QGraphicsSceneMouseEvent *event)
 {
-    Q_UNUSED(item);
-    Q_UNUSED(event);
+    Q_UNUSED(item)
+    Q_UNUSED(event)
 }
 
 void TimelineMoveTool::mouseMoveEvent(TimelineMovableAbstractItem *item,
                                       QGraphicsSceneMouseEvent *event)
 {
-    Q_UNUSED(item);
+    Q_UNUSED(item)
 
     if (!currentItem())
         return;
@@ -116,8 +116,8 @@ void TimelineMoveTool::mouseMoveEvent(TimelineMovableAbstractItem *item,
 void TimelineMoveTool::mouseReleaseEvent(TimelineMovableAbstractItem *item,
                                          QGraphicsSceneMouseEvent *event)
 {
-    Q_UNUSED(item);
-    Q_UNUSED(event);
+    Q_UNUSED(item)
+    Q_UNUSED(event)
 
     if (auto *current = currentItem()) {
         if (current->asTimelineFrameHandle()) {
@@ -156,18 +156,18 @@ void TimelineMoveTool::mouseReleaseEvent(TimelineMovableAbstractItem *item,
 void TimelineMoveTool::mouseDoubleClickEvent(TimelineMovableAbstractItem *item,
                                              QGraphicsSceneMouseEvent *event)
 {
-    Q_UNUSED(item);
-    Q_UNUSED(event);
+    Q_UNUSED(item)
+    Q_UNUSED(event)
 }
 
 void TimelineMoveTool::keyPressEvent(QKeyEvent *keyEvent)
 {
-    Q_UNUSED(keyEvent);
+    Q_UNUSED(keyEvent)
 }
 
 void TimelineMoveTool::keyReleaseEvent(QKeyEvent *keyEvent)
 {
-    Q_UNUSED(keyEvent);
+    Q_UNUSED(keyEvent)
 }
 
 } // namespace QmlDesigner
diff --git a/src/plugins/qmldesigner/components/timelineeditor/timelinesectionitem.cpp b/src/plugins/qmldesigner/components/timelineeditor/timelinesectionitem.cpp
index 7bd784a7dd..96013e242b 100644
--- a/src/plugins/qmldesigner/components/timelineeditor/timelinesectionitem.cpp
+++ b/src/plugins/qmldesigner/components/timelineeditor/timelinesectionitem.cpp
@@ -846,8 +846,8 @@ void TimelineBarItem::scrollOffsetChanged()
 
 void TimelineBarItem::paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget)
 {
-    Q_UNUSED(option);
-    Q_UNUSED(widget);
+    Q_UNUSED(option)
+    Q_UNUSED(widget)
 
     QColor brushColorSelected = Theme::getColor(Theme::QmlDesigner_HighlightColor);
     QColor brushColor = Theme::getColor(Theme::QmlDesigner_HighlightColor).darker(120);
diff --git a/src/plugins/qmldesigner/components/timelineeditor/timelineselectiontool.cpp b/src/plugins/qmldesigner/components/timelineeditor/timelineselectiontool.cpp
index 53367c9b67..987ac4935a 100644
--- a/src/plugins/qmldesigner/components/timelineeditor/timelineselectiontool.cpp
+++ b/src/plugins/qmldesigner/components/timelineeditor/timelineselectiontool.cpp
@@ -68,8 +68,8 @@ SelectionMode TimelineSelectionTool::selectionMode(QGraphicsSceneMouseEvent *eve
 void TimelineSelectionTool::mousePressEvent(TimelineMovableAbstractItem *item,
                                             QGraphicsSceneMouseEvent *event)
 {
-    Q_UNUSED(item);
-    Q_UNUSED(event);
+    Q_UNUSED(item)
+    Q_UNUSED(event)
 
     if (event->buttons() == Qt::LeftButton && selectionMode(event) == SelectionMode::New)
         deselect();
@@ -78,7 +78,7 @@ void TimelineSelectionTool::mousePressEvent(TimelineMovableAbstractItem *item,
 void TimelineSelectionTool::mouseMoveEvent(TimelineMovableAbstractItem *item,
                                            QGraphicsSceneMouseEvent *event)
 {
-    Q_UNUSED(item);
+    Q_UNUSED(item)
 
     if (event->buttons() == Qt::LeftButton) {
         auto endPoint = event->scenePos();
@@ -97,8 +97,8 @@ void TimelineSelectionTool::mouseMoveEvent(TimelineMovableAbstractItem *item,
 void TimelineSelectionTool::mouseReleaseEvent(TimelineMovableAbstractItem *item,
                                               QGraphicsSceneMouseEvent *event)
 {
-    Q_UNUSED(item);
-    Q_UNUSED(event);
+    Q_UNUSED(item)
+    Q_UNUSED(event)
 
     commitSelection(selectionMode(event));
 
@@ -108,20 +108,20 @@ void TimelineSelectionTool::mouseReleaseEvent(TimelineMovableAbstractItem *item,
 void TimelineSelectionTool::mouseDoubleClickEvent(TimelineMovableAbstractItem *item,
                                                   QGraphicsSceneMouseEvent *event)
 {
-    Q_UNUSED(item);
-    Q_UNUSED(event);
+    Q_UNUSED(item)
+    Q_UNUSED(event)
 
     reset();
 }
 
 void TimelineSelectionTool::keyPressEvent(QKeyEvent *keyEvent)
 {
-    Q_UNUSED(keyEvent);
+    Q_UNUSED(keyEvent)
 }
 
 void TimelineSelectionTool::keyReleaseEvent(QKeyEvent *keyEvent)
 {
-    Q_UNUSED(keyEvent);
+    Q_UNUSED(keyEvent)
 }
 
 void TimelineSelectionTool::deselect()
diff --git a/src/plugins/qmldesigner/designercore/instances/puppetcreator.cpp b/src/plugins/qmldesigner/designercore/instances/puppetcreator.cpp
index 0959dd4a9e..553a47914c 100644
--- a/src/plugins/qmldesigner/designercore/instances/puppetcreator.cpp
+++ b/src/plugins/qmldesigner/designercore/instances/puppetcreator.cpp
@@ -395,7 +395,7 @@ QString PuppetCreator::qmlPuppetFallbackDirectory(const DesignerSettings &settin
         return defaultPuppetFallbackDirectory();
     return puppetFallbackDirectory;
 #else
-    Q_UNUSED(settings);
+    Q_UNUSED(settings)
     return QString();
 #endif
 }
diff --git a/src/plugins/qmldesigner/designercore/model/qmlobjectnode.cpp b/src/plugins/qmldesigner/designercore/model/qmlobjectnode.cpp
index cc44f9c448..b571fd473f 100644
--- a/src/plugins/qmldesigner/designercore/model/qmlobjectnode.cpp
+++ b/src/plugins/qmldesigner/designercore/model/qmlobjectnode.cpp
@@ -548,7 +548,7 @@ QString QmlObjectNode::generateTranslatableText(const QString &text)
         }
     return QString(QStringLiteral("qsTr(\"%1\")")).arg(text);
 #else
-    Q_UNUSED(text);
+    Q_UNUSED(text)
     return QString();
 #endif
 }
diff --git a/src/plugins/qmldesigner/designercore/model/rewriteactioncompressor.cpp b/src/plugins/qmldesigner/designercore/model/rewriteactioncompressor.cpp
index 6dac375ff7..3c111471a6 100644
--- a/src/plugins/qmldesigner/designercore/model/rewriteactioncompressor.cpp
+++ b/src/plugins/qmldesigner/designercore/model/rewriteactioncompressor.cpp
@@ -228,7 +228,7 @@ void RewriteActionCompressor::compressPropertyActions(QList<RewriteAction *> &ac
         if (RemovePropertyRewriteAction *removeAction = action->asRemovePropertyRewriteAction()) {
             const AbstractProperty property = removeAction->property();
             if (AddPropertyRewriteAction *addAction = addedProperties.value(property, 0)) {
-                Q_UNUSED(addAction);
+                Q_UNUSED(addAction)
             } else {
                 removedProperties.insert(property, action);
             }
diff --git a/src/plugins/qmldesigner/designercore/rewritertransaction.cpp b/src/plugins/qmldesigner/designercore/rewritertransaction.cpp
index 1bae709e0c..d4279be7ce 100644
--- a/src/plugins/qmldesigner/designercore/rewritertransaction.cpp
+++ b/src/plugins/qmldesigner/designercore/rewritertransaction.cpp
@@ -108,7 +108,7 @@ void RewriterTransaction::commit()
         if (m_activeIdentifier) {
             qDebug() << "Commit RewriterTransaction:" << m_identifier << m_identifierNumber;
             bool success = m_identifierList.removeOne(m_identifier + QByteArrayLiteral("-") + QByteArray::number(m_identifierNumber));
-            Q_UNUSED(success);
+            Q_UNUSED(success)
             Q_ASSERT(success);
         }
     }
diff --git a/src/plugins/qmljseditor/qmljseditorplugin.cpp b/src/plugins/qmljseditor/qmljseditorplugin.cpp
index de5daf6a61..7882d8f2d0 100644
--- a/src/plugins/qmljseditor/qmljseditorplugin.cpp
+++ b/src/plugins/qmljseditor/qmljseditorplugin.cpp
@@ -116,8 +116,8 @@ QmlJSEditorPlugin::~QmlJSEditorPlugin()
 
 bool QmlJSEditorPlugin::initialize(const QStringList &arguments, QString *errorMessage)
 {
-    Q_UNUSED(arguments);
-    Q_UNUSED(errorMessage);
+    Q_UNUSED(arguments)
+    Q_UNUSED(errorMessage)
 
     d = new QmlJSEditorPluginPrivate;
 
diff --git a/src/plugins/qmlpreview/qmlpreviewplugin.cpp b/src/plugins/qmlpreview/qmlpreviewplugin.cpp
index 630bd06fa1..88555b9f92 100644
--- a/src/plugins/qmlpreview/qmlpreviewplugin.cpp
+++ b/src/plugins/qmlpreview/qmlpreviewplugin.cpp
@@ -101,8 +101,8 @@ static void defaultFpsHandler(quint16 frames[8])
 
 bool QmlPreviewPlugin::initialize(const QStringList &arguments, QString *errorString)
 {
-    Q_UNUSED(arguments);
-    Q_UNUSED(errorString);
+    Q_UNUSED(arguments)
+    Q_UNUSED(errorString)
 
     setFileLoader(&defaultFileLoader);
     setFileClassifier(&defaultFileClassifier);
@@ -430,7 +430,7 @@ void QmlPreviewPlugin::triggerPreview(const QString &changedFile, const QByteArr
 QmlPreviewParser::QmlPreviewParser()
 {
     static const int dialectMeta = qRegisterMetaType<QmlJS::Dialect::Enum>();
-    Q_UNUSED(dialectMeta);
+    Q_UNUSED(dialectMeta)
 }
 
 void QmlPreviewParser::parse(const QString &name, const QByteArray &contents,
diff --git a/src/plugins/qmlprofiler/debugmessagesmodel.cpp b/src/plugins/qmlprofiler/debugmessagesmodel.cpp
index 1ec11ac8f7..1509c95c9d 100644
--- a/src/plugins/qmlprofiler/debugmessagesmodel.cpp
+++ b/src/plugins/qmlprofiler/debugmessagesmodel.cpp
@@ -95,7 +95,7 @@ int DebugMessagesModel::expandedRow(int index) const
 
 int DebugMessagesModel::collapsedRow(int index) const
 {
-    Q_UNUSED(index);
+    Q_UNUSED(index)
     return Constants::QML_MIN_LEVEL;
 }
 
diff --git a/src/plugins/qmlprofiler/flamegraphmodel.cpp b/src/plugins/qmlprofiler/flamegraphmodel.cpp
index 7821ff8520..5673f2fbc3 100644
--- a/src/plugins/qmlprofiler/flamegraphmodel.cpp
+++ b/src/plugins/qmlprofiler/flamegraphmodel.cpp
@@ -300,7 +300,7 @@ int FlameGraphModel::rowCount(const QModelIndex &parent) const
 
 int FlameGraphModel::columnCount(const QModelIndex &parent) const
 {
-    Q_UNUSED(parent);
+    Q_UNUSED(parent)
     return 1;
 }
 
diff --git a/src/plugins/qmlprofiler/memoryusagemodel.cpp b/src/plugins/qmlprofiler/memoryusagemodel.cpp
index 1fcfc4631f..86620ed6d0 100644
--- a/src/plugins/qmlprofiler/memoryusagemodel.cpp
+++ b/src/plugins/qmlprofiler/memoryusagemodel.cpp
@@ -45,7 +45,7 @@ MemoryUsageModel::MemoryUsageModel(QmlProfilerModelManager *manager,
 
 qint64 MemoryUsageModel::rowMaxValue(int rowNumber) const
 {
-    Q_UNUSED(rowNumber);
+    Q_UNUSED(rowNumber)
     return m_maxSize;
 }
 
@@ -271,7 +271,7 @@ void MemoryUsageModel::clear()
 
 bool MemoryUsageModel::handlesTypeId(int typeId) const
 {
-    Q_UNUSED(typeId);
+    Q_UNUSED(typeId)
     // We don't want the memory ranges allocated by some QML/JS function to be highlighted when
     // propagating a typeId selection to the timeline. The actual range should be highlighted.
     return false;
diff --git a/src/plugins/qmlprofiler/qmlprofileranimationsmodel.cpp b/src/plugins/qmlprofiler/qmlprofileranimationsmodel.cpp
index 8fef692ed3..bec3496a15 100644
--- a/src/plugins/qmlprofiler/qmlprofileranimationsmodel.cpp
+++ b/src/plugins/qmlprofiler/qmlprofileranimationsmodel.cpp
@@ -57,7 +57,7 @@ void QmlProfilerAnimationsModel::clear()
 
 void QmlProfilerAnimationsModel::loadEvent(const QmlEvent &event, const QmlEventType &type)
 {
-    Q_UNUSED(type);
+    Q_UNUSED(type)
     AnimationThread lastThread = (AnimationThread)event.number<qint32>(2);
 
     // initial estimation of the event duration: 1/framerate
diff --git a/src/plugins/qmlprofiler/qmlprofilerbindingloopsrenderpass.cpp b/src/plugins/qmlprofiler/qmlprofilerbindingloopsrenderpass.cpp
index 2ac1850735..f7eaab21a2 100644
--- a/src/plugins/qmlprofiler/qmlprofilerbindingloopsrenderpass.cpp
+++ b/src/plugins/qmlprofiler/qmlprofilerbindingloopsrenderpass.cpp
@@ -157,8 +157,8 @@ Timeline::TimelineRenderPass::State *QmlProfilerBindingLoopsRenderPass::update(
         const Timeline::TimelineRenderState *parentState, State *oldState,
         int indexFrom, int indexTo, bool stateChanged, float spacing) const
 {
-    Q_UNUSED(stateChanged);
-    Q_UNUSED(spacing);
+    Q_UNUSED(stateChanged)
+    Q_UNUSED(spacing)
 
     auto model = qobject_cast<const QmlProfilerRangeModel *>(renderer->model());
 
@@ -219,7 +219,7 @@ Point2DWithOffset *BindlingLoopsGeometry::vertexData()
     Q_ASSERT(attributes[1].position == 1);
     Q_ASSERT(attributes[1].tupleSize == 2);
     Q_ASSERT(attributes[1].type == GL_FLOAT);
-    Q_UNUSED(attributes);
+    Q_UNUSED(attributes)
     return static_cast<Point2DWithOffset *>(geometry->vertexData());
 }
 
diff --git a/src/plugins/qmlprofiler/qmlprofilerrangemodel.cpp b/src/plugins/qmlprofiler/qmlprofilerrangemodel.cpp
index 6c099feec3..50c461ef1c 100644
--- a/src/plugins/qmlprofiler/qmlprofilerrangemodel.cpp
+++ b/src/plugins/qmlprofiler/qmlprofilerrangemodel.cpp
@@ -65,7 +65,7 @@ bool QmlProfilerRangeModel::supportsBindingLoops() const
 
 void QmlProfilerRangeModel::loadEvent(const QmlEvent &event, const QmlEventType &type)
 {
-    Q_UNUSED(type);
+    Q_UNUSED(type)
     // store starttime-based instance
     if (event.rangeStage() == RangeStart) {
         int index = insertStart(event.timestamp(), event.typeIndex());
diff --git a/src/plugins/qmlprofiler/qmlprofilerstatewidget.cpp b/src/plugins/qmlprofiler/qmlprofilerstatewidget.cpp
index 859f26bada..ff73b9dd41 100644
--- a/src/plugins/qmlprofiler/qmlprofilerstatewidget.cpp
+++ b/src/plugins/qmlprofiler/qmlprofilerstatewidget.cpp
@@ -45,7 +45,7 @@ namespace Internal {
 class QmlProfilerStateWidget::QmlProfilerStateWidgetPrivate
 {
     public:
-    QmlProfilerStateWidgetPrivate(QmlProfilerStateWidget *qq) : text(nullptr) { Q_UNUSED(qq); }
+    QmlProfilerStateWidgetPrivate(QmlProfilerStateWidget *qq) : text(nullptr) { Q_UNUSED(qq) }
 
     QLabel *text;
 
diff --git a/src/plugins/qmlprofiler/qmlprofilertool.cpp b/src/plugins/qmlprofiler/qmlprofilertool.cpp
index ba5228f7c1..984446c3f9 100644
--- a/src/plugins/qmlprofiler/qmlprofilertool.cpp
+++ b/src/plugins/qmlprofiler/qmlprofilertool.cpp
@@ -246,7 +246,7 @@ QmlProfilerTool::QmlProfilerTool()
     if (EditorManager *editorManager = EditorManager::instance()) {
         connect(editorManager, &EditorManager::editorCreated,
                 model, [this, model](Core::IEditor *editor, const QString &fileName) {
-            Q_UNUSED(editor);
+            Q_UNUSED(editor)
             model->createMarks(d->m_viewContainer, fileName);
         });
     }
@@ -721,7 +721,7 @@ void QmlProfilerTool::updateFeatures(quint64 features)
 template<>
 void QmlProfilerTool::updateFeatures<MaximumProfileFeature>(quint64 features)
 {
-    Q_UNUSED(features);
+    Q_UNUSED(features)
     return;
 }
 
diff --git a/src/plugins/qmlprofiler/qmlprofilertraceclient.cpp b/src/plugins/qmlprofiler/qmlprofilertraceclient.cpp
index a8f82e72fc..054cc31eae 100644
--- a/src/plugins/qmlprofiler/qmlprofilertraceclient.cpp
+++ b/src/plugins/qmlprofiler/qmlprofilertraceclient.cpp
@@ -253,7 +253,7 @@ QmlProfilerTraceClient::QmlProfilerTraceClient(QmlDebug::QmlDebugConnection *cli
     });
     connect(this, &QmlProfilerTraceClient::traceFinished,
             d->engineControl.get(), [this](qint64 timestamp, const QList<int> &engineIds) {
-        Q_UNUSED(timestamp);
+        Q_UNUSED(timestamp)
         // The engines might not be blocked because the trace can get finished before engine control
         // sees them.
         for (int blocked : d->engineControl->blockedEngines()) {
diff --git a/src/plugins/qmlprofiler/qmlprofilertracefile.cpp b/src/plugins/qmlprofiler/qmlprofilertracefile.cpp
index 075c518e77..c994c37719 100644
--- a/src/plugins/qmlprofiler/qmlprofilertracefile.cpp
+++ b/src/plugins/qmlprofiler/qmlprofilertracefile.cpp
@@ -123,7 +123,7 @@ QmlProfilerTraceFile::QmlProfilerTraceFile(QObject *parent) : Timeline::Timeline
         qRegisterMetaType<QVector<QmlEventType> >(),
         qRegisterMetaType<QVector<QmlNote> >()
     };
-    Q_UNUSED(meta);
+    Q_UNUSED(meta)
 }
 
 void QmlProfilerTraceFile::load(QIODevice *device)
@@ -834,7 +834,7 @@ void QmlProfilerTraceFile::saveQzt(QIODevice *device)
 
     qint64 lastProgressTimestamp = traceStart();
     modelManager()->replayQmlEvents([&](const QmlEvent &event, const QmlEventType &type) {
-        Q_UNUSED(type);
+        Q_UNUSED(type)
         bufferStream << event;
         // 32MB buffer should be plenty for efficient compression
         if (buffer.data().length() > (1 << 25)) {
diff --git a/src/plugins/qmlprofiler/tests/qmlprofilerclientmanager_test.cpp b/src/plugins/qmlprofiler/tests/qmlprofilerclientmanager_test.cpp
index 70b815776b..a4f2cafaa9 100644
--- a/src/plugins/qmlprofiler/tests/qmlprofilerclientmanager_test.cpp
+++ b/src/plugins/qmlprofiler/tests/qmlprofilerclientmanager_test.cpp
@@ -123,7 +123,7 @@ void QmlProfilerClientManagerTest::testConnectionFailure()
     QByteArray fatalAsserts =  qgetenv("QTC_FATAL_ASSERTS");
     qunsetenv("QTC_FATAL_ASSERTS");
     MessageHandler handler(&softAssertMessageHandler);
-    Q_UNUSED(handler);
+    Q_UNUSED(handler)
 
     QFETCH(QmlProfilerModelManager *, modelManager);
     QFETCH(QmlProfilerStateManager *, stateManager);
@@ -342,7 +342,7 @@ void invalidHelloMessageHandler(QtMsgType type, const QMessageLogContext &contex
 void QmlProfilerClientManagerTest::testInvalidData()
 {
     MessageHandler handler(&invalidHelloMessageHandler);
-    Q_UNUSED(handler);
+    Q_UNUSED(handler)
 
     QSignalSpy openedSpy(&clientManager, SIGNAL(connectionOpened()));
     QSignalSpy closedSpy(&clientManager, SIGNAL(connectionClosed()));
diff --git a/src/plugins/qmlprofiler/tests/qmlprofilerdetailsrewriter_test.cpp b/src/plugins/qmlprofiler/tests/qmlprofilerdetailsrewriter_test.cpp
index 55787e918b..e189656a79 100644
--- a/src/plugins/qmlprofiler/tests/qmlprofilerdetailsrewriter_test.cpp
+++ b/src/plugins/qmlprofiler/tests/qmlprofilerdetailsrewriter_test.cpp
@@ -89,7 +89,7 @@ QmlProfilerDetailsRewriterTest::QmlProfilerDetailsRewriterTest(QObject *parent)
 void QmlProfilerDetailsRewriterTest::testMissingModelManager()
 {
     DummyBuildConfigurationFactory factory;
-    Q_UNUSED(factory);
+    Q_UNUSED(factory)
 
     seedRewriter();
     delete m_modelManager;
@@ -99,8 +99,8 @@ void QmlProfilerDetailsRewriterTest::testMissingModelManager()
     QVERIFY(!m_rewriterDone);
     auto rewriteConnection = connect(&m_rewriter, &QmlProfilerDetailsRewriter::rewriteDetailsString,
             this, [&](int typeId, const QString &string) {
-        Q_UNUSED(typeId);
-        Q_UNUSED(string);
+        Q_UNUSED(typeId)
+        Q_UNUSED(string)
         QFAIL("found nonexisting file in nonexisting model manager");
     });
     m_rewriter.requestDetailsForLocation(44, QmlEventLocation("Test.qml", 12, 12));
@@ -113,7 +113,7 @@ void QmlProfilerDetailsRewriterTest::testMissingModelManager()
 void QmlProfilerDetailsRewriterTest::testRequestDetailsForLocation()
 {
     DummyBuildConfigurationFactory factory;
-    Q_UNUSED(factory);
+    Q_UNUSED(factory)
 
     seedRewriter();
     QVERIFY(!m_rewriterDone);
@@ -164,7 +164,7 @@ void QmlProfilerDetailsRewriterTest::testRequestDetailsForLocation()
 void QmlProfilerDetailsRewriterTest::testGetLocalFile()
 {
     DummyBuildConfigurationFactory factory;
-    Q_UNUSED(factory);
+    Q_UNUSED(factory)
 
     seedRewriter();
     QCOMPARE(m_rewriter.getLocalFile("notthere.qml"), QString());
diff --git a/src/plugins/qnx/qnxdevice.cpp b/src/plugins/qnx/qnxdevice.cpp
index 52aa5df08a..b47bbf0223 100644
--- a/src/plugins/qnx/qnxdevice.cpp
+++ b/src/plugins/qnx/qnxdevice.cpp
@@ -60,7 +60,7 @@ class QnxPortsGatheringMethod : public PortsGatheringMethod
     // used to be fixed. These two can now be matched to each other.
     Runnable runnable(QAbstractSocket::NetworkLayerProtocol protocol) const override
     {
-        Q_UNUSED(protocol);
+        Q_UNUSED(protocol)
         Runnable runnable;
         runnable.executable = FileName::fromString("netstat");
         runnable.commandLineArguments = "-na";
diff --git a/src/plugins/qtsupport/baseqtversion.cpp b/src/plugins/qtsupport/baseqtversion.cpp
index 2dd4160a3b..8d3b24d960 100644
--- a/src/plugins/qtsupport/baseqtversion.cpp
+++ b/src/plugins/qtsupport/baseqtversion.cpp
@@ -1425,7 +1425,7 @@ QSet<Id> BaseQtVersion::features() const
 
 void BaseQtVersion::addToEnvironment(const Kit *k, Environment &env) const
 {
-    Q_UNUSED(k);
+    Q_UNUSED(k)
     env.set("QTDIR", QDir::toNativeSeparators(qmakeProperty("QT_HOST_DATA")));
 }
 
@@ -1469,8 +1469,8 @@ void BaseQtVersion::recheckDumper()
 
 Tasks BaseQtVersion::reportIssuesImpl(const QString &proFile, const QString &buildDir) const
 {
-    Q_UNUSED(proFile);
-    Q_UNUSED(buildDir);
+    Q_UNUSED(proFile)
+    Q_UNUSED(buildDir)
     Tasks results;
 
     if (!isValid()) {
diff --git a/src/plugins/qtsupport/baseqtversion.h b/src/plugins/qtsupport/baseqtversion.h
index 34e33b1c20..31be1ad317 100644
--- a/src/plugins/qtsupport/baseqtversion.h
+++ b/src/plugins/qtsupport/baseqtversion.h
@@ -71,7 +71,7 @@ class MacroExpanderWrapper
 {
 public:
     MacroExpanderWrapper() = default;
-    MacroExpanderWrapper(const MacroExpanderWrapper &other) { Q_UNUSED(other); }
+    MacroExpanderWrapper(const MacroExpanderWrapper &other) { Q_UNUSED(other) }
     MacroExpanderWrapper(MacroExpanderWrapper &&other) = default;
 
     Utils::MacroExpander *macroExpander(const BaseQtVersion *qtversion) const;
diff --git a/src/plugins/qtsupport/qscxmlcgenerator.cpp b/src/plugins/qtsupport/qscxmlcgenerator.cpp
index 415a6ea701..30694071bc 100644
--- a/src/plugins/qtsupport/qscxmlcgenerator.cpp
+++ b/src/plugins/qtsupport/qscxmlcgenerator.cpp
@@ -114,7 +114,7 @@ bool QScxmlcGenerator::prepareToRun(const QByteArray &sourceContents)
 
 FileNameToContentsHash QScxmlcGenerator::handleProcessFinished(QProcess *process)
 {
-    Q_UNUSED(process);
+    Q_UNUSED(process)
     const Utils::FilePath wd = workingDirectory();
     FileNameToContentsHash result;
     forEachTarget([&](const Utils::FilePath &target) {
diff --git a/src/plugins/qtsupport/qtkitinformation.cpp b/src/plugins/qtsupport/qtkitinformation.cpp
index 3319aa732a..7d8ada6480 100644
--- a/src/plugins/qtsupport/qtkitinformation.cpp
+++ b/src/plugins/qtsupport/qtkitinformation.cpp
@@ -331,8 +331,8 @@ void QtKitAspect::qtVersionsChanged(const QList<int> &addedIds,
                                          const QList<int> &removedIds,
                                          const QList<int> &changedIds)
 {
-    Q_UNUSED(addedIds);
-    Q_UNUSED(removedIds);
+    Q_UNUSED(addedIds)
+    Q_UNUSED(removedIds)
     foreach (ProjectExplorer::Kit *k, ProjectExplorer::KitManager::kits()) {
         if (changedIds.contains(qtVersionId(k))) {
             k->validate(); // Qt version may have become (in)valid
diff --git a/src/plugins/qtsupport/qtoptionspage.cpp b/src/plugins/qtsupport/qtoptionspage.cpp
index c2269ebe07..58dace5d84 100644
--- a/src/plugins/qtsupport/qtoptionspage.cpp
+++ b/src/plugins/qtsupport/qtoptionspage.cpp
@@ -699,8 +699,8 @@ void QtOptionsPageWidget::updateDescriptionLabel()
 
 void QtOptionsPageWidget::versionChanged(const QModelIndex &current, const QModelIndex &previous)
 {
-    Q_UNUSED(current);
-    Q_UNUSED(previous);
+    Q_UNUSED(current)
+    Q_UNUSED(previous)
     userChangedCurrentVersion();
 }
 
diff --git a/src/plugins/qtsupport/qtprojectimporter.cpp b/src/plugins/qtsupport/qtprojectimporter.cpp
index 0e4124f7d9..301026b356 100644
--- a/src/plugins/qtsupport/qtprojectimporter.cpp
+++ b/src/plugins/qtsupport/qtprojectimporter.cpp
@@ -243,7 +243,7 @@ Kit *TestQtProjectImporter::createKit(void *directoryData) const
 
 const QList<BuildInfo> TestQtProjectImporter::buildInfoListForKit(const Kit *k, void *directoryData) const
 {
-    Q_UNUSED(directoryData);
+    Q_UNUSED(directoryData)
     assert(m_testData.contains(directoryData));
     assert(!m_deletedTestData.contains(directoryData));
     assert(static_cast<const DirectoryData *>(directoryData)->importPath == m_path);
diff --git a/src/plugins/qtsupport/qtsupportplugin.cpp b/src/plugins/qtsupport/qtsupportplugin.cpp
index 5faa9f7a1a..a143db76b3 100644
--- a/src/plugins/qtsupport/qtsupportplugin.cpp
+++ b/src/plugins/qtsupport/qtsupportplugin.cpp
@@ -79,8 +79,8 @@ QtSupportPlugin::~QtSupportPlugin()
 
 bool QtSupportPlugin::initialize(const QStringList &arguments, QString *errorMessage)
 {
-    Q_UNUSED(arguments);
-    Q_UNUSED(errorMessage);
+    Q_UNUSED(arguments)
+    Q_UNUSED(errorMessage)
     QMakeParser::initialize();
     ProFileEvaluator::initialize();
     new ProFileCacheManager(this);
diff --git a/src/plugins/studiowelcome/studiowelcomeplugin.cpp b/src/plugins/studiowelcome/studiowelcomeplugin.cpp
index 57edb46327..b5dc746898 100644
--- a/src/plugins/studiowelcome/studiowelcomeplugin.cpp
+++ b/src/plugins/studiowelcome/studiowelcomeplugin.cpp
@@ -204,8 +204,8 @@ StudioWelcomePlugin::~StudioWelcomePlugin()
 
 bool StudioWelcomePlugin::initialize(const QStringList &arguments, QString *errorString)
 {
-    Q_UNUSED(arguments);
-    Q_UNUSED(errorString);
+    Q_UNUSED(arguments)
+    Q_UNUSED(errorString)
 
     qmlRegisterType<ProjectModel>("projectmodel", 1, 0, "ProjectModel");
 
diff --git a/src/plugins/subversion/subversionclient.cpp b/src/plugins/subversion/subversionclient.cpp
index 7401fe37ff..4b6a9fbf1b 100644
--- a/src/plugins/subversion/subversionclient.cpp
+++ b/src/plugins/subversion/subversionclient.cpp
@@ -285,7 +285,7 @@ SubversionDiffEditorController *SubversionClient::findOrCreateDiffEditor(const Q
 
 void SubversionClient::diff(const QString &workingDirectory, const QStringList &files, const QStringList &extraOptions)
 {
-    Q_UNUSED(extraOptions);
+    Q_UNUSED(extraOptions)
 
     const QString vcsCmdString = vcsCommandString(DiffCommand);
     const QString documentId = QLatin1String(Constants::SUBVERSION_PLUGIN)
diff --git a/src/plugins/tasklist/stopmonitoringhandler.cpp b/src/plugins/tasklist/stopmonitoringhandler.cpp
index 56ca7c78f5..0ca105a719 100644
--- a/src/plugins/tasklist/stopmonitoringhandler.cpp
+++ b/src/plugins/tasklist/stopmonitoringhandler.cpp
@@ -49,7 +49,7 @@ bool StopMonitoringHandler::canHandle(const ProjectExplorer::Task &task) const
 void StopMonitoringHandler::handle(const ProjectExplorer::Task &task)
 {
     QTC_ASSERT(canHandle(task), return);
-    Q_UNUSED(task);
+    Q_UNUSED(task)
     TaskListPlugin::stopMonitoring();
 }
 
diff --git a/src/plugins/tasklist/taskfile.cpp b/src/plugins/tasklist/taskfile.cpp
index 871cefe1ab..ad9b9d18b7 100644
--- a/src/plugins/tasklist/taskfile.cpp
+++ b/src/plugins/tasklist/taskfile.cpp
@@ -43,14 +43,14 @@ TaskFile::TaskFile(QObject *parent) : Core::IDocument(parent)
 
 Core::IDocument::ReloadBehavior TaskFile::reloadBehavior(ChangeTrigger state, ChangeType type) const
 {
-    Q_UNUSED(state);
-    Q_UNUSED(type);
+    Q_UNUSED(state)
+    Q_UNUSED(type)
     return BehaviorSilent;
 }
 
 bool TaskFile::reload(QString *errorString, ReloadFlag flag, ChangeType type)
 {
-    Q_UNUSED(flag);
+    Q_UNUSED(flag)
 
     if (type == TypePermissions)
         return true;
diff --git a/src/plugins/texteditor/autocompleter.cpp b/src/plugins/texteditor/autocompleter.cpp
index ea50725639..799efdef67 100644
--- a/src/plugins/texteditor/autocompleter.cpp
+++ b/src/plugins/texteditor/autocompleter.cpp
@@ -342,15 +342,15 @@ int AutoCompleter::paragraphSeparatorAboutToBeInserted(QTextCursor &cursor)
 bool AutoCompleter::contextAllowsAutoBrackets(const QTextCursor &cursor,
                                               const QString &textToInsert) const
 {
-    Q_UNUSED(cursor);
-    Q_UNUSED(textToInsert);
+    Q_UNUSED(cursor)
+    Q_UNUSED(textToInsert)
     return false;
 }
 
 bool AutoCompleter::contextAllowsAutoQuotes(const QTextCursor &cursor, const QString &textToInsert) const
 {
-    Q_UNUSED(cursor);
-    Q_UNUSED(textToInsert);
+    Q_UNUSED(cursor)
+    Q_UNUSED(textToInsert)
     return false;
 }
 
@@ -361,13 +361,13 @@ bool AutoCompleter::contextAllowsElectricCharacters(const QTextCursor &cursor) c
 
 bool AutoCompleter::isInComment(const QTextCursor &cursor) const
 {
-    Q_UNUSED(cursor);
+    Q_UNUSED(cursor)
     return false;
 }
 
 bool AutoCompleter::isInString(const QTextCursor &cursor) const
 {
-    Q_UNUSED(cursor);
+    Q_UNUSED(cursor)
     return false;
 }
 
@@ -377,11 +377,11 @@ QString AutoCompleter::insertMatchingBrace(const QTextCursor &cursor,
                                            bool skipChars,
                                            int *skippedChars) const
 {
-    Q_UNUSED(cursor);
-    Q_UNUSED(text);
-    Q_UNUSED(lookAhead);
-    Q_UNUSED(skipChars);
-    Q_UNUSED(skippedChars);
+    Q_UNUSED(cursor)
+    Q_UNUSED(text)
+    Q_UNUSED(lookAhead)
+    Q_UNUSED(skipChars)
+    Q_UNUSED(skippedChars)
     return QString();
 }
 
@@ -391,16 +391,16 @@ QString AutoCompleter::insertMatchingQuote(const QTextCursor &cursor,
                                            bool skipChars,
                                            int *skippedChars) const
 {
-    Q_UNUSED(cursor);
-    Q_UNUSED(text);
-    Q_UNUSED(lookAhead);
-    Q_UNUSED(skipChars);
-    Q_UNUSED(skippedChars);
+    Q_UNUSED(cursor)
+    Q_UNUSED(text)
+    Q_UNUSED(lookAhead)
+    Q_UNUSED(skipChars)
+    Q_UNUSED(skippedChars)
     return QString();
 }
 
 QString AutoCompleter::insertParagraphSeparator(const QTextCursor &cursor) const
 {
-    Q_UNUSED(cursor);
+    Q_UNUSED(cursor)
     return QString();
 }
diff --git a/src/plugins/texteditor/codeassist/assistproposalitem.cpp b/src/plugins/texteditor/codeassist/assistproposalitem.cpp
index 05222ed107..cf9cbe6e38 100644
--- a/src/plugins/texteditor/codeassist/assistproposalitem.cpp
+++ b/src/plugins/texteditor/codeassist/assistproposalitem.cpp
@@ -122,7 +122,7 @@ bool AssistProposalItem::implicitlyApplies() const
 
 bool AssistProposalItem::prematurelyApplies(const QChar &c) const
 {
-    Q_UNUSED(c);
+    Q_UNUSED(c)
     return false;
 }
 
diff --git a/src/plugins/texteditor/codeassist/codeassistant.cpp b/src/plugins/texteditor/codeassist/codeassistant.cpp
index 4f9605d1e3..a29019a245 100644
--- a/src/plugins/texteditor/codeassist/codeassistant.cpp
+++ b/src/plugins/texteditor/codeassist/codeassistant.cpp
@@ -554,7 +554,7 @@ bool CodeAssistantPrivate::isDestroyEvent(int key, const QString &keyText)
 
 bool CodeAssistantPrivate::eventFilter(QObject *o, QEvent *e)
 {
-    Q_UNUSED(o);
+    Q_UNUSED(o)
 
     if (isWaitingForProposal()) {
         QEvent::Type type = e->type();
diff --git a/src/plugins/texteditor/codeassist/genericproposalmodel.cpp b/src/plugins/texteditor/codeassist/genericproposalmodel.cpp
index 19e1a0962b..30d5a43201 100644
--- a/src/plugins/texteditor/codeassist/genericproposalmodel.cpp
+++ b/src/plugins/texteditor/codeassist/genericproposalmodel.cpp
@@ -337,7 +337,7 @@ FuzzyMatcher::CaseSensitivity
 
 bool GenericProposalModel::isSortable(const QString &prefix) const
 {
-    Q_UNUSED(prefix);
+    Q_UNUSED(prefix)
 
     if (m_currentItems.size() < kMaxSort)
         return true;
diff --git a/src/plugins/texteditor/codeassist/iassistproposal.cpp b/src/plugins/texteditor/codeassist/iassistproposal.cpp
index 84beac910f..a5576ae620 100644
--- a/src/plugins/texteditor/codeassist/iassistproposal.cpp
+++ b/src/plugins/texteditor/codeassist/iassistproposal.cpp
@@ -104,7 +104,7 @@ bool IAssistProposal::supportsPrefix() const
 
 bool IAssistProposal::isCorrective(TextEditorWidget *editorWidget) const
 {
-    Q_UNUSED(editorWidget);
+    Q_UNUSED(editorWidget)
     return false;
 }
 
@@ -116,7 +116,7 @@ bool IAssistProposal::isCorrective(TextEditorWidget *editorWidget) const
 
 void IAssistProposal::makeCorrection(TextEditorWidget *editorWidget)
 {
-    Q_UNUSED(editorWidget);
+    Q_UNUSED(editorWidget)
 }
 
 void IAssistProposal::setFragile(bool fragile)
diff --git a/src/plugins/texteditor/codeassist/keywordscompletionassist.cpp b/src/plugins/texteditor/codeassist/keywordscompletionassist.cpp
index b5458e0aa3..b08fdc558f 100644
--- a/src/plugins/texteditor/codeassist/keywordscompletionassist.cpp
+++ b/src/plugins/texteditor/codeassist/keywordscompletionassist.cpp
@@ -158,7 +158,7 @@ QString KeywordsFunctionHintModel::text(int index) const
 
 int KeywordsFunctionHintModel::activeArgument(const QString &prefix) const
 {
-    Q_UNUSED(prefix);
+    Q_UNUSED(prefix)
     return 1;
 }
 
diff --git a/src/plugins/texteditor/normalindenter.cpp b/src/plugins/texteditor/normalindenter.cpp
index c6cb0febd1..e4a8ef4d10 100644
--- a/src/plugins/texteditor/normalindenter.cpp
+++ b/src/plugins/texteditor/normalindenter.cpp
@@ -58,8 +58,8 @@ int NormalIndenter::indentFor(const QTextBlock &block,
                               const TabSettings &tabSettings,
                               int cursorPositionInEditor)
 {
-    Q_UNUSED(tabSettings);
-    Q_UNUSED(cursorPositionInEditor);
+    Q_UNUSED(tabSettings)
+    Q_UNUSED(cursorPositionInEditor)
 
     QTextBlock previous = block.previous();
     if (!previous.isValid())
diff --git a/src/plugins/texteditor/texteditor.cpp b/src/plugins/texteditor/texteditor.cpp
index 2250b6fb5b..98ff2359e1 100644
--- a/src/plugins/texteditor/texteditor.cpp
+++ b/src/plugins/texteditor/texteditor.cpp
@@ -7900,7 +7900,7 @@ int TextEditorWidget::lineNumberDigits() const
 
 bool TextEditorWidget::selectionVisible(int blockNumber) const
 {
-    Q_UNUSED(blockNumber);
+    Q_UNUSED(blockNumber)
     return true;
 }
 
@@ -8506,7 +8506,7 @@ void TextEditorWidget::invokeAssist(AssistKind kind, IAssistProvider *provider)
 AssistInterface *TextEditorWidget::createAssistInterface(AssistKind kind,
                                                              AssistReason reason) const
 {
-    Q_UNUSED(kind);
+    Q_UNUSED(kind)
     return new AssistInterface(document(), position(), d->m_document->filePath().toString(), reason);
 }
 
diff --git a/src/plugins/texteditor/texteditoroverlay.cpp b/src/plugins/texteditor/texteditoroverlay.cpp
index a33ca13810..735869082f 100644
--- a/src/plugins/texteditor/texteditoroverlay.cpp
+++ b/src/plugins/texteditor/texteditoroverlay.cpp
@@ -393,7 +393,7 @@ void TextEditorOverlay::fillSelection(QPainter *painter,
 
 void TextEditorOverlay::paint(QPainter *painter, const QRect &clip)
 {
-    Q_UNUSED(clip);
+    Q_UNUSED(clip)
     for (int i = m_selections.size()-1; i >= 0; --i) {
         const OverlaySelection &selection = m_selections.at(i);
         if (selection.m_dropShadow)
@@ -420,7 +420,7 @@ void TextEditorOverlay::paint(QPainter *painter, const QRect &clip)
 
 void TextEditorOverlay::fill(QPainter *painter, const QColor &color, const QRect &clip)
 {
-    Q_UNUSED(clip);
+    Q_UNUSED(clip)
     for (int i = m_selections.size()-1; i >= 0; --i) {
         const OverlaySelection &selection = m_selections.at(i);
         if (selection.m_dropShadow)
diff --git a/src/plugins/texteditor/textindenter.cpp b/src/plugins/texteditor/textindenter.cpp
index 3dab3e2c48..c2d328d3fe 100644
--- a/src/plugins/texteditor/textindenter.cpp
+++ b/src/plugins/texteditor/textindenter.cpp
@@ -51,7 +51,7 @@ void TextIndenter::indentBlock(const QTextBlock &block,
                                const TabSettings &tabSettings,
                                int /*cursorPositionInEditor*/)
 {
-    Q_UNUSED(typedChar);
+    Q_UNUSED(typedChar)
     const int indent = indentFor(block, tabSettings);
     if (indent < 0)
         return;
diff --git a/src/plugins/texteditor/textmark.cpp b/src/plugins/texteditor/textmark.cpp
index 3493570487..63d6c17844 100644
--- a/src/plugins/texteditor/textmark.cpp
+++ b/src/plugins/texteditor/textmark.cpp
@@ -267,7 +267,7 @@ bool TextMark::isDraggable() const
 
 void TextMark::dragToLine(int lineNumber)
 {
-    Q_UNUSED(lineNumber);
+    Q_UNUSED(lineNumber)
 }
 
 void TextMark::addToToolTipLayout(QGridLayout *target) const
diff --git a/src/plugins/todo/todoitemsprovider.cpp b/src/plugins/todo/todoitemsprovider.cpp
index 9c8d921567..ef3040054d 100644
--- a/src/plugins/todo/todoitemsprovider.cpp
+++ b/src/plugins/todo/todoitemsprovider.cpp
@@ -80,7 +80,7 @@ void TodoItemsProvider::settingsChanged(const Settings &newSettings)
 
 void TodoItemsProvider::projectSettingsChanged(Project *project)
 {
-    Q_UNUSED(project);
+    Q_UNUSED(project)
     updateList();
 }
 
diff --git a/src/plugins/todo/todooutputtreeview.cpp b/src/plugins/todo/todooutputtreeview.cpp
index 9db3800089..d75b5c140a 100644
--- a/src/plugins/todo/todooutputtreeview.cpp
+++ b/src/plugins/todo/todooutputtreeview.cpp
@@ -101,7 +101,7 @@ void TodoOutputTreeView::resizeEvent(QResizeEvent *event)
 
 void TodoOutputTreeView::todoColumnResized(int column, int oldSize, int newSize)
 {
-    Q_UNUSED(oldSize);
+    Q_UNUSED(oldSize)
     if (column == Constants::OUTPUT_COLUMN_TEXT)
         m_textColumnDefaultWidth = newSize;
     else if (column == Constants::OUTPUT_COLUMN_FILE)
diff --git a/src/plugins/todo/todoplugin.cpp b/src/plugins/todo/todoplugin.cpp
index b59e50ee44..e16e11e063 100644
--- a/src/plugins/todo/todoplugin.cpp
+++ b/src/plugins/todo/todoplugin.cpp
@@ -54,8 +54,8 @@ TodoPlugin::~TodoPlugin() = default;
 
 bool TodoPlugin::initialize(const QStringList& args, QString *errMsg)
 {
-    Q_UNUSED(args);
-    Q_UNUSED(errMsg);
+    Q_UNUSED(args)
+    Q_UNUSED(errMsg)
 
     m_settings.load(Core::ICore::settings());
 
diff --git a/src/plugins/valgrind/callgrind/callgrindcontroller.cpp b/src/plugins/valgrind/callgrind/callgrindcontroller.cpp
index 7260f0090f..f195d2e374 100644
--- a/src/plugins/valgrind/callgrind/callgrindcontroller.cpp
+++ b/src/plugins/valgrind/callgrind/callgrindcontroller.cpp
@@ -187,7 +187,7 @@ void CallgrindController::controllerProcessFinished(int rc, QProcess::ExitStatus
 
 void CallgrindController::controllerProcessClosed(bool success)
 {
-    Q_UNUSED(success);
+    Q_UNUSED(success)
     //    QTC_ASSERT(m_remote.m_process, return);
 
 //    m_remote.m_errorString = m_remote.m_process->errorString();
diff --git a/src/plugins/valgrind/memchecktool.cpp b/src/plugins/valgrind/memchecktool.cpp
index 6a699c4686..ed194129e9 100644
--- a/src/plugins/valgrind/memchecktool.cpp
+++ b/src/plugins/valgrind/memchecktool.cpp
@@ -818,7 +818,7 @@ void MemcheckToolPrivate::heobAction()
     // process environment
     QByteArray env;
     void *envPtr = nullptr;
-    Q_UNUSED(envPtr);
+    Q_UNUSED(envPtr)
     if (!envStrings.isEmpty()) {
         uint pos = 0;
         for (const QString &par : envStrings) {
diff --git a/src/plugins/valgrind/suppressiondialog.cpp b/src/plugins/valgrind/suppressiondialog.cpp
index fbd2b21726..e853791f8c 100644
--- a/src/plugins/valgrind/suppressiondialog.cpp
+++ b/src/plugins/valgrind/suppressiondialog.cpp
@@ -227,7 +227,7 @@ void SuppressionDialog::accept()
     foreach (const QModelIndex &index, indices) {
         bool removed = model->removeRow(index.row());
         QTC_ASSERT(removed, qt_noop());
-        Q_UNUSED(removed);
+        Q_UNUSED(removed)
     }
 
     // One suppression might hide multiple rows, care for that.
diff --git a/src/plugins/valgrind/valgrindmemcheckparsertest.h b/src/plugins/valgrind/valgrindmemcheckparsertest.h
index 71da4cc302..6dff0aef57 100644
--- a/src/plugins/valgrind/valgrindmemcheckparsertest.h
+++ b/src/plugins/valgrind/valgrindmemcheckparsertest.h
@@ -123,7 +123,7 @@ public:
     }
     void processErrorReceived(const QString &s)
     {
-        Q_UNUSED(s);
+        Q_UNUSED(s)
         // qDebug() << "error received:" << s; // this can be a lot of text
         m_errorReceived = true;
     }
diff --git a/src/plugins/vcsbase/vcsbaseclientsettings.cpp b/src/plugins/vcsbase/vcsbaseclientsettings.cpp
index 96571e5782..ebf81d5123 100644
--- a/src/plugins/vcsbase/vcsbaseclientsettings.cpp
+++ b/src/plugins/vcsbase/vcsbaseclientsettings.cpp
@@ -394,7 +394,7 @@ QVariant VcsBaseClientSettings::keyDefaultValue(const QString &key) const
 
 void VcsBaseClientSettings::readLegacySettings(const QSettings *settings)
 {
-    Q_UNUSED(settings);
+    Q_UNUSED(settings)
 }
 
 } // namespace VcsBase
diff --git a/src/plugins/vcsbase/vcsbaseeditor.cpp b/src/plugins/vcsbase/vcsbaseeditor.cpp
index 885b0c7cd1..fee6dbc72c 100644
--- a/src/plugins/vcsbase/vcsbaseeditor.cpp
+++ b/src/plugins/vcsbase/vcsbaseeditor.cpp
@@ -460,7 +460,7 @@ void UrlTextCursorHandler::handleCurrentContents()
 
 void UrlTextCursorHandler::fillContextMenu(QMenu *menu, EditorContentType type) const
 {
-    Q_UNUSED(type);
+    Q_UNUSED(type)
     menu->addSeparator();
     menu->addAction(createOpenUrlAction(tr("Open URL in Browser...")));
     menu->addAction(createCopyUrlAction(tr("Copy URL Location")));
@@ -527,7 +527,7 @@ EmailTextCursorHandler::EmailTextCursorHandler(VcsBaseEditorWidget *editorWidget
 
 void EmailTextCursorHandler::fillContextMenu(QMenu *menu, EditorContentType type) const
 {
-    Q_UNUSED(type);
+    Q_UNUSED(type)
     menu->addSeparator();
     menu->addAction(createOpenUrlAction(tr("Send Email To...")));
     menu->addAction(createCopyUrlAction(tr("Copy Email Address")));
@@ -673,7 +673,7 @@ bool VcsBaseEditorWidget::supportChangeLinks() const
 
 QString VcsBaseEditorWidget::fileNameForLine(int line) const
 {
-    Q_UNUSED(line);
+    Q_UNUSED(line)
     return source();
 }
 
@@ -1212,7 +1212,7 @@ DiffChunk VcsBaseEditorWidget::diffChunk(QTextCursor cursor) const
 
 void VcsBaseEditorWidget::reportCommandFinished(bool ok, int exitCode, const QVariant &data)
 {
-    Q_UNUSED(exitCode);
+    Q_UNUSED(exitCode)
 
     hideProgressIndicator();
     if (!ok) {
@@ -1549,13 +1549,13 @@ QString VcsBaseEditorWidget::decorateVersion(const QString &revision) const
 
 bool VcsBaseEditorWidget::isValidRevision(const QString &revision) const
 {
-    Q_UNUSED(revision);
+    Q_UNUSED(revision)
     return true;
 }
 
 QString VcsBaseEditorWidget::revisionSubject(const QTextBlock &inBlock) const
 {
-    Q_UNUSED(inBlock);
+    Q_UNUSED(inBlock)
     return QString();
 }
 
diff --git a/src/plugins/vcsbase/wizard/vcscommandpage.cpp b/src/plugins/vcsbase/wizard/vcscommandpage.cpp
index 653df132fd..c08077e902 100644
--- a/src/plugins/vcsbase/wizard/vcscommandpage.cpp
+++ b/src/plugins/vcsbase/wizard/vcscommandpage.cpp
@@ -71,7 +71,7 @@ VcsCommandPageFactory::VcsCommandPageFactory()
 
 WizardPage *VcsCommandPageFactory::create(JsonWizard *wizard, Id typeId, const QVariant &data)
 {
-    Q_UNUSED(wizard);
+    Q_UNUSED(wizard)
 
     QTC_ASSERT(canCreate(typeId), return 0);
 
diff --git a/src/plugins/vcsbase/wizard/vcsconfigurationpage.cpp b/src/plugins/vcsbase/wizard/vcsconfigurationpage.cpp
index 22b69ac591..894d1155ba 100644
--- a/src/plugins/vcsbase/wizard/vcsconfigurationpage.cpp
+++ b/src/plugins/vcsbase/wizard/vcsconfigurationpage.cpp
@@ -78,7 +78,7 @@ VcsConfigurationPageFactory::VcsConfigurationPageFactory()
 Utils::WizardPage *VcsConfigurationPageFactory::create(JsonWizard *wizard, Id typeId,
                                                        const QVariant &data)
 {
-    Q_UNUSED(wizard);
+    Q_UNUSED(wizard)
 
     QTC_ASSERT(canCreate(typeId), return 0);
 
diff --git a/src/shared/modeltest/modeltest.cpp b/src/shared/modeltest/modeltest.cpp
index 2dfb296b46..75000e9f3b 100644
--- a/src/shared/modeltest/modeltest.cpp
+++ b/src/shared/modeltest/modeltest.cpp
@@ -458,7 +458,7 @@ void ModelTest::data()
  */
 void ModelTest::rowsAboutToBeInserted(const QModelIndex &parent, int start, int end)
 {
-    Q_UNUSED(end);
+    Q_UNUSED(end)
     Changing c;
     c.parent = parent;
     c.oldSize = model->rowCount(parent);
diff --git a/src/shared/proparser/registry.cpp b/src/shared/proparser/registry.cpp
index 12c268ae2b..8320cd3e59 100644
--- a/src/shared/proparser/registry.cpp
+++ b/src/shared/proparser/registry.cpp
@@ -148,9 +148,9 @@ QString qt_readRegistryKey(HKEY parentHandle, const QString &rSubkey, unsigned l
 
     RegCloseKey(handle);
 #else
-    Q_UNUSED(parentHandle);
+    Q_UNUSED(parentHandle)
     Q_UNUSED(rSubkey)
-    Q_UNUSED(options);
+    Q_UNUSED(options)
 #endif
 
     return result;
diff --git a/src/shared/registryaccess/registryaccess.cpp b/src/shared/registryaccess/registryaccess.cpp
index 728aa41d7e..d98d6ed0e3 100644
--- a/src/shared/registryaccess/registryaccess.cpp
+++ b/src/shared/registryaccess/registryaccess.cpp
@@ -101,7 +101,7 @@ bool openRegistryKey(HKEY category, // HKEY_LOCAL_MACHINE, etc.
                      AccessMode mode,
                      QString *errorMessage)
 {
-    Q_UNUSED(debuggerRegistryKeyC);  // avoid warning from MinGW
+    Q_UNUSED(debuggerRegistryKeyC)  // avoid warning from MinGW
 
     REGSAM accessRights = KEY_READ;
     if (readWrite)
diff --git a/src/tools/iostool/iosdevicemanager.cpp b/src/tools/iostool/iosdevicemanager.cpp
index 53a9fd1625..f4a7fe08b9 100644
--- a/src/tools/iostool/iosdevicemanager.cpp
+++ b/src/tools/iostool/iosdevicemanager.cpp
@@ -1297,8 +1297,8 @@ void CommandSession::reportProgress(CFDictionaryRef dict)
 
 void CommandSession::reportProgress2(int progress, const QString &status)
 {
-    Q_UNUSED(progress);
-    Q_UNUSED(status);
+    Q_UNUSED(progress)
+    Q_UNUSED(status)
 }
 
 QString CommandSession::commandName()
diff --git a/src/tools/iostool/main.cpp b/src/tools/iostool/main.cpp
index f62c0c6180..328956e971 100644
--- a/src/tools/iostool/main.cpp
+++ b/src/tools/iostool/main.cpp
@@ -657,8 +657,8 @@ void IosTool::doExit(int errorCode)
 void IosTool::isTransferringApp(const QString &bundlePath, const QString &deviceId, int progress,
                                 const QString &info)
 {
-    Q_UNUSED(bundlePath);
-    Q_UNUSED(deviceId);
+    Q_UNUSED(bundlePath)
+    Q_UNUSED(deviceId)
     QMutexLocker l(&m_xmlMutex);
     out.writeStartElement(QLatin1String("status"));
     out.writeAttribute(QLatin1String("progress"), QString::number(progress));
@@ -671,8 +671,8 @@ void IosTool::isTransferringApp(const QString &bundlePath, const QString &device
 void IosTool::didTransferApp(const QString &bundlePath, const QString &deviceId,
                              Ios::IosDeviceManager::OpStatus status)
 {
-    Q_UNUSED(bundlePath);
-    Q_UNUSED(deviceId);
+    Q_UNUSED(bundlePath)
+    Q_UNUSED(deviceId)
     {
         QMutexLocker l(&m_xmlMutex);
         if (status == Ios::IosDeviceManager::Success) {
@@ -698,8 +698,8 @@ void IosTool::didStartApp(const QString &bundlePath, const QString &deviceId,
                           Ios::IosDeviceManager::OpStatus status, int gdbFd,
                           Ios::DeviceSession *deviceSession)
 {
-    Q_UNUSED(bundlePath);
-    Q_UNUSED(deviceId);
+    Q_UNUSED(bundlePath)
+    Q_UNUSED(deviceId)
     {
         QMutexLocker l(&m_xmlMutex);
         out.writeEmptyElement(QLatin1String("app_started"));
@@ -811,7 +811,7 @@ void IosTool::writeMaybeBin(const QString &extraMsg, const char *msg, quintptr l
 
 void IosTool::deviceInfo(const QString &deviceId, const Ios::IosDeviceManager::Dict &devInfo)
 {
-    Q_UNUSED(deviceId);
+    Q_UNUSED(deviceId)
     {
         QMutexLocker l(&m_xmlMutex);
         out.writeTextElement(QLatin1String("device_id"), deviceId);
diff --git a/src/tools/qtcreatorcrashhandler/crashhandlersetup.cpp b/src/tools/qtcreatorcrashhandler/crashhandlersetup.cpp
index fd24e6b543..1cfd8d7b59 100644
--- a/src/tools/qtcreatorcrashhandler/crashhandlersetup.cpp
+++ b/src/tools/qtcreatorcrashhandler/crashhandlersetup.cpp
@@ -154,9 +154,9 @@ CrashHandlerSetup::CrashHandlerSetup(const QString &appName,
         }
     }
 #else
-    Q_UNUSED(appName);
-    Q_UNUSED(restartCap);
-    Q_UNUSED(executableDirPath);
+    Q_UNUSED(appName)
+    Q_UNUSED(restartCap)
+    Q_UNUSED(executableDirPath)
 #endif // BUILD_CRASH_HANDLER
 }
 
diff --git a/src/tools/sdktool/addtoolchainoperation.cpp b/src/tools/sdktool/addtoolchainoperation.cpp
index afcab9a5e2..a5be70e877 100644
--- a/src/tools/sdktool/addtoolchainoperation.cpp
+++ b/src/tools/sdktool/addtoolchainoperation.cpp
@@ -264,7 +264,7 @@ QVariantMap AddToolChainOperation::addToolChain(const QVariantMap &map, const QS
     QString newLang; // QtC 4.3 and later
     QString oldLang; // QtC 4.2
     int langInt = lang.toInt(&ok);
-    Q_UNUSED(langInt);
+    Q_UNUSED(langInt)
     if (lang == "2" || lang == "Cxx") {
         newLang = "Cxx";
         oldLang = "2";
diff --git a/src/tools/valgrindfake/outputgenerator.cpp b/src/tools/valgrindfake/outputgenerator.cpp
index d2c944dac7..4aec9ae9e1 100644
--- a/src/tools/valgrindfake/outputgenerator.cpp
+++ b/src/tools/valgrindfake/outputgenerator.cpp
@@ -107,7 +107,7 @@ void OutputGenerator::produceRuntimeError()
 #ifndef __clang_analyzer__
         int zero = 0; // hide the error at compile-time to avoid a compiler warning
         int i = 1 / zero;
-        Q_UNUSED(i);
+        Q_UNUSED(i)
 #endif
         Q_ASSERT(false);
     } else if (m_garbage) {
diff --git a/tests/auto/cplusplus/preprocessor/tst_preprocessor.cpp b/tests/auto/cplusplus/preprocessor/tst_preprocessor.cpp
index e00adbfe53..79bad5a206 100644
--- a/tests/auto/cplusplus/preprocessor/tst_preprocessor.cpp
+++ b/tests/auto/cplusplus/preprocessor/tst_preprocessor.cpp
@@ -180,10 +180,10 @@ public:
         Q_UNUSED(initialIncludes)
 #if 1
         m_recordedIncludes.append(Include(includedFileName, mode, line));
-        Q_UNUSED(m_env);
-        Q_UNUSED(m_includeDepth);
+        Q_UNUSED(m_env)
+        Q_UNUSED(m_includeDepth)
 #else
-        Q_UNUSED(line);
+        Q_UNUSED(line)
 
         QString resolvedFileName;
         if (mode == IncludeLocal)
diff --git a/tests/auto/cplusplus/semantic/tst_semantic.cpp b/tests/auto/cplusplus/semantic/tst_semantic.cpp
index e13795154b..0862e7acad 100644
--- a/tests/auto/cplusplus/semantic/tst_semantic.cpp
+++ b/tests/auto/cplusplus/semantic/tst_semantic.cpp
@@ -122,11 +122,11 @@ public:
 #ifndef NO_PARSER_OR_SEMANTIC_ERROR_MESSAGES
             qDebug() << fileName->chars()<<':'<<line<<':'<<column<<' ' << QString::vasprintf(format, ap);
 #else
-            Q_UNUSED(fileName);
-            Q_UNUSED(line);
-            Q_UNUSED(column);
-            Q_UNUSED(format);
-            Q_UNUSED(ap);
+            Q_UNUSED(fileName)
+            Q_UNUSED(line)
+            Q_UNUSED(column)
+            Q_UNUSED(format)
+            Q_UNUSED(ap)
 #endif
         }
     };
diff --git a/tests/auto/cplusplus/translationunit/tst_translationunit.cpp b/tests/auto/cplusplus/translationunit/tst_translationunit.cpp
index 2c651676bc..082fcf88eb 100644
--- a/tests/auto/cplusplus/translationunit/tst_translationunit.cpp
+++ b/tests/auto/cplusplus/translationunit/tst_translationunit.cpp
@@ -222,7 +222,7 @@ static QByteArray stripEncodingPrefixAndQuotationMarks(const QByteArray &literal
     Q_ASSERT(firstQuotationMarkPosition != -1);
     Q_ASSERT(lastQuotationMarkPosition == literal.size() - 1);
     Q_ASSERT(firstQuotationMarkPosition < lastQuotationMarkPosition - 1);
-    Q_UNUSED(lastQuotationMarkPosition);
+    Q_UNUSED(lastQuotationMarkPosition)
 
     QByteArray result = literal.mid(firstQuotationMarkPosition + 1);
     result.chop(1);
diff --git a/tests/auto/tracing/flamegraphview/tst_flamegraphview.cpp b/tests/auto/tracing/flamegraphview/tst_flamegraphview.cpp
index d29ee1f7c8..1046a83597 100644
--- a/tests/auto/tracing/flamegraphview/tst_flamegraphview.cpp
+++ b/tests/auto/tracing/flamegraphview/tst_flamegraphview.cpp
@@ -87,9 +87,9 @@ public:
 
     Q_INVOKABLE void gotoSourceLocation(const QString &file, int line, int column)
     {
-        Q_UNUSED(file);
-        Q_UNUSED(line);
-        Q_UNUSED(column);
+        Q_UNUSED(file)
+        Q_UNUSED(line)
+        Q_UNUSED(column)
     }
 };
 
diff --git a/tests/auto/tracing/timelinerenderpass/tst_timelinerenderpass.cpp b/tests/auto/tracing/timelinerenderpass/tst_timelinerenderpass.cpp
index cfff804e52..d59fad4284 100644
--- a/tests/auto/tracing/timelinerenderpass/tst_timelinerenderpass.cpp
+++ b/tests/auto/tracing/timelinerenderpass/tst_timelinerenderpass.cpp
@@ -45,12 +45,12 @@ TimelineRenderPass::State *DummyRenderPass::update(const TimelineAbstractRendere
                                                    State *state, int indexFrom, int indexTo,
                                                    bool stateChanged, float spacing) const
 {
-    Q_UNUSED(renderer);
-    Q_UNUSED(parentState);
-    Q_UNUSED(indexFrom);
-    Q_UNUSED(indexTo);
-    Q_UNUSED(stateChanged);
-    Q_UNUSED(spacing);
+    Q_UNUSED(renderer)
+    Q_UNUSED(parentState)
+    Q_UNUSED(indexFrom)
+    Q_UNUSED(indexTo)
+    Q_UNUSED(stateChanged)
+    Q_UNUSED(spacing)
     return state;
 }
 
diff --git a/tests/auto/utils/settings/tst_settings.cpp b/tests/auto/utils/settings/tst_settings.cpp
index 931c601a6e..10bc8afa74 100644
--- a/tests/auto/utils/settings/tst_settings.cpp
+++ b/tests/auto/utils/settings/tst_settings.cpp
@@ -92,7 +92,7 @@ protected:
     SettingsMergeResult merge(const SettingsMergeData &global,
                               const SettingsMergeData &local) const final
     {
-        Q_UNUSED(global);
+        Q_UNUSED(global)
 
         const QString key = local.key;
         const QVariant main = local.main.value(key);
diff --git a/tests/manual/debugger/simple/simple_test_app.cpp b/tests/manual/debugger/simple/simple_test_app.cpp
index 864e20d40a..1902dfe27c 100644
--- a/tests/manual/debugger/simple/simple_test_app.cpp
+++ b/tests/manual/debugger/simple/simple_test_app.cpp
@@ -423,7 +423,7 @@ class XX : virtual public Foo { public: XX() { } };
 
 class Y : virtual public Foo { public: Y() { } };
 
-class D : public X, public Y { int diamond; D(){Q_UNUSED(diamond);} };
+class D : public X, public Y { int diamond; D(){Q_UNUSED(diamond);} }
 
 
 namespace peekandpoke {
@@ -3408,7 +3408,7 @@ namespace lambda {
         std::string x;
         auto f = [&] () -> const std::string & {
                 size_t z = x.size();
-                Q_UNUSED(z);
+                Q_UNUSED(z)
                 return x;
          };
         auto c = f();
@@ -6633,7 +6633,7 @@ namespace bug5106 {
     class A5106
     {
     public:
-            A5106(int a, int b) : m_a(a), m_b(b) {Q_UNUSED(m_a);Q_UNUSED(m_b);}
+            A5106(int a, int b) : m_a(a), m_b(b) {Q_UNUSED(m_a);Q_UNUSED(m_b)}
             virtual int test() { return 5; }
     private:
             int m_a, m_b;
@@ -6642,7 +6642,7 @@ namespace bug5106 {
     class B5106 : public A5106
     {
     public:
-            B5106(int c, int a, int b) : A5106(a, b), m_c(c) {Q_UNUSED(m_c);}
+            B5106(int c, int a, int b) : A5106(a, b), m_c(c) {Q_UNUSED(m_c)}
             virtual int test() { return 4; BREAK_HERE; }
     private:
             int m_c;
@@ -7224,7 +7224,7 @@ template <class X> int ffff(X)
 int main(int argc, char *argv[])
 {
     int z = ffff(3) + ffff(2.0);
-    Q_UNUSED(z);
+    Q_UNUSED(z)
 
     #if USE_GUILIB
     QApplication app(argc, argv);
author	hjk <hjk@qt.io>	2019-07-23 10:58:00 +0200
committer	hjk <hjk@qt.io>	2019-07-23 11:55:59 +0000
commit	251287f0d35dd82e68dabed8214ef8af893aff91 (patch)
tree	a3ba843c1c23f4aea06bc01bf7ab0dd69d6fc741
parent	2b26eca80f9ebcdc2f1dc0d890a39a4fbc2d129c (diff)