diff options
| author | Tor Arne Vestbø <tor.arne.vestbo@qt.io> | 2017-04-19 15:54:47 +0200 |
|---|---|---|
| committer | Giuseppe D'Angelo <giuseppe.dangelo@kdab.com> | 2017-04-19 22:59:43 +0000 |
| commit | 924b02aecbce4843ff9d0a7d1d15f1eb154f5d69 (patch) | |
| tree | cec9028953247bf522116cc7ae009df1523dc493 /src/corelib/io/qloggingregistry.cpp | |
| parent | 80432021146d62ec6ffd0798f2228f741f0b9fad (diff) | |
Revert "Initialize QLoggingRegistry rules on first use, not qApp construction"
This reverts commit 47cc9e23a313d67a4a3107242f205d2473842021.
We use QCoreApplication::applicationDirPath in the logging initialization to find
a possible qtlogging.ini file. Because QCoreApplication::applicationDirPath requires
a QCoreApplication instance this leads to a qWarning, which in turn leads to a
recursive call to the logging initialization, and in turn to a recursive mutex deadlock.
Task-number: QTCREATORBUG-18031
Change-Id: Ic75e1e8c062eb647991725378489bf87c9648cca
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
Diffstat (limited to 'src/corelib/io/qloggingregistry.cpp')
| -rw-r--r-- | src/corelib/io/qloggingregistry.cpp | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/src/corelib/io/qloggingregistry.cpp b/src/corelib/io/qloggingregistry.cpp index 9a5c923323..47fb1fb6b8 100644 --- a/src/corelib/io/qloggingregistry.cpp +++ b/src/corelib/io/qloggingregistry.cpp @@ -255,7 +255,6 @@ void QLoggingSettingsParser::parseNextLine(QStringRef line) QLoggingRegistry::QLoggingRegistry() : categoryFilter(defaultCategoryFilter) { - init(); } static bool qtLoggingDebug() |