summaryrefslogtreecommitdiffstats
path: root/src/imports/compositor/qwaylandquickcompositorplugin.cpp
diff options
context:
space:
mode:
authorJørgen Lind <jorgen.lind@theqtcompany.com>2015-09-14 12:35:52 +0200
committerPaul Olav Tvete <paul.tvete@theqtcompany.com>2015-09-14 12:17:05 +0000
commitf5f06c709937b657c66ca4e35f4e3065ba390153 (patch)
tree1019883bf566cc7de6d86b9cd2ab4f43b342b26c /src/imports/compositor/qwaylandquickcompositorplugin.cpp
parent2deffa537c82e2f21e01dff5c8f5ba283dd06032 (diff)
Remove global coordinates
This involves removing: - pickView and mapView from QWaylandOutput - requestedPos[X,Y] from QWaylandView Change-Id: Ie53eef434ac6ae7d0d5474f649f78a59ae857167 Reviewed-by: Paul Olav Tvete <paul.tvete@theqtcompany.com>
Diffstat (limited to 'src/imports/compositor/qwaylandquickcompositorplugin.cpp')
-rw-r--r--src/imports/compositor/qwaylandquickcompositorplugin.cpp5
1 files changed, 3 insertions, 2 deletions
diff --git a/src/imports/compositor/qwaylandquickcompositorplugin.cpp b/src/imports/compositor/qwaylandquickcompositorplugin.cpp
index 8581b0a7b..e83468e5c 100644
--- a/src/imports/compositor/qwaylandquickcompositorplugin.cpp
+++ b/src/imports/compositor/qwaylandquickcompositorplugin.cpp
@@ -56,8 +56,9 @@
QT_BEGIN_NAMESPACE
-Q_COMPOSITOR_DECLARE_QUICK_DATA_CLASS(QWaylandShell)
Q_COMPOSITOR_DECLARE_QUICK_EXTENSION_CLASS(QWaylandQuickCompositor)
+Q_COMPOSITOR_DECLARE_QUICK_DATA_CLASS(QWaylandShell)
+Q_COMPOSITOR_DECLARE_QUICK_DATA_CLASS(QWaylandShellSurface)
class QmlUrlResolver
{
@@ -137,7 +138,7 @@ public:
//This should probably be somewhere else
qmlRegisterType<QWaylandShellQuickData>(uri, 1, 0, "DefaultShell");
- qmlRegisterType<QWaylandShellSurface>(uri, 1, 0, "DefaultShellSurface");
+ qmlRegisterType<QWaylandShellSurfaceQuickData>(uri, 1, 0, "DefaultShellSurface");
}
};
//![class decl]