From f3d40b02558f5eca54ddb33b132d350b958cac1e Mon Sep 17 00:00:00 2001 From: Eskil Abrahamsen Blomfeldt Date: Wed, 8 Jul 2020 14:28:54 +0200 Subject: 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 --- src/imports/compositor-extensions/xdgshell/qmldir | 2 ++ 1 file changed, 2 insertions(+) (limited to 'src/imports/compositor-extensions/xdgshell/qmldir') 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 -- cgit v1.2.1