From 687609f2f3a98ade4b8e074615c3d1db1228fce0 Mon Sep 17 00:00:00 2001 From: Maximilian Goldstein Date: Tue, 14 Dec 2021 13:23:32 +0100 Subject: Move QObject and QQmlComponent into builtins Previously we had two versions of QObject and QQmlComponent: a hand-written version in bultins and one that is generated from QtQml. We now move the QtQml version into builtins in order to allow for representing the JavaScript extensions that are present in these types. We also add some logic so that unused types will still react properly despite the fact that those components are no longer in QtQml. This is done by introducing the concept of static modules. These are modules that have side effects beyond simply provinding components. This applies both to when some components are in builtins instead of QtQml or when the global object is modified in some way (i.e. by adding an image provider). This is a tooling-only concept and does not affect how these modules are handled at runtime. Fixes: QTBUG-99025 Change-Id: Ifacaa836e4d2eef0521494f5a41363e053c90007 Reviewed-by: Ulf Hermann --- src/qml/Qt6QmlBuildInternals.cmake | 2 ++ 1 file changed, 2 insertions(+) (limited to 'src/qml/Qt6QmlBuildInternals.cmake') diff --git a/src/qml/Qt6QmlBuildInternals.cmake b/src/qml/Qt6QmlBuildInternals.cmake index 4b6a144b0e..13cc64cad7 100644 --- a/src/qml/Qt6QmlBuildInternals.cmake +++ b/src/qml/Qt6QmlBuildInternals.cmake @@ -18,6 +18,8 @@ macro(qt_internal_get_internal_add_qml_module_keywords NO_GENERATE_QMLDIR NO_LINT NO_CACHEGEN + __QT_INTERNAL_STATIC_MODULE + __QT_INTERNAL_SYSTEM_MODULE ) set(${single_args} URI -- cgit v1.2.3