qiurui
/
qtdeclarative
mirror of https://github.com/qt/qtdeclarative.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

QmlCompiler: Do not generate code that shadows arguments 

Fixes: QTBUG-114897
Change-Id: I23bc913a86ee90764735c1661cd5036f7d177a22
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>
(cherry picked from commit b7b63ba92c)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
This commit is contained in:
Ulf Hermann 2023-07-05 13:37:23 +02:00 committed by Qt Cherry-pick Bot
parent b140dec114
commit bca9e06ac3
2 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/qmlcompiler/qqmljscompiler.cpp
View File

@ -477,8 +477,8 @@ void wrapCall(const QQmlPrivate::AOTCompiledContext *aotContext, void *dataPtr,
)"; )";
static const char *funcHeaderCode = R"( static const char *funcHeaderCode = R"(
[](const QQmlPrivate::AOTCompiledContext *aotContext, void *dataPtr, void **argumentsPtr) { [](const QQmlPrivate::AOTCompiledContext *context, void *data, void **argv) {
wrapCall(aotContext, dataPtr, argumentsPtr, [](const QQmlPrivate::AOTCompiledContext *aotContext, void **argumentsPtr) { wrapCall(context, data, argv, [](const QQmlPrivate::AOTCompiledContext *aotContext, void **argumentsPtr) {
Q_UNUSED(aotContext) Q_UNUSED(aotContext)
Q_UNUSED(argumentsPtr) Q_UNUSED(argumentsPtr)
)"; )";

5
tests/auto/cmake/test_common_import_path/CMakeLists.txt
View File

@ -13,6 +13,11 @@ set(CMAKE_AUTOMOC ON)
# Simplify finding the backing targets' DLLs on Windows # Simplify finding the backing targets' DLLs on Windows
if(WIN32) if(WIN32)
set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}) set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR})
else()
add_compile_options (
-Werror # Treat all warnings as errors
-Wshadow # Warn on shadowing
)
endif() endif()
add_subdirectory(duck/tick) add_subdirectory(duck/tick)