diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2018-07-17 01:00:21 +0200 |
|---|---|---|
| committer | Edward Welbourne <edward.welbourne@qt.io> | 2018-07-17 10:19:22 +0200 |
| commit | 1783fca89768a9d503d886673643dc4542ec467f (patch) | |
| tree | 5055f39393017219e448ade71b3842896c4679c5 /src/corelib/io/qloggingcategory.cpp | |
| parent | b82648bd59256abb8e7084e0424a1f8a6a034c34 (diff) | |
| parent | 435d1d53bd61491010dbb2130a27e35cd9798965 (diff) | |
Merge remote-tracking branch 'origin/5.11' into dev
Conflicts:
src/plugins/platforms/cocoa/qcocoawindow.mm
src/plugins/platforms/xcb/qxcbintegration.cpp
Conflicts git missed:
src/plugins/platforms/qnx/qqnxglcontext.cpp
Change-Id: I0582cdc9e66e43efe79038b9c43d4f9572ac88fc
Diffstat (limited to 'src/corelib/io/qloggingcategory.cpp')
| -rw-r--r-- | src/corelib/io/qloggingcategory.cpp | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/src/corelib/io/qloggingcategory.cpp b/src/corelib/io/qloggingcategory.cpp index a6c27d19c0..d8402c4eb6 100644 --- a/src/corelib/io/qloggingcategory.cpp +++ b/src/corelib/io/qloggingcategory.cpp @@ -221,6 +221,8 @@ static void setBoolLane(QBasicAtomicInt *atomic, bool enable, int shift) All message types for this category are enabled by default. If \a category is \c{0}, the category name is changed to \c "default". + + Note that \a category must be kept valid during the lifetime of this object. */ QLoggingCategory::QLoggingCategory(const char *category) : d(0), @@ -235,6 +237,8 @@ QLoggingCategory::QLoggingCategory(const char *category) If \a category is \c{0}, the category name is changed to \c "default". + Note that \a category must be kept valid during the lifetime of this object. + \since 5.4 */ QLoggingCategory::QLoggingCategory(const char *category, QtMsgType enableForLevel) |