diff options
Diffstat (limited to 'src/imports/compositor')
-rw-r--r-- | src/imports/compositor/WaylandCursorItem.qml | 25 | ||||
-rw-r--r-- | src/imports/compositor/plugins.qmltypes | 183 | ||||
-rw-r--r-- | src/imports/compositor/qwaylandmousetracker.cpp | 16 | ||||
-rw-r--r-- | src/imports/compositor/qwaylandmousetracker_p.h | 8 | ||||
-rw-r--r-- | src/imports/compositor/qwaylandquickcompositorplugin.cpp | 18 |
5 files changed, 148 insertions, 102 deletions
diff --git a/src/imports/compositor/WaylandCursorItem.qml b/src/imports/compositor/WaylandCursorItem.qml index 9eacff9be..931acbb08 100644 --- a/src/imports/compositor/WaylandCursorItem.qml +++ b/src/imports/compositor/WaylandCursorItem.qml @@ -39,17 +39,19 @@ import QtWayland.Compositor 1.0 WaylandQuickItem { id: cursorItem - property QtObject inputDevice + property QtObject seat property int hotspotX: 0 property int hotspotY: 0 visible: cursorItem.surface != null inputEventsEnabled: false + enabled: false + transform: Translate { x: -hotspotX; y: -hotspotY } - onInputDeviceChanged: { - if (!inputDevice) + onSeatChanged: { + if (!seat) return; - inputDevice.cursorSurfaceRequest.connect(setCursorSurface); + seat.cursorSurfaceRequest.connect(setCursorSurface); } function setCursorSurface(surface, hotspotX, hotspotY) { @@ -57,4 +59,19 @@ WaylandQuickItem { cursorItem.hotspotX = hotspotX; cursorItem.hotspotY = hotspotY; } + + WaylandQuickItem { + id: dragIcon + property point offset + + x: cursorItem.hotspotX + offset.x + y: cursorItem.hotspotY + offset.y + z: -1 + surface: cursorItem.seat.drag.icon + + Connections { + target: dragIcon.surface + onOffsetForNextFrame: dragIcon.offset = offset; + } + } } diff --git a/src/imports/compositor/plugins.qmltypes b/src/imports/compositor/plugins.qmltypes index 8d07403c0..4c7cd7aa5 100644 --- a/src/imports/compositor/plugins.qmltypes +++ b/src/imports/compositor/plugins.qmltypes @@ -14,6 +14,7 @@ Module { exports: ["QtWayland.Compositor/WaylandClient 1.0"] isCreatable: false exportMetaObjectRevisions: [0] + Property { name: "compositor"; type: "QWaylandCompositor"; isReadonly: true; isPointer: true } Property { name: "userId"; type: "qlonglong"; isReadonly: true } Property { name: "groupId"; type: "qlonglong"; isReadonly: true } Property { name: "processId"; type: "qlonglong"; isReadonly: true } @@ -26,7 +27,7 @@ Module { } Component { name: "QWaylandCompositor" - prototype: "QObject" + prototype: "QWaylandObject" exports: ["QtWayland.Compositor/WaylandCompositorBase 1.0"] isCreatable: false exportMetaObjectRevisions: [0] @@ -35,13 +36,13 @@ Module { Property { name: "defaultOutput"; type: "QWaylandOutput"; isPointer: true } Property { name: "useHardwareIntegrationExtension"; type: "bool" } Property { - name: "defaultInputDevice" - type: "QWaylandInputDevice" + name: "defaultSeat" + type: "QWaylandSeat" isReadonly: true isPointer: true } Signal { - name: "createSurface" + name: "surfaceRequested" Parameter { name: "client"; type: "QWaylandClient"; isPointer: true } Parameter { name: "id"; type: "uint" } Parameter { name: "version"; type: "int" } @@ -60,9 +61,17 @@ Module { Parameter { name: "parent"; type: "QWaylandSurface"; isPointer: true } } Signal { - name: "defaultInputDeviceChanged" - Parameter { name: "newDevice"; type: "QWaylandInputDevice"; isPointer: true } - Parameter { name: "oldDevice"; type: "QWaylandInputDevice"; isPointer: true } + name: "defaultSeatChanged" + Parameter { name: "newDevice"; type: "QWaylandSeat"; isPointer: true } + Parameter { name: "oldDevice"; type: "QWaylandSeat"; isPointer: true } + } + Signal { + name: "outputAdded" + Parameter { name: "output"; type: "QWaylandOutput"; isPointer: true } + } + Signal { + name: "outputRemoved" + Parameter { name: "output"; type: "QWaylandOutput"; isPointer: true } } Method { name: "processWaylandEvents" } Method { @@ -81,15 +90,32 @@ Module { } Component { name: "QWaylandCompositorExtension" - prototype: "QObject" + prototype: "QWaylandObject" exports: ["QtWayland.Compositor/WaylandExtension 1.0"] isCreatable: false exportMetaObjectRevisions: [0] } Component { - name: "QWaylandInputDevice" + name: "QWaylandDrag" prototype: "QObject" - exports: ["QtWayland.Compositor/WaylandInputDevice 1.0"] + exports: ["QtWayland.Compositor/WaylandDrag 1.0"] + isCreatable: false + exportMetaObjectRevisions: [0] + Property { name: "icon"; type: "QWaylandSurface"; isReadonly: true; isPointer: true } + Property { name: "visible"; type: "bool"; isReadonly: true } + Signal { name: "dragStarted" } + Method { + name: "dragMove" + Parameter { name: "target"; type: "QWaylandSurface"; isPointer: true } + Parameter { name: "pos"; type: "QPointF" } + } + Method { name: "drop" } + Method { name: "cancelDrag" } + } + Component { + name: "QWaylandSeat" + prototype: "QWaylandObject" + exports: ["QtWayland.Compositor/WaylandSeat 1.0"] isCreatable: false exportMetaObjectRevisions: [0] Enum { @@ -101,6 +127,7 @@ Module { "DefaultCapabilities": 7 } } + Property { name: "drag"; type: "QWaylandDrag"; isReadonly: true; isPointer: true } Signal { name: "mouseFocusChanged" Parameter { name: "newFocus"; type: "QWaylandView"; isPointer: true } @@ -127,12 +154,16 @@ Module { Property { name: "mouseX"; type: "double"; isReadonly: true } Property { name: "mouseY"; type: "double"; isReadonly: true } Property { name: "containsMouse"; type: "bool"; isReadonly: true } - Property { name: "enableWSCursor"; type: "bool" } + Property { name: "windowSystemCursorEnabled"; type: "bool" } Signal { name: "hoveredChanged" } } + Component { name: "QWaylandObject"; prototype: "QObject" } Component { name: "QWaylandOutput" - prototype: "QObject" + prototype: "QWaylandObject" + exports: ["QtWayland.Compositor/WaylandOutputBase 1.0"] + isCreatable: false + exportMetaObjectRevisions: [0] Enum { name: "Subpixel" values: { @@ -173,6 +204,24 @@ Module { Signal { name: "physicalSizeFollowsSizeChanged" } Signal { name: "windowDestroyed" } } + Component { + name: "QWaylandQtWindowManager" + prototype: "QWaylandCompositorExtension" + Property { name: "showIsFullScreen"; type: "bool" } + Signal { + name: "openUrl" + Parameter { name: "client"; type: "QWaylandClient"; isPointer: true } + Parameter { name: "url"; type: "QUrl" } + } + } + Component { + name: "QWaylandQtWindowManagerQuickExtension" + defaultProperty: "data" + prototype: "QWaylandQtWindowManager" + exports: ["QtWayland.Compositor/QtWindowManager 1.0"] + exportMetaObjectRevisions: [0] + Property { name: "data"; type: "QObject"; isList: true; isReadonly: true } + } Component { name: "QWaylandQuickCompositor"; prototype: "QWaylandCompositor" } Component { name: "QWaylandQuickCompositorQuickExtensionContainer" @@ -194,7 +243,6 @@ Module { prototype: "QQuickItem" exports: ["QtWayland.Compositor/WaylandQuickItem 1.0"] exportMetaObjectRevisions: [0] - Property { name: "view"; type: "QWaylandView"; isReadonly: true; isPointer: true } Property { name: "compositor"; type: "QWaylandCompositor"; isReadonly: true; isPointer: true } Property { name: "surface"; type: "QWaylandSurface"; isPointer: true } Property { name: "paintEnabled"; type: "bool" } @@ -204,6 +252,8 @@ Module { Property { name: "focusOnClick"; type: "bool" } Property { name: "sizeFollowsSurface"; type: "bool" } Property { name: "subsurfaceHandler"; type: "QObject"; isPointer: true } + Property { name: "bufferLocked"; type: "bool" } + Property { name: "allowDiscardFrontBuffer"; type: "bool" } Signal { name: "surfaceDestroyed" } Signal { name: "mouseMove" @@ -212,7 +262,7 @@ Module { Signal { name: "mouseRelease" } Method { name: "takeFocus" - Parameter { name: "device"; type: "QWaylandInputDevice"; isPointer: true } + Parameter { name: "device"; type: "QWaylandSeat"; isPointer: true } } Method { name: "takeFocus" } Method { @@ -222,6 +272,11 @@ Module { Method { name: "raise" } Method { name: "lower" } Method { + name: "mapToSurface" + type: "QPointF" + Parameter { name: "point"; type: "QPointF" } + } + Method { name: "inputMethodQuery" type: "QVariant" Parameter { name: "query"; type: "Qt::InputMethodQuery" } @@ -268,7 +323,7 @@ Module { } Component { name: "QWaylandSurface" - prototype: "QObject" + prototype: "QWaylandObject" exports: ["QtWayland.Compositor/WaylandSurfaceBase 1.0"] isCreatable: false exportMetaObjectRevisions: [0] @@ -318,6 +373,10 @@ Module { Parameter { name: "sibling"; type: "QWaylandSurface"; isPointer: true } } Signal { + name: "dragStarted" + Parameter { name: "drag"; type: "QWaylandDrag"; isPointer: true } + } + Signal { name: "configure" Parameter { name: "hasBuffer"; type: "bool" } } @@ -345,46 +404,15 @@ Module { Property { name: "data"; type: "QObject"; isList: true; isReadonly: true } } Component { - name: "QWaylandView" - prototype: "QObject" - exports: ["QtWayland.Compositor/WaylandView 1.0"] - isCreatable: false - exportMetaObjectRevisions: [0] - Property { name: "renderObject"; type: "QObject"; isReadonly: true; isPointer: true } - Property { name: "surface"; type: "QWaylandSurface"; isPointer: true } - Property { name: "output"; type: "QWaylandOutput"; isPointer: true } - Property { name: "bufferLock"; type: "bool" } - Property { name: "discardFrontBuffers"; type: "bool" } - Signal { name: "surfaceDestroyed" } - } - Component { - name: "QWaylandWindowManagerExtension" - prototype: "QWaylandCompositorExtension" - Property { name: "showIsFullScreen"; type: "bool" } - Signal { - name: "openUrl" - Parameter { name: "client"; type: "QWaylandClient"; isPointer: true } - Parameter { name: "url"; type: "QUrl" } - } - } - Component { - name: "QWaylandWindowManagerExtensionQuickExtension" - defaultProperty: "data" - prototype: "QWaylandWindowManagerExtension" - exports: ["QtWayland.Compositor/WindowManager 1.0"] - exportMetaObjectRevisions: [0] - Property { name: "data"; type: "QObject"; isList: true; isReadonly: true } - } - Component { name: "QWaylandWlShell" prototype: "QWaylandCompositorExtension" Signal { - name: "createShellSurface" + name: "wlShellSurfaceRequested" Parameter { name: "surface"; type: "QWaylandSurface"; isPointer: true } Parameter { name: "resource"; type: "QWaylandResource" } } Signal { - name: "shellSurfaceCreated" + name: "wlShellSurfaceCreated" Parameter { name: "shellSurface"; type: "QWaylandWlShellSurface"; isPointer: true } } } @@ -399,12 +427,8 @@ Module { Component { name: "QWaylandWlShellSurface" prototype: "QWaylandShellSurface" - exports: [ - "QtWayland.Compositor/WlShellSurface 1.0", - "QtWayland.Compositor/WlShellSurfaceBase 1.0" - ] - isCreatable: false - exportMetaObjectRevisions: [0, 0] + exports: ["QtWayland.Compositor/WlShellSurface 1.0"] + exportMetaObjectRevisions: [0] Enum { name: "FullScreenMethod" values: { @@ -436,17 +460,18 @@ Module { } } Property { name: "surface"; type: "QWaylandSurface"; isReadonly: true; isPointer: true } + Property { name: "shell"; type: "QWaylandWlShell"; isReadonly: true; isPointer: true } Property { name: "title"; type: "string"; isReadonly: true } Property { name: "className"; type: "string"; isReadonly: true } Property { name: "focusPolicy"; type: "FocusPolicy"; isReadonly: true } Signal { name: "pong" } Signal { name: "startMove" - Parameter { name: "inputDevice"; type: "QWaylandInputDevice"; isPointer: true } + Parameter { name: "seat"; type: "QWaylandSeat"; isPointer: true } } Signal { name: "startResize" - Parameter { name: "inputDevice"; type: "QWaylandInputDevice"; isPointer: true } + Parameter { name: "seat"; type: "QWaylandSeat"; isPointer: true } Parameter { name: "edges"; type: "ResizeEdge" } } Signal { name: "setDefaultToplevel" } @@ -464,7 +489,7 @@ Module { } Signal { name: "setPopup" - Parameter { name: "inputDevice"; type: "QWaylandInputDevice"; isPointer: true } + Parameter { name: "seat"; type: "QWaylandSeat"; isPointer: true } Parameter { name: "parentSurface"; type: "QWaylandSurface"; isPointer: true } Parameter { name: "relativeToParent"; type: "QPoint" } } @@ -497,7 +522,7 @@ Module { name: "QWaylandXdgShell" prototype: "QWaylandCompositorExtension" Signal { - name: "createXdgSurface" + name: "xdgSurfaceRequested" Parameter { name: "surface"; type: "QWaylandSurface"; isPointer: true } Parameter { name: "resource"; type: "QWaylandResource" } } @@ -510,10 +535,10 @@ Module { Parameter { name: "xdgPopup"; type: "QWaylandXdgPopup"; isPointer: true } } Signal { - name: "createXdgPopup" + name: "xdgPopupRequested" Parameter { name: "surface"; type: "QWaylandSurface"; isPointer: true } Parameter { name: "parent"; type: "QWaylandSurface"; isPointer: true } - Parameter { name: "seat"; type: "QWaylandInputDevice"; isPointer: true } + Parameter { name: "seat"; type: "QWaylandSeat"; isPointer: true } Parameter { name: "position"; type: "QPoint" } Parameter { name: "resource"; type: "QWaylandResource" } } @@ -539,12 +564,8 @@ Module { Component { name: "QWaylandXdgSurface" prototype: "QWaylandShellSurface" - exports: [ - "QtWayland.Compositor/XdgSurface 1.0", - "QtWayland.Compositor/XdgSurfaceBase 1.0" - ] - isCreatable: false - exportMetaObjectRevisions: [0, 0] + exports: ["QtWayland.Compositor/XdgSurface 1.0"] + exportMetaObjectRevisions: [0] Enum { name: "State" values: { @@ -580,18 +601,20 @@ Module { Property { name: "activated"; type: "bool"; isReadonly: true } Signal { name: "showWindowMenu" - Parameter { name: "inputDevice"; type: "QWaylandInputDevice"; isPointer: true } + Parameter { name: "seat"; type: "QWaylandSeat"; isPointer: true } Parameter { name: "localSurfacePosition"; type: "QPoint" } } Signal { name: "startMove" - Parameter { name: "inputDevice"; type: "QWaylandInputDevice"; isPointer: true } + Parameter { name: "seat"; type: "QWaylandSeat"; isPointer: true } } Signal { name: "startResize" - Parameter { name: "inputDevice"; type: "QWaylandInputDevice"; isPointer: true } + Parameter { name: "seat"; type: "QWaylandSeat"; isPointer: true } Parameter { name: "edges"; type: "ResizeEdge" } } + Signal { name: "setTopLevel" } + Signal { name: "setTransient" } Signal { name: "setMaximized" } Signal { name: "unsetMaximized" } Signal { @@ -631,23 +654,23 @@ Module { } Method { name: "sendClose" } Method { - name: "requestMaximized" + name: "sendMaximized" type: "uint" Parameter { name: "size"; type: "QSize" } } Method { - name: "requestUnMaximized" + name: "sendUnmaximized" type: "uint" Parameter { name: "size"; type: "QSize" } } - Method { name: "requestUnMaximized"; type: "uint" } + Method { name: "sendUnmaximized"; type: "uint" } Method { - name: "requestFullscreen" + name: "sendFullscreen" type: "uint" Parameter { name: "size"; type: "QSize" } } Method { - name: "requestResizing" + name: "sendResizing" type: "uint" Parameter { name: "maxSize"; type: "QSize" } } @@ -659,7 +682,7 @@ Module { exportMetaObjectRevisions: [0] isComposite: true defaultProperty: "data" - Property { name: "inputDevice"; type: "QObject"; isPointer: true } + Property { name: "seat"; type: "QObject"; isPointer: true } Property { name: "hotspotX"; type: "int" } Property { name: "hotspotY"; type: "int" } Method { @@ -669,7 +692,6 @@ Module { Parameter { name: "hotspotX"; type: "QVariant" } Parameter { name: "hotspotY"; type: "QVariant" } } - Property { name: "view"; type: "QWaylandView"; isReadonly: true; isPointer: true } Property { name: "compositor"; type: "QWaylandCompositor"; isReadonly: true; isPointer: true } Property { name: "surface"; type: "QWaylandSurface"; isPointer: true } Property { name: "paintEnabled"; type: "bool" } @@ -679,6 +701,8 @@ Module { Property { name: "focusOnClick"; type: "bool" } Property { name: "sizeFollowsSurface"; type: "bool" } Property { name: "subsurfaceHandler"; type: "QObject"; isPointer: true } + Property { name: "bufferLocked"; type: "bool" } + Property { name: "allowDiscardFrontBuffer"; type: "bool" } Signal { name: "surfaceDestroyed" } Signal { name: "mouseMove" @@ -687,7 +711,7 @@ Module { Signal { name: "mouseRelease" } Method { name: "takeFocus" - Parameter { name: "device"; type: "QWaylandInputDevice"; isPointer: true } + Parameter { name: "device"; type: "QWaylandSeat"; isPointer: true } } Method { name: "takeFocus" } Method { @@ -697,6 +721,11 @@ Module { Method { name: "raise" } Method { name: "lower" } Method { + name: "mapToSurface" + type: "QPointF" + Parameter { name: "point"; type: "QPointF" } + } + Method { name: "inputMethodQuery" type: "QVariant" Parameter { name: "query"; type: "Qt::InputMethodQuery" } diff --git a/src/imports/compositor/qwaylandmousetracker.cpp b/src/imports/compositor/qwaylandmousetracker.cpp index a77d6b1a0..489dc7b55 100644 --- a/src/imports/compositor/qwaylandmousetracker.cpp +++ b/src/imports/compositor/qwaylandmousetracker.cpp @@ -45,7 +45,7 @@ class QWaylandMouseTrackerPrivate : public QQuickItemPrivate Q_DECLARE_PUBLIC(QWaylandMouseTracker) public: QWaylandMouseTrackerPrivate() - : enableWSCursor(false) + : windowSystemCursorEnabled(false) , hovered(false) { QImage cursorImage(64,64,QImage::Format_ARGB32); @@ -76,7 +76,7 @@ public: } QPointF mousePos; - bool enableWSCursor; + bool windowSystemCursorEnabled; QPixmap cursorPixmap; bool hovered; }; @@ -102,24 +102,24 @@ qreal QWaylandMouseTracker::mouseY() const return d->mousePos.y(); } -void QWaylandMouseTracker::setEnableWSCursor(bool enable) +void QWaylandMouseTracker::setWindowSystemCursorEnabled(bool enable) { Q_D(QWaylandMouseTracker); - if (d->enableWSCursor != enable) { - d->enableWSCursor = enable; + if (d->windowSystemCursorEnabled != enable) { + d->windowSystemCursorEnabled = enable; if (enable) { unsetCursor(); } else { setCursor(QCursor(d->cursorPixmap)); } - emit enableWSCursorChanged(); + emit windowSystemCursorEnabledChanged(); } } -bool QWaylandMouseTracker::enableWSCursor() const +bool QWaylandMouseTracker::windowSystemCursorEnabled() const { Q_D(const QWaylandMouseTracker); - return d->enableWSCursor; + return d->windowSystemCursorEnabled; } bool QWaylandMouseTracker::hovered() const diff --git a/src/imports/compositor/qwaylandmousetracker_p.h b/src/imports/compositor/qwaylandmousetracker_p.h index 1bc37a5e2..d90b037ff 100644 --- a/src/imports/compositor/qwaylandmousetracker_p.h +++ b/src/imports/compositor/qwaylandmousetracker_p.h @@ -53,21 +53,21 @@ class Q_WAYLAND_COMPOSITOR_EXPORT QWaylandMouseTracker : public QQuickItem Q_PROPERTY(qreal mouseY READ mouseY NOTIFY mouseYChanged) Q_PROPERTY(bool containsMouse READ hovered NOTIFY hoveredChanged) - Q_PROPERTY(bool enableWSCursor READ enableWSCursor WRITE setEnableWSCursor NOTIFY enableWSCursorChanged) + Q_PROPERTY(bool windowSystemCursorEnabled READ windowSystemCursorEnabled WRITE setWindowSystemCursorEnabled NOTIFY windowSystemCursorEnabledChanged) public: QWaylandMouseTracker(QQuickItem *parent = 0); qreal mouseX() const; qreal mouseY() const; - void setEnableWSCursor(bool enable); - bool enableWSCursor() const; + void setWindowSystemCursorEnabled(bool enable); + bool windowSystemCursorEnabled() const; bool hovered() const; signals: void mouseXChanged(); void mouseYChanged(); - void enableWSCursorChanged(); + void windowSystemCursorEnabledChanged(); void hoveredChanged(); protected: diff --git a/src/imports/compositor/qwaylandquickcompositorplugin.cpp b/src/imports/compositor/qwaylandquickcompositorplugin.cpp index c992d3fcb..894a3e28f 100644 --- a/src/imports/compositor/qwaylandquickcompositorplugin.cpp +++ b/src/imports/compositor/qwaylandquickcompositorplugin.cpp @@ -46,11 +46,12 @@ #include <QtWaylandCompositor/QWaylandQuickOutput> #include <QtWaylandCompositor/QWaylandCompositorExtension> #include <QtWaylandCompositor/QWaylandQuickExtension> -#include <QtWaylandCompositor/QWaylandInputDevice> +#include <QtWaylandCompositor/QWaylandSeat> +#include <QtWaylandCompositor/QWaylandDrag> #include <QtWaylandCompositor/QWaylandQuickShellSurfaceItem> #include <QtWaylandCompositor/QWaylandResource> -#include <QtWaylandCompositor/QWaylandWindowManagerExtension> +#include <QtWaylandCompositor/QWaylandQtWindowManager> #include <QtWaylandCompositor/QWaylandWlShell> #include <QtWaylandCompositor/QWaylandTextInputManager> #include <QtWaylandCompositor/QWaylandXdgShell> @@ -61,7 +62,7 @@ QT_BEGIN_NAMESPACE Q_COMPOSITOR_DECLARE_QUICK_EXTENSION_CONTAINER_CLASS(QWaylandQuickCompositor) -Q_COMPOSITOR_DECLARE_QUICK_EXTENSION_CLASS(QWaylandWindowManagerExtension) +Q_COMPOSITOR_DECLARE_QUICK_EXTENSION_CLASS(QWaylandQtWindowManager) Q_COMPOSITOR_DECLARE_QUICK_EXTENSION_CLASS(QWaylandWlShell) Q_COMPOSITOR_DECLARE_QUICK_EXTENSION_CLASS(QWaylandXdgShell) Q_COMPOSITOR_DECLARE_QUICK_EXTENSION_CLASS(QWaylandTextInputManager) @@ -91,7 +92,7 @@ private: class QWaylandCompositorPlugin : public QQmlExtensionPlugin { Q_OBJECT - Q_PLUGIN_METADATA(IID "org.qt-project.Qt.QQmlExtensionInterface/1.0") + Q_PLUGIN_METADATA(IID QQmlExtensionInterface_iid) public: virtual void registerTypes(const char *uri) { @@ -119,17 +120,16 @@ public: qmlRegisterUncreatableType<QWaylandCompositorExtension>(uri, 1, 0, "WaylandExtension", QObject::tr("Cannot create instance of WaylandExtension")); qmlRegisterUncreatableType<QWaylandClient>(uri, 1, 0, "WaylandClient", QObject::tr("Cannot create instance of WaylandClient")); - qmlRegisterUncreatableType<QWaylandView>(uri, 1, 0, "WaylandView", QObject::tr("Cannot create instance of WaylandView, it can be retrieved by accessor on WaylandQuickItem")); - qmlRegisterUncreatableType<QWaylandInputDevice>(uri, 1, 0, "WaylandInputDevice", QObject::tr("Cannot create instance of WaylandInputDevice")); + qmlRegisterUncreatableType<QWaylandOutput>(uri, 1, 0, "WaylandOutputBase", QObject::tr("Cannot create instance of WaylandOutputBase, use WaylandOutput instead")); + qmlRegisterUncreatableType<QWaylandSeat>(uri, 1, 0, "WaylandSeat", QObject::tr("Cannot create instance of WaylandSeat")); + qmlRegisterUncreatableType<QWaylandDrag>(uri, 1, 0, "WaylandDrag", QObject::tr("Cannot create instance of WaylandDrag")); qmlRegisterUncreatableType<QWaylandCompositor>(uri, 1, 0, "WaylandCompositorBase", QObject::tr("Cannot create instance of WaylandCompositorBase, use WaylandCompositor instead")); qmlRegisterUncreatableType<QWaylandSurface>(uri, 1, 0, "WaylandSurfaceBase", QObject::tr("Cannot create instance of WaylandSurfaceBase, use WaylandSurface instead")); qmlRegisterUncreatableType<QWaylandShellSurface>(uri, 1, 0, "ShellSurface", QObject::tr("Cannot create instance of ShellSurface")); - qmlRegisterUncreatableType<QWaylandWlShellSurface>(uri, 1, 0, "WlShellSurfaceBase", QObject::tr("Cannot create instance of WlShellSurfaceBase, use WlShellSurface instead")); - qmlRegisterUncreatableType<QWaylandXdgSurface>(uri, 1, 0, "XdgSurfaceBase", QObject::tr("Cannot create instance of XdgSurfaceBase, use XdgSurface instead")); qmlRegisterUncreatableType<QWaylandResource>(uri, 1, 0, "WaylandResource", QObject::tr("Cannot create instance of WaylandResource")); //This should probably be somewhere else - qmlRegisterType<QWaylandWindowManagerExtensionQuickExtension>(uri, 1, 0, "WindowManager"); + qmlRegisterType<QWaylandQtWindowManagerQuickExtension>(uri, 1, 0, "QtWindowManager"); qmlRegisterType<QWaylandWlShellQuickExtension>(uri, 1, 0, "WlShell"); qmlRegisterType<QWaylandWlShellSurface>(uri, 1, 0, "WlShellSurface"); qmlRegisterType<QWaylandQuickShellSurfaceItem>(uri, 1, 0, "ShellSurfaceItem"); |