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/compositor/compositor_api/qwaylandquicksurface.h | |
| 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/compositor/compositor_api/qwaylandquicksurface.h')
| -rw-r--r-- | src/compositor/compositor_api/qwaylandquicksurface.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/compositor/compositor_api/qwaylandquicksurface.h b/src/compositor/compositor_api/qwaylandquicksurface.h index b0f3f012..e3381525 100644 --- a/src/compositor/compositor_api/qwaylandquicksurface.h +++ b/src/compositor/compositor_api/qwaylandquicksurface.h @@ -46,6 +46,8 @@ class Q_WAYLAND_COMPOSITOR_EXPORT QWaylandQuickSurface : public QWaylandSurface Q_DECLARE_PRIVATE(QWaylandQuickSurface) Q_WAYLAND_COMPOSITOR_DECLARE_QUICK_CHILDREN(QWaylandQuickSurface) Q_PROPERTY(bool useTextureAlpha READ useTextureAlpha WRITE setUseTextureAlpha NOTIFY useTextureAlphaChanged) + QML_NAMED_ELEMENT(WaylandSurface) + QML_ADDED_IN_VERSION(1, 0) public: QWaylandQuickSurface(); QWaylandQuickSurface(QWaylandCompositor *compositor, QWaylandClient *client, quint32 id, int version); |