From 6ce2f3f26bf08b4c6952f492a3731eb4fe5a42bc Mon Sep 17 00:00:00 2001 From: Lars Schmertmann Date: Sat, 27 Jun 2020 14:18:09 +0200 Subject: Add ; to Q_UNUSED This is required to remove the ; from the macro with Qt 6. Task-number: QTBUG-82978 Change-Id: I3f0b6717956ca8fa486bed9817b89dfa19f5e0e1 Reviewed-by: Friedemann Kleint --- src/gui/util/qastchandler.cpp | 2 +- src/gui/util/qktxhandler.cpp | 2 +- src/gui/util/qpkmhandler.cpp | 2 +- src/gui/util/qundostack.cpp | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) (limited to 'src/gui/util') diff --git a/src/gui/util/qastchandler.cpp b/src/gui/util/qastchandler.cpp index 6d163c6701..e91ae3e0f5 100644 --- a/src/gui/util/qastchandler.cpp +++ b/src/gui/util/qastchandler.cpp @@ -61,7 +61,7 @@ struct AstcHeader bool QAstcHandler::canRead(const QByteArray &suffix, const QByteArray &block) { - Q_UNUSED(suffix) + Q_UNUSED(suffix); return block.startsWith("\x13\xAB\xA1\x5C"); } diff --git a/src/gui/util/qktxhandler.cpp b/src/gui/util/qktxhandler.cpp index 7eda4c46fb..f6aa46718d 100644 --- a/src/gui/util/qktxhandler.cpp +++ b/src/gui/util/qktxhandler.cpp @@ -105,7 +105,7 @@ struct KTXMipmapLevel { bool QKtxHandler::canRead(const QByteArray &suffix, const QByteArray &block) { - Q_UNUSED(suffix) + Q_UNUSED(suffix); return (qstrncmp(block.constData(), ktxIdentifier, KTX_IDENTIFIER_LENGTH) == 0); } diff --git a/src/gui/util/qpkmhandler.cpp b/src/gui/util/qpkmhandler.cpp index e0c3b75efe..1c073cf94e 100644 --- a/src/gui/util/qpkmhandler.cpp +++ b/src/gui/util/qpkmhandler.cpp @@ -67,7 +67,7 @@ static PkmType typeMap[5] = { bool QPkmHandler::canRead(const QByteArray &suffix, const QByteArray &block) { - Q_UNUSED(suffix) + Q_UNUSED(suffix); return block.startsWith("PKM "); } diff --git a/src/gui/util/qundostack.cpp b/src/gui/util/qundostack.cpp index f7b5024389..84ef2787e1 100644 --- a/src/gui/util/qundostack.cpp +++ b/src/gui/util/qundostack.cpp @@ -215,7 +215,7 @@ int QUndoCommand::id() const bool QUndoCommand::mergeWith(const QUndoCommand *command) { - Q_UNUSED(command) + Q_UNUSED(command); return false; } -- cgit v1.2.3