summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorVolker Hilsheimer <[email protected]>2024-12-18 15:30:38 +0100
committerVolker Hilsheimer <[email protected]>2024-12-20 10:42:45 +0100
commitb957dfc6e06deed64e20e8eee5d2164250b28b95 (patch)
tree0a83949b6d2981fb7d90399a4da1aff55ce32174
parent1bd883dbc15c4016f78d421afac2ac9f31ec4874 (diff)
QTestLib: Remove logging category declaration from public header
The lcQtGuiTest category is only used in qtestsupport_gui.cpp, so declare it there as a static logging category. Addresses header-review comment, amends 5ac4f04325a56d47812f528fe31ceb0d4932f664. Pick-to: 6.9 Task-number: QTBUG-132090 Change-Id: I5b2a93822a698f55c52c1be87ebf8a689f49e2a3 Reviewed-by: Axel Spoerl <[email protected]> Reviewed-by: Juha Vuolle <[email protected]>
-rw-r--r--src/gui/kernel/qtestsupport_gui.cpp3
-rw-r--r--src/gui/kernel/qtestsupport_gui.h5
2 files changed, 2 insertions, 6 deletions
diff --git a/src/gui/kernel/qtestsupport_gui.cpp b/src/gui/kernel/qtestsupport_gui.cpp
index 85f791dd450..5867028b630 100644
--- a/src/gui/kernel/qtestsupport_gui.cpp
+++ b/src/gui/kernel/qtestsupport_gui.cpp
@@ -14,6 +14,7 @@
#include <QtCore/QDebug>
#if QT_CONFIG(test_gui)
+#include <QtCore/qloggingcategory.h>
#include <private/qinputdevicemanager_p.h>
#include <private/qeventpoint_p.h>
#include <private/qhighdpiscaling_p.h>
@@ -183,7 +184,7 @@ QEventPoint &QTouchEventSequence::pointOrPreviousPoint(int touchId)
// We mean it.
//
#if QT_CONFIG(test_gui)
-Q_LOGGING_CATEGORY(lcQtGuiTest, "qt.gui.test");
+Q_STATIC_LOGGING_CATEGORY(lcQtGuiTest, "qt.gui.test");
#define deb qCDebug(lcQtGuiTest)
/*!
diff --git a/src/gui/kernel/qtestsupport_gui.h b/src/gui/kernel/qtestsupport_gui.h
index 349c48ef6e7..581e13713e8 100644
--- a/src/gui/kernel/qtestsupport_gui.h
+++ b/src/gui/kernel/qtestsupport_gui.h
@@ -8,10 +8,6 @@
#include <QtGui/qevent.h>
#include <QtCore/qmap.h>
-#if QT_CONFIG(test_gui)
-#include <QtCore/qloggingcategory.h>
-#endif // #if QT_CONFIG(test_gui)
-
QT_BEGIN_NAMESPACE
class QWindow;
@@ -75,7 +71,6 @@ protected:
//
#if QT_CONFIG(test_gui)
-Q_DECLARE_LOGGING_CATEGORY(lcQtGuiTest)
namespace QtGuiTest
{
Q_NAMESPACE_EXPORT(Q_GUI_EXPORT)