diff options
author | Liang Qi <liang.qi@qt.io> | 2016-06-29 10:10:22 +0200 |
---|---|---|
committer | Liang Qi <liang.qi@qt.io> | 2016-06-29 10:10:22 +0200 |
commit | f27d8b9f570e7fe5eab527ea13ed8bc3ec172702 (patch) | |
tree | d84389d3c2a37b38435e0be5259f48e5f04290e0 /src/corelib | |
parent | a8c98dcb89f2b3f8438555d8febe17d3542d0567 (diff) | |
parent | 0d720a000f4f35c5ea6942426efec6847b06f4ce (diff) |
Merge remote-tracking branch 'origin/5.6' into 5.7
Change-Id: If6ba05867e7c98159e1b94ff71923e8b36bdbccb
Diffstat (limited to 'src/corelib')
-rw-r--r-- | src/corelib/io/qloggingcategory.cpp | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/src/corelib/io/qloggingcategory.cpp b/src/corelib/io/qloggingcategory.cpp index 519cec507a..afdf0d0312 100644 --- a/src/corelib/io/qloggingcategory.cpp +++ b/src/corelib/io/qloggingcategory.cpp @@ -86,6 +86,15 @@ static void setBoolLane(QBasicAtomicInt *atomic, bool enable, int shift) \snippet qloggingcategory/main.cpp 1 + \note Category names are free text. However, to allow easy configuration + of the categories using \l{Logging Rules} the names should follow some rules: + \list + \li Use letters and numbers only. + \li Further structure categories into common areas by using dots. + \li Avoid the category names \c{debug}, \c{info}, \c{warning}, and \c{critical}. + \li Category names starting with \c{qt} are reserved for Qt modules. + \endlist + \section1 Checking Category Configuration QLoggingCategory provides \l isDebugEnabled(), \l isInfoEnabled(), |