diff options
| author | Jarek Kobus <jaroslaw.kobus@theqtcompany.com> | 2015-04-24 13:32:57 +0200 |
|---|---|---|
| committer | Jarek Kobus <jaroslaw.kobus@theqtcompany.com> | 2015-04-24 12:58:49 +0000 |
| commit | c522fd5de907fb264e24eed842e28d9ac56bce0c (patch) | |
| tree | a2110fe689c40f58ae94f8fc05b59f16436f30f5 /src/libs | |
| parent | 2554ccb7ba4ef3103411e38b0c2d5d218217cccd (diff) | |
Add more logging categories.
Change-Id: I1c7dabfd16a69ef5a3e5aaa490036de061f1fd13
Reviewed-by: Karsten Heimrich <karsten.heimrich@theqtcompany.com>
Diffstat (limited to 'src/libs')
| -rw-r--r-- | src/libs/installer/globals.cpp | 19 | ||||
| -rw-r--r-- | src/libs/installer/globals.h | 5 |
2 files changed, 17 insertions, 7 deletions
diff --git a/src/libs/installer/globals.cpp b/src/libs/installer/globals.cpp index 43e5b4365..b91210640 100644 --- a/src/libs/installer/globals.cpp +++ b/src/libs/installer/globals.cpp @@ -34,22 +34,29 @@ #include "globals.h" const char IFW_COMPONENT_CHECKER[] = "ifw.componentChecker"; +const char IFW_RESOURCES[] = "ifw.resources"; +const char IFW_TRANSLATIONS[] = "ifw.translations"; namespace QInstaller { Q_LOGGING_CATEGORY(lcComponentChecker, IFW_COMPONENT_CHECKER) +Q_LOGGING_CATEGORY(lcResources, IFW_RESOURCES) +Q_LOGGING_CATEGORY(lcTranslations, IFW_TRANSLATIONS) -Q_GLOBAL_STATIC_WITH_ARGS(QRegExp, staticCommaRegExp, (QLatin1String("\\b(,|, )\\b"))); -QRegExp commaRegExp() +QStringList loggingCategories() { - return *staticCommaRegExp(); + static QStringList categories = QStringList() + << QLatin1String(IFW_COMPONENT_CHECKER) + << QLatin1String(IFW_RESOURCES) + << QLatin1String(IFW_TRANSLATIONS); + return categories; } -QStringList loggingCategories() +Q_GLOBAL_STATIC_WITH_ARGS(QRegExp, staticCommaRegExp, (QLatin1String("\\b(,|, )\\b"))); +QRegExp commaRegExp() { - static QStringList categories = QStringList() << QLatin1String(IFW_COMPONENT_CHECKER); - return categories; + return *staticCommaRegExp(); } } // namespace QInstaller diff --git a/src/libs/installer/globals.h b/src/libs/installer/globals.h index 3d6461690..53ce4ffb5 100644 --- a/src/libs/installer/globals.h +++ b/src/libs/installer/globals.h @@ -42,10 +42,13 @@ namespace QInstaller { Q_DECLARE_LOGGING_CATEGORY(lcComponentChecker) +Q_DECLARE_LOGGING_CATEGORY(lcResources) +Q_DECLARE_LOGGING_CATEGORY(lcTranslations) -QRegExp INSTALLER_EXPORT commaRegExp(); QStringList INSTALLER_EXPORT loggingCategories(); +QRegExp INSTALLER_EXPORT commaRegExp(); + } // QInstaller #endif // GLOBALS_H |