1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Move the declaration of the qLcQpaInputMethods category to the header

Browse Source 
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>
This commit is contained in:
Thiago Macieira 2024-09-07 12:21:35 +02:00
parent fcdef0cd5f
commit 5384317da8
5 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/plugins/platforms/wayland/qwaylandinputcontext.cpp
View File

@ -4,7 +4,6 @@
#include "qwaylandinputcontext_p.h"
#include <QLoggingCategory>
#include <QtGui/QGuiApplication>
#include <QtGui/QTextCharFormat>
#include <QtGui/QWindow>

3
src/plugins/platforms/wayland/qwaylandinputcontext_p.h
View File

@ -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;

3
src/plugins/platforms/wayland/qwaylandinputmethodcontext.cpp
View File

@ -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

3
src/plugins/platforms/wayland/qwaylandtextinputv1.cpp
View File

@ -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 {

3
src/plugins/platforms/wayland/qwaylandtextinputv2.cpp
View File

@ -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 {