diff options
author | Liang Qi <liang.qi@qt.io> | 2019-11-13 07:20:23 +0100 |
---|---|---|
committer | Liang Qi <liang.qi@qt.io> | 2019-11-13 07:21:33 +0100 |
commit | d140f2f61499f424983582770af8c28399a373c1 (patch) | |
tree | b05dc03863502293083ded9d61fc344ab5a9da7b /src/corelib/io | |
parent | bf131e8d2181b3404f5293546ed390999f760404 (diff) | |
parent | 8ffb200153d1b1a8402c875c4961160efb149201 (diff) |
Merge remote-tracking branch 'origin/5.13' into 5.14
Conflicts:
examples/widgets/widgets/scribble/mainwindow.cpp
This amends cb54c16584cf3be746a1a536c1e37cb3022a2f1b.
Change-Id: Iaae60a893330524b2973917e23b31f9d51f8bd38
Diffstat (limited to 'src/corelib/io')
-rw-r--r-- | src/corelib/io/qloggingcategory.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/corelib/io/qloggingcategory.cpp b/src/corelib/io/qloggingcategory.cpp index 4d4784cdf7..5de8be116c 100644 --- a/src/corelib/io/qloggingcategory.cpp +++ b/src/corelib/io/qloggingcategory.cpp @@ -179,7 +179,7 @@ static void setBoolLane(QBasicAtomicInt *atomic, bool enable, int shift) The \c QtProject/qtlogging.ini file is looked up in all directories returned by QStandardPaths::GenericConfigLocation. - Set the \c QT_LOGGING_DEBUG environment variable to find out where you logging + Set the \c QT_LOGGING_DEBUG environment variable to find out where your logging rules are loaded from. \section2 Installing a Custom Filter |