From 2b7bb828414ab373f9362d4fa773d6de482cc72d Mon Sep 17 00:00:00 2001 From: Samuli Piippo Date: Thu, 22 Apr 2021 15:29:56 +0300 Subject: Add missing define guards Ammend cca1b94190a094b5d1d7ce492b6533e2d330c5e8 to use m_composeState only if xcbcommon is available. Change-Id: I48332b15def3282c5bda3e1c7c393ea7e9849cbe Reviewed-by: Aleix Pol Gonzalez (cherry picked from commit 05658e127dedfff65789860415537c6920ec574d) Reviewed-by: Qt Cherry-pick Bot --- src/client/qwaylandinputcontext.cpp | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/client/qwaylandinputcontext.cpp b/src/client/qwaylandinputcontext.cpp index 923950fe9..7220decd4 100644 --- a/src/client/qwaylandinputcontext.cpp +++ b/src/client/qwaylandinputcontext.cpp @@ -406,8 +406,10 @@ bool QWaylandInputContext::isValid() const void QWaylandInputContext::reset() { qCDebug(qLcQpaInputMethods) << Q_FUNC_INFO; +#if QT_CONFIG(xkbcommon) if (m_composeState) xkb_compose_state_reset(m_composeState); +#endif QPlatformInputContext::reset(); -- cgit v1.2.3 From 9601c0013b9db7a8ddcf9103828fab21c0d1be22 Mon Sep 17 00:00:00 2001 From: Albert Astals Cid Date: Mon, 10 May 2021 14:38:49 +0200 Subject: Include locale.h for setlocale/LC_CTYPE Change-Id: Iced32a31a63cec71008549c1e0961d59ffc45a37 Reviewed-by: Aleix Pol Gonzalez (cherry picked from commit e9522eda46028f351d87311d898ab985856970b0) Reviewed-by: Qt Cherry-pick Bot --- src/client/qwaylandinputcontext.cpp | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/client/qwaylandinputcontext.cpp b/src/client/qwaylandinputcontext.cpp index 7220decd4..0151dfc9b 100644 --- a/src/client/qwaylandinputcontext.cpp +++ b/src/client/qwaylandinputcontext.cpp @@ -51,6 +51,10 @@ #include "qwaylandinputmethodeventbuilder_p.h" #include "qwaylandwindow_p.h" +#if QT_CONFIG(xkbcommon) +#include +#endif + QT_BEGIN_NAMESPACE Q_LOGGING_CATEGORY(qLcQpaInputMethods, "qt.qpa.input.methods") -- cgit v1.2.3 From 1b494206cd4e4cc8226eef81760124d52f3d3da6 Mon Sep 17 00:00:00 2001 From: Kai Uwe Broulik Date: Mon, 19 Apr 2021 15:12:01 +0200 Subject: Docs: Add "instantiates" keywords Document what the corresponding C++ class for any given QML item is, like it's done in Qt Declarative. Change-Id: I015565f88cb457f1e73dd7c2c54edff3505db395 Reviewed-by: Eskil Abrahamsen Blomfeldt (cherry picked from commit a04decb6a85ef254ec48842e7551a2920de6a714) Reviewed-by: Paul Olav Tvete --- src/compositor/compositor_api/qwaylandclient.cpp | 1 + src/compositor/compositor_api/qwaylandcompositor.cpp | 1 + src/compositor/compositor_api/qwaylandoutput.cpp | 1 + src/compositor/compositor_api/qwaylandquickitem.cpp | 1 + src/compositor/compositor_api/qwaylandseat.cpp | 1 + src/compositor/compositor_api/qwaylandsurface.cpp | 1 + src/compositor/compositor_api/qwaylandview.cpp | 1 + src/compositor/extensions/qwaylandidleinhibitv1.cpp | 1 + src/compositor/extensions/qwaylandiviapplication.cpp | 1 + src/compositor/extensions/qwaylandivisurface.cpp | 1 + src/compositor/extensions/qwaylandquickshellsurfaceitem.cpp | 1 + src/compositor/extensions/qwaylandshellsurface.cpp | 1 + src/compositor/extensions/qwaylandwlshell.cpp | 2 ++ src/compositor/extensions/qwaylandxdgdecorationv1.cpp | 1 + src/compositor/extensions/qwaylandxdgoutputv1.cpp | 1 + src/compositor/extensions/qwaylandxdgshell.cpp | 4 ++++ 16 files changed, 20 insertions(+) diff --git a/src/compositor/compositor_api/qwaylandclient.cpp b/src/compositor/compositor_api/qwaylandclient.cpp index 51f46e0b3..cea02578f 100644 --- a/src/compositor/compositor_api/qwaylandclient.cpp +++ b/src/compositor/compositor_api/qwaylandclient.cpp @@ -79,6 +79,7 @@ public: /*! * \qmltype WaylandClient + * \instantiates QWaylandClient * \inqmlmodule QtWayland.Compositor * \since 5.8 * \brief Represents a client connecting to the WaylandCompositor. diff --git a/src/compositor/compositor_api/qwaylandcompositor.cpp b/src/compositor/compositor_api/qwaylandcompositor.cpp index 23bdbb152..483bae404 100644 --- a/src/compositor/compositor_api/qwaylandcompositor.cpp +++ b/src/compositor/compositor_api/qwaylandcompositor.cpp @@ -451,6 +451,7 @@ void QWaylandCompositorPrivate::loadServerBufferIntegration() /*! \qmltype WaylandCompositor + \instantiates QWaylandCompositor \inqmlmodule QtWayland.Compositor \since 5.8 \brief Manages the Wayland display server. diff --git a/src/compositor/compositor_api/qwaylandoutput.cpp b/src/compositor/compositor_api/qwaylandoutput.cpp index 9cde6f979..5ca7a4e83 100644 --- a/src/compositor/compositor_api/qwaylandoutput.cpp +++ b/src/compositor/compositor_api/qwaylandoutput.cpp @@ -249,6 +249,7 @@ QWaylandOutput::QWaylandOutput() /*! \qmltype WaylandOutput + \instantiates QWaylandOutput \inqmlmodule QtWayland.Compositor \since 5.8 \brief Provides access to a displayable area managed by the compositor. diff --git a/src/compositor/compositor_api/qwaylandquickitem.cpp b/src/compositor/compositor_api/qwaylandquickitem.cpp index 84f66a5cd..b487fb301 100644 --- a/src/compositor/compositor_api/qwaylandquickitem.cpp +++ b/src/compositor/compositor_api/qwaylandquickitem.cpp @@ -319,6 +319,7 @@ private: /*! * \qmltype WaylandQuickItem + * \instantiates QWaylandQuickItem * \inqmlmodule QtWayland.Compositor * \since 5.8 * \brief Provides a Qt Quick item that represents a WaylandView. diff --git a/src/compositor/compositor_api/qwaylandseat.cpp b/src/compositor/compositor_api/qwaylandseat.cpp index 88e806095..d11cbb928 100644 --- a/src/compositor/compositor_api/qwaylandseat.cpp +++ b/src/compositor/compositor_api/qwaylandseat.cpp @@ -136,6 +136,7 @@ void QWaylandSeatPrivate::seat_get_touch(wl_seat::Resource *resource, uint32_t i /*! * \qmltype WaylandSeat + * \instantiates QWaylandSeat * \inqmlmodule QtWayland.Compositor * \since 5.8 * \brief Provides access to keyboard, mouse, and touch input. diff --git a/src/compositor/compositor_api/qwaylandsurface.cpp b/src/compositor/compositor_api/qwaylandsurface.cpp index 0c055478b..4fed76d32 100644 --- a/src/compositor/compositor_api/qwaylandsurface.cpp +++ b/src/compositor/compositor_api/qwaylandsurface.cpp @@ -335,6 +335,7 @@ QtWayland::ClientBuffer *QWaylandSurfacePrivate::getBuffer(struct ::wl_resource /*! * \qmltype WaylandSurface + * \instantiates QWaylandSurface * \inqmlmodule QtWayland.Compositor * \since 5.8 * \brief Represents a rectangular area on an output device. diff --git a/src/compositor/compositor_api/qwaylandview.cpp b/src/compositor/compositor_api/qwaylandview.cpp index caa1c666a..b42db670d 100644 --- a/src/compositor/compositor_api/qwaylandview.cpp +++ b/src/compositor/compositor_api/qwaylandview.cpp @@ -54,6 +54,7 @@ void QWaylandViewPrivate::markSurfaceAsDestroyed(QWaylandSurface *surface) /*! * \qmltype WaylandView + * \instantiates QWaylandView * \inqmlmodule QtWayland.Compositor * \since 5.8 * \brief Represents a view of a surface on an output. diff --git a/src/compositor/extensions/qwaylandidleinhibitv1.cpp b/src/compositor/extensions/qwaylandidleinhibitv1.cpp index 86444a6af..295c4814e 100644 --- a/src/compositor/extensions/qwaylandidleinhibitv1.cpp +++ b/src/compositor/extensions/qwaylandidleinhibitv1.cpp @@ -51,6 +51,7 @@ QT_BEGIN_NAMESPACE /*! \qmltype IdleInhibitManagerV1 + \instantiates QWaylandIdleInhibitManagerV1 \inqmlmodule QtWayland.Compositor \since 5.14 \brief Provides an extension that allows to inhibit the idle behavior of the compositor. diff --git a/src/compositor/extensions/qwaylandiviapplication.cpp b/src/compositor/extensions/qwaylandiviapplication.cpp index b6ddb9832..61b42264a 100644 --- a/src/compositor/extensions/qwaylandiviapplication.cpp +++ b/src/compositor/extensions/qwaylandiviapplication.cpp @@ -40,6 +40,7 @@ QT_BEGIN_NAMESPACE /*! * \qmltype IviApplication * \inqmlmodule QtWayland.Compositor + * \instantiates QWaylandIviApplication * \since 5.8 * \brief Provides a shell extension for embedded-style user interfaces. * diff --git a/src/compositor/extensions/qwaylandivisurface.cpp b/src/compositor/extensions/qwaylandivisurface.cpp index e68077a4a..0588e9bc7 100644 --- a/src/compositor/extensions/qwaylandivisurface.cpp +++ b/src/compositor/extensions/qwaylandivisurface.cpp @@ -46,6 +46,7 @@ QWaylandSurfaceRole QWaylandIviSurfacePrivate::s_role("ivi_surface"); /*! * \qmltype IviSurface * \inqmlmodule QtWayland.Compositor + * \instantiates QWaylandIviSurface * \since 5.8 * \brief Provides a simple way to identify and resize a surface. * diff --git a/src/compositor/extensions/qwaylandquickshellsurfaceitem.cpp b/src/compositor/extensions/qwaylandquickshellsurfaceitem.cpp index 2196f8cdc..eb6db4141 100644 --- a/src/compositor/extensions/qwaylandquickshellsurfaceitem.cpp +++ b/src/compositor/extensions/qwaylandquickshellsurfaceitem.cpp @@ -52,6 +52,7 @@ QWaylandQuickShellSurfaceItem *QWaylandQuickShellSurfaceItemPrivate::maybeCreate /*! * \qmltype ShellSurfaceItem + * \instantiates QWaylandQuickShellSurfaceItem * \inherits WaylandQuickItem * \inqmlmodule QtWayland.Compositor * \since 5.8 diff --git a/src/compositor/extensions/qwaylandshellsurface.cpp b/src/compositor/extensions/qwaylandshellsurface.cpp index 42148c17a..373a06cff 100644 --- a/src/compositor/extensions/qwaylandshellsurface.cpp +++ b/src/compositor/extensions/qwaylandshellsurface.cpp @@ -31,6 +31,7 @@ /*! * \qmltype ShellSurface + * \instantiates QWaylandShellSurface * \inqmlmodule QtWayland.Compositor * \since 5.8 * \brief Provides a common interface for surface roles specified by shell extensions. diff --git a/src/compositor/extensions/qwaylandwlshell.cpp b/src/compositor/extensions/qwaylandwlshell.cpp index 114257659..7904a9e5a 100644 --- a/src/compositor/extensions/qwaylandwlshell.cpp +++ b/src/compositor/extensions/qwaylandwlshell.cpp @@ -245,6 +245,7 @@ void QWaylandWlShellSurfacePrivate::shell_surface_set_class(Resource *resource, /*! * \qmltype WlShell * \inqmlmodule QtWayland.Compositor + * \instantiates QWaylandWlShell * \since 5.8 * \brief Provides an extension for desktop-style user interfaces. * @@ -414,6 +415,7 @@ QByteArray QWaylandWlShell::interfaceName() /*! * \qmltype WlShellSurface * \inqmlmodule QtWayland.Compositor + * \instantiates QWaylandWlShellSurface * \since 5.8 * \brief Provides a \c wl_shell_surface that offers desktop-style compositor-specific features to a surface. * diff --git a/src/compositor/extensions/qwaylandxdgdecorationv1.cpp b/src/compositor/extensions/qwaylandxdgdecorationv1.cpp index 037f78f59..e1c9e4b46 100644 --- a/src/compositor/extensions/qwaylandxdgdecorationv1.cpp +++ b/src/compositor/extensions/qwaylandxdgdecorationv1.cpp @@ -40,6 +40,7 @@ QT_BEGIN_NAMESPACE /*! \qmltype XdgDecorationManagerV1 \inqmlmodule QtWayland.Compositor + \instantiates QWaylandXdgDecorationManagerV1 \since 5.12 \brief Provides an extension for negotiation of server-side and client-side window decorations. diff --git a/src/compositor/extensions/qwaylandxdgoutputv1.cpp b/src/compositor/extensions/qwaylandxdgoutputv1.cpp index 954e7aaf7..4c67ef7f9 100644 --- a/src/compositor/extensions/qwaylandxdgoutputv1.cpp +++ b/src/compositor/extensions/qwaylandxdgoutputv1.cpp @@ -39,6 +39,7 @@ QT_BEGIN_NAMESPACE /*! * \qmltype XdgOutputManagerV1 * \inqmlmodule QtWayland.Compositor + * \instantiates QWaylandXdgOutputManagerV1 * \since 5.14 * \brief Provides an extension for describing outputs in a desktop oriented fashion. * diff --git a/src/compositor/extensions/qwaylandxdgshell.cpp b/src/compositor/extensions/qwaylandxdgshell.cpp index c1b626bc0..8137887c9 100644 --- a/src/compositor/extensions/qwaylandxdgshell.cpp +++ b/src/compositor/extensions/qwaylandxdgshell.cpp @@ -135,6 +135,7 @@ void QWaylandXdgShellPrivate::xdg_wm_base_pong(Resource *resource, uint32_t seri /*! * \qmltype XdgShell * \inqmlmodule QtWayland.Compositor + * \instantiates QWaylandXdgShell * \since 5.12 * \brief Provides an extension for desktop-style user interfaces. * @@ -455,6 +456,7 @@ void QWaylandXdgSurfacePrivate::xdg_surface_set_window_geometry(QtWaylandServer: /*! * \qmltype XdgSurface * \inqmlmodule QtWayland.Compositor + * \instantiates QWaylandXdgSurface * \since 5.12 * \brief XdgSurface provides desktop-style compositor-specific features to an xdg surface. * @@ -704,6 +706,7 @@ QWaylandQuickShellIntegration *QWaylandXdgSurface::createIntegration(QWaylandQui /*! * \qmltype XdgToplevel * \inqmlmodule QtWayland.Compositor + * \instantiates QWaylandXdgToplevel * \since 5.12 * \brief XdgToplevel represents the toplevel window specific parts of an xdg surface. * @@ -1541,6 +1544,7 @@ void QWaylandXdgToplevelPrivate::xdg_toplevel_set_minimized(QtWaylandServer::xdg /*! * \qmltype XdgPopup * \inqmlmodule QtWayland.Compositor + * \instantiates QWaylandXdgPopup * \since 5.12 * \brief XdgPopup represents the popup specific parts of and xdg surface. * -- cgit v1.2.3 From 0971d58c6182641987c9a21119499ba59613fb38 Mon Sep 17 00:00:00 2001 From: Tarja Sundqvist Date: Thu, 20 May 2021 14:47:39 +0300 Subject: Bump version Change-Id: I7f046c2006d68b1d129a569f380f8847f389477d --- .qmake.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.qmake.conf b/.qmake.conf index d1dc9832d..2b807d2cc 100644 --- a/.qmake.conf +++ b/.qmake.conf @@ -4,4 +4,4 @@ DEFINES += QT_NO_FOREACH DEFINES += QT_NO_JAVA_STYLE_ITERATORS DEFINES += QT_NO_LINKED_LIST -MODULE_VERSION = 5.15.4 +MODULE_VERSION = 5.15.5 -- cgit v1.2.3