qdoc: Manage logging category in utilities.h/cpp

Change-Id: I39ec66fbe95edc42a3dac51e8bc718ee42cc4a2a
Reviewed-by: Paul Wicking <paul.wicking@qt.io>

6 files changed, 5 insertions, 14 deletions

diff --git a/tests/auto/qdoc/config/CMakeLists.txt b/tests/auto/qdoc/config/CMakeLists.txt
index 2d54cc041..98eebb7d0 100644
--- a/tests/auto/qdoc/config/CMakeLists.txt
+++ b/tests/auto/qdoc/config/CMakeLists.txt
@@ -8,8 +8,8 @@ qt_add_test(tst_config
     SOURCES
         ../../../../src/qdoc/config.cpp ../../../../src/qdoc/config.h
         ../../../../src/qdoc/location.cpp ../../../../src/qdoc/location.h
-        ../../../../src/qdoc/loggingcategory.h
         ../../../../src/qdoc/qdoccommandlineparser.cpp ../../../../src/qdoc/qdoccommandlineparser.h
+        ../../../../src/qdoc/utilities.cpp ../../../../src/qdoc/utilities.h
         tst_config.cpp
     INCLUDE_DIRECTORIES
         ../../../../src/qdoc
diff --git a/tests/auto/qdoc/config/config.pro b/tests/auto/qdoc/config/config.pro
index b6cb9a32d..e72a99fa1 100644
--- a/tests/auto/qdoc/config/config.pro
+++ b/tests/auto/qdoc/config/config.pro
@@ -7,10 +7,11 @@ HEADERS += \
     $$PWD/../../../../src/qdoc/config.h \
     $$PWD/../../../../src/qdoc/location.h \
     $$PWD/../../../../src/qdoc/qdoccommandlineparser.h \
-    $$PWD/../../../../src/qdoc/loggingcategory.h
+    $$PWD/../../../../src/qdoc/utilities.h
 
 SOURCES += \
     tst_config.cpp \
     $$PWD/../../../../src/qdoc/config.cpp \
     $$PWD/../../../../src/qdoc/location.cpp \
-    $$PWD/../../../../src/qdoc/qdoccommandlineparser.cpp
+    $$PWD/../../../../src/qdoc/qdoccommandlineparser.cpp \
+    $$PWD/../../../../src/qdoc/utilities.cpp
diff --git a/tests/auto/qdoc/config/tst_config.cpp b/tests/auto/qdoc/config/tst_config.cpp
index 816057512..15426f556 100644
--- a/tests/auto/qdoc/config/tst_config.cpp
+++ b/tests/auto/qdoc/config/tst_config.cpp
@@ -34,10 +34,6 @@
 #include <QtCore/qstringlist.h>
 #include <QtTest/QtTest>
 
-QT_BEGIN_NAMESPACE
-Q_LOGGING_CATEGORY(lcQdoc, "qt.test")
-QT_END_NAMESPACE
-
 class tst_Config : public QObject
 {
     Q_OBJECT
diff --git a/tests/auto/qdoc/utilities/CMakeLists.txt b/tests/auto/qdoc/utilities/CMakeLists.txt
index bd949b84d..d47700827 100644
--- a/tests/auto/qdoc/utilities/CMakeLists.txt
+++ b/tests/auto/qdoc/utilities/CMakeLists.txt
@@ -6,7 +6,6 @@
 
 qt_add_test(tst_utilities
     SOURCES
-        ../../../../src/qdoc/loggingcategory.h
         ../../../../src/qdoc/utilities.cpp ../../../../src/qdoc/utilities.h
         tst_utilities.cpp
     INCLUDE_DIRECTORIES
diff --git a/tests/auto/qdoc/utilities/tst_utilities.cpp b/tests/auto/qdoc/utilities/tst_utilities.cpp
index 0f63b1daf..322c7197b 100644
--- a/tests/auto/qdoc/utilities/tst_utilities.cpp
+++ b/tests/auto/qdoc/utilities/tst_utilities.cpp
@@ -30,10 +30,6 @@
 
 #include <QtTest/QtTest>
 
-QT_BEGIN_NAMESPACE
-Q_LOGGING_CATEGORY(lcQdoc, "qt.test")
-QT_END_NAMESPACE
-
 class tst_Utilities : public QObject
 {
     Q_OBJECT
@@ -48,7 +44,7 @@ private slots:
 
 void tst_Utilities::loggingCategoryName()
 {
-    const QString expected = "qt.test";
+    const QString expected = "qt.qdoc";
     QCOMPARE(lcQdoc().categoryName(), expected);
 }
 
diff --git a/tests/auto/qdoc/utilities/utilities.pro b/tests/auto/qdoc/utilities/utilities.pro
index 57489f2b1..fb58b9211 100644
--- a/tests/auto/qdoc/utilities/utilities.pro
+++ b/tests/auto/qdoc/utilities/utilities.pro
@@ -4,7 +4,6 @@ TARGET = tst_utilities
 INCLUDEPATH += $$PWD/../../../../src/qdoc
 
 HEADERS += \
-    $$PWD/../../../../src/qdoc/loggingcategory.h \
     $$PWD/../../../../src/qdoc/utilities.h
 
 SOURCES += \