From 5384317da85d3559b4ed8b02a65a58665f83c50b Mon Sep 17 00:00:00 2001
From: Thiago Macieira <thiago.macieira@intel.com>
Date: Sat, 7 Sep 2024 12:21:35 +0200
Subject: [PATCH] Move the declaration of the qLcQpaInputMethods category to
 the header
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Qt 6.8 requires it.

qloggingcategory.h:168:67: warning: ‘const QLoggingCategory& qLcQpaInputMethods() [with <template-parameter-1-1> = void]’ is deprecated: Use Q_STATIC_LOGGING_CATEGORY or add either Q_DECLARE_LOGGING_CATEGORY or QT_DECLARE_EXPORTED_QT_LOGGING_CATEGORY in a header [-Wdeprecated-declarations]

Pick-to: 6.8
Change-Id: I41815e1c1bfdd5bab41cfffdd50d4679670398d8
Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
---
 src/plugins/platforms/wayland/qwaylandinputcontext.cpp       | 1 -
 src/plugins/platforms/wayland/qwaylandinputcontext_p.h       | 3 +++
 src/plugins/platforms/wayland/qwaylandinputmethodcontext.cpp | 3 +--
 src/plugins/platforms/wayland/qwaylandtextinputv1.cpp        | 3 +--
 src/plugins/platforms/wayland/qwaylandtextinputv2.cpp        | 3 +--
 5 files changed, 6 insertions(+), 7 deletions(-)

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 <QLoggingCategory>
 #include <QtGui/QGuiApplication>
 #include <QtGui/QTextCharFormat>
 #include <QtGui/QWindow>
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 <qpa/qplatforminputcontext.h>
 
+#include <QLoggingCategory>
 #include <QPointer>
 
 #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 {