Don't explicitly disable the Qt3D category logging

Category logging is off by default, so explicitly turning it off will
just make it harder to turn it on in the application.

qt.*.debug has special behavior in the sense that defaults to off. Other
categories, like Qt3D.*.debug default to true. Therefore the only correct
way in Qt 3D is to always specify warning-and-up as the default enabled
severity.

Change-Id: I91daf48e049b7a9fcfac9720982138b178ee4804
Reviewed-by: Antti Määttä <antti.maatta@qt.io>

13 files changed, 15 insertions, 19 deletions

diff --git a/src/core/aspects/qaspectengine.cpp b/src/core/aspects/qaspectengine.cpp
index c1ec1b4ac..91961984f 100644
--- a/src/core/aspects/qaspectengine.cpp
+++ b/src/core/aspects/qaspectengine.cpp
@@ -177,10 +177,6 @@ void QAspectEnginePrivate::generateCreationChanges(QNode *root)
 QAspectEngine::QAspectEngine(QObject *parent)
     : QObject(*new QAspectEnginePrivate, parent)
 {
-    // Don't show any debug output from Qt3D. If you need to enable additional logging
-    // for debugging use a rules file as explained in the QLoggingCategory documentation.
-    QLoggingCategory::setFilterRules(QString::fromUtf8("Qt3D.*.debug=false\n"));
-
     qCDebug(Aspects) << Q_FUNC_INFO;
     Q_D(QAspectEngine);
     d->m_scene = new QScene(this);
diff --git a/src/core/corelogging.cpp b/src/core/corelogging.cpp
index 4ad8c5f0e..6bd7bfcb7 100644
--- a/src/core/corelogging.cpp
+++ b/src/core/corelogging.cpp
@@ -43,10 +43,10 @@ QT_BEGIN_NAMESPACE
 
 namespace Qt3DCore {
 
-Q_LOGGING_CATEGORY(Nodes, "Qt3D.Core.Nodes")
-Q_LOGGING_CATEGORY(Aspects, "Qt3D.Core.Aspects")
-Q_LOGGING_CATEGORY(Resources, "Qt3D.Core.Resources")
-Q_LOGGING_CATEGORY(ChangeArbiter, "Qt3D.Core.ChangeArbiter")
+Q_LOGGING_CATEGORY(Nodes, "Qt3D.Core.Nodes", QtWarningMsg);
+Q_LOGGING_CATEGORY(Aspects, "Qt3D.Core.Aspects", QtWarningMsg);
+Q_LOGGING_CATEGORY(Resources, "Qt3D.Core.Resources", QtWarningMsg);
+Q_LOGGING_CATEGORY(ChangeArbiter, "Qt3D.Core.ChangeArbiter", QtWarningMsg);
 
 } // Qt3D
 
diff --git a/src/plugins/geometryloaders/default/basegeometryloader.cpp b/src/plugins/geometryloaders/default/basegeometryloader.cpp
index 687c39e6a..2943eec2b 100644
--- a/src/plugins/geometryloaders/default/basegeometryloader.cpp
+++ b/src/plugins/geometryloaders/default/basegeometryloader.cpp
@@ -50,7 +50,7 @@ QT_BEGIN_NAMESPACE
 
 namespace Qt3DRender {
 
-Q_LOGGING_CATEGORY(BaseGeometryLoaderLog, "Qt3D.BaseGeometryLoader")
+Q_LOGGING_CATEGORY(BaseGeometryLoaderLog, "Qt3D.BaseGeometryLoader", QtWarningMsg)
 
 BaseGeometryLoader::BaseGeometryLoader()
     : m_loadTextureCoords(true)
diff --git a/src/plugins/geometryloaders/default/objgeometryloader.cpp b/src/plugins/geometryloaders/default/objgeometryloader.cpp
index ab2f17712..0f22acc66 100644
--- a/src/plugins/geometryloaders/default/objgeometryloader.cpp
+++ b/src/plugins/geometryloaders/default/objgeometryloader.cpp
@@ -46,7 +46,7 @@ QT_BEGIN_NAMESPACE
 
 namespace Qt3DRender {
 
-Q_LOGGING_CATEGORY(ObjGeometryLoaderLog, "Qt3D.ObjGeometryLoader")
+Q_LOGGING_CATEGORY(ObjGeometryLoaderLog, "Qt3D.ObjGeometryLoader", QtWarningMsg)
 
 static void addFaceVertex(const FaceIndices &faceIndices,
                           QVector<FaceIndices>& faceIndexVector,
diff --git a/src/plugins/geometryloaders/default/plygeometryloader.cpp b/src/plugins/geometryloaders/default/plygeometryloader.cpp
index a7c252174..a51c991af 100644
--- a/src/plugins/geometryloaders/default/plygeometryloader.cpp
+++ b/src/plugins/geometryloaders/default/plygeometryloader.cpp
@@ -46,7 +46,7 @@ QT_BEGIN_NAMESPACE
 
 namespace Qt3DRender {
 
-Q_LOGGING_CATEGORY(PlyGeometryLoaderLog, "Qt3D.PlyGeometryLoader")
+Q_LOGGING_CATEGORY(PlyGeometryLoaderLog, "Qt3D.PlyGeometryLoader", QtWarningMsg)
 
 namespace {
 
diff --git a/src/plugins/geometryloaders/default/stlgeometryloader.cpp b/src/plugins/geometryloaders/default/stlgeometryloader.cpp
index b76698cc7..b4b5333cb 100644
--- a/src/plugins/geometryloaders/default/stlgeometryloader.cpp
+++ b/src/plugins/geometryloaders/default/stlgeometryloader.cpp
@@ -46,7 +46,7 @@ QT_BEGIN_NAMESPACE
 
 namespace Qt3DRender {
 
-Q_LOGGING_CATEGORY(StlGeometryLoaderLog, "Qt3D.StlGeometryLoader")
+Q_LOGGING_CATEGORY(StlGeometryLoaderLog, "Qt3D.StlGeometryLoader", QtWarningMsg)
 
 bool StlGeometryLoader::doLoad(QIODevice *ioDev, const QString &subMesh)
 {
diff --git a/src/plugins/geometryloaders/fbx/fbxgeometryloader.cpp b/src/plugins/geometryloaders/fbx/fbxgeometryloader.cpp
index cb0b57d50..7b1b8e4ee 100644
--- a/src/plugins/geometryloaders/fbx/fbxgeometryloader.cpp
+++ b/src/plugins/geometryloaders/fbx/fbxgeometryloader.cpp
@@ -52,7 +52,7 @@ QT_BEGIN_NAMESPACE
 
 namespace Qt3DRender {
 
-Q_LOGGING_CATEGORY(FbxGeometryLoaderLog, "Qt3D.FbxGeometryLoader")
+Q_LOGGING_CATEGORY(FbxGeometryLoaderLog, "Qt3D.FbxGeometryLoader", QtWarningMsg)
 
 class FbxStreamWrapper : public FbxStream
 {
diff --git a/src/plugins/geometryloaders/gltf/gltfgeometryloader.cpp b/src/plugins/geometryloaders/gltf/gltfgeometryloader.cpp
index 20e0bef5f..3ebb6bec2 100644
--- a/src/plugins/geometryloaders/gltf/gltfgeometryloader.cpp
+++ b/src/plugins/geometryloaders/gltf/gltfgeometryloader.cpp
@@ -57,7 +57,7 @@ QT_BEGIN_NAMESPACE
 
 namespace Qt3DRender {
 
-Q_LOGGING_CATEGORY(GLTFGeometryLoaderLog, "Qt3D.GLTFGeometryLoader")
+Q_LOGGING_CATEGORY(GLTFGeometryLoaderLog, "Qt3D.GLTFGeometryLoader", QtWarningMsg)
 
 #define KEY_ACCESSORS    QLatin1String("accessors")
 #define KEY_ATTRIBUTES   QLatin1String("attributes")
diff --git a/src/plugins/sceneparsers/assimp/assimpimporter.cpp b/src/plugins/sceneparsers/assimp/assimpimporter.cpp
index 87a6649f1..40db838b7 100644
--- a/src/plugins/sceneparsers/assimp/assimpimporter.cpp
+++ b/src/plugins/sceneparsers/assimp/assimpimporter.cpp
@@ -83,7 +83,7 @@ namespace Qt3DRender {
     It should be noted that Assimp aiString is explicitly defined to be UTF-8.
 */
 
-Q_LOGGING_CATEGORY(AssimpImporterLog, "Qt3D.AssimpImporter")
+Q_LOGGING_CATEGORY(AssimpImporterLog, "Qt3D.AssimpImporter", QtWarningMsg)
 
 namespace {
 
diff --git a/src/plugins/sceneparsers/gltf/gltfimporter.cpp b/src/plugins/sceneparsers/gltf/gltfimporter.cpp
index c026594bf..916589ffa 100644
--- a/src/plugins/sceneparsers/gltf/gltfimporter.cpp
+++ b/src/plugins/sceneparsers/gltf/gltfimporter.cpp
@@ -255,7 +255,7 @@ Qt3DRender::QFilterKey *buildFilterKey(const QString &key, const QJsonValue &val
 
 namespace Qt3DRender {
 
-Q_LOGGING_CATEGORY(GLTFImporterLog, "Qt3D.GLTFImport")
+Q_LOGGING_CATEGORY(GLTFImporterLog, "Qt3D.GLTFImport", QtWarningMsg)
 
 
 GLTFImporter::GLTFImporter() : QSceneImporter(),
diff --git a/src/plugins/sceneparsers/gltfexport/gltfexporter.cpp b/src/plugins/sceneparsers/gltfexport/gltfexporter.cpp
index 7332fa6b5..49af741f9 100644
--- a/src/plugins/sceneparsers/gltfexport/gltfexporter.cpp
+++ b/src/plugins/sceneparsers/gltfexport/gltfexporter.cpp
@@ -225,7 +225,7 @@ using namespace Qt3DExtras;
 
 namespace Qt3DRender {
 
-Q_LOGGING_CATEGORY(GLTFExporterLog, "Qt3D.GLTFExport")
+Q_LOGGING_CATEGORY(GLTFExporterLog, "Qt3D.GLTFExport", QtWarningMsg)
 
 const QString MATERIAL_DIFFUSE_COLOR = QStringLiteral("kd");
 const QString MATERIAL_SPECULAR_COLOR = QStringLiteral("ks");
diff --git a/src/quick3d/imports/scene3d/scene3dlogging.cpp b/src/quick3d/imports/scene3d/scene3dlogging.cpp
index b9582799b..b6656541b 100644
--- a/src/quick3d/imports/scene3d/scene3dlogging.cpp
+++ b/src/quick3d/imports/scene3d/scene3dlogging.cpp
@@ -43,7 +43,7 @@ QT_BEGIN_NAMESPACE
 
 namespace Qt3DRender {
 
-Q_LOGGING_CATEGORY(Scene3D, "Qt3D.Scene3D")
+Q_LOGGING_CATEGORY(Scene3D, "Qt3D.Scene3D", QtWarningMsg)
 
 } // Qt3DRender
 
diff --git a/src/quick3d/quick3dscene2d/qt3dquickscene2d_logging.cpp b/src/quick3d/quick3dscene2d/qt3dquickscene2d_logging.cpp
index c9af316de..e60ba0fde 100644
--- a/src/quick3d/quick3dscene2d/qt3dquickscene2d_logging.cpp
+++ b/src/quick3d/quick3dscene2d/qt3dquickscene2d_logging.cpp
@@ -41,7 +41,7 @@ QT_BEGIN_NAMESPACE
 namespace Qt3DRender {
 namespace Quick {
 
-Q_LOGGING_CATEGORY(Scene2D, "Qt3D.Scene2D")
+Q_LOGGING_CATEGORY(Scene2D, "Qt3D.Scene2D", QtWarningMsg)
 
 } // Quick
 } // Qt3DRender