diff options
| author | Ulf Hermann <ulf.hermann@qt.io> | 2024-01-09 16:58:28 +0100 |
|---|---|---|
| committer | Ulf Hermann <ulf.hermann@qt.io> | 2024-01-11 00:42:17 +0100 |
| commit | 5eba4080511a006d10fc86d141d3f0f5abf0b8f8 (patch) | |
| tree | 897d558eeb20b6527fdabef97d38a934c59ce054 /tests/auto/qml/qqmllanguage/data | |
| parent | 26effad71e174d2b6df297ef3e43b3dcf2e021c9 (diff) | |
QtQml: Do detour through the CU for building property caches
This partially reverts commit bf2258e6f44f1279eee5e9c2dd595c5dd2020784.
When building property caches we have to take the possibility into
account that the QQmlType we have at hand is from a different QML
engine. We therefore have to double check with our own QML engine.
Pick-to: 6.7
Fixes: QTBUG-120189
Change-Id: If3b53a14b767f464318a61ed15d62077efd6bf61
Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Diffstat (limited to 'tests/auto/qml/qqmllanguage/data')
4 files changed, 24 insertions, 0 deletions
diff --git a/tests/auto/qml/qqmllanguage/data/Comps/IconPropertiesGroup.qml b/tests/auto/qml/qqmllanguage/data/Comps/IconPropertiesGroup.qml new file mode 100644 index 0000000000..232c755bfb --- /dev/null +++ b/tests/auto/qml/qqmllanguage/data/Comps/IconPropertiesGroup.qml @@ -0,0 +1,5 @@ +import QtQuick + +QtObject { + function dothing() { console.log("do") } +} diff --git a/tests/auto/qml/qqmllanguage/data/Comps/OverlayDrawer.qml b/tests/auto/qml/qqmllanguage/data/Comps/OverlayDrawer.qml new file mode 100644 index 0000000000..713c760a04 --- /dev/null +++ b/tests/auto/qml/qqmllanguage/data/Comps/OverlayDrawer.qml @@ -0,0 +1,5 @@ +import QtQuick + +Item { + property IconPropertiesGroup handleOpenIcon: IconPropertiesGroup {} +} diff --git a/tests/auto/qml/qqmllanguage/data/Comps/qmldir b/tests/auto/qml/qqmllanguage/data/Comps/qmldir new file mode 100644 index 0000000000..0a68a376f6 --- /dev/null +++ b/tests/auto/qml/qqmllanguage/data/Comps/qmldir @@ -0,0 +1,4 @@ +module Comps +OverlayDrawer 254.0 OverlayDrawer.qml +IconPropertiesGroup 254.0 IconPropertiesGroup.qml + diff --git a/tests/auto/qml/qqmllanguage/data/ambiguousComponents.qml b/tests/auto/qml/qqmllanguage/data/ambiguousComponents.qml new file mode 100644 index 0000000000..e2a4588e23 --- /dev/null +++ b/tests/auto/qml/qqmllanguage/data/ambiguousComponents.qml @@ -0,0 +1,10 @@ +import QtQuick +import Comps as Comps + +Comps.OverlayDrawer { + property var dothing + + Component.onCompleted: dothing = handleOpenIcon.dothing + + function dodo() { dothing() } +} |