diff options
| author | Ulf Hermann <ulf.hermann@qt.io> | 2021-11-24 17:58:28 +0100 |
|---|---|---|
| committer | Ulf Hermann <ulf.hermann@qt.io> | 2021-11-26 11:59:38 +0100 |
| commit | 968578a217966e3bd7ddf16f18d61a626b994fd1 (patch) | |
| tree | 2ff824dde30eb179ead18692c9c9bfe4bfa283c2 | |
| parent | 6d5c2cecdd9694f6ecf9679ea2d46c04b51ca771 (diff) | |
Fix logging categories in QtQml and friends
Make sure they all start with "qt.qml" and move them into the Qt
namespace. Remove dead ones.
Change-Id: I3d7a3c08b797c29df6737b2c4a5cacb26cd82956
Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>
| -rw-r--r-- | src/plugins/qmltooling/qmldbg_preview/qqmldebugtranslationservice.cpp | 2 | ||||
| -rw-r--r-- | src/qml/jit/qv4assemblercommon.cpp | 2 | ||||
| -rw-r--r-- | src/qml/qml/qqmlbuiltinfunctions.cpp | 2 | ||||
| -rw-r--r-- | src/qmlcompiler/qqmljscompiler.cpp | 4 | ||||
| -rw-r--r-- | src/qmlcompiler/qqmljstyperesolver.cpp | 2 | ||||
| -rw-r--r-- | src/qmlmodels/qqmldelegatemodel.cpp | 2 |
6 files changed, 6 insertions, 8 deletions
diff --git a/src/plugins/qmltooling/qmldbg_preview/qqmldebugtranslationservice.cpp b/src/plugins/qmltooling/qmldbg_preview/qqmldebugtranslationservice.cpp index 2b54683a37..c961698e57 100644 --- a/src/plugins/qmltooling/qmldbg_preview/qqmldebugtranslationservice.cpp +++ b/src/plugins/qmltooling/qmldbg_preview/qqmldebugtranslationservice.cpp @@ -66,8 +66,6 @@ QT_BEGIN_NAMESPACE -Q_LOGGING_CATEGORY(lcQmlTooling, "qt.quick.qmltooling.debugtranslation") - using namespace QQmlDebugTranslation; QDebug operator<<(QDebug debug, const TranslationBindingInformation &translationBindingInformation) diff --git a/src/qml/jit/qv4assemblercommon.cpp b/src/qml/jit/qv4assemblercommon.cpp index 6952c0b053..321070e393 100644 --- a/src/qml/jit/qv4assemblercommon.cpp +++ b/src/qml/jit/qv4assemblercommon.cpp @@ -59,7 +59,7 @@ QT_BEGIN_NAMESPACE namespace QV4 { namespace JIT { -Q_LOGGING_CATEGORY(lcAsm, "qt.v4.asm") +Q_LOGGING_CATEGORY(lcAsm, "qt.qml.v4.asm") namespace { class QIODevicePrintStream: public FilePrintStream diff --git a/src/qml/qml/qqmlbuiltinfunctions.cpp b/src/qml/qml/qqmlbuiltinfunctions.cpp index fe6ba0c81c..0a1fe67fd9 100644 --- a/src/qml/qml/qqmlbuiltinfunctions.cpp +++ b/src/qml/qml/qqmlbuiltinfunctions.cpp @@ -84,7 +84,7 @@ QT_BEGIN_NAMESPACE -Q_LOGGING_CATEGORY(lcRootProperties, "qml.rootObjectProperties"); +Q_LOGGING_CATEGORY(lcRootProperties, "qt.qml.rootObjectProperties"); using namespace QV4; diff --git a/src/qmlcompiler/qqmljscompiler.cpp b/src/qmlcompiler/qqmljscompiler.cpp index e9ccce9662..73faaaa6fc 100644 --- a/src/qmlcompiler/qqmljscompiler.cpp +++ b/src/qmlcompiler/qqmljscompiler.cpp @@ -38,10 +38,10 @@ #include <limits> -Q_LOGGING_CATEGORY(lcAotCompiler, "qml.compiler.aot", QtWarningMsg); - QT_BEGIN_NAMESPACE +Q_LOGGING_CATEGORY(lcAotCompiler, "qt.qml.compiler.aot", QtWarningMsg); + static const int FileScopeCodeIndex = -1; static QSet<QString> getIllegalNames() diff --git a/src/qmlcompiler/qqmljstyperesolver.cpp b/src/qmlcompiler/qqmljstyperesolver.cpp index 2595275dd5..ed1e21bc31 100644 --- a/src/qmlcompiler/qqmljstyperesolver.cpp +++ b/src/qmlcompiler/qqmljstyperesolver.cpp @@ -39,7 +39,7 @@ QT_BEGIN_NAMESPACE -Q_LOGGING_CATEGORY(lcTypeResolver, "qml.compiler.typeresolver", QtInfoMsg); +Q_LOGGING_CATEGORY(lcTypeResolver, "qt.qml.compiler.typeresolver", QtInfoMsg); template<typename Action> static bool searchBaseAndExtensionTypes(const QQmlJSScope::ConstPtr type, const Action &check) diff --git a/src/qmlmodels/qqmldelegatemodel.cpp b/src/qmlmodels/qqmldelegatemodel.cpp index 5e891bac75..e76d9f4529 100644 --- a/src/qmlmodels/qqmldelegatemodel.cpp +++ b/src/qmlmodels/qqmldelegatemodel.cpp @@ -56,7 +56,7 @@ QT_BEGIN_NAMESPACE -Q_LOGGING_CATEGORY(lcItemViewDelegateRecycling, "qt.quick.itemview.delegaterecycling") +Q_LOGGING_CATEGORY(lcItemViewDelegateRecycling, "qt.qml.delegatemodel.recycling") class QQmlDelegateModelItem; |