diff options
| author | Jørgen Lind <jorgen.lind@theqtcompany.com> | 2015-07-31 10:25:12 +0200 |
|---|---|---|
| committer | Jørgen Lind <jorgen.lind@theqtcompany.com> | 2015-08-28 13:10:32 +0200 |
| commit | b4f037cff4fc8ece612d8dca034ba784d86b816f (patch) | |
| tree | 8f29d668534df0fb8c72b4e69f019fbb27f40957 /src/compositor/compositor_api/qwaylandview.cpp | |
| parent | 760471c5404509aa02df4a39f89eb24199d58a7c (diff) | |
| download | qtwayland-b4f037cff4fc8ece612d8dca034ba784d86b816f.tar.gz | |
Remove excess definition of QWaylandKeymap
Also remove QWaylandUnmapLock
Change-Id: I0b481224fd03032603084142f36be279351f6611
Diffstat (limited to 'src/compositor/compositor_api/qwaylandview.cpp')
| -rw-r--r-- | src/compositor/compositor_api/qwaylandview.cpp | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/src/compositor/compositor_api/qwaylandview.cpp b/src/compositor/compositor_api/qwaylandview.cpp index f8394830..81c19996 100644 --- a/src/compositor/compositor_api/qwaylandview.cpp +++ b/src/compositor/compositor_api/qwaylandview.cpp @@ -38,7 +38,9 @@ #include "qwaylandview_p.h" #include "qwaylandsurface.h" #include "qwaylandsurface_p.h" - +#include <QtCompositor/QWaylandInputDevice> +#include <QtCompositor/QWaylandCompositor> +#include <QtCompositor/private/qwaylandoutputspace_p.h> #include <QtCore/QMutex> QT_BEGIN_NAMESPACE @@ -70,7 +72,7 @@ QWaylandView::~QWaylandView() if (d->surface) { QWaylandInputDevice *i = d->surface->compositor()->defaultInputDevice(); if (i->mouseFocus() == this) - i->setMouseFocus(Q_NULLPTR, QPointF()); + i->setMouseFocus(Q_NULLPTR); d->surface->deref(); } |