diff options
author | Tim Blechmann <tim@klingt.org> | 2022-10-05 19:37:07 +0800 |
---|---|---|
committer | Tim Blechmann <tim@klingt.org> | 2022-11-16 08:39:53 +0000 |
commit | 88d173336e422b7241508c085f2c236e70955da7 (patch) | |
tree | 28fe8a02505f1b6d90d194d28fe5883468497d24 | |
parent | 0b1464f6d0c86c13019db3e97f1e4d118e54c782 (diff) |
tooling: silence -Wextra-semi-stmt
silence clang's -Wextra-semi-stmt
Change-Id: I5dee9ec46b44076f0fc0590399131b1b267e1ad2
Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
(cherry picked from commit aadf0243c693d6bfd9009278b883e1d5b1015097)
-rw-r--r-- | src/qml/Qt6QmlMacros.cmake | 2 | ||||
-rw-r--r-- | src/qmlcompiler/qqmljscompiler.cpp | 6 | ||||
-rw-r--r-- | tools/qmltc/qmltccompiler.cpp | 2 | ||||
-rw-r--r-- | tools/qmltc/qmltccompilerpieces.h | 18 |
4 files changed, 14 insertions, 14 deletions
diff --git a/src/qml/Qt6QmlMacros.cmake b/src/qml/Qt6QmlMacros.cmake index b1420b0360..2205d178cd 100644 --- a/src/qml/Qt6QmlMacros.cmake +++ b/src/qml/Qt6QmlMacros.cmake @@ -1704,7 +1704,7 @@ function(qt6_add_qml_plugin target) # file have sensible indenting set(qt_qml_plugin_constructor_content "volatile auto registration = &${register_types_function_name}; - Q_UNUSED(registration);" + Q_UNUSED(registration)" ) set(generated_cpp_file diff --git a/src/qmlcompiler/qqmljscompiler.cpp b/src/qmlcompiler/qqmljscompiler.cpp index 9e4c3a1cbb..c69b272d35 100644 --- a/src/qmlcompiler/qqmljscompiler.cpp +++ b/src/qmlcompiler/qqmljscompiler.cpp @@ -438,7 +438,7 @@ void wrapCall(const QQmlPrivate::AOTCompiledContext *aotContext, void *dataPtr, { using return_type = std::invoke_result_t<Binding, const QQmlPrivate::AOTCompiledContext *, void **>; if constexpr (std::is_same_v<return_type, void>) { - Q_UNUSED(dataPtr); + Q_UNUSED(dataPtr) binding(aotContext, argumentsPtr); } else { if (dataPtr) { @@ -453,8 +453,8 @@ void wrapCall(const QQmlPrivate::AOTCompiledContext *aotContext, void *dataPtr, static const char *funcHeaderCode = R"( [](const QQmlPrivate::AOTCompiledContext *aotContext, void *dataPtr, void **argumentsPtr) { wrapCall(aotContext, dataPtr, argumentsPtr, [](const QQmlPrivate::AOTCompiledContext *aotContext, void **argumentsPtr) { -Q_UNUSED(aotContext); -Q_UNUSED(argumentsPtr); +Q_UNUSED(aotContext) +Q_UNUSED(argumentsPtr) )"; bool qSaveQmlJSUnitAsCpp(const QString &inputFileName, const QString &outputFileName, const QV4::CompiledData::SaveableUnitPointer &unit, const QQmlJSAotFunctionMap &aotFunctions, QString *errorString) diff --git a/tools/qmltc/qmltccompiler.cpp b/tools/qmltc/qmltccompiler.cpp index 66d10eaa83..ba2a0fd5fb 100644 --- a/tools/qmltc/qmltccompiler.cpp +++ b/tools/qmltc/qmltccompiler.cpp @@ -245,7 +245,7 @@ void QmltcCompiler::compileType( } // compilation stub: - current.externalCtor.body << u"Q_UNUSED(engine);"_s; + current.externalCtor.body << u"Q_UNUSED(engine)"_s; if (documentRoot) { current.externalCtor.body << u"// document root:"_s; // if it's document root, we want to create our QQmltcObjectCreationBase diff --git a/tools/qmltc/qmltccompilerpieces.h b/tools/qmltc/qmltccompilerpieces.h index fc27ab76cc..e316321a20 100644 --- a/tools/qmltc/qmltccompilerpieces.h +++ b/tools/qmltc/qmltccompilerpieces.h @@ -136,7 +136,7 @@ inline decltype(auto) QmltcCodeGenerator::generate_initCode(QmltcType ¤t, // * bool canFinalize [optional, when document root] const bool isDocumentRoot = type == visitor->result(); - current.init.body << u"Q_UNUSED(creator);"_s; // can happen sometimes + current.init.body << u"Q_UNUSED(creator)"_s; // can happen sometimes current.init.body << u"auto context = parentContext;"_s; @@ -182,7 +182,7 @@ inline decltype(auto) QmltcCodeGenerator::generate_initCode(QmltcType ¤t, current.init.body << QStringLiteral("auto %1 = QQmlEnginePrivate::get(engine);").arg(privateEngineName); - current.init.body << QStringLiteral("Q_UNUSED(%1);").arg(privateEngineName); // precaution + current.init.body << QStringLiteral("Q_UNUSED(%1)").arg(privateEngineName); // precaution // when generating root, we need to create a new (document-level) context. // otherwise, just use existing context as is @@ -379,8 +379,8 @@ inline void QmltcCodeGenerator::generate_endInitCode(QmltcType ¤t, // QML_endInit()'s parameters: // * QQmltcObjectCreationHelper* creator // * QQmlEngine* engine - current.endInit.body << u"Q_UNUSED(creator);"_s; - current.endInit.body << u"Q_UNUSED(engine);"_s; + current.endInit.body << u"Q_UNUSED(creator)"_s; + current.endInit.body << u"Q_UNUSED(engine)"_s; generate_qmltcInstructionCallCode(¤t.endInit, type, u"engine"_s, u"creator, engine"_s); @@ -415,8 +415,8 @@ QmltcCodeGenerator::generate_setComplexBindingsCode(QmltcType ¤t, // QML_setComplexBindings()'s parameters: // * QQmltcObjectCreationHelper* creator // * QQmlEngine* engine - current.setComplexBindings.body << u"Q_UNUSED(creator);"_s; - current.setComplexBindings.body << u"Q_UNUSED(engine);"_s; + current.setComplexBindings.body << u"Q_UNUSED(creator)"_s; + current.setComplexBindings.body << u"Q_UNUSED(engine)"_s; generate_qmltcInstructionCallCode(¤t.setComplexBindings, type, u"engine"_s, u"creator, engine"_s); @@ -440,9 +440,9 @@ inline void QmltcCodeGenerator::generate_interfaceCallCode(QmltcMethod *function // * QQmltcObjectCreationHelper* creator // * bool canFinalize [optional, when document root] const bool isDocumentRoot = type == visitor->result(); - function->body << u"Q_UNUSED(creator);"_s; + function->body << u"Q_UNUSED(creator)"_s; if (isDocumentRoot) - function->body << u"Q_UNUSED(canFinalize);"_s; + function->body << u"Q_UNUSED(canFinalize)"_s; if (auto base = type->baseType(); base->isComposite()) { function->body << u"// call base's method"_s; @@ -550,7 +550,7 @@ QmltcCodeGenerator::generate_handleOnCompletedCode(QmltcType ¤t, // QML_handleOnCompleted()'s parameters: // * QQmltcObjectCreationHelper* creator - current.handleOnCompleted.body << u"Q_UNUSED(creator);"_s; + current.handleOnCompleted.body << u"Q_UNUSED(creator)"_s; generate_qmltcInstructionCallCode(¤t.handleOnCompleted, type, QString(), u"creator"_s); } |