diff options
| author | Kai Koehne <kai.koehne@theqtcompany.com> | 2015-06-19 13:38:58 +0200 |
|---|---|---|
| committer | Kai Koehne <kai.koehne@theqtcompany.com> | 2015-08-24 07:17:29 +0000 |
| commit | cb6ab056480e39ed347d5a75e4b1b1f34443148c (patch) | |
| tree | ec027691bcb19707cd98448034a2680f8828b681 /src/corelib/io/qloggingregistry_p.h | |
| parent | 5c95c2077ce480a2a0192babbe5efe1e23731633 (diff) | |
QLoggingRegistry: Look up logging configuration in Qt data path
Distributions like Fedora would like to disable logging globally, without
having to patch Qt. Fedora right now therefore adds a
/etc/xdg/qtlogging.ini file, which unfortunately though also messes with
Qt versions compiled by the user.
This patch lets QLoggingRegistry look up logging configurations also
in QLibraryInfo::DataPath, which would allow to tweak the values per
Qt installation.
See also https://bugzilla.redhat.com/show_bug.cgi?id=1227295
Change-Id: I0fca304a47f45739d0c08a9e4e715673bf10aa80
Reviewed-by: Alex Blasche <alexander.blasche@theqtcompany.com>
Diffstat (limited to 'src/corelib/io/qloggingregistry_p.h')
| -rw-r--r-- | src/corelib/io/qloggingregistry_p.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/src/corelib/io/qloggingregistry_p.h b/src/corelib/io/qloggingregistry_p.h index 718e09d9bb..bb32a4996d 100644 --- a/src/corelib/io/qloggingregistry_p.h +++ b/src/corelib/io/qloggingregistry_p.h @@ -122,6 +122,7 @@ private: QMutex registryMutex; + QVector<QLoggingRule> qtConfigRules; QVector<QLoggingRule> configRules; QVector<QLoggingRule> envRules; QVector<QLoggingRule> apiRules; |