diff options
| author | Maximilian Goldstein <max.goldstein@qt.io> | 2021-12-14 13:23:32 +0100 |
|---|---|---|
| committer | Maximilian Goldstein <max.goldstein@qt.io> | 2021-12-17 12:43:14 +0100 |
| commit | 687609f2f3a98ade4b8e074615c3d1db1228fce0 (patch) | |
| tree | 4d5ed39c9ea5087cb4868315e826ea9869c32dee /src/qml/Qt6QmlBuildInternals.cmake | |
| parent | b9dba49d57338df0335912f9c6db627404af149d (diff) | |
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 <ulf.hermann@qt.io>
Diffstat (limited to 'src/qml/Qt6QmlBuildInternals.cmake')
| -rw-r--r-- | src/qml/Qt6QmlBuildInternals.cmake | 2 |
1 files changed, 2 insertions, 0 deletions
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 |