diff options
Diffstat (limited to 'src/common-lib/logging.cpp')
| -rw-r--r-- | src/common-lib/logging.cpp | 23 |
1 files changed, 17 insertions, 6 deletions
diff --git a/src/common-lib/logging.cpp b/src/common-lib/logging.cpp index 064610b5..74d9a7c6 100644 --- a/src/common-lib/logging.cpp +++ b/src/common-lib/logging.cpp @@ -1,10 +1,11 @@ /**************************************************************************** ** +** Copyright (C) 2019 The Qt Company Ltd. ** Copyright (C) 2019 Luxoft Sweden AB ** Copyright (C) 2018 Pelagicore AG ** Contact: https://www.qt.io/licensing/ ** -** This file is part of the Luxoft Application Manager. +** This file is part of the Qt Application Manager. ** ** $QT_BEGIN_LICENSE:LGPL-QTAS$ ** Commercial License Usage @@ -73,8 +74,8 @@ Q_CORE_EXPORT void qWinMsgHandler(QtMsgType t, const char* str); QT_BEGIN_NAMESPACE_AM #if defined(QT_GENIVIEXTRAS_LIB) -static const char *s_defaultSystemUiDltId = "LXAM"; -static const char *s_defaultSystemUiDltDescription = "Luxoft Application-Manager"; +static const char *s_defaultSystemUiDltId = "QTAM"; +static const char *s_defaultSystemUiDltDescription = "Qt Application Manager"; #endif /* @@ -105,6 +106,10 @@ static const char *s_defaultSystemUiDltDescription = "Luxoft Application-Manager \li \c QML \li General QML related messages \row + \li \c am.runtime + \li \c RT + \li Runtime messages +\row \li \c am.runtime.qml \li \c QMRT \li QML runtime messages @@ -125,6 +130,10 @@ static const char *s_defaultSystemUiDltDescription = "Luxoft Application-Manager \li \c INTN \li Intent sub-system messages \row + \li \c am.cache + \li \c CACH + \li Cache sub-system messages +\row \li \c general \li \c GEN \li Used for DLT logging only and enabled by default. Categories that have no context ID @@ -139,11 +148,13 @@ QDLT_LOGGING_CATEGORY(LogInstaller, "am.installer", "INST", "Installer sub-syste QDLT_LOGGING_CATEGORY(LogGraphics, "am.graphics", "GRPH", "OpenGL/UI related messages") QDLT_LOGGING_CATEGORY(LogWaylandDebug, "am.wayland.debug", "WAYL", "Wayland related messages") QDLT_LOGGING_CATEGORY(LogQml, "am.qml", "QML", "General QML related messages") +QDLT_LOGGING_CATEGORY(LogRuntime, "am.runtime", "RT", "Runtime messages") QDLT_LOGGING_CATEGORY(LogQmlRuntime, "am.runtime.qml", "QMRT", "QML runtime messages") QDLT_LOGGING_CATEGORY(LogQmlIpc, "am.qml.ipc", "QMIP", "QML IPC messages") QDLT_LOGGING_CATEGORY(LogNotifications, "am.notify", "NTFY", "Notifications sub-system messages") QDLT_LOGGING_CATEGORY(LogDeployment, "am.deployment", "DPLM", "Deployment hints") QDLT_LOGGING_CATEGORY(LogIntents, "am.intent", "INTN", "Intents sub-system messages") +QDLT_LOGGING_CATEGORY(LogCache, "am.cache", "CACH", "Cache sub-system messages") QDLT_LOGGING_CATEGORY(LogGeneral, "general", "GEN", "Messages without dedicated context ID (fallback)") QDLT_FALLBACK_CATEGORY(LogGeneral) @@ -391,10 +402,10 @@ QVariant Logging::useAMConsoleLogger() void Logging::useAMConsoleLogger(const QVariant &config) { s_useAMConsoleLoggerConfig = config; - if (!s_useAMConsoleLoggerConfig.isValid()) - s_useAMConsoleLogger = !s_messagePatternDefined; - else + if (s_useAMConsoleLoggerConfig.userType() == QMetaType::Bool) s_useAMConsoleLogger = s_useAMConsoleLoggerConfig.toBool(); + else + s_useAMConsoleLogger = !s_messagePatternDefined; } QByteArray Logging::applicationId() |