diff options
| -rw-r--r-- | src/imports/compositor/compositor.pro | 3 | ||||
| -rw-r--r-- | src/imports/compositor/plugins.qmltypes | 43 |
2 files changed, 40 insertions, 6 deletions
diff --git a/src/imports/compositor/compositor.pro b/src/imports/compositor/compositor.pro index 50b26d4d0..f5c7567a0 100644 --- a/src/imports/compositor/compositor.pro +++ b/src/imports/compositor/compositor.pro @@ -1,7 +1,7 @@ CXX_MODULE = qml TARGET = qwaylandcompositorplugin TARGETPATH = QtWayland/Compositor -IMPORT_VERSION = 1.3 +IMPORT_VERSION = 1.$$QT_MINOR_VERSION HEADERS += \ qwaylandmousetracker_p.h @@ -43,4 +43,5 @@ CONFIG(debug, debug|release): QML_FILES += $$COMPOSITOR_QML_FILES QT += quick-private qml-private gui-private core-private waylandcompositor waylandcompositor-private +QMAKE_QMLPLUGINDUMP_FLAGS = -defaultplatform load(qml_plugin) diff --git a/src/imports/compositor/plugins.qmltypes b/src/imports/compositor/plugins.qmltypes index a0ff2eb76..07a306e57 100644 --- a/src/imports/compositor/plugins.qmltypes +++ b/src/imports/compositor/plugins.qmltypes @@ -4,7 +4,7 @@ import QtQuick.tooling 1.2 // It is used for QML tooling purposes only. // // This file was auto-generated by: -// 'qmlplugindump -nonrelocatable QtWayland.Compositor 1.3' +// 'qmlplugindump -nonrelocatable -defaultplatform QtWayland.Compositor 1.13' Module { dependencies: ["QtQuick 2.0", "QtQuick.Window 2.11"] @@ -280,8 +280,11 @@ Module { name: "QWaylandQuickItem" defaultProperty: "data" prototype: "QQuickItem" - exports: ["QtWayland.Compositor/WaylandQuickItem 1.0"] - exportMetaObjectRevisions: [0] + exports: [ + "QtWayland.Compositor/WaylandQuickItem 1.0", + "QtWayland.Compositor/WaylandQuickItem 1.13" + ] + exportMetaObjectRevisions: [0, 13] Property { name: "compositor"; type: "QWaylandCompositor"; isReadonly: true; isPointer: true } Property { name: "surface"; type: "QWaylandSurface"; isPointer: true } Property { name: "paintEnabled"; type: "bool" } @@ -326,6 +329,12 @@ Module { Parameter { name: "point"; type: "QPointF" } } Method { + name: "mapFromSurface" + revision: 13 + type: "QPointF" + Parameter { name: "point"; type: "QPointF" } + } + Method { name: "inputMethodQuery" type: "QVariant" Parameter { name: "query"; type: "Qt::InputMethodQuery" } @@ -357,8 +366,11 @@ Module { name: "QWaylandQuickSurface" defaultProperty: "data" prototype: "QWaylandSurface" - exports: ["QtWayland.Compositor/WaylandSurface 1.0"] - exportMetaObjectRevisions: [0] + exports: [ + "QtWayland.Compositor/WaylandSurface 1.0", + "QtWayland.Compositor/WaylandSurface 1.13" + ] + exportMetaObjectRevisions: [0, 13] Property { name: "data"; type: "QObject"; isList: true; isReadonly: true } Property { name: "useTextureAlpha"; type: "bool" } Property { name: "clientRenderingEnabled"; type: "bool" } @@ -474,6 +486,9 @@ Module { } } Property { name: "client"; type: "QWaylandClient"; isReadonly: true; isPointer: true } + Property { name: "sourceGeometry"; revision: 13; type: "QRectF"; isReadonly: true } + Property { name: "destinationSize"; revision: 13; type: "QSize"; isReadonly: true } + Property { name: "bufferSize"; revision: 13; type: "QSize"; isReadonly: true } Property { name: "size"; type: "QSize"; isReadonly: true } Property { name: "bufferScale"; type: "int"; isReadonly: true } Property { name: "contentOrientation"; type: "Qt::ScreenOrientation"; isReadonly: true } @@ -493,6 +508,9 @@ Module { name: "childAdded" Parameter { name: "child"; type: "QWaylandSurface"; isPointer: true } } + Signal { name: "sourceGeometryChanged"; revision: 13 } + Signal { name: "destinationSizeChanged"; revision: 13 } + Signal { name: "bufferSizeChanged"; revision: 13 } Signal { name: "offsetForNextFrame" Parameter { name: "offset"; type: "QPoint" } @@ -541,6 +559,15 @@ Module { exportMetaObjectRevisions: [0] Property { name: "data"; type: "QObject"; isList: true; isReadonly: true } } + Component { name: "QWaylandWlScaler"; prototype: "QWaylandCompositorExtension" } + Component { + name: "QWaylandWlScalerQuickExtension" + defaultProperty: "data" + prototype: "QWaylandWlScaler" + exports: ["QtWayland.Compositor/WlScaler 1.13"] + exportMetaObjectRevisions: [0] + Property { name: "data"; type: "QObject"; isList: true; isReadonly: true } + } Component { name: "QWaylandWlShell" prototype: "QWaylandShell" @@ -1262,6 +1289,12 @@ Module { Parameter { name: "point"; type: "QPointF" } } Method { + name: "mapFromSurface" + revision: 13 + type: "QPointF" + Parameter { name: "point"; type: "QPointF" } + } + Method { name: "inputMethodQuery" type: "QVariant" Parameter { name: "query"; type: "Qt::InputMethodQuery" } |