diff --git a/src/plugins/platforms/wayland/qwaylandinputcontext.cpp b/src/plugins/platforms/wayland/qwaylandinputcontext.cpp index a38bb9a0a15..4d70f35facc 100644 --- a/src/plugins/platforms/wayland/qwaylandinputcontext.cpp +++ b/src/plugins/platforms/wayland/qwaylandinputcontext.cpp @@ -4,7 +4,6 @@ #include "qwaylandinputcontext_p.h" -#include #include #include #include diff --git a/src/plugins/platforms/wayland/qwaylandinputcontext_p.h b/src/plugins/platforms/wayland/qwaylandinputcontext_p.h index e6ce21d3414..0076f20cd82 100644 --- a/src/plugins/platforms/wayland/qwaylandinputcontext_p.h +++ b/src/plugins/platforms/wayland/qwaylandinputcontext_p.h @@ -18,6 +18,7 @@ #include +#include #include #include "qwaylandtextinputinterface_p.h" @@ -31,6 +32,8 @@ struct wl_callback_listener; QT_BEGIN_NAMESPACE +Q_DECLARE_LOGGING_CATEGORY(qLcQpaInputMethods) + namespace QtWaylandClient { class QWaylandDisplay; diff --git a/src/plugins/platforms/wayland/qwaylandinputmethodcontext.cpp b/src/plugins/platforms/wayland/qwaylandinputmethodcontext.cpp index 2733e4f3aab..b0f55ef570c 100644 --- a/src/plugins/platforms/wayland/qwaylandinputmethodcontext.cpp +++ b/src/plugins/platforms/wayland/qwaylandinputmethodcontext.cpp @@ -2,6 +2,7 @@ // SPDX-License-Identifier: LicenseRef-Qt-Commercial OR LGPL-3.0-only OR GPL-2.0-only OR GPL-3.0-only #include "qwaylandinputmethodcontext_p.h" +#include "qwaylandinputcontext_p.h" #include "qwaylanddisplay_p.h" #include "qwaylandinputdevice_p.h" @@ -11,8 +12,6 @@ QT_BEGIN_NAMESPACE -Q_DECLARE_LOGGING_CATEGORY(qLcQpaInputMethods) - namespace QtWaylandClient { static constexpr int maxStringSize = 1000; // actual max is 4096/3 diff --git a/src/plugins/platforms/wayland/qwaylandtextinputv1.cpp b/src/plugins/platforms/wayland/qwaylandtextinputv1.cpp index 846ed95c87b..dc999624b76 100644 --- a/src/plugins/platforms/wayland/qwaylandtextinputv1.cpp +++ b/src/plugins/platforms/wayland/qwaylandtextinputv1.cpp @@ -4,6 +4,7 @@ #include "qwaylandtextinputv1_p.h" +#include "qwaylandinputcontext_p.h" #include "qwaylandwindow_p.h" #include "qwaylandinputmethodeventbuilder_p.h" @@ -21,8 +22,6 @@ QT_BEGIN_NAMESPACE -Q_DECLARE_LOGGING_CATEGORY(qLcQpaInputMethods) - namespace QtWaylandClient { namespace { diff --git a/src/plugins/platforms/wayland/qwaylandtextinputv2.cpp b/src/plugins/platforms/wayland/qwaylandtextinputv2.cpp index 9d462f7d60b..9f767eaed00 100644 --- a/src/plugins/platforms/wayland/qwaylandtextinputv2.cpp +++ b/src/plugins/platforms/wayland/qwaylandtextinputv2.cpp @@ -5,6 +5,7 @@ #include "qwaylandtextinputv2_p.h" +#include "qwaylandinputcontext_p.h" #include "qwaylandwindow_p.h" #include "qwaylandinputmethodeventbuilder_p.h" @@ -22,8 +23,6 @@ QT_BEGIN_NAMESPACE -Q_DECLARE_LOGGING_CATEGORY(qLcQpaInputMethods) - namespace QtWaylandClient { namespace {