diff options
| author | Ulf Hermann <ulf.hermann@qt.io> | 2025-10-10 10:47:46 +0200 |
|---|---|---|
| committer | Ulf Hermann <ulf.hermann@qt.io> | 2025-10-13 10:57:38 +0200 |
| commit | 75dcbb156b2b1dfe0bb43e3119735f26f848e0f6 (patch) | |
| tree | a3a55c0b62d83fc130a70b00f45d657c4e227271 /tests/auto/qml/qmlcppcodegen/data | |
| parent | 2512ffea91bbaec41d55eea2813a365edc3160a5 (diff) | |
QtQml: Fix resolution of aliases to local aliases
When we find an alias to a local alias, we need to first check if the
target alias is already resolved. Otherwise we can't insert the source
alias, yet.
Amends commit 9e1378260a3f3a6eb4cad8d6ae47bc218e6a2b5f.
Pick-to: 6.10
Fixes: QTBUG-141059
Change-Id: If272a746595b39cb2dbc2b8cc0c2f688277cfe59
Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>
Diffstat (limited to 'tests/auto/qml/qmlcppcodegen/data')
| -rw-r--r-- | tests/auto/qml/qmlcppcodegen/data/CMakeLists.txt | 1 | ||||
| -rw-r--r-- | tests/auto/qml/qmlcppcodegen/data/aliasToLocalAlias.qml | 11 |
2 files changed, 12 insertions, 0 deletions
diff --git a/tests/auto/qml/qmlcppcodegen/data/CMakeLists.txt b/tests/auto/qml/qmlcppcodegen/data/CMakeLists.txt index c30e70cc22..b59472c9c5 100644 --- a/tests/auto/qml/qmlcppcodegen/data/CMakeLists.txt +++ b/tests/auto/qml/qmlcppcodegen/data/CMakeLists.txt @@ -98,6 +98,7 @@ set(qml_files WindowDerived.qml aliasLookup.qml aliasToAliasResolutionSkipCorruption.qml + aliasToLocalAlias.qml ambiguous1/Ambiguous.qml ambiguous2/Ambiguous.qml ambiguousAs.qml diff --git a/tests/auto/qml/qmlcppcodegen/data/aliasToLocalAlias.qml b/tests/auto/qml/qmlcppcodegen/data/aliasToLocalAlias.qml new file mode 100644 index 0000000000..6bd4b20679 --- /dev/null +++ b/tests/auto/qml/qmlcppcodegen/data/aliasToLocalAlias.qml @@ -0,0 +1,11 @@ +// Copyright (C) 2025 The Qt Company Ltd. +// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only +pragma Strict +import QtQml + +QtObject { + id: option + + property alias label: option.description + property alias description: option.objectName +} |