summaryrefslogtreecommitdiffstats
path: root/src/corelib/io
diff options
context:
space:
mode:
authorFrederik Gladhorn <frederik.gladhorn@digia.com>2014-05-05 09:22:53 +0200
committerThe Qt Project <gerrit-noreply@qt-project.org>2014-05-05 09:22:53 +0200
commit1f278c6e1126a41e83aec83e2eeacb96ee08e74b (patch)
treec544d6d79205bf77ae9aefe860a88965bceff995 /src/corelib/io
parenta5bba1f9da376840d92f2008d8ba8433753b1847 (diff)
parente6286ca289db11463d13ec4d31055995b32ad258 (diff)
Merge "Merge remote-tracking branch 'origin/release' into stable" into refs/staging/stable
Diffstat (limited to 'src/corelib/io')
-rw-r--r--src/corelib/io/qloggingcategory.cpp6
1 files changed, 6 insertions, 0 deletions
diff --git a/src/corelib/io/qloggingcategory.cpp b/src/corelib/io/qloggingcategory.cpp
index 08ecd67dc8..518052e537 100644
--- a/src/corelib/io/qloggingcategory.cpp
+++ b/src/corelib/io/qloggingcategory.cpp
@@ -62,6 +62,12 @@ Q_GLOBAL_STATIC_WITH_ARGS(QLoggingCategory, qtDefaultCategory,
by a string - at runtime. Whether a category should be actually logged or
not can be checked with the \l isEnabled() methods.
+ All objects are meant to be configured by a common registry (see also
+ \l{Configuring Categories}). Different objects can also represent the same
+ category. It's therefore not recommended to export objects across module
+ boundaries, nor to manipulate the objects directly, nor to inherit from
+ QLoggingCategory.
+
\section1 Creating category objects
The Q_LOGGING_CATEGORY() and the Q_DECLARE_LOGGING_CATEGORY() macros