diff options
| author | Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@qt.io> | 2020-07-08 14:28:54 +0200 |
|---|---|---|
| committer | Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@qt.io> | 2020-08-20 09:57:06 +0200 |
| commit | f3d40b02558f5eca54ddb33b132d350b958cac1e (patch) | |
| tree | ca6fdbdd8525b75810feaccf62aa0d1c1de05002 /src/imports/compositor-extensions | |
| parent | eca2eb2c19fdbb4ed5003d636d935fbf83968d70 (diff) | |
| download | qtwayland-f3d40b02558f5eca54ddb33b132d350b958cac1e.tar.gz | |
Port QtWayland.Compositor to new QML extension API
In order to add new properties and types in Qt 6, we
need to port everything over to the new extension API
in QML. This is generally more type safe and needs
less manual maintenance, but there is some work involved
in porting.
The previous version exposed some types from
the QtWaylandCompositor C++ library, extended a few
of them with Qt Quick-specific subclass, added
one additional C++-implemented type (QWaylandMouseTracker)
and two additional QML-implemented types.
We need all types to be defined in the same place for
the automatic generation of plugins.qmltypes to work.
Therefore all the additional types are moved from the
plugin into the library, but still not exposed through
public API.
The plugin still exposes the types, so for the user this
change will be transparent.
Fixes: QTBUG-85512
Change-Id: I46e9e80424c9299c3eaee92773d233b1ec29cf2c
Reviewed-by: Paul Olav Tvete <paul.tvete@qt.io>
Diffstat (limited to 'src/imports/compositor-extensions')
| -rw-r--r-- | src/imports/compositor-extensions/iviapplication/qmldir | 2 | ||||
| -rw-r--r-- | src/imports/compositor-extensions/wlshell/qmldir | 2 | ||||
| -rw-r--r-- | src/imports/compositor-extensions/xdgshell/qmldir | 2 |
3 files changed, 6 insertions, 0 deletions
diff --git a/src/imports/compositor-extensions/iviapplication/qmldir b/src/imports/compositor-extensions/iviapplication/qmldir index 75f6403e..a4d10b31 100644 --- a/src/imports/compositor-extensions/iviapplication/qmldir +++ b/src/imports/compositor-extensions/iviapplication/qmldir @@ -1,3 +1,5 @@ module QtWayland.Compositor.IviApplication plugin qwaylandcompositoriviapplicationplugin classname QWaylandCompositorIviApplicationPlugin +typeinfo plugins.qmltypes +typeinfo plugins.qmltypes diff --git a/src/imports/compositor-extensions/wlshell/qmldir b/src/imports/compositor-extensions/wlshell/qmldir index 75e1f2b3..51019c35 100644 --- a/src/imports/compositor-extensions/wlshell/qmldir +++ b/src/imports/compositor-extensions/wlshell/qmldir @@ -1,3 +1,5 @@ module QtWayland.Compositor.WlShell plugin qwaylandcompositorwlshellplugin classname QWaylandCompositorWlShellPlugin +typeinfo plugins.qmltypes +typeinfo plugins.qmltypes diff --git a/src/imports/compositor-extensions/xdgshell/qmldir b/src/imports/compositor-extensions/xdgshell/qmldir index 9880a20a..d011ddc1 100644 --- a/src/imports/compositor-extensions/xdgshell/qmldir +++ b/src/imports/compositor-extensions/xdgshell/qmldir @@ -1,3 +1,5 @@ module QtWayland.Compositor.XdgShell plugin qwaylandcompositorxdgshellplugin classname QWaylandCompositorXdgShellPlugin +typeinfo plugins.qmltypes +typeinfo plugins.qmltypes |