summaryrefslogtreecommitdiffstats
path: root/src/imports
diff options
context:
space:
mode:
authorJohan Klokkhammer Helsing <johan.helsing@qt.io>2016-07-07 15:12:11 +0200
committerJohan Helsing <johan.helsing@qt.io>2016-07-11 10:05:42 +0000
commita7a2390b8a659b07f44752a538d098e9a762c2eb (patch)
tree3caaede84ab82b58d80b677348cac5c13ef35eeb /src/imports
parent411a2672f8bb057614abd0aedb3c321d5dc92363 (diff)
Expose QWaylandDrag to the QML API
Change-Id: I688f8c5d6781d695d3554aaec0c11be95cec371b Reviewed-by: Giulio Camuffo <giulio.camuffo@kdab.com>
Diffstat (limited to 'src/imports')
-rw-r--r--src/imports/compositor/plugins.qmltypes22
-rw-r--r--src/imports/compositor/qwaylandquickcompositorplugin.cpp2
2 files changed, 24 insertions, 0 deletions
diff --git a/src/imports/compositor/plugins.qmltypes b/src/imports/compositor/plugins.qmltypes
index a34630923..04ddb32ff 100644
--- a/src/imports/compositor/plugins.qmltypes
+++ b/src/imports/compositor/plugins.qmltypes
@@ -87,6 +87,23 @@ Module {
exportMetaObjectRevisions: [0]
}
Component {
+ name: "QWaylandDrag"
+ prototype: "QObject"
+ 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: "QWaylandInputDevice"
prototype: "QObject"
exports: ["QtWayland.Compositor/WaylandInputDevice 1.0"]
@@ -101,6 +118,7 @@ Module {
"DefaultCapabilities": 7
}
}
+ Property { name: "drag"; type: "QWaylandDrag"; isReadonly: true; isPointer: true }
Signal {
name: "mouseFocusChanged"
Parameter { name: "newFocus"; type: "QWaylandView"; isPointer: true }
@@ -344,6 +362,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" }
}
diff --git a/src/imports/compositor/qwaylandquickcompositorplugin.cpp b/src/imports/compositor/qwaylandquickcompositorplugin.cpp
index e8e033409..b93f9f169 100644
--- a/src/imports/compositor/qwaylandquickcompositorplugin.cpp
+++ b/src/imports/compositor/qwaylandquickcompositorplugin.cpp
@@ -47,6 +47,7 @@
#include <QtWaylandCompositor/QWaylandCompositorExtension>
#include <QtWaylandCompositor/QWaylandQuickExtension>
#include <QtWaylandCompositor/QWaylandInputDevice>
+#include <QtWaylandCompositor/QWaylandDrag>
#include <QtWaylandCompositor/QWaylandQuickShellSurfaceItem>
#include <QtWaylandCompositor/QWaylandResource>
@@ -139,6 +140,7 @@ public:
qmlRegisterUncreatableType<QWaylandOutput>(uri, 1, 0, "WaylandOutputBase", QObject::tr("Cannot create instance of WaylandOutputBase, use WaylandOutput instead"));
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<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"));