From d2d70779224b067f6035f431319036054272ce65 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B8rgen=20Lind?= <jorgen.lind@theqtcompany.com>
Date: Mon, 24 Aug 2015 16:51:01 +0200
Subject: Make the default wl_shell available from QML

This finaly ties together how to use QWaylandQuickItems with different
shells

It was required to decouple QWaylandView from the QWaylandQuickItem
since QML doesn't play to well with muliple inheritance. The
QWaylandQuickItem can be retrieved from the QWaylandView which is now
conveniently a QObject. Also the QWaylandQuickItem owns the
QWaylandView. This architecture also leaves room for creating a
QWaylandWidget :)

Change-Id: Ib8a00e6f17f0f1bfc3ff244753f021c76db22cb1
---
 src/compositor/compositor_api/qwaylandkeyboard.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'src/compositor/compositor_api/qwaylandkeyboard.cpp')

diff --git a/src/compositor/compositor_api/qwaylandkeyboard.cpp b/src/compositor/compositor_api/qwaylandkeyboard.cpp
index 383c97b00..4de676916 100644
--- a/src/compositor/compositor_api/qwaylandkeyboard.cpp
+++ b/src/compositor/compositor_api/qwaylandkeyboard.cpp
@@ -41,7 +41,7 @@
 #include <QtCompositor/QWaylandInputDevice>
 #include <QtCompositor/QWaylandClient>
 
-#include <QtCompositor/private/qwlshellsurface_p.h>
+#include <QtCompositor/QWaylandShellSurface>
 
 #include <QtCore/QFile>
 #include <QtCore/QStandardPaths>
@@ -400,7 +400,7 @@ QWaylandSurface *QWaylandKeyboard::focus() const
 bool QWaylandKeyboard::setFocus(QWaylandSurface *surface)
 {
     Q_D(QWaylandKeyboard);
-    QtWayland::ShellSurface *shellsurface = QtWayland::ShellSurface::findIn(surface);
+    QWaylandShellSurface *shellsurface = QWaylandShellSurface::findIn(surface);
     if (shellsurface &&  shellsurface->isTransientInactive())
             return false;
     d->grab->focused(surface);
-- 
cgit v1.2.3