From ef4eeb4d243e0fd6f44f52be2c345ab450c70a49 Mon Sep 17 00:00:00 2001 From: Paul Olav Tvete Date: Tue, 20 Jun 2017 08:47:34 +0200 Subject: Add changes file for 5.9.1 Change-Id: Ic0a54fe798e23876bfcb0397e41fabc63acd3b22 Reviewed-by: Johan Helsing --- dist/changes-5.9.1 | 50 ++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 50 insertions(+) create mode 100644 dist/changes-5.9.1 diff --git a/dist/changes-5.9.1 b/dist/changes-5.9.1 new file mode 100644 index 000000000..92cdcf953 --- /dev/null +++ b/dist/changes-5.9.1 @@ -0,0 +1,50 @@ +Qt 5.9.1 is a bug-fix release. It maintains both forward and backward +compatibility (source and binary) with Qt 5.9.0. + +For more details, refer to the online documentation included in this +distribution. The documentation is also available online: + +http://doc.qt.io/qt-5/index.html + +The Qt version 5.9 series is binary compatible with the 5.8.x series. +Applications compiled for 5.8 will continue to run with 5.9. Exception: +between Qt 5.8.0 and 5.9.0 the QWaylandQuickOutput class was changed +in a binary incompatible way. + +Some of the changes listed in this file include issue tracking numbers +corresponding to tasks in the Qt Bug Tracker: + +https://bugreports.qt.io/ + +Each of these identifiers can be entered in the bug tracker to obtain more +information about a particular change. + +**************************************************************************** +* Qt Wayland General * +**************************************************************************** + + - [QTBUG-61183] Fix build issue when libhybris is installed. + + - Fix build issue when X11 is not installed. + + +**************************************************************************** +* Qt Wayland QPA Plugin * +**************************************************************************** + + - [QTBUG-55956] Fix windows with WA_TranslucentBackground on Weston. + + - Fix double delete in Broadcom plugin. + + - Fix issues with high-DPI scaling. + + - Make sure cursor is set correctly when the pointer enters the window. + + - Fix keyboard modifiers for mouse wheel events. + + +**************************************************************************** +* Qt Wayland Compositor API * +**************************************************************************** + +- This release contains only minor code improvements in the compositor API. -- cgit v1.2.3 From 843637ed4b403e5a0c06ac537327e0730da22d17 Mon Sep 17 00:00:00 2001 From: Oswald Buddenhagen Date: Fri, 30 Jun 2017 09:52:20 +0200 Subject: Bump version Change-Id: I7156b617468f802a01b1a3277ffc33383c93e71d --- .qmake.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.qmake.conf b/.qmake.conf index 0dcf6d9b0..78a277a3f 100644 --- a/.qmake.conf +++ b/.qmake.conf @@ -1,3 +1,3 @@ load(qt_build_config) -MODULE_VERSION = 5.9.1 +MODULE_VERSION = 5.9.2 -- cgit v1.2.3 From 6f3d69264b6640c94ecfdb89c4bbf90319534b09 Mon Sep 17 00:00:00 2001 From: Paul Olav Tvete Date: Mon, 26 Jun 2017 12:28:16 +0200 Subject: Update .gitignore Change-Id: Iddbfa1f631fe13fd901e0b3a00bafe334da51cf1 Reviewed-by: Giulio Camuffo --- .gitignore | 5 +++++ examples/wayland/ivi-compositor/.gitignore | 1 + examples/wayland/multi-screen/.gitignore | 1 + 3 files changed, 7 insertions(+) create mode 100644 examples/wayland/ivi-compositor/.gitignore create mode 100644 examples/wayland/multi-screen/.gitignore diff --git a/.gitignore b/.gitignore index b841728fa..bb3819ca3 100644 --- a/.gitignore +++ b/.gitignore @@ -12,6 +12,8 @@ qwayland-server-*.h *-protocol.c *-client-protocol.h *-server-protocol.h +qtwayland*-config.* +qtwayland*-config_p.h .qmake.cache config.log config.tests/egl/egl @@ -23,6 +25,9 @@ config.tests/xkbcommon/xkbcommon config.tests/wayland/wayland config.tests/drm_egl_server/drm_egl_server config.tests/wayland_scanner/wayland_scanner +config.cache +config.opt +config.summary qrc_*.cpp moc_*.cpp .obj/ diff --git a/examples/wayland/ivi-compositor/.gitignore b/examples/wayland/ivi-compositor/.gitignore new file mode 100644 index 000000000..4477704e2 --- /dev/null +++ b/examples/wayland/ivi-compositor/.gitignore @@ -0,0 +1 @@ +ivi-compositor diff --git a/examples/wayland/multi-screen/.gitignore b/examples/wayland/multi-screen/.gitignore new file mode 100644 index 000000000..5e732742b --- /dev/null +++ b/examples/wayland/multi-screen/.gitignore @@ -0,0 +1 @@ +multi-screen -- cgit v1.2.3 From 6e2f628bedbe6dcbe5ac14614c4a30c8199af4f7 Mon Sep 17 00:00:00 2001 From: Giulio Camuffo Date: Mon, 3 Jul 2017 08:19:58 +0200 Subject: Use a non grabbing zxdg_popup_v6 for tooltips Change-Id: I9de16c48a1dee7728fb02faa590c112bd656aa09 Reviewed-by: David Edmundson Reviewed-by: Pier Luigi Fiorini --- src/client/qwaylandxdgshellv6.cpp | 10 ++++++---- src/client/qwaylandxdgshellv6_p.h | 2 +- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/src/client/qwaylandxdgshellv6.cpp b/src/client/qwaylandxdgshellv6.cpp index 947940213..cd81778c7 100644 --- a/src/client/qwaylandxdgshellv6.cpp +++ b/src/client/qwaylandxdgshellv6.cpp @@ -163,8 +163,8 @@ void QWaylandXdgSurfaceV6::setAppId(const QString &appId) void QWaylandXdgSurfaceV6::setType(Qt::WindowType type, QWaylandWindow *transientParent) { - if (type == Qt::Popup && transientParent) { - setPopup(transientParent, m_window->display()->lastInputDevice(), m_window->display()->lastInputSerial()); + if ((type == Qt::Popup || type == Qt::ToolTip) && transientParent) { + setPopup(transientParent, m_window->display()->lastInputDevice(), m_window->display()->lastInputSerial(), type == Qt::Popup); } else { setToplevel(); if (transientParent) { @@ -189,7 +189,7 @@ void QWaylandXdgSurfaceV6::setToplevel() m_toplevel = new Toplevel(this); } -void QWaylandXdgSurfaceV6::setPopup(QWaylandWindow *parent, QWaylandInputDevice *device, int serial) +void QWaylandXdgSurfaceV6::setPopup(QWaylandWindow *parent, QWaylandInputDevice *device, int serial, bool grab) { Q_ASSERT(!m_toplevel && !m_popup); @@ -209,7 +209,9 @@ void QWaylandXdgSurfaceV6::setPopup(QWaylandWindow *parent, QWaylandInputDevice m_popup = new Popup(this, parentXdgSurface, positioner); positioner->destroy(); delete positioner; - m_popup->grab(device->wl_seat(), serial); + if (grab) { + m_popup->grab(device->wl_seat(), serial); + } } void QWaylandXdgSurfaceV6::zxdg_surface_v6_configure(uint32_t serial) diff --git a/src/client/qwaylandxdgshellv6_p.h b/src/client/qwaylandxdgshellv6_p.h index 12f7301d5..769f19837 100644 --- a/src/client/qwaylandxdgshellv6_p.h +++ b/src/client/qwaylandxdgshellv6_p.h @@ -121,7 +121,7 @@ private: }; void setToplevel(); - void setPopup(QWaylandWindow *parent, QWaylandInputDevice *device, int serial); + void setPopup(QWaylandWindow *parent, QWaylandInputDevice *device, int serial, bool grab); QWaylandXdgShellV6 *m_shell; QWaylandWindow *m_window; -- cgit v1.2.3 From ee2d39044f8a9a42a9da945ee18e135690efa0e3 Mon Sep 17 00:00:00 2001 From: Johan Klokkhammer Helsing Date: Wed, 12 Jul 2017 15:13:10 +0200 Subject: Fix incorrect type for WaylandQuickItem::subsurfaceHandler in docs Change-Id: I8d08eddb0eb9cd005b29e13818ba27efa11c6872 Reviewed-by: Giulio Camuffo --- src/compositor/compositor_api/qwaylandquickitem.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/compositor/compositor_api/qwaylandquickitem.cpp b/src/compositor/compositor_api/qwaylandquickitem.cpp index 14d4a9f11..073322ee3 100644 --- a/src/compositor/compositor_api/qwaylandquickitem.cpp +++ b/src/compositor/compositor_api/qwaylandquickitem.cpp @@ -740,7 +740,7 @@ void QWaylandQuickItem::handleSubsurfaceAdded(QWaylandSurface *childSurface) /*! - \qmlproperty bool QtWaylandCompositor::WaylandQuickItem::subsurfaceHandler + \qmlproperty object QtWaylandCompositor::WaylandQuickItem::subsurfaceHandler This property provides a way to override the default subsurface behavior. -- cgit v1.2.3 From 1ad476827975419594f7b294b5fc984ee59237ad Mon Sep 17 00:00:00 2001 From: David Edmundson Date: Wed, 19 Jul 2017 13:01:24 +0100 Subject: Reset mFrameCallback in destruction Otherwise we crash if we call reset twice. For example if we call setParent and setVisible together. Change-Id: I7f07825167bf8c3236a80e649a6d6805fd6c868b Reviewed-by: Johan Helsing --- src/client/qwaylandwindow.cpp | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/client/qwaylandwindow.cpp b/src/client/qwaylandwindow.cpp index 5585fd52a..98d0603cc 100644 --- a/src/client/qwaylandwindow.cpp +++ b/src/client/qwaylandwindow.cpp @@ -249,8 +249,10 @@ void QWaylandWindow::reset() if (isInitialized()) destroy(); - if (mFrameCallback) + if (mFrameCallback) { wl_callback_destroy(mFrameCallback); + mFrameCallback = nullptr; + } } QWaylandWindow *QWaylandWindow::fromWlSurface(::wl_surface *surface) -- cgit v1.2.3 From 6e6473699e3fe99b114b151c9a9e03f4dd183c89 Mon Sep 17 00:00:00 2001 From: Johan Klokkhammer Helsing Date: Wed, 12 Jul 2017 15:39:37 +0200 Subject: Documentation: ShellSurfaceItem inherits WaylandQuickItem Change-Id: Ia67fe4f677dd77a6c1b4d7c1762fdefa9a2aed60 Reviewed-by: Venugopal Shivashankar --- src/compositor/extensions/qwaylandquickshellsurfaceitem.cpp | 1 + 1 file changed, 1 insertion(+) diff --git a/src/compositor/extensions/qwaylandquickshellsurfaceitem.cpp b/src/compositor/extensions/qwaylandquickshellsurfaceitem.cpp index b0a141f83..bb2f72547 100644 --- a/src/compositor/extensions/qwaylandquickshellsurfaceitem.cpp +++ b/src/compositor/extensions/qwaylandquickshellsurfaceitem.cpp @@ -47,6 +47,7 @@ QT_BEGIN_NAMESPACE /*! * \qmltype ShellSurfaceItem + * \inherits WaylandQuickItem * \inqmlmodule QtWayland.Compositor * \since 5.8 * \brief A Qt Quick item type representing a WlShellSurface. -- cgit v1.2.3 From 54cd03c41a79cfc64ef56f855da76e0082a71b23 Mon Sep 17 00:00:00 2001 From: David Edmundson Date: Fri, 14 Jul 2017 14:04:48 +0100 Subject: Check surface exists when setting textinput focus QWaylandWindow resets the surface on various events. Handling focus comes in a posted event, so this can be after we've hidden a window and lost a surface. Task-number: QTBUG-61704 Change-Id: I535ff78c6bc2b86816696a08f8eebc47186d1225 Reviewed-by: Johan Helsing --- src/client/qwaylandinputcontext.cpp | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/client/qwaylandinputcontext.cpp b/src/client/qwaylandinputcontext.cpp index dcc4ad5c7..fac5fb840 100644 --- a/src/client/qwaylandinputcontext.cpp +++ b/src/client/qwaylandinputcontext.cpp @@ -541,8 +541,10 @@ void QWaylandInputContext::setFocusObject(QObject *) if (window && window->handle() && inputMethodAccepted()) { if (mCurrentWindow.data() != window) { struct ::wl_surface *surface = static_cast(window->handle())->object(); - textInput()->enable(surface); - mCurrentWindow = window; + if (surface) { + textInput()->enable(surface); + mCurrentWindow = window; + } } textInput()->updateState(Qt::ImQueryAll, QtWayland::zwp_text_input_v2::update_state_enter); } -- cgit v1.2.3 From e1605103ab79d7ef377afc73ac69925a082a87f7 Mon Sep 17 00:00:00 2001 From: Marco Martin Date: Tue, 25 Jul 2017 14:40:41 +0200 Subject: Fallback to focusWindow as transient parent The wayland protocol requires Popup windows to have a transient parent set, in order to correctly position the window on the screen. In Qt, some popup menus don't have it, so they will appear misplaced in the screen. This adds an heuristic which makes transientParent() return the current application focus window, which is an approximation which won't be always correct, but seems to fix most applications Task-number: QTBUG-60932 Change-Id: Icec1e306d3f64f4f00ad735a8c2eedb99e85eabb Reviewed-by: Johan Helsing --- src/client/qwaylandwindow.cpp | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/client/qwaylandwindow.cpp b/src/client/qwaylandwindow.cpp index 98d0603cc..4a60a6616 100644 --- a/src/client/qwaylandwindow.cpp +++ b/src/client/qwaylandwindow.cpp @@ -720,6 +720,8 @@ QWaylandWindow *QWaylandWindow::transientParent() const // events. if (auto transientParent = window()->transientParent()) return static_cast(topLevelWindow(transientParent)->handle()); + else if (QGuiApplication::focusWindow() && (window()->type() == Qt::ToolTip || window()->type() == Qt::Popup)) + return static_cast(topLevelWindow(QGuiApplication::focusWindow())->handle()); return nullptr; } -- cgit v1.2.3 From 38f673748d86bb2e3443d566bbf9b94fc8709cfe Mon Sep 17 00:00:00 2001 From: Johan Klokkhammer Helsing Date: Tue, 8 Aug 2017 14:24:23 +0200 Subject: Add missing documentation for examples Add documentation for the following examples: minimal-qml, ivi-compositor, multi-screen and spanning-screens. Change-Id: Iacb14af9b1c825f08e2092836cb4821db005628d Reviewed-by: Venugopal Shivashankar --- .../ivi-compositor/doc/src/ivi-compositor.qdoc | 44 +++++++++++++++++++++ .../wayland/minimal-qml/doc/src/minimal-qml.qdoc | 36 +++++++++++++++++ .../wayland/multi-screen/doc/src/multi-screen.qdoc | 45 ++++++++++++++++++++++ .../spanning-screens/doc/src/spanning-screens.qdoc | 36 +++++++++++++++++ 4 files changed, 161 insertions(+) create mode 100644 examples/wayland/ivi-compositor/doc/src/ivi-compositor.qdoc create mode 100644 examples/wayland/minimal-qml/doc/src/minimal-qml.qdoc create mode 100644 examples/wayland/multi-screen/doc/src/multi-screen.qdoc create mode 100644 examples/wayland/spanning-screens/doc/src/spanning-screens.qdoc diff --git a/examples/wayland/ivi-compositor/doc/src/ivi-compositor.qdoc b/examples/wayland/ivi-compositor/doc/src/ivi-compositor.qdoc new file mode 100644 index 000000000..ae37c8950 --- /dev/null +++ b/examples/wayland/ivi-compositor/doc/src/ivi-compositor.qdoc @@ -0,0 +1,44 @@ +/**************************************************************************** +** +** Copyright (C) 2017 The Qt Company Ltd. +** Contact: http://www.qt.io/licensing/ +** +** This file is part of the documentation of the Qt Toolkit. +** +** $QT_BEGIN_LICENSE:FDL$ +** 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 Free Documentation License Usage +** Alternatively, this file may be used under the terms of the GNU Free +** Documentation License version 1.3 as published by the Free Software +** Foundation and appearing in the file included in the packaging of +** this file. Please review the following information to ensure +** the GNU Free Documentation License version 1.3 requirements +** will be met: http://www.gnu.org/copyleft/fdl.html. +** $QT_END_LICENSE$ +** +****************************************************************************/ + +/*! + * \title Qt Wayland Compositor Examples - IVI Compositor + * \example ivi-compositor + * \brief IVI Compositor is an example that demonstrates how to use the IviApplication extension. + * \ingroup qtwaylandcompositor-examples + * + * IVI Compositor is a Wayland compositor example demonstrating how to create a + * compositor supporting the \c ivi-application protocol. + * + * IVI application windows with the id 1337 will be resized to cover one half + * of the screen, while all other windows will be resized to cover the other + * half. + * + * To start a Qt application using the \c ivi-application protocol with the + * right id, you need to set QT_WAYLAND_SHELL_INTEGRATION to ivi-shell and + * QT_IVI_SURFACE_ID to 1337. + */ diff --git a/examples/wayland/minimal-qml/doc/src/minimal-qml.qdoc b/examples/wayland/minimal-qml/doc/src/minimal-qml.qdoc new file mode 100644 index 000000000..24a5f6522 --- /dev/null +++ b/examples/wayland/minimal-qml/doc/src/minimal-qml.qdoc @@ -0,0 +1,36 @@ +/**************************************************************************** +** +** Copyright (C) 2017 The Qt Company Ltd. +** Contact: http://www.qt.io/licensing/ +** +** This file is part of the documentation of the Qt Toolkit. +** +** $QT_BEGIN_LICENSE:FDL$ +** 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 Free Documentation License Usage +** Alternatively, this file may be used under the terms of the GNU Free +** Documentation License version 1.3 as published by the Free Software +** Foundation and appearing in the file included in the packaging of +** this file. Please review the following information to ensure +** the GNU Free Documentation License version 1.3 requirements +** will be met: http://www.gnu.org/copyleft/fdl.html. +** $QT_END_LICENSE$ +** +****************************************************************************/ + +/*! + * \title Qt Wayland Compositor Examples - Minimal QML + * \example minimal-qml + * \brief Minimal QML is a simple example that demonstrates how to write a Wayland compositor in QML. + * \ingroup qtwaylandcompositor-examples + * + * Minimal QML is a desktop-style Wayland compositor example implementing a + * complete Qt Wayland Compositor with as little code as possible. + */ diff --git a/examples/wayland/multi-screen/doc/src/multi-screen.qdoc b/examples/wayland/multi-screen/doc/src/multi-screen.qdoc new file mode 100644 index 000000000..20d3912ca --- /dev/null +++ b/examples/wayland/multi-screen/doc/src/multi-screen.qdoc @@ -0,0 +1,45 @@ +/**************************************************************************** +** +** Copyright (C) 2017 The Qt Company Ltd. +** Contact: http://www.qt.io/licensing/ +** +** This file is part of the documentation of the Qt Toolkit. +** +** $QT_BEGIN_LICENSE:FDL$ +** 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 Free Documentation License Usage +** Alternatively, this file may be used under the terms of the GNU Free +** Documentation License version 1.3 as published by the Free Software +** Foundation and appearing in the file included in the packaging of +** this file. Please review the following information to ensure +** the GNU Free Documentation License version 1.3 requirements +** will be met: http://www.gnu.org/copyleft/fdl.html. +** $QT_END_LICENSE$ +** +****************************************************************************/ + +/*! + * \title Qt Wayland Compositor Examples - Multi Screen + * \example multi-screen + * \brief Multi Screen is a desktop-style Wayland compositor for multiple screens. + * \ingroup qtwaylandcompositor-examples + * + * Multi-screen is a desktop-style Wayland compositor example for multiple + * screens. + * + * When a client creates a shell surface, one ShellSurfaceItem is created on + * each screen. The ShellSurfaceItem will be visible only on one (or two) + * screens at a time. ShellSurfaceItem positions are synchronized so that when + * windows enter one screen they are moved off another at the same time. + * + * WaylandQuickItem::setPrimary() is called at appropriate times to set the + * primary view for the ShellSurface, which is used when the client asks to be + * maximized or fullscreen. + */ diff --git a/examples/wayland/spanning-screens/doc/src/spanning-screens.qdoc b/examples/wayland/spanning-screens/doc/src/spanning-screens.qdoc new file mode 100644 index 000000000..cbb720fae --- /dev/null +++ b/examples/wayland/spanning-screens/doc/src/spanning-screens.qdoc @@ -0,0 +1,36 @@ +/**************************************************************************** +** +** Copyright (C) 2017 The Qt Company Ltd. +** Contact: http://www.qt.io/licensing/ +** +** This file is part of the documentation of the Qt Toolkit. +** +** $QT_BEGIN_LICENSE:FDL$ +** 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 Free Documentation License Usage +** Alternatively, this file may be used under the terms of the GNU Free +** Documentation License version 1.3 as published by the Free Software +** Foundation and appearing in the file included in the packaging of +** this file. Please review the following information to ensure +** the GNU Free Documentation License version 1.3 requirements +** will be met: http://www.gnu.org/copyleft/fdl.html. +** $QT_END_LICENSE$ +** +****************************************************************************/ + +/*! + * \title Qt Wayland Compositor Examples - Spanning Screens + * \example spanning-screens + * \brief Spanning Screens is an example that demonstrates how to let Wayland clients span multiple screens. + * \ingroup qtwaylandcompositor-examples + * + * Spanning screens is a Wayland compositor example that maximizes clients + * across a top and a bottom screen. + */ -- cgit v1.2.3 From 6bbbee12b81bb09b0708631f78491bd9ca978315 Mon Sep 17 00:00:00 2001 From: Johan Klokkhammer Helsing Date: Tue, 8 Aug 2017 09:54:46 +0200 Subject: Add missing QML documentation for ShellSurfaceItem::moveItem And add a more helpful explanation of the property. Change-Id: Ia5cd31867f5b0be586129abef829e00ee384b346 Reviewed-by: Venugopal Shivashankar --- src/compositor/extensions/qwaylandquickshellsurfaceitem.cpp | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/src/compositor/extensions/qwaylandquickshellsurfaceitem.cpp b/src/compositor/extensions/qwaylandquickshellsurfaceitem.cpp index bb2f72547..5418d290e 100644 --- a/src/compositor/extensions/qwaylandquickshellsurfaceitem.cpp +++ b/src/compositor/extensions/qwaylandquickshellsurfaceitem.cpp @@ -127,10 +127,20 @@ void QWaylandQuickShellSurfaceItem::setShellSurface(QWaylandShellSurface *shellS emit shellSurfaceChanged(); } +/*! + * \qmlproperty Item QtWaylandCompositor::ShellSurfaceItem::moveItem + * + * This property holds the move item for this ShellSurfaceItem. This is the item that will be moved + * when the clients request the ShellSurface to be moved, maximized, resized etc. This property is + * useful when implementing server-side decorations. + */ + /*! * \property QWaylandQuickShellSurfaceItem::moveItem * - * This property holds the move item for this QWaylandQuickShellSurfaceItem. + * This property holds the move item for this QWaylandQuickShellSurfaceItem. This is the item that + * will be moved when the clients request the QWaylandShellSurface to be moved, maximized, resized + * etc. This property is useful when implementing server-side decorations. */ QQuickItem *QWaylandQuickShellSurfaceItem::moveItem() const { -- cgit v1.2.3 From 3e0128ff1ec495da04350f9713becbdd94707da6 Mon Sep 17 00:00:00 2001 From: Johan Klokkhammer Helsing Date: Mon, 7 Aug 2017 15:00:33 +0200 Subject: Remove unimplemented overload for QWaylandSeat::sendFullKeyEvent Change-Id: I2cc4e0877d5957c0939d62ec66ed2ce72f15e7e6 Reviewed-by: Paul Olav Tvete --- src/compositor/compositor_api/qwaylandseat.h | 1 - 1 file changed, 1 deletion(-) diff --git a/src/compositor/compositor_api/qwaylandseat.h b/src/compositor/compositor_api/qwaylandseat.h index 5af10a45a..86cf250a6 100644 --- a/src/compositor/compositor_api/qwaylandseat.h +++ b/src/compositor/compositor_api/qwaylandseat.h @@ -97,7 +97,6 @@ public: void sendKeyReleaseEvent(uint code); void sendFullKeyEvent(QKeyEvent *event); - void sendFullKeyEvent(QWaylandSurface *surface, QKeyEvent *event); uint sendTouchPointEvent(QWaylandSurface *surface, int id, const QPointF &point, Qt::TouchPointState state); void sendTouchFrameEvent(QWaylandClient *client); -- cgit v1.2.3 From 7f70da6a644bc5b690066f0ab4814e1358f57e81 Mon Sep 17 00:00:00 2001 From: Johan Klokkhammer Helsing Date: Fri, 21 Jul 2017 16:51:04 +0200 Subject: Try -lEGL when checking for wayland-egl This will detect wayland-egl on an imx6 without pkg-config Change-Id: I9c0fe6eef375fd0431a218c3b0407505c29eead9 Reviewed-by: Karim Pinter Reviewed-by: Paul Olav Tvete --- src/client/configure.json | 3 ++- src/compositor/configure.json | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/src/client/configure.json b/src/client/configure.json index d216960e1..b11416f68 100644 --- a/src/client/configure.json +++ b/src/client/configure.json @@ -28,7 +28,8 @@ "test": "wayland_egl", "sources": [ { "type": "pkgConfig", "args": "wayland-egl" }, - "-lwayland-egl" + "-lwayland-egl", + "-lEGL" ] }, "xcomposite": { diff --git a/src/compositor/configure.json b/src/compositor/configure.json index 733ccfc03..a95c4eb01 100644 --- a/src/compositor/configure.json +++ b/src/compositor/configure.json @@ -18,7 +18,8 @@ "test": "wayland_egl", "sources": [ { "type": "pkgConfig", "args": "wayland-egl" }, - "-lwayland-egl" + "-lwayland-egl", + "-lEGL" ] }, "xcomposite": { -- cgit v1.2.3