diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-11-15 01:00:11 +0100 |
|---|---|---|
| committer | Edward Welbourne <edward.welbourne@qt.io> | 2019-11-15 16:29:40 +0100 |
| commit | adc7bbe910a4b89a579ffa93da5a937cfc1379f4 (patch) | |
| tree | e28a2fadc82652798302cc7f79a6f4310a2eb8d7 /src/corelib/io/qloggingcategory.cpp | |
| parent | 14bb413309092adc53e8451daff5690c4698c07d (diff) | |
| parent | c15a069830baf87f57c84e86326cf86ba9a39713 (diff) | |
Merge remote-tracking branch 'origin/5.14' into 5.15
Conflicts:
src/gui/rhi/qshader.cpp
tests/auto/corelib/time/qtimezone/tst_qtimezone.cpp
Change-Id: I1c4ae718eb3592a0a0a90af9d11553f3ab68cad5
Diffstat (limited to 'src/corelib/io/qloggingcategory.cpp')
| -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 |