From 463b9137b1b78def03fca6fc987df9bf249cb2f6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B8rgen=20Lind?= Date: Fri, 14 Aug 2015 14:15:18 +0200 Subject: Remove QtWayland::InputDevice and add QWaylandInputDevicePrivate. Also make sure noone holds a reference to the private instance. Change-Id: Ic2327595d58d6308e1e2699370f53aef47061b04 --- src/compositor/wayland_wrapper/qwldatadevice.cpp | 18 +- src/compositor/wayland_wrapper/qwldatadevice_p.h | 1 - .../wayland_wrapper/qwldatadevicemanager.cpp | 8 +- src/compositor/wayland_wrapper/qwlinputdevice.cpp | 311 --------------------- src/compositor/wayland_wrapper/qwlinputdevice_p.h | 155 ---------- src/compositor/wayland_wrapper/qwlinputmethod.cpp | 1 - src/compositor/wayland_wrapper/qwlpointer.cpp | 1 - src/compositor/wayland_wrapper/wayland_wrapper.pri | 2 - 8 files changed, 13 insertions(+), 484 deletions(-) delete mode 100644 src/compositor/wayland_wrapper/qwlinputdevice.cpp delete mode 100644 src/compositor/wayland_wrapper/qwlinputdevice_p.h (limited to 'src/compositor/wayland_wrapper') diff --git a/src/compositor/wayland_wrapper/qwldatadevice.cpp b/src/compositor/wayland_wrapper/qwldatadevice.cpp index a7cb3bd9c..83d0b9dd3 100644 --- a/src/compositor/wayland_wrapper/qwldatadevice.cpp +++ b/src/compositor/wayland_wrapper/qwldatadevice.cpp @@ -38,7 +38,6 @@ #include "qwldatasource_p.h" #include "qwldataoffer_p.h" -#include "qwlinputdevice_p.h" #include "qwlkeyboard_p.h" #include "qwlpointer_p.h" #include "qwaylandsurface_p.h" @@ -49,6 +48,7 @@ #include "qwaylandview.h" #include #include +#include #include #include @@ -146,7 +146,7 @@ void DataDevice::focus() void DataDevice::motion(uint32_t time) { - Q_EMIT QWaylandInputDevicePrivate::get(m_inputDevice)->dragHandle()->positionChanged(); + Q_EMIT m_inputDevice->drag()->positionChanged(); m_dragIconPosition = pointer->currentSpacePosition(); if (m_dragFocusResource && m_dragFocus) { @@ -171,8 +171,8 @@ void DataDevice::button(uint32_t time, Qt::MouseButton button, uint32_t state) if (m_dragIcon) { m_dragIcon = 0; m_dragIconPosition = QPointF(); - Q_EMIT QWaylandInputDevicePrivate::get(m_inputDevice)->dragHandle()->positionChanged(); - Q_EMIT QWaylandInputDevicePrivate::get(m_inputDevice)->dragHandle()->iconChanged(); + Q_EMIT m_inputDevice->drag()->positionChanged(); + Q_EMIT m_inputDevice->drag()->iconChanged(); } setDragFocus(0, QPointF()); @@ -182,8 +182,8 @@ void DataDevice::button(uint32_t time, Qt::MouseButton button, uint32_t state) void DataDevice::data_device_start_drag(Resource *resource, struct ::wl_resource *source, struct ::wl_resource *origin, struct ::wl_resource *icon, uint32_t serial) { - if (QWaylandInputDevicePrivate::get(m_inputDevice)->pointerDevice()->grabSerial() == serial) { - if (!QWaylandInputDevicePrivate::get(m_inputDevice)->pointerDevice()->isButtonPressed() || + if (m_inputDevice->pointer()->grabSerial() == serial) { + if (!m_inputDevice->pointer()->isButtonPressed() || m_inputDevice->mouseFocus()->surfaceResource() != origin) return; @@ -191,10 +191,10 @@ void DataDevice::data_device_start_drag(Resource *resource, struct ::wl_resource m_dragDataSource = source != 0 ? DataSource::fromResource(source) : 0; m_dragIcon = icon != 0 ? QWaylandSurface::fromResource(icon) : 0; m_dragIconPosition = QPointF(); - Q_EMIT QWaylandInputDevicePrivate::get(m_inputDevice)->dragHandle()->positionChanged(); - Q_EMIT QWaylandInputDevicePrivate::get(m_inputDevice)->dragHandle()->iconChanged(); + Q_EMIT m_inputDevice->drag()->positionChanged(); + Q_EMIT m_inputDevice->drag()->iconChanged(); - QWaylandInputDevicePrivate::get(m_inputDevice)->pointerDevice()->startGrab(this); + m_inputDevice->pointer()->startGrab(this); } } diff --git a/src/compositor/wayland_wrapper/qwldatadevice_p.h b/src/compositor/wayland_wrapper/qwldatadevice_p.h index 435e253e3..6d4f4f1b5 100644 --- a/src/compositor/wayland_wrapper/qwldatadevice_p.h +++ b/src/compositor/wayland_wrapper/qwldatadevice_p.h @@ -38,7 +38,6 @@ #define WLDATADEVICE_H #include -#include #include #include #include diff --git a/src/compositor/wayland_wrapper/qwldatadevicemanager.cpp b/src/compositor/wayland_wrapper/qwldatadevicemanager.cpp index 23e85813a..56c7f8026 100644 --- a/src/compositor/wayland_wrapper/qwldatadevicemanager.cpp +++ b/src/compositor/wayland_wrapper/qwldatadevicemanager.cpp @@ -39,9 +39,9 @@ #include #include +#include #include "qwldatadevice_p.h" #include "qwldatasource_p.h" -#include "qwlinputdevice_p.h" #include "qwldataoffer_p.h" #include "qwaylandmimehelper.h" @@ -200,7 +200,7 @@ void DataDeviceManager::overrideSelection(const QMimeData &mimeData) m_compositorOwnsSelection = true; QWaylandInputDevice *dev = m_compositor->defaultInputDevice(); - QWaylandSurface *focusSurface = QWaylandInputDevicePrivate::get(dev)->keyboardFocus(); + QWaylandSurface *focusSurface = dev->keyboardFocus(); if (focusSurface) offerFromCompositorToClient( QWaylandInputDevicePrivate::get(dev)->dataDevice()->resourceMap().value(focusSurface->waylandClient())->handle); @@ -243,8 +243,8 @@ void DataDeviceManager::data_device_manager_create_data_source(Resource *resourc void DataDeviceManager::data_device_manager_get_data_device(Resource *resource, uint32_t id, struct ::wl_resource *seat) { - QWaylandInputDevicePrivate *input_device = QWaylandInputDevicePrivate::fromSeatResource(seat); - input_device->clientRequestedDataDevice(this, resource->client(), id); + QWaylandInputDevice *input_device = QWaylandInputDevice::fromSeatResource(seat); + QWaylandInputDevicePrivate::get(input_device)->clientRequestedDataDevice(this, resource->client(), id); } void DataDeviceManager::comp_accept(wl_client *, wl_resource *, uint32_t, const char *) diff --git a/src/compositor/wayland_wrapper/qwlinputdevice.cpp b/src/compositor/wayland_wrapper/qwlinputdevice.cpp deleted file mode 100644 index 12c38bf83..000000000 --- a/src/compositor/wayland_wrapper/qwlinputdevice.cpp +++ /dev/null @@ -1,311 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2015 The Qt Company Ltd. -** Contact: http://www.qt.io/licensing/ -** -** This file is part of the QtWaylandCompositor module of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:LGPL3$ -** Commercial License Usage -** Licensees holding valid commercial Qt licenses may use this file in -** accordance with the commercial license agreement provided with the -** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and The Qt Company. For licensing terms -** and conditions see http://www.qt.io/terms-conditions. For further -** information use the contact form at http://www.qt.io/contact-us. -** -** GNU Lesser General Public License Usage -** Alternatively, this file may be used under the terms of the GNU Lesser -** General Public License version 3 as published by the Free Software -** Foundation and appearing in the file LICENSE.LGPLv3 included in the -** packaging of this file. Please review the following information to -** ensure the GNU Lesser General Public License version 3 requirements -** will be met: https://www.gnu.org/licenses/lgpl.html. -** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU -** General Public License version 2.0 or later as published by the Free -** Software Foundation and appearing in the file LICENSE.GPL included in -** the packaging of this file. Please review the following information to -** ensure the GNU General Public License version 2.0 requirements will be -** met: http://www.gnu.org/licenses/gpl-2.0.html. -** -** $QT_END_LICENSE$ -** -****************************************************************************/ - -#include "qwlinputdevice_p.h" - -#include -#include -#include "qwldatadevice_p.h" -#include "qwlinputmethod_p.h" -#include "qwlqttouch_p.h" -#include "qwlqtkey_p.h" -#include "qwaylanddrag.h" -#include "qwlpointer_p.h" -#include "qwlkeyboard_p.h" -#include "qwltouch_p.h" -#include "qwaylandview.h" -#include - -#include - -QT_BEGIN_NAMESPACE - -QWaylandInputDevicePrivate::QWaylandInputDevicePrivate(QWaylandInputDevice *inputdevice, QWaylandCompositor *compositor) - : QObjectPrivate() - , QtWaylandServer::wl_seat(compositor->display(), 3) - , m_dragHandle(new QWaylandDrag(inputdevice)) - , m_compositor(compositor) - , m_outputSpace(compositor->primaryOutputSpace()) - , m_mouseFocus(Q_NULLPTR) - , m_capabilities() - , m_inputMethod(m_compositor->extensionFlags() & QWaylandCompositor::TextInputExtension ? new QtWayland::InputMethod(m_compositor, inputdevice) : 0) - , m_data_device() -{ -} - -QWaylandInputDevicePrivate::~QWaylandInputDevicePrivate() -{ -} - -QWaylandPointer *QWaylandInputDevicePrivate::pointerDevice() const -{ - return m_pointer.data(); -} - -QWaylandKeyboard *QWaylandInputDevicePrivate::keyboardDevice() const -{ - return m_keyboard.data(); -} - -QWaylandTouch *QWaylandInputDevicePrivate::touchDevice() const -{ - return m_touch.data(); -} - -QtWayland::InputMethod *QWaylandInputDevicePrivate::inputMethod() -{ - return m_inputMethod.data(); -} - - -void QWaylandInputDevicePrivate::seat_destroy_resource(wl_seat::Resource *) -{ -// cleanupDataDeviceForClient(resource->client(), true); -} - -void QWaylandInputDevicePrivate::seat_bind_resource(wl_seat::Resource *resource) -{ - // The order of m_capabilities matches the order defined in the wayland protocol - wl_seat::send_capabilities(resource->handle, (uint32_t)m_capabilities); -} - -void QWaylandInputDevicePrivate::setCapabilities(QWaylandInputDevice::CapabilityFlags caps) -{ - Q_Q(QWaylandInputDevice); - if (m_capabilities != caps) { - QWaylandInputDevice::CapabilityFlags changed = caps ^ m_capabilities; - - if (changed & QWaylandInputDevice::Pointer) { - m_pointer.reset(m_pointer.isNull() ? QWaylandCompositorPrivate::get(compositor())->callCreatePointerDevice(q) : 0); - } - - if (changed & QWaylandInputDevice::Keyboard) { - m_keyboard.reset(m_keyboard.isNull() ? QWaylandCompositorPrivate::get(compositor())->callCreateKeyboardDevice(q) : 0); - } - - if (changed & QWaylandInputDevice::Touch) { - m_touch.reset(m_touch.isNull() ? QWaylandCompositorPrivate::get(compositor())->callCreateTouchDevice(q) : 0); - } - - m_capabilities = caps; - QList resources = resourceMap().values(); - for (int i = 0; i < resources.size(); i++) { - wl_seat::send_capabilities(resources.at(i)->handle, (uint32_t)m_capabilities); - } - } -} - -void QWaylandInputDevicePrivate::seat_get_pointer(wl_seat::Resource *resource, uint32_t id) -{ - if (!m_pointer.isNull()) { - m_pointer->addClient(QWaylandClient::fromWlClient(m_compositor, resource->client()), id); - } -} - -void QWaylandInputDevicePrivate::seat_get_keyboard(wl_seat::Resource *resource, uint32_t id) -{ - if (!m_keyboard.isNull()) { - m_keyboard->addClient(QWaylandClient::fromWlClient(m_compositor, resource->client()), id); - } -} - -void QWaylandInputDevicePrivate::seat_get_touch(wl_seat::Resource *resource, uint32_t id) -{ - if (!m_touch.isNull()) { - m_touch->addClient(QWaylandClient::fromWlClient(m_compositor, resource->client()), id); - } -} - -void QWaylandInputDevicePrivate::sendMousePressEvent(Qt::MouseButton button) -{ - pointerDevice()->sendMousePressEvent(button); -} - -void QWaylandInputDevicePrivate::sendMouseReleaseEvent(Qt::MouseButton button) -{ - pointerDevice()->sendMouseReleaseEvent(button); -} - -void QWaylandInputDevicePrivate::sendMouseMoveEvent(QWaylandView *view, const QPointF &localPos, const QPointF &globalPos) -{ - pointerDevice()->sendMouseMoveEvent(view, localPos,globalPos); -} - -void QWaylandInputDevicePrivate::sendMouseWheelEvent(Qt::Orientation orientation, int delta) -{ - pointerDevice()->sendMouseWheelEvent(orientation, delta); -} - -void QWaylandInputDevicePrivate::sendTouchPointEvent(int id, const QPointF &point, Qt::TouchPointState state) -{ - if (m_touch.isNull()) { - return; - } - m_touch->sendTouchPointEvent(id, point,state); -} - -void QWaylandInputDevicePrivate::sendTouchFrameEvent() -{ - if (!m_touch.isNull()) { - m_touch->sendFrameEvent(); - } -} - -void QWaylandInputDevicePrivate::sendTouchCancelEvent() -{ - if (!m_touch.isNull()) { - m_touch->sendCancelEvent(); - } -} - -void QWaylandInputDevicePrivate::sendFullKeyEvent(QKeyEvent *event) -{ - if (!keyboardFocus()) { - qWarning("Cannot send key event, no keyboard focus, fix the compositor"); - return; - } - - QtWayland::QtKeyExtensionGlobal *ext = QtWayland::QtKeyExtensionGlobal::findIn(m_compositor); - if (ext && ext->postQtKeyEvent(event, keyboardFocus())) - return; - - if (!m_keyboard.isNull() && !event->isAutoRepeat()) { - if (event->type() == QEvent::KeyPress) - m_keyboard->sendKeyPressEvent(event->nativeScanCode()); - else if (event->type() == QEvent::KeyRelease) - m_keyboard->sendKeyReleaseEvent(event->nativeScanCode()); - } -} - -void QWaylandInputDevicePrivate::sendFullKeyEvent(QWaylandSurface *surface, QKeyEvent *event) -{ - QtWayland::QtKeyExtensionGlobal *ext = QtWayland::QtKeyExtensionGlobal::findIn(m_compositor); - if (ext) - ext->postQtKeyEvent(event, surface); -} - -void QWaylandInputDevicePrivate::sendFullTouchEvent(QTouchEvent *event) -{ - if (!mouseFocus()) { - qWarning("Cannot send touch event, no pointer focus, fix the compositor"); - return; - } - - if (!m_touch) - return; - - m_touch->sendFullTouchEvent(event); -} - -QWaylandSurface *QWaylandInputDevicePrivate::keyboardFocus() const -{ - if (m_keyboard.isNull() || !m_keyboard->focus()) - return Q_NULLPTR; - - return m_keyboard->focus(); -} - -/*! - * \return True if the keyboard focus is changed successfully. False for inactive transient surfaces. - */ -bool QWaylandInputDevicePrivate::setKeyboardFocus(QWaylandSurface *surface) -{ - if (surface && surface->isDestroyed()) - return false; - - if (!m_keyboard.isNull() && m_keyboard->setFocus(surface)) { - if (m_data_device) - m_data_device->setFocus(m_keyboard->focusClient()); - return true; - } - return false; -} - -QWaylandView *QWaylandInputDevicePrivate::mouseFocus() const -{ - return m_mouseFocus; -} - -void QWaylandInputDevicePrivate::setMouseFocus(QWaylandView *focus) -{ - Q_Q(QWaylandInputDevice); - if (focus == m_mouseFocus) - return; - - QWaylandView *oldFocus = m_mouseFocus; - m_mouseFocus = focus; - q->mouseFocusChanged(m_mouseFocus, oldFocus); -} - -void QWaylandInputDevicePrivate::clientRequestedDataDevice(QtWayland::DataDeviceManager *, struct wl_client *client, uint32_t id) -{ - Q_Q(QWaylandInputDevice); - if (!m_data_device) - m_data_device.reset(new QtWayland::DataDevice(q)); - m_data_device->add(client, id, 1); -} - -QWaylandCompositor *QWaylandInputDevicePrivate::compositor() const -{ - return m_compositor; -} - -QWaylandDrag *QWaylandInputDevicePrivate::dragHandle() const -{ - return m_dragHandle.data(); -} - -const QtWayland::DataDevice *QWaylandInputDevicePrivate::dataDevice() const -{ - return m_data_device.data(); -} - -QWaylandOutputSpace *QWaylandInputDevicePrivate::outputSpace() const -{ - return m_outputSpace; -} - -void QWaylandInputDevicePrivate::setOutputSpace(QWaylandOutputSpace *outputSpace) -{ - m_outputSpace = outputSpace; -} - -QWaylandInputDevicePrivate *QWaylandInputDevicePrivate::get(QWaylandInputDevice *device) -{ - return device->d_func(); -} - -QT_END_NAMESPACE diff --git a/src/compositor/wayland_wrapper/qwlinputdevice_p.h b/src/compositor/wayland_wrapper/qwlinputdevice_p.h deleted file mode 100644 index 1ed8593ac..000000000 --- a/src/compositor/wayland_wrapper/qwlinputdevice_p.h +++ /dev/null @@ -1,155 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2015 The Qt Company Ltd. -** Contact: http://www.qt.io/licensing/ -** -** This file is part of the QtWaylandCompositor module of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:LGPL3$ -** Commercial License Usage -** Licensees holding valid commercial Qt licenses may use this file in -** accordance with the commercial license agreement provided with the -** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and The Qt Company. For licensing terms -** and conditions see http://www.qt.io/terms-conditions. For further -** information use the contact form at http://www.qt.io/contact-us. -** -** GNU Lesser General Public License Usage -** Alternatively, this file may be used under the terms of the GNU Lesser -** General Public License version 3 as published by the Free Software -** Foundation and appearing in the file LICENSE.LGPLv3 included in the -** packaging of this file. Please review the following information to -** ensure the GNU Lesser General Public License version 3 requirements -** will be met: https://www.gnu.org/licenses/lgpl.html. -** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU -** General Public License version 2.0 or later as published by the Free -** Software Foundation and appearing in the file LICENSE.GPL included in -** the packaging of this file. Please review the following information to -** ensure the GNU General Public License version 2.0 requirements will be -** met: http://www.gnu.org/licenses/gpl-2.0.html. -** -** $QT_END_LICENSE$ -** -****************************************************************************/ - -#ifndef WLINPUTDEVICE_H -#define WLINPUTDEVICE_H - -#include - -#include -#include - -#include -#include -#include -#include - -#ifndef QT_NO_WAYLAND_XKB -#include -#endif - -#include - -QT_BEGIN_NAMESPACE - -class QKeyEvent; -class QTouchEvent; -class QWaylandInputDevice; -class QWaylandDrag; -class QWaylandView; - -namespace QtWayland { - -class Compositor; -class DataDevice; -class Surface; -class DataDeviceManager; -class Pointer; -class Keyboard; -class Touch; -class InputMethod; - -} - -class Q_COMPOSITOR_EXPORT QWaylandInputDevicePrivate : public QObjectPrivate, public QtWaylandServer::wl_seat -{ -public: - Q_DECLARE_PUBLIC(QWaylandInputDevice) - - QWaylandInputDevicePrivate(QWaylandInputDevice *device, QWaylandCompositor *compositor); - ~QWaylandInputDevicePrivate(); - - void sendMousePressEvent(Qt::MouseButton button); - void sendMouseReleaseEvent(Qt::MouseButton button); - void sendMouseMoveEvent(QWaylandView *surface, const QPointF &localPos, const QPointF &spacePos = QPointF()); - void sendMouseWheelEvent(Qt::Orientation orientation, int delta); - - void sendTouchPointEvent(int id, const QPointF &point, Qt::TouchPointState state); - void sendTouchFrameEvent(); - void sendTouchCancelEvent(); - - void sendFullKeyEvent(QKeyEvent *event); - void sendFullKeyEvent(QWaylandSurface *surface, QKeyEvent *event); - - void sendFullTouchEvent(QTouchEvent *event); - - QWaylandSurface *keyboardFocus() const; - bool setKeyboardFocus(QWaylandSurface *surface); - - QWaylandView *mouseFocus() const; - void setMouseFocus(QWaylandView *focus); - - void clientRequestedDataDevice(QtWayland::DataDeviceManager *dndSelection, struct wl_client *client, uint32_t id); - const QtWayland::DataDevice *dataDevice() const; - - QWaylandOutputSpace *outputSpace() const; - void setOutputSpace(QWaylandOutputSpace *outputSpace); - - QWaylandCompositor *compositor() const; - QWaylandDrag *dragHandle() const; - - QWaylandPointer *pointerDevice() const; - QWaylandKeyboard *keyboardDevice() const; - QWaylandTouch *touchDevice() const; - QtWayland::InputMethod *inputMethod(); - - static QWaylandInputDevicePrivate *fromSeatResource(struct ::wl_resource *resource) - { - return static_cast(wl_seat::Resource::fromResource(resource)->seat_object); - } - - QWaylandInputDevice::CapabilityFlags capabilities() const { return m_capabilities; } - void setCapabilities(QWaylandInputDevice::CapabilityFlags caps); - - static QWaylandInputDevicePrivate *get(QWaylandInputDevice *device); -private: - QScopedPointer m_dragHandle; - QWaylandCompositor *m_compositor; - QWaylandOutputSpace *m_outputSpace; - QWaylandView *m_mouseFocus; - QWaylandInputDevice::CapabilityFlags m_capabilities; - - QScopedPointer m_pointer; - QScopedPointer m_keyboard; - QScopedPointer m_touch; - QScopedPointer m_inputMethod; - QScopedPointer m_data_device; - - void seat_bind_resource(wl_seat::Resource *resource) Q_DECL_OVERRIDE; - - void seat_get_pointer(wl_seat::Resource *resource, - uint32_t id) Q_DECL_OVERRIDE; - void seat_get_keyboard(wl_seat::Resource *resource, - uint32_t id) Q_DECL_OVERRIDE; - void seat_get_touch(wl_seat::Resource *resource, - uint32_t id) Q_DECL_OVERRIDE; - - void seat_destroy_resource(wl_seat::Resource *resource) Q_DECL_OVERRIDE; -}; - -QT_END_NAMESPACE - -#endif // WLINPUTDEVICE_H diff --git a/src/compositor/wayland_wrapper/qwlinputmethod.cpp b/src/compositor/wayland_wrapper/qwlinputmethod.cpp index 59b23cdd3..106cb40a7 100644 --- a/src/compositor/wayland_wrapper/qwlinputmethod.cpp +++ b/src/compositor/wayland_wrapper/qwlinputmethod.cpp @@ -37,7 +37,6 @@ #include "qwlinputmethod_p.h" #include -#include "qwlinputdevice_p.h" #include "qwlinputmethodcontext_p.h" #include "qwlinputpanel_p.h" #include "qwlkeyboard_p.h" diff --git a/src/compositor/wayland_wrapper/qwlpointer.cpp b/src/compositor/wayland_wrapper/qwlpointer.cpp index 28a72b76e..5f5068f5c 100644 --- a/src/compositor/wayland_wrapper/qwlpointer.cpp +++ b/src/compositor/wayland_wrapper/qwlpointer.cpp @@ -37,7 +37,6 @@ #include "qwlpointer_p.h" -#include "qwlinputdevice_p.h" #include "qwlkeyboard_p.h" #include "qwaylandcompositor.h" #include "qwaylandview.h" diff --git a/src/compositor/wayland_wrapper/wayland_wrapper.pri b/src/compositor/wayland_wrapper/wayland_wrapper.pri index 66de019cc..96d05116e 100644 --- a/src/compositor/wayland_wrapper/wayland_wrapper.pri +++ b/src/compositor/wayland_wrapper/wayland_wrapper.pri @@ -9,7 +9,6 @@ HEADERS += \ wayland_wrapper/qwldatadevicemanager_p.h \ wayland_wrapper/qwldataoffer_p.h \ wayland_wrapper/qwldatasource_p.h \ - wayland_wrapper/qwlinputdevice_p.h \ wayland_wrapper/qwlinputmethod_p.h \ wayland_wrapper/qwlinputmethodcontext_p.h \ wayland_wrapper/qwlkeyboard_p.h \ @@ -24,7 +23,6 @@ SOURCES += \ wayland_wrapper/qwldatadevicemanager.cpp \ wayland_wrapper/qwldataoffer.cpp \ wayland_wrapper/qwldatasource.cpp \ - wayland_wrapper/qwlinputdevice.cpp \ wayland_wrapper/qwlinputmethod.cpp \ wayland_wrapper/qwlinputmethodcontext.cpp \ wayland_wrapper/qwlkeyboard.cpp \ -- cgit v1.2.3