Fix warning for ';'

The macro already contain a ';'. Removing the argument or
[[maybe_unused]] would maybe even a better approach.

Change-Id: I31750d10a4f252c667e7c0e5e13bf1085dbe11a2
Reviewed-by: hjk <[email protected]>

64 files changed, 144 insertions, 140 deletions

diff --git a/src/libs/advanceddockingsystem/ads_globals.h b/src/libs/advanceddockingsystem/ads_globals.h
index 364f49e01e2..ab6e274c8a4 100644
--- a/src/libs/advanceddockingsystem/ads_globals.h
+++ b/src/libs/advanceddockingsystem/ads_globals.h
@@ -205,8 +205,8 @@ void setToolTip(QObjectPtr obj, const QString &tip)
 #ifndef QT_NO_TOOLTIP
     obj->setToolTip(tip);
 #else
-    Q_UNUSED(obj);
-    Q_UNUSED(tip);
+    Q_UNUSED(obj)
+    Q_UNUSED(tip)
 #endif
 }
 
diff --git a/src/libs/advanceddockingsystem/dockfocuscontroller.cpp b/src/libs/advanceddockingsystem/dockfocuscontroller.cpp
index 549e13c5a94..0cf457e9cf1 100644
--- a/src/libs/advanceddockingsystem/dockfocuscontroller.cpp
+++ b/src/libs/advanceddockingsystem/dockfocuscontroller.cpp
@@ -208,7 +208,7 @@ void DockFocusController::onFocusWindowChanged(QWindow *focusWindow)
 
 void DockFocusController::onApplicationFocusChanged(QWidget *focusedOld, QWidget *focusedNow)
 {
-    Q_UNUSED(focusedOld);
+    Q_UNUSED(focusedOld)
 
     // Ignore focus changes if we are restoring state, or if user clicked a tab which in turn
     // caused the focus change.
diff --git a/src/libs/advanceddockingsystem/pushbutton.cpp b/src/libs/advanceddockingsystem/pushbutton.cpp
index ddc4b83ca88..a5c20f4ca63 100644
--- a/src/libs/advanceddockingsystem/pushbutton.cpp
+++ b/src/libs/advanceddockingsystem/pushbutton.cpp
@@ -33,7 +33,7 @@ void PushButton::setButtonOrientation(Orientation orientation)
 
 void PushButton::paintEvent(QPaintEvent *event)
 {
-    Q_UNUSED(event);
+    Q_UNUSED(event)
 
     QStylePainter painter(this);
     QStyleOptionButton option;
diff --git a/src/libs/modelinglib/qmt/model_widgets_ui/propertiesviewmview.cpp b/src/libs/modelinglib/qmt/model_widgets_ui/propertiesviewmview.cpp
index 11df24188db..cc99d3ede43 100644
--- a/src/libs/modelinglib/qmt/model_widgets_ui/propertiesviewmview.cpp
+++ b/src/libs/modelinglib/qmt/model_widgets_ui/propertiesviewmview.cpp
@@ -1270,7 +1270,7 @@ void PropertiesView::MView::visitMDiagramBehind(const MDiagram *diagram)
 
 void PropertiesView::MView::visitDObjectBefore(const DObject *object)
 {
-    Q_UNUSED(object);
+    Q_UNUSED(object)
 }
 
 void PropertiesView::MView::onStereotypesChanged(const QString &stereotypes)
diff --git a/src/libs/modelinglib/qmt/style/defaultstyleengine.cpp b/src/libs/modelinglib/qmt/style/defaultstyleengine.cpp
index bce1804892d..f8ee61a848e 100644
--- a/src/libs/modelinglib/qmt/style/defaultstyleengine.cpp
+++ b/src/libs/modelinglib/qmt/style/defaultstyleengine.cpp
@@ -327,7 +327,7 @@ const Style *DefaultStyleEngine::applyObjectStyle(const Style *baseStyle, const
 
 const Style *DefaultStyleEngine::applyRelationStyle(const Style *baseStyle, ElementType elementType, const RelationVisuals &relationVisuals, const Parameters *parameters)
 {
-    Q_UNUSED(parameters);
+    Q_UNUSED(parameters)
 
     RelationStyleKey key(elementType, relationVisuals);
     const Style *derivedStyle = m_relationStyleMap.value(key);
diff --git a/src/libs/qmljs/parser/qmljsengine_p.h b/src/libs/qmljs/parser/qmljsengine_p.h
index f9f5dfc79a6..d0b8395d4a9 100644
--- a/src/libs/qmljs/parser/qmljsengine_p.h
+++ b/src/libs/qmljs/parser/qmljsengine_p.h
@@ -40,19 +40,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/qmljsmodelmanagerinterface.cpp b/src/libs/qmljs/qmljsmodelmanagerinterface.cpp
index b375434bff3..332d27b2aff 100644
--- a/src/libs/qmljs/qmljsmodelmanagerinterface.cpp
+++ b/src/libs/qmljs/qmljsmodelmanagerinterface.cpp
@@ -1736,8 +1736,8 @@ ModelManagerInterface::ProjectInfo ModelManagerInterface::defaultProjectInfo() c
 ModelManagerInterface::ProjectInfo ModelManagerInterface::defaultProjectInfoForProject(
     ProjectExplorer::Project *project, const FilePaths &hiddenRccFolders) const
 {
-    Q_UNUSED(project);
-    Q_UNUSED(hiddenRccFolders);
+    Q_UNUSED(project)
+    Q_UNUSED(hiddenRccFolders)
     return ModelManagerInterface::ProjectInfo();
 }
 
diff --git a/src/libs/solutions/terminal/surfaceintegration.h b/src/libs/solutions/terminal/surfaceintegration.h
index 99b9538de15..9dd9d933ae7 100644
--- a/src/libs/solutions/terminal/surfaceintegration.h
+++ b/src/libs/solutions/terminal/surfaceintegration.h
@@ -13,9 +13,9 @@ public:
     virtual void onOsc(int cmd, std::string_view str, bool initial, bool final) = 0;
 
     virtual void onBell() {}
-    virtual void onTitle(const QString &title) { Q_UNUSED(title); }
+    virtual void onTitle(const QString &title) { Q_UNUSED(title) }
 
-    virtual void onSetClipboard(const QByteArray &text) { Q_UNUSED(text); }
+    virtual void onSetClipboard(const QByteArray &text) { Q_UNUSED(text) }
     virtual void onGetClipboard() {}
 };
 
diff --git a/src/libs/solutions/terminal/terminalsurface.cpp b/src/libs/solutions/terminal/terminalsurface.cpp
index 5e02e5548cd..f51a9539b18 100644
--- a/src/libs/solutions/terminal/terminalsurface.cpp
+++ b/src/libs/solutions/terminal/terminalsurface.cpp
@@ -364,7 +364,7 @@ struct TerminalSurfacePrivate
     }
     int movecursor(VTermPos pos, VTermPos oldpos, int visible)
     {
-        Q_UNUSED(oldpos);
+        Q_UNUSED(oldpos)
         Cursor oldCursor = q->cursor();
         m_cursor.position = {pos.col, pos.row};
         m_cursor.visible = visible > 0;
diff --git a/src/libs/solutions/terminal/terminalview.h b/src/libs/solutions/terminal/terminalview.h
index 838cf379108..57120849d14 100644
--- a/src/libs/solutions/terminal/terminalview.h
+++ b/src/libs/solutions/terminal/terminalview.h
@@ -112,7 +112,7 @@ public:
 
     virtual qint64 writeToPty(const QByteArray &data)
     {
-        Q_UNUSED(data);
+        Q_UNUSED(data)
         return 0;
     }
     void writeToTerminal(const QByteArray &data, bool forceFlush);
@@ -127,23 +127,25 @@ public:
 
     virtual bool resizePty(QSize newSize)
     {
-        Q_UNUSED(newSize);
+        Q_UNUSED(newSize)
         return false;
     }
 
-    virtual void setClipboard(const QString &text) { Q_UNUSED(text); }
+    virtual void setClipboard(const QString &text) { Q_UNUSED(text) }
     virtual std::optional<Link> toLink(const QString &text)
     {
-        Q_UNUSED(text);
+        Q_UNUSED(text)
         return std::nullopt;
     }
 
     virtual void selectionChanged(const std::optional<Selection> &newSelection)
     {
-        Q_UNUSED(newSelection);
+        Q_UNUSED(newSelection)
     }
-    virtual void linkActivated(const Link &link) { Q_UNUSED(link); }
-    virtual void contextMenuRequested(const QPoint &pos) { Q_UNUSED(pos); }
+
+    virtual void linkActivated(const Link &link) { Q_UNUSED(link) }
+
+    virtual void contextMenuRequested(const QPoint &pos) { Q_UNUSED(pos) }
 
     virtual void surfaceChanged(){};
 
diff --git a/src/libs/utils/devicefileaccess.cpp b/src/libs/utils/devicefileaccess.cpp
index 4a4bddcfd0b..1d9eafa53ac 100644
--- a/src/libs/utils/devicefileaccess.cpp
+++ b/src/libs/utils/devicefileaccess.cpp
@@ -396,7 +396,7 @@ Result<FilePath> DeviceFileAccess::createTempFile(const FilePath &filePath)
 Utils::Result<std::unique_ptr<FilePathWatcher>> DeviceFileAccess::watch(
     const FilePath &path) const
 {
-    Q_UNUSED(path);
+    Q_UNUSED(path)
     return ResultError(Tr::tr("watch is not implemented."));
 }
 
@@ -484,7 +484,7 @@ bool UnavailableDeviceFileAccess::hasHardLinks(const FilePath &filePath) const
 
 Result<> UnavailableDeviceFileAccess::ensureWritableDirectory(const FilePath &filePath) const
 {
-    Q_UNUSED(filePath);
+    Q_UNUSED(filePath)
     return ResultError(unavailableMessage());
 }
 
@@ -636,7 +636,7 @@ Result<FilePath> UnavailableDeviceFileAccess::createTempFile(const FilePath &fil
 Result<std::unique_ptr<FilePathWatcher>>
     UnavailableDeviceFileAccess::watch(const FilePath &path) const
 {
-    Q_UNUSED(path);
+    Q_UNUSED(path)
     return ResultError(unavailableMessage());
 }
 
@@ -1201,13 +1201,13 @@ Utils::Result<std::unique_ptr<FilePathWatcher>> DesktopDeviceFileAccess::watch(
 
 QTextCodec *DesktopDeviceFileAccess::processStdOutCodec(const FilePath &executable) const
 {
-    Q_UNUSED(executable);
+    Q_UNUSED(executable)
     return QTextCodec::codecForLocale();
 }
 
 QTextCodec *DesktopDeviceFileAccess::processStdErrCodec(const FilePath &executable) const
 {
-    Q_UNUSED(executable);
+    Q_UNUSED(executable)
     return QTextCodec::codecForLocale();
 }
 
diff --git a/src/libs/utils/filepath.cpp b/src/libs/utils/filepath.cpp
index c4920c89382..ce808546323 100644
--- a/src/libs/utils/filepath.cpp
+++ b/src/libs/utils/filepath.cpp
@@ -2537,7 +2537,7 @@ QTCREATOR_UTILS_EXPORT bool operator>=(const FilePath &first, const FilePath &se
 
 QTCREATOR_UTILS_EXPORT size_t qHash(const FilePath &filePath, uint seed)
 {
-    Q_UNUSED(seed);
+    Q_UNUSED(seed)
 
     if (filePath.m_hash == 0) {
         if (filePath.caseSensitivity() == Qt::CaseSensitive)
diff --git a/src/libs/utils/filesystemmodel.cpp b/src/libs/utils/filesystemmodel.cpp
index cf8f97c52c4..71f90b8d438 100644
--- a/src/libs/utils/filesystemmodel.cpp
+++ b/src/libs/utils/filesystemmodel.cpp
@@ -1747,8 +1747,8 @@ QMimeData *FileSystemModel::mimeData(const QModelIndexList &indexes) const
 bool FileSystemModel::dropMimeData(const QMimeData *data, Qt::DropAction action,
                              int row, int column, const QModelIndex &parent)
 {
-    Q_UNUSED(row);
-    Q_UNUSED(column);
+    Q_UNUSED(row)
+    Q_UNUSED(column)
     if (!parent.isValid() || isReadOnly())
         return false;
 
diff --git a/src/libs/utils/fileutils.cpp b/src/libs/utils/fileutils.cpp
index 54eccbfe0d2..06efc41e64f 100644
--- a/src/libs/utils/fileutils.cpp
+++ b/src/libs/utils/fileutils.cpp
@@ -193,7 +193,7 @@ static bool saveFileSupportedFileSystem(const FilePath &path)
         }
     }
 #else
-    Q_UNUSED(path);
+    Q_UNUSED(path)
 #endif
     return true;
 }
diff --git a/src/libs/utils/fsengine/fsenginehandler.cpp b/src/libs/utils/fsengine/fsenginehandler.cpp
index 4d69623d846..6821c23398d 100644
--- a/src/libs/utils/fsengine/fsenginehandler.cpp
+++ b/src/libs/utils/fsengine/fsenginehandler.cpp
@@ -296,7 +296,7 @@ QStringList FSEngineImpl::entryList(QDir::Filters filters, const QStringList &fi
 
 QAbstractFileEngine::FileFlags FSEngineImpl::fileFlags(FileFlags type) const
 {
-    Q_UNUSED(type);
+    Q_UNUSED(type)
     return {g_filePathInfoCache.cached(m_filePath, createCacheData).filePathInfo.fileFlags.toInt()};
 }
 
diff --git a/src/libs/utils/iconbutton.cpp b/src/libs/utils/iconbutton.cpp
index fec2edf83f2..17b0dcf0ae1 100644
--- a/src/libs/utils/iconbutton.cpp
+++ b/src/libs/utils/iconbutton.cpp
@@ -20,7 +20,7 @@ IconButton::IconButton(QWidget *parent)
 
 void IconButton::paintEvent(QPaintEvent *e)
 {
-    Q_UNUSED(e);
+    Q_UNUSED(e)
 
     QPainter p(this);
     QRect r(QPoint(), size());
diff --git a/src/libs/utils/icondisplay.cpp b/src/libs/utils/icondisplay.cpp
index 93999708905..3261786ce9e 100644
--- a/src/libs/utils/icondisplay.cpp
+++ b/src/libs/utils/icondisplay.cpp
@@ -29,7 +29,7 @@ IconDisplay::~IconDisplay() = default;
 
 void IconDisplay::paintEvent(QPaintEvent *event)
 {
-    Q_UNUSED(event);
+    Q_UNUSED(event)
 
     QPainter painter(this);
     painter.setRenderHint(QPainter::Antialiasing);
diff --git a/src/libs/utils/markdownbrowser.cpp b/src/libs/utils/markdownbrowser.cpp
index 459bf5e0e52..d5ec078d740 100644
--- a/src/libs/utils/markdownbrowser.cpp
+++ b/src/libs/utils/markdownbrowser.cpp
@@ -145,7 +145,7 @@ public:
 
     QSizeF intrinsicSize(QTextDocument *doc, int pos, const QTextFormat &format) override
     {
-        Q_UNUSED(pos);
+        Q_UNUSED(pos)
 
         if (!doc || !format.hasProperty(isCopiedPropertyId()))
             return QSizeF(0, 0);
@@ -163,7 +163,7 @@ public:
         int pos,
         const QTextFormat &format) override
     {
-        Q_UNUSED(pos);
+        Q_UNUSED(pos)
 
         if (!doc || !format.hasProperty(isCopiedPropertyId()))
             return;
@@ -300,8 +300,8 @@ public:
     virtual QSizeF intrinsicSize(
         QTextDocument *doc, int posInDocument, const QTextFormat &format) override
     {
-        Q_UNUSED(doc);
-        Q_UNUSED(posInDocument);
+        Q_UNUSED(doc)
+        Q_UNUSED(posInDocument)
         QSize result = Utils::Icons::UNKNOWN_FILE.icon().actualSize(QSize(16, 16));
         QString name = format.toImageFormat().name();
 
@@ -329,8 +329,8 @@ public:
         int posInDocument,
         const QTextFormat &format) override
     {
-        Q_UNUSED(document);
-        Q_UNUSED(posInDocument);
+        Q_UNUSED(document)
+        Q_UNUSED(posInDocument)
 
         const QString name = format.toImageFormat().name();
         Entry::Pointer *entryPtr = m_entries.object(name);
diff --git a/src/libs/utils/mimetypes2/mimeprovider.cpp b/src/libs/utils/mimetypes2/mimeprovider.cpp
index d94ba6755f8..b7b5eac1375 100644
--- a/src/libs/utils/mimetypes2/mimeprovider.cpp
+++ b/src/libs/utils/mimetypes2/mimeprovider.cpp
@@ -591,7 +591,7 @@ MimeBinaryProvider::loadMimeTypeExtra(const QString &mimeName)
     }
     return it;
 #else
-    Q_UNUSED(mimeName);
+    Q_UNUSED(mimeName)
     qWarning("Cannot load mime type since QXmlStreamReader is not available.");
     return m_mimetypeExtra.cend();
 #endif // feature xmlstreamreader
diff --git a/src/libs/utils/mimetypes2/mimetypeparser.cpp b/src/libs/utils/mimetypes2/mimetypeparser.cpp
index e05183d496b..512f0f5cab7 100644
--- a/src/libs/utils/mimetypes2/mimetypeparser.cpp
+++ b/src/libs/utils/mimetypes2/mimetypeparser.cpp
@@ -305,7 +305,7 @@ bool MimeTypeParserBase::parse(QIODevice *dev, const QString &fileName, QString
 
     return true;
 #else
-    Q_UNUSED(dev);
+    Q_UNUSED(dev)
     if (errorMessage)
         *errorMessage = QString::fromLatin1("QXmlStreamReader is not available, cannot parse '%1'.").arg(fileName);
     return false;
diff --git a/src/libs/utils/outputformatter.h b/src/libs/utils/outputformatter.h
index 4da46bf6f1b..0649956ddff 100644
--- a/src/libs/utils/outputformatter.h
+++ b/src/libs/utils/outputformatter.h
@@ -75,7 +75,7 @@ public:
     // The input is to be considered "complete" for parsing purposes.
     virtual Result handleLine(const QString &line, OutputFormat format) = 0;
 
-    virtual bool handleLink(const QString &href) { Q_UNUSED(href); return false; }
+    virtual bool handleLink(const QString &href) { Q_UNUSED(href) return false; }
     virtual bool hasFatalErrors() const { return false; }
     virtual void flush() {}
     virtual void runPostPrintActions(QPlainTextEdit *) {}
diff --git a/src/libs/utils/passworddialog.cpp b/src/libs/utils/passworddialog.cpp
index 6e20f78690a..61bb58cd304 100644
--- a/src/libs/utils/passworddialog.cpp
+++ b/src/libs/utils/passworddialog.cpp
@@ -27,7 +27,7 @@ ShowPasswordButton::ShowPasswordButton(QWidget *parent)
 
 void ShowPasswordButton::paintEvent(QPaintEvent *e)
 {
-    Q_UNUSED(e);
+    Q_UNUSED(e)
     QIcon icon = isChecked() ? Utils::Icons::EYE_OPEN_TOOLBAR.icon()
                              : Utils::Icons::EYE_CLOSED_TOOLBAR.icon();
     QPainter p(this);
diff --git a/src/libs/utils/plaintextedit/plaintextedit.cpp b/src/libs/utils/plaintextedit/plaintextedit.cpp
index 1a5922eb96c..a4e21243299 100644
--- a/src/libs/utils/plaintextedit/plaintextedit.cpp
+++ b/src/libs/utils/plaintextedit/plaintextedit.cpp
@@ -152,7 +152,7 @@ public:
 static inline bool shouldEnableInputMethod(PlainTextEdit *control)
 {
 #if defined(Q_OS_ANDROID)
-    Q_UNUSED(control);
+    Q_UNUSED(control)
     return !control->isReadOnly() || (control->textInteractionFlags() & Qt::TextSelectableByMouse);
 #else
     return !control->isReadOnly();
@@ -575,7 +575,7 @@ qreal PlainTextEditPrivate::verticalOffset(int topBlock, int topLine) const
         PlainTextDocumentLayout *documentLayout = qobject_cast<PlainTextDocumentLayout*>(doc->documentLayout());
         Q_ASSERT(documentLayout);
         QRectF r = documentLayout->blockBoundingRect(currentBlock);
-        Q_UNUSED(r);
+        Q_UNUSED(r)
         QTextLayout *layout = currentBlock.layout();
         if (layout && topLine <= layout->lineCount()) {
             QTextLine line = layout->lineAt(topLine - 1);
@@ -1894,8 +1894,8 @@ void PlainTextEdit::keyReleaseEvent(QKeyEvent *e)
 */
 QVariant PlainTextEdit::loadResource(int type, const QUrl &name)
 {
-    Q_UNUSED(type);
-    Q_UNUSED(name);
+    Q_UNUSED(type)
+    Q_UNUSED(name)
     return QVariant();
 }
 
diff --git a/src/libs/utils/plaintextedit/widgettextcontrol.cpp b/src/libs/utils/plaintextedit/widgettextcontrol.cpp
index 78050d57674..3ea0fceee9c 100644
--- a/src/libs/utils/plaintextedit/widgettextcontrol.cpp
+++ b/src/libs/utils/plaintextedit/widgettextcontrol.cpp
@@ -275,7 +275,7 @@ WidgetTextControlPrivate::WidgetTextControlPrivate(WidgetTextControl *q)
 bool WidgetTextControlPrivate::cursorMoveKeyEvent(QKeyEvent *e)
 {
 #ifdef QT_NO_SHORTCUT
-    Q_UNUSED(e);
+    Q_UNUSED(e)
 #endif
 
     if (cursor.isNull())
@@ -810,9 +810,9 @@ void WidgetTextControlPrivate::_q_contentsChanged(int from, int charsRemoved, in
         delete ev;
     }
 #else
-    Q_UNUSED(from);
-    Q_UNUSED(charsRemoved);
-    Q_UNUSED(charsAdded);
+    Q_UNUSED(from)
+    Q_UNUSED(charsRemoved)
+    Q_UNUSED(charsAdded)
 #endif
 }
 
@@ -1049,7 +1049,7 @@ void WidgetTextControl::setTextCursor(const QTextCursor &cursor, bool selectionC
     if (selectionClipboard)
         d->setClipboardSelection();
 #else
-    Q_UNUSED(selectionClipboard);
+    Q_UNUSED(selectionClipboard)
 #endif
 }
 
@@ -1503,8 +1503,8 @@ accept:
 
 QVariant WidgetTextControl::loadResource(int type, const QUrl &name)
 {
-    Q_UNUSED(type);
-    Q_UNUSED(name);
+    Q_UNUSED(type)
+    Q_UNUSED(name)
     return QVariant();
 }
 
@@ -2018,12 +2018,12 @@ bool WidgetTextControlPrivate::sendMouseEventToInputContext(
     QEvent *e, QEvent::Type eventType, Qt::MouseButton button, const QPointF &pos,
     Qt::KeyboardModifiers modifiers, Qt::MouseButtons buttons, const QPoint &globalPos)
 {
-    Q_UNUSED(eventType);
-    Q_UNUSED(button);
-    Q_UNUSED(pos);
-    Q_UNUSED(modifiers);
-    Q_UNUSED(buttons);
-    Q_UNUSED(globalPos);
+    Q_UNUSED(eventType)
+    Q_UNUSED(button)
+    Q_UNUSED(pos)
+    Q_UNUSED(modifiers)
+    Q_UNUSED(buttons)
+    Q_UNUSED(globalPos)
 #if !defined(QT_NO_IM)
 
     if (isPreediting()) {
@@ -2042,7 +2042,7 @@ bool WidgetTextControlPrivate::sendMouseEventToInputContext(
         }
     }
 #else
-    Q_UNUSED(e);
+    Q_UNUSED(e)
 #endif
     return false;
 }
@@ -2050,9 +2050,9 @@ bool WidgetTextControlPrivate::sendMouseEventToInputContext(
 void WidgetTextControlPrivate::contextMenuEvent(const QPoint &screenPos, const QPointF &docPos, QWidget *contextWidget)
 {
 #ifdef QT_NO_CONTEXTMENU
-    Q_UNUSED(screenPos);
-    Q_UNUSED(docPos);
-    Q_UNUSED(contextWidget);
+    Q_UNUSED(screenPos)
+    Q_UNUSED(docPos)
+    Q_UNUSED(contextWidget)
 #else
     QMenu *menu = q->createStandardContextMenu(docPos, contextWidget);
     if (!menu)
@@ -3322,7 +3322,7 @@ void WidgetTextControlPrivate::append(const QString &text, Qt::TextFormat format
         tmp.insertText(text);
     }
 #else
-    Q_UNUSED(format);
+    Q_UNUSED(format)
     tmp.insertText(text);
 #endif // QT_NO_TEXTHTMLPARSER
     if (!cursor.hasSelection())
diff --git a/src/libs/utils/terminalinterface.cpp b/src/libs/utils/terminalinterface.cpp
index a7cddd382f4..1a757089460 100644
--- a/src/libs/utils/terminalinterface.cpp
+++ b/src/libs/utils/terminalinterface.cpp
@@ -418,7 +418,7 @@ void TerminalInterface::start()
 
 qint64 TerminalInterface::write(const QByteArray &data)
 {
-    Q_UNUSED(data);
+    Q_UNUSED(data)
     QTC_CHECK(false);
     return -1;
 }
diff --git a/src/libs/utils/unarchiver.cpp b/src/libs/utils/unarchiver.cpp
index f44d317ccfe..5301ea9ebfb 100644
--- a/src/libs/utils/unarchiver.cpp
+++ b/src/libs/utils/unarchiver.cpp
@@ -66,7 +66,7 @@ static int _open(struct archive *a, void *client_data)
 
 static la_ssize_t _read(struct archive *a, void *client_data, const void **buff)
 {
-    Q_UNUSED(a);
+    Q_UNUSED(a)
     ReadData *data = static_cast<ReadData *>(client_data);
     *buff = data->data;
     return data->file.read(data->data, 10240);
@@ -74,7 +74,7 @@ static la_ssize_t _read(struct archive *a, void *client_data, const void **buff)
 
 int _close(struct archive *a, void *client_data)
 {
-    Q_UNUSED(a);
+    Q_UNUSED(a)
     ReadData *data = static_cast<ReadData *>(client_data);
     data->file.close();
     return ARCHIVE_OK;
diff --git a/src/plugins/android/javaparser.cpp b/src/plugins/android/javaparser.cpp
index a6b6146f1d2..9caad701a49 100644
--- a/src/plugins/android/javaparser.cpp
+++ b/src/plugins/android/javaparser.cpp
@@ -33,7 +33,7 @@ void JavaParser::setSourceDirectory(const FilePath &sourceDirectory)
 
 OutputLineParser::Result JavaParser::handleLine(const QString &line, OutputFormat type)
 {
-    Q_UNUSED(type);
+    Q_UNUSED(type)
     static const QRegularExpression javaRegExp("^(.*\\[javac\\]\\s)(.*\\.java):(\\d+):(.*)$");
 
     const QRegularExpressionMatch match = javaRegExp.match(line);
diff --git a/src/plugins/android/splashscreencontainerwidget.cpp b/src/plugins/android/splashscreencontainerwidget.cpp
index bf2f64095e6..be92477389f 100644
--- a/src/plugins/android/splashscreencontainerwidget.cpp
+++ b/src/plugins/android/splashscreencontainerwidget.cpp
@@ -84,7 +84,7 @@ class SplashScreenWidget : public QWidget
     private:
         void paintEvent(QPaintEvent *event) override
         {
-            Q_UNUSED(event);
+            Q_UNUSED(event)
             QPainter painter(this);
             painter.setPen(QPen(Qt::gray, 1));
             painter.setBrush(QBrush(m_parentWidget->m_backgroundColor));
diff --git a/src/plugins/appstatisticsmonitor/chart.cpp b/src/plugins/appstatisticsmonitor/chart.cpp
index 86e99283fa7..b47f92e8325 100644
--- a/src/plugins/appstatisticsmonitor/chart.cpp
+++ b/src/plugins/appstatisticsmonitor/chart.cpp
@@ -159,7 +159,7 @@ void Chart::clear()
 
 void Chart::paintEvent(QPaintEvent *event)
 {
-    Q_UNUSED(event);
+    Q_UNUSED(event)
     QPainter painter(this);
     // painter.fillRect(rect(), creatorColor(Theme::Token_Background_Default)); left for the future
     painter.fillRect(rect(), creatorColor(Theme::BackgroundColorNormal));
diff --git a/src/plugins/clangformat/llvmfilesystem.h b/src/plugins/clangformat/llvmfilesystem.h
index 0bfa5afe614..0fc5f30083b 100644
--- a/src/plugins/clangformat/llvmfilesystem.h
+++ b/src/plugins/clangformat/llvmfilesystem.h
@@ -20,7 +20,7 @@ class LlvmFileAdapter : public File
 public:
     LlvmFileAdapter(const Twine &Path)
     {
-        Q_UNUSED(Path);
+        Q_UNUSED(Path)
     }
     /// Destroy the file after closing it (if open).
     /// Sub-classes should generally call close() inside their destructors. We
@@ -47,8 +47,8 @@ public:
                                                      bool RequiresNullTerminator = true,
                                                      bool IsVolatile = false) override
     {
-        Q_UNUSED(RequiresNullTerminator);
-        Q_UNUSED(IsVolatile);
+        Q_UNUSED(RequiresNullTerminator)
+        Q_UNUSED(IsVolatile)
 
         const FilePath path = FilePath::fromUserInput(QString::fromStdString(Name.str()));
         const Result<QByteArray> contents = path.fileContents(FileSize, 0);
@@ -102,8 +102,8 @@ public:
     /// \note The 'end' iterator is directory_iterator().
     vfs::directory_iterator dir_begin(const Twine &Dir, std::error_code &EC) override
     {
-        Q_UNUSED(Dir);
-        Q_UNUSED(EC);
+        Q_UNUSED(Dir)
+        Q_UNUSED(EC)
         Q_UNIMPLEMENTED();
         return {};
     }
@@ -112,7 +112,7 @@ public:
     /// this file system and may propagate down for nested file systems.
     std::error_code setCurrentWorkingDirectory(const Twine &Path) override
     {
-        Q_UNUSED(Path);
+        Q_UNUSED(Path)
         Q_UNIMPLEMENTED();
         return std::make_error_code(std::errc::not_supported);
     }
@@ -133,8 +133,8 @@ public:
 #endif
         override
     {
-        Q_UNUSED(Path);
-        Q_UNUSED(Output);
+        Q_UNUSED(Path)
+        Q_UNUSED(Output)
 
         Q_UNIMPLEMENTED();
         return std::make_error_code(std::errc::not_supported);
diff --git a/src/plugins/cmakeprojectmanager/cmakebuildstep.cpp b/src/plugins/cmakeprojectmanager/cmakebuildstep.cpp
index 0b009422d17..81f65c3efc9 100644
--- a/src/plugins/cmakeprojectmanager/cmakebuildstep.cpp
+++ b/src/plugins/cmakeprojectmanager/cmakebuildstep.cpp
@@ -818,7 +818,7 @@ void CMakeBuildStep::updateDeploymentData()
 
     QString install = currentInstallPrefix();
     FilePath rootDir = cmakeExecutable().withNewPath(stagingDir().path());
-    Q_UNUSED(install);
+    Q_UNUSED(install)
 
     DeploymentData deploymentData;
     deploymentData.setLocalInstallRoot(rootDir);
diff --git a/src/plugins/coreplugin/basefilewizardfactory.cpp b/src/plugins/coreplugin/basefilewizardfactory.cpp
index 7935ce53b69..5d492126be7 100644
--- a/src/plugins/coreplugin/basefilewizardfactory.cpp
+++ b/src/plugins/coreplugin/basefilewizardfactory.cpp
@@ -50,7 +50,7 @@ Wizard *BaseFileWizardFactory::runWizardImpl(const FilePath &path, Id platform,
                                              const QVariantMap &extraValues,
                                              bool showWizard)
 {
-    Q_UNUSED(showWizard);
+    Q_UNUSED(showWizard)
     QTC_ASSERT(!path.isEmpty(), return nullptr);
 
     // Create dialog and run it. Ensure that the dialog is deleted when
diff --git a/src/plugins/coreplugin/dialogs/settingsdialog.cpp b/src/plugins/coreplugin/dialogs/settingsdialog.cpp
index 6ca8b7d8f06..3b2dfa99b21 100644
--- a/src/plugins/coreplugin/dialogs/settingsdialog.cpp
+++ b/src/plugins/coreplugin/dialogs/settingsdialog.cpp
@@ -261,7 +261,7 @@ static bool categoryVisible([[maybe_unused]] const Id &id)
     if (anyOf(list, [id](const QString &str) { return id.toString().contains(str); }))
         return false;
 #else
-    Q_UNUSED(id);
+    Q_UNUSED(id)
 #endif
     return true;
 }
diff --git a/src/plugins/ctfvisualizer/ctfstatisticsview.cpp b/src/plugins/ctfvisualizer/ctfstatisticsview.cpp
index a1bb52f7e7a..6934ce4f873 100644
--- a/src/plugins/ctfvisualizer/ctfstatisticsview.cpp
+++ b/src/plugins/ctfvisualizer/ctfstatisticsview.cpp
@@ -32,7 +32,7 @@ CtfStatisticsView::CtfStatisticsView(CtfStatisticsModel *model, QWidget *parent)
     connect(selectionModel(), &QItemSelectionModel::currentChanged, this,
             [this](const QModelIndex &current, const QModelIndex &previous)
     {
-        Q_UNUSED(previous);
+        Q_UNUSED(previous)
         QModelIndex index = this->model()->index(current.row(), CtfStatisticsModel::Title);
         QString title = this->model()->data(index).toString();
         emit this->eventTypeSelected(title);
diff --git a/src/plugins/ctfvisualizer/ctftimelinemodel.cpp b/src/plugins/ctfvisualizer/ctftimelinemodel.cpp
index 2a2a8860120..983b71f95f8 100644
--- a/src/plugins/ctfvisualizer/ctftimelinemodel.cpp
+++ b/src/plugins/ctfvisualizer/ctftimelinemodel.cpp
@@ -106,7 +106,7 @@ int CtfTimelineModel::expandedRow(int index) const
 
 int CtfTimelineModel::collapsedRow(int index) const
 {
-    Q_UNUSED(index);
+    Q_UNUSED(index)
     return 0;
 }
 
diff --git a/src/plugins/debugger/debuggertooltipmanager.cpp b/src/plugins/debugger/debuggertooltipmanager.cpp
index 50aaa9453c5..854877d08e0 100644
--- a/src/plugins/debugger/debuggertooltipmanager.cpp
+++ b/src/plugins/debugger/debuggertooltipmanager.cpp
@@ -90,7 +90,7 @@ public:
 
     void onModeChanged(Id mode)
     {
-        Q_UNUSED(mode);
+        Q_UNUSED(mode)
         // if (mode == Constants::MODE_DEBUG)
         updateVisibleToolTips();
     }
diff --git a/src/plugins/docker/dockerdevice.cpp b/src/plugins/docker/dockerdevice.cpp
index 9a9e8d8ea82..8c21e50d746 100644
--- a/src/plugins/docker/dockerdevice.cpp
+++ b/src/plugins/docker/dockerdevice.cpp
@@ -709,9 +709,8 @@ DockerDevice::DockerDevice()
 
     setFileAccessFactory([this] { return d->createFileAccess(); });
 
-    setOpenTerminal([this](const Environment &env,
-                           const FilePath &workingDir) -> Result<> {
-        Q_UNUSED(env); // TODO: That's the runnable's environment in general. Use it via -e below.
+    setOpenTerminal([this](const Environment &env, const FilePath &workingDir) -> Result<> {
+        Q_UNUSED(env) // TODO: That's the runnable's environment in general. Use it via -e below.
 
         Result<QString> result = d->updateContainerAccess();
 
diff --git a/src/plugins/extensionmanager/remotespec.cpp b/src/plugins/extensionmanager/remotespec.cpp
index fe7294f1928..dfc26ea7477 100644
--- a/src/plugins/extensionmanager/remotespec.cpp
+++ b/src/plugins/extensionmanager/remotespec.cpp
@@ -45,7 +45,7 @@ ExtensionSystem::IPlugin *RemoteSpec::plugin() const
 
 FilePath RemoteSpec::installLocation(bool inUserFolder) const
 {
-    Q_UNUSED(inUserFolder);
+    Q_UNUSED(inUserFolder)
     return {};
 };
 
diff --git a/src/plugins/help/macwebkithelpviewer.mm b/src/plugins/help/macwebkithelpviewer.mm
index c62ee3d7773..5a4f42b1df3 100644
--- a/src/plugins/help/macwebkithelpviewer.mm
+++ b/src/plugins/help/macwebkithelpviewer.mm
@@ -703,8 +703,8 @@ DOMRange *MacWebKitHelpViewer::findText(NSString *text, bool forward, bool caseS
 bool MacWebKitHelpViewer::findText(const QString &text, FindFlags flags, bool incremental,
                                    bool fromSearch, bool *wrapped)
 {
-    Q_UNUSED(incremental);
-    Q_UNUSED(fromSearch);
+    Q_UNUSED(incremental)
+    Q_UNUSED(fromSearch)
     @autoreleasepool {
         if (wrapped)
             *wrapped = false;
diff --git a/src/plugins/languageclient/client.cpp b/src/plugins/languageclient/client.cpp
index 7ec64e0b688..a07d964db7d 100644
--- a/src/plugins/languageclient/client.cpp
+++ b/src/plugins/languageclient/client.cpp
@@ -1544,7 +1544,7 @@ void Client::projectClosed(ProjectExplorer::Project *project)
 
 bool Client::canOpenProject(ProjectExplorer::Project *project)
 {
-    Q_UNUSED(project);
+    Q_UNUSED(project)
     return true;
 }
 
diff --git a/src/plugins/languageclient/languageclientformatter.cpp b/src/plugins/languageclient/languageclientformatter.cpp
index 4fc0a792d69..f7bc738778b 100644
--- a/src/plugins/languageclient/languageclientformatter.cpp
+++ b/src/plugins/languageclient/languageclientformatter.cpp
@@ -196,7 +196,7 @@ FullFormattingRequest::FullFormattingRequest(Client *client, TextEditor::TextDoc
 IFormattingRequest::RequestType FullFormattingRequest::prepareRequest(
     const QTextCursor &cursor, const TextEditor::TabSettings &settings, LanguageClientFormatter *formatter)
 {
-    Q_UNUSED(cursor);
+    Q_UNUSED(cursor)
     if (!canRequest<DocumentFormattingRequest>(m_client, m_document))
         return std::monostate();
     const FilePath &filePath = m_document->filePath();
diff --git a/src/plugins/mcusupport/test/unittest.cpp b/src/plugins/mcusupport/test/unittest.cpp
index f45fd668e6d..dea614bb39e 100644
--- a/src/plugins/mcusupport/test/unittest.cpp
+++ b/src/plugins/mcusupport/test/unittest.cpp
@@ -731,7 +731,7 @@ void McuSupportTest::test_legacy_createPackagesWithCorrespondingSettings()
     const McuTargetDescription description = parseDescriptionJson(json.toLocal8Bit());
     auto [targets, packages]{
         targetsFromDescriptions({description}, settingsMockPtr, sdkPackagePtr, runLegacy)};
-    Q_UNUSED(targets);
+    Q_UNUSED(targets)
 
     QSet<Key> settings = transform<QSet<Key>>(packages, [](const auto &package) {
         return package->settingsKey();
@@ -1008,7 +1008,7 @@ void McuSupportTest::test_legacy_createTargetWithToolchainPackages()
 
     const auto [targets, packages]{
         targetsFromDescriptions({description}, settingsMockPtr, sdkPackagePtr, runLegacy)};
-    Q_UNUSED(packages);
+    Q_UNUSED(packages)
 
     verifyTargetToolchains(targets,
                            toolchainFilePath,
@@ -1042,7 +1042,7 @@ void McuSupportTest::test_createTargetWithToolchainPackages()
     const McuTargetDescription description = parseDescriptionJson(json.toLocal8Bit());
     const auto [targets, packages]{
         targetsFromDescriptions({description}, settingsMockPtr, sdkPackagePtr, !runLegacy)};
-    Q_UNUSED(packages);
+    Q_UNUSED(packages)
 
     const auto qtForMCUsSDK = findOrDefault(packages, [](const McuPackagePtr &pkg) {
         return (pkg->cmakeVariableName() == QUL_CMAKE_VAR);
diff --git a/src/plugins/mesonprojectmanager/buildoptionsmodel.h b/src/plugins/mesonprojectmanager/buildoptionsmodel.h
index 223a9a4a623..b1dd02da2c6 100644
--- a/src/plugins/mesonprojectmanager/buildoptionsmodel.h
+++ b/src/plugins/mesonprojectmanager/buildoptionsmodel.h
@@ -132,7 +132,7 @@ public:
     };
     bool setData(int column, const QVariant &data, int role) final
     {
-        Q_UNUSED(role);
+        Q_UNUSED(role)
         QTC_ASSERT(column == 1, return false);
         m_option->setValue(data);
         return true;
diff --git a/src/plugins/mesonprojectmanager/mesonoutputparser.cpp b/src/plugins/mesonprojectmanager/mesonoutputparser.cpp
index a156c27d4e9..0b0b6cf5124 100644
--- a/src/plugins/mesonprojectmanager/mesonoutputparser.cpp
+++ b/src/plugins/mesonprojectmanager/mesonoutputparser.cpp
@@ -25,7 +25,7 @@ inline void MesonOutputParser::addTask(ProjectExplorer::Task task)
 #ifndef MESONPARSER_DISABLE_TASKS_FOR_TESTS // small hack to allow unit testing without the banana/monkey/jungle
     ProjectExplorer::TaskHub::addTask(task);
 #else
-    Q_UNUSED(task);
+    Q_UNUSED(task)
 #endif
 }
 
@@ -35,8 +35,8 @@ inline void MesonOutputParser::addTask(ProjectExplorer::Task::TaskType type, con
     auto task = ProjectExplorer::BuildSystemTask(type, QString("Meson build:%1").arg(line));
     addTask(task);
 #else
-    Q_UNUSED(type);
-    Q_UNUSED(line);
+    Q_UNUSED(type)
+    Q_UNUSED(line)
 #endif
 }
 
@@ -57,11 +57,11 @@ inline Utils::OutputLineParser::LinkSpecs MesonOutputParser::addTask(
     addTask(task);
     addLinkSpecForAbsoluteFilePath(linkSpecs, task.file, task.line, task.column, match, 1);
 #else
-    Q_UNUSED(type);
-    Q_UNUSED(line);
-    Q_UNUSED(match);
-    Q_UNUSED(fileCapIndex);
-    Q_UNUSED(lineNumberCapIndex);
+    Q_UNUSED(type)
+    Q_UNUSED(line)
+    Q_UNUSED(match)
+    Q_UNUSED(fileCapIndex)
+    Q_UNUSED(lineNumberCapIndex)
 #endif
     return linkSpecs;
 }
diff --git a/src/plugins/projectexplorer/devicesupport/idevice.cpp b/src/plugins/projectexplorer/devicesupport/idevice.cpp
index 5a520e9af20..3dc74366089 100644
--- a/src/plugins/projectexplorer/devicesupport/idevice.cpp
+++ b/src/plugins/projectexplorer/devicesupport/idevice.cpp
@@ -718,7 +718,7 @@ bool IDevice::ensureReachable(const FilePath &other) const
 
 Result<FilePath> IDevice::localSource(const Utils::FilePath &other) const
 {
-    Q_UNUSED(other);
+    Q_UNUSED(other)
     return make_unexpected(Tr::tr("localSource() not implemented for this device type."));
 }
 
diff --git a/src/plugins/projectexplorer/jsonwizard/jsonfieldpage.cpp b/src/plugins/projectexplorer/jsonwizard/jsonfieldpage.cpp
index 814a694b06e..e8f7f903aa7 100644
--- a/src/plugins/projectexplorer/jsonwizard/jsonfieldpage.cpp
+++ b/src/plugins/projectexplorer/jsonwizard/jsonfieldpage.cpp
@@ -156,7 +156,7 @@ void JsonFieldPage::Field::setHasUserChanges()
 
 void JsonFieldPage::Field::fromSettings(const QVariant &value)
 {
-    Q_UNUSED(value);
+    Q_UNUSED(value)
 }
 
 QVariant JsonFieldPage::Field::toSettings() const
diff --git a/src/plugins/projectexplorer/jsonwizard/jsonfieldpage.h b/src/plugins/projectexplorer/jsonwizard/jsonfieldpage.h
index 578d16c711e..6d14157aca0 100644
--- a/src/plugins/projectexplorer/jsonwizard/jsonfieldpage.h
+++ b/src/plugins/projectexplorer/jsonwizard/jsonfieldpage.h
@@ -72,7 +72,10 @@ public:
         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() const;
         void setHasUserChanges();
diff --git a/src/plugins/qbsprojectmanager/qbsrequest.cpp b/src/plugins/qbsprojectmanager/qbsrequest.cpp
index ac0fadd52f2..07d422ed66e 100644
--- a/src/plugins/qbsprojectmanager/qbsrequest.cpp
+++ b/src/plugins/qbsprojectmanager/qbsrequest.cpp
@@ -159,7 +159,7 @@ void QbsRequestObject::start()
                                                                 const QStringList &stdOut,
                                                                 const QStringList &stdErr,
                                                                 bool success) {
-        Q_UNUSED(workingDir);
+        Q_UNUSED(workingDir)
         const bool hasOutput = !stdOut.isEmpty() || !stdErr.isEmpty();
         if (success && !hasOutput)
             return;
diff --git a/src/plugins/qmldesigner/components/curveeditor/curveeditor.cpp b/src/plugins/qmldesigner/components/curveeditor/curveeditor.cpp
index 36ce3373e59..6415e7df1bb 100644
--- a/src/plugins/qmldesigner/components/curveeditor/curveeditor.cpp
+++ b/src/plugins/qmldesigner/components/curveeditor/curveeditor.cpp
@@ -100,7 +100,7 @@ CurveEditor::CurveEditor(CurveEditorModel *model, QWidget *parent)
         m_view, &GraphicsView::updateSelection);
 
     connect(m_view, &GraphicsView::zoomChanged, [this](double x, double y) {
-        Q_UNUSED(y);
+        Q_UNUSED(y)
         m_toolbar->setZoom(x);
     });
 
diff --git a/src/plugins/qmldesigner/components/scripteditor/propertytreemodel.cpp b/src/plugins/qmldesigner/components/scripteditor/propertytreemodel.cpp
index b1892c9b557..cb9ddfe9602 100644
--- a/src/plugins/qmldesigner/components/scripteditor/propertytreemodel.cpp
+++ b/src/plugins/qmldesigner/components/scripteditor/propertytreemodel.cpp
@@ -606,7 +606,7 @@ const std::vector<PropertyName> PropertyTreeModel::sortedAndFilteredPropertyName
 std::vector<PropertyName> PropertyTreeModel::sortedAndFilteredSignalNames(const NodeMetaInfo &metaInfo,
                                                                           bool recursive)
 {
-    Q_UNUSED(recursive);
+    Q_UNUSED(recursive)
 
     auto filtered = Utils::filtered(metaInfo.signalNames(), [](const PropertyName &name) {
         if (std::find(priorityListSignals.cbegin(), priorityListSignals.cend(), name)
@@ -647,7 +647,7 @@ std::vector<PropertyName> PropertyTreeModel::sortedAndFilteredSignalNames(const
 std::vector<PropertyName> PropertyTreeModel::sortedAndFilteredSlotNames(const NodeMetaInfo &metaInfo,
                                                                         bool recursive)
 {
-    Q_UNUSED(recursive);
+    Q_UNUSED(recursive)
 
     auto priorityList = priorityListSlots;
     auto filtered = Utils::filtered(metaInfo.slotNames(), [priorityList](const PropertyName &name) {
diff --git a/src/plugins/qmlprofiler/quick3dframemodel.cpp b/src/plugins/qmlprofiler/quick3dframemodel.cpp
index 3a8452c2c0f..5e0a7a75396 100644
--- a/src/plugins/qmlprofiler/quick3dframemodel.cpp
+++ b/src/plugins/qmlprofiler/quick3dframemodel.cpp
@@ -72,7 +72,7 @@ int Quick3DFrameModel::rowCount(const QModelIndex &parent) const
 
 int Quick3DFrameModel::columnCount(const QModelIndex &parent) const
 {
-    Q_UNUSED(parent);
+    Q_UNUSED(parent)
     return MaxColumnType;
 }
 
diff --git a/src/plugins/qmlprojectmanager/qmlprojectexporter/pythongenerator.cpp b/src/plugins/qmlprojectmanager/qmlprojectexporter/pythongenerator.cpp
index 05012aa60ef..145bce29a2f 100644
--- a/src/plugins/qmlprojectmanager/qmlprojectexporter/pythongenerator.cpp
+++ b/src/plugins/qmlprojectmanager/qmlprojectexporter/pythongenerator.cpp
@@ -87,8 +87,8 @@ void PythonGenerator::updateProject(QmlProject *project)
     Regenerates the .qrc resources file
 */
 void PythonGenerator::update(const QSet<QString> &added, const QSet<QString> &removed) {
-    Q_UNUSED(added);
-    Q_UNUSED(removed);
+    Q_UNUSED(added)
+    Q_UNUSED(removed)
     ResourceGenerator::createQrc(qmlProject());
     // Generated Python code does not need to be updated
 };
diff --git a/src/plugins/qtsupport/baseqtversion.cpp b/src/plugins/qtsupport/baseqtversion.cpp
index 4aa0500e915..832d303d305 100644
--- a/src/plugins/qtsupport/baseqtversion.cpp
+++ b/src/plugins/qtsupport/baseqtversion.cpp
@@ -1692,7 +1692,7 @@ Environment QtVersion::qmakeRunEnvironment() const
 
 void QtVersion::setupQmakeRunEnvironment(Environment &env) const
 {
-    Q_UNUSED(env);
+    Q_UNUSED(env)
 }
 
 bool QtVersion::hasQmlDumpWithRelocatableFlag() const
diff --git a/src/plugins/qtsupport/qtoutputformatter.cpp b/src/plugins/qtsupport/qtoutputformatter.cpp
index d5a8ce582a0..a87780be6d6 100644
--- a/src/plugins/qtsupport/qtoutputformatter.cpp
+++ b/src/plugins/qtsupport/qtoutputformatter.cpp
@@ -134,7 +134,7 @@ OutputLineParser::LinkSpec QtOutputLineParser::matchLine(const QString &line) co
 
 OutputLineParser::Result QtOutputLineParser::handleLine(const QString &txt, OutputFormat format)
 {
-    Q_UNUSED(format);
+    Q_UNUSED(format)
     const LinkSpec lr = matchLine(txt);
     if (!lr.target.isEmpty())
         return Result(Status::Done, {lr});
diff --git a/src/plugins/squish/objectsmapdocument.cpp b/src/plugins/squish/objectsmapdocument.cpp
index 3475e3ee6f2..53c5cba6e56 100644
--- a/src/plugins/squish/objectsmapdocument.cpp
+++ b/src/plugins/squish/objectsmapdocument.cpp
@@ -75,7 +75,7 @@ void ObjectsMapDocument::setModified(bool modified)
 Result<> ObjectsMapDocument::reload(Core::IDocument::ReloadFlag flag,
                                   Core::IDocument::ChangeType type)
 {
-    Q_UNUSED(type);
+    Q_UNUSED(type)
     if (flag == FlagIgnore)
         return ResultOk;
     emit aboutToReload();
diff --git a/src/plugins/squish/squishwizardpages.cpp b/src/plugins/squish/squishwizardpages.cpp
index ed977b31fd4..15c1b35ecfc 100644
--- a/src/plugins/squish/squishwizardpages.cpp
+++ b/src/plugins/squish/squishwizardpages.cpp
@@ -281,7 +281,7 @@ public:
     WizardPage *create(JsonWizard *wizard, Id typeId, const QVariant &data) final
     {
         Q_UNUSED(wizard)
-        Q_UNUSED(data);
+        Q_UNUSED(data)
         QTC_ASSERT(canCreate(typeId), return nullptr);
         return new SquishAUTPage;
     }
diff --git a/src/plugins/terminal/terminalwidget.cpp b/src/plugins/terminal/terminalwidget.cpp
index 28104a0d3b2..bc3ec8b44d1 100644
--- a/src/plugins/terminal/terminalwidget.cpp
+++ b/src/plugins/terminal/terminalwidget.cpp
@@ -584,7 +584,7 @@ void TerminalWidget::dropEvent(QDropEvent *event)
 
 void TerminalWidget::showEvent(QShowEvent *event)
 {
-    Q_UNUSED(event);
+    Q_UNUSED(event)
 
     if (!m_process)
         setupPty();
diff --git a/src/plugins/texteditor/bookmarkmanager.cpp b/src/plugins/texteditor/bookmarkmanager.cpp
index 0d3a9ba8eb0..1dabf80ccd0 100644
--- a/src/plugins/texteditor/bookmarkmanager.cpp
+++ b/src/plugins/texteditor/bookmarkmanager.cpp
@@ -550,9 +550,9 @@ bool BookmarkManager::canDropMimeData(const QMimeData *data, Qt::DropAction acti
                                       int row, int column,
                                       const QModelIndex &parent) const
 {
-    Q_UNUSED(row);
-    Q_UNUSED(column);
-    Q_UNUSED(parent);
+    Q_UNUSED(row)
+    Q_UNUSED(column)
+    Q_UNUSED(parent)
 
     if (!(action & supportedDropActions()))
         return false;
@@ -567,7 +567,7 @@ bool BookmarkManager::canDropMimeData(const QMimeData *data, Qt::DropAction acti
 bool BookmarkManager::dropMimeData(const QMimeData *data, Qt::DropAction action,
                                    int row, int column, const QModelIndex &parent)
 {
-    Q_UNUSED(column);
+    Q_UNUSED(column)
 
     if (!(action & supportedDropActions()))
         return false;
diff --git a/src/plugins/texteditor/codeassist/codeassist_test.cpp b/src/plugins/texteditor/codeassist/codeassist_test.cpp
index cd49d6579fc..988a0f3fdac 100644
--- a/src/plugins/texteditor/codeassist/codeassist_test.cpp
+++ b/src/plugins/texteditor/codeassist/codeassist_test.cpp
@@ -100,7 +100,7 @@ class TestProvider final : public CompletionAssistProvider
 public:
     IAssistProcessor *createProcessor(const AssistInterface *assistInterface) const final
     {
-        Q_UNUSED(assistInterface);
+        Q_UNUSED(assistInterface)
         return new TestProcessor(m_items);
     }
     QList<AssistProposalItemInterface *> m_items;
diff --git a/src/plugins/texteditor/textindenter.cpp b/src/plugins/texteditor/textindenter.cpp
index c2bbce0cfe9..05ae64086f7 100644
--- a/src/plugins/texteditor/textindenter.cpp
+++ b/src/plugins/texteditor/textindenter.cpp
@@ -131,9 +131,9 @@ void PlainTextIndenter::autoIndent(const QTextCursor &cursor,
                               const TabSettings &tabSettings,
                               int cursorPositionInEditor)
 {
-    Q_UNUSED(cursor);
-    Q_UNUSED(tabSettings);
-    Q_UNUSED(cursorPositionInEditor);
+    Q_UNUSED(cursor)
+    Q_UNUSED(tabSettings)
+    Q_UNUSED(cursorPositionInEditor)
 }
 
 } // namespace TextEditor
diff --git a/src/plugins/texteditor/textsuggestion.cpp b/src/plugins/texteditor/textsuggestion.cpp
index 50eb64044a6..b41d3b6c7fd 100644
--- a/src/plugins/texteditor/textsuggestion.cpp
+++ b/src/plugins/texteditor/textsuggestion.cpp
@@ -49,7 +49,7 @@ bool TextSuggestion::applyLine(TextEditorWidget *widget)
 
 bool TextSuggestion::filterSuggestions(TextEditorWidget *widget)
 {
-    Q_UNUSED(widget);
+    Q_UNUSED(widget)
 
     QTextCursor c = m_suggestion.range.begin.toTextCursor(sourceDocument());
     c.setPosition(currentPosition(), QTextCursor::KeepAnchor);
diff --git a/src/plugins/vcsbase/vcsoutputformatter.cpp b/src/plugins/vcsbase/vcsoutputformatter.cpp
index 3563e419c2c..1e90c2f0b27 100644
--- a/src/plugins/vcsbase/vcsoutputformatter.cpp
+++ b/src/plugins/vcsbase/vcsoutputformatter.cpp
@@ -34,7 +34,7 @@ VcsOutputLineParser::VcsOutputLineParser() :
 
 OutputLineParser::Result VcsOutputLineParser::handleLine(const QString &text, OutputFormat format)
 {
-    Q_UNUSED(format);
+    Q_UNUSED(format)
     QRegularExpressionMatchIterator it = m_regexp.globalMatch(text);
     if (!it.hasNext())
         return Status::NotHandled;
diff --git a/src/tools/qmlpuppet/qmlprivategate/qmlprivategate.cpp b/src/tools/qmlpuppet/qmlprivategate/qmlprivategate.cpp
index b4cdba9f769..6d614bf9c76 100644
--- a/src/tools/qmlpuppet/qmlprivategate/qmlprivategate.cpp
+++ b/src/tools/qmlpuppet/qmlprivategate/qmlprivategate.cpp
@@ -474,8 +474,8 @@ void DesignerCustomObjectDataFork::keepBindingFromGettingDeleted(QQmlContext *co
                                                              const QQuickDesignerSupport::PropertyName &propertyName)
 {
     //Refcounting is taking care
-    Q_UNUSED(context);
-    Q_UNUSED(propertyName);
+    Q_UNUSED(context)
+    Q_UNUSED(propertyName)
 }
 
 void DesignerCustomObjectDataFork::handleDestroyed()
@@ -906,7 +906,7 @@ bool isSubclassOf(QObject *object, const QByteArray &superTypeName)
 
 void getPropertyCache(QObject *object, QQmlEngine *engine)
 {
-    Q_UNUSED(engine);
+    Q_UNUSED(engine)
     QQuickDesignerSupportProperties::getPropertyCache(object);
 }
 
diff --git a/src/tools/qmlpuppet/qmlpuppet/runner/loadwatcher.h b/src/tools/qmlpuppet/qmlpuppet/runner/loadwatcher.h
index ece18d9d766..5fcba199d25 100644
--- a/src/tools/qmlpuppet/qmlpuppet/runner/loadwatcher.h
+++ b/src/tools/qmlpuppet/qmlpuppet/runner/loadwatcher.h
@@ -34,7 +34,7 @@ public:
 public Q_SLOTS:
     void checkFinished(QObject *o, const QUrl &url)
     {
-        Q_UNUSED(url);
+        Q_UNUSED(url)
         if (o) {
             checkForWindow(o);
             if (conf && qae) {