diff options
| author | Kai Koehne <kai.koehne@qt.io> | 2018-07-23 11:49:19 +0200 |
|---|---|---|
| committer | Kai Koehne <kai.koehne@qt.io> | 2018-07-28 14:43:40 +0000 |
| commit | bd0279c4173eb627d432d9a05411bbc725240d4e (patch) | |
| tree | 4bcd3bb9f3dd1f8882fc71fd2ffa2dda3ec37891 /src/corelib/global | |
| parent | 01d2f35b6988edacc741b358703d16d4cd8c199a (diff) | |
Logging: Accept .ini files written by QSettings
For keys, QSettings escapes all characters outside of [-a-zA-Z0-9_.]
by using percent encoding, and changes '/' to '\'. That is,
settings.setValue("qt.*", true)
will be written to an .ini file as
qt.%2A=true
This means that QSettings can not be used to write general-purpose
qtlogging.ini files. Fix this by applying the reverse transformation
method from QSettings when reading in the .ini file.
[ChangeLog][Logging] Qt will now accept qtlogging.ini files
written by QSettings.
Task-number: QTBUG-69548
Change-Id: I55b7a8b433291268dc6855901f72b1c04f8ee6d3
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io>
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Diffstat (limited to 'src/corelib/global')
| -rw-r--r-- | src/corelib/global/qconfig-bootstrapped.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/src/corelib/global/qconfig-bootstrapped.h b/src/corelib/global/qconfig-bootstrapped.h index 3469ebe5e6..0564683f48 100644 --- a/src/corelib/global/qconfig-bootstrapped.h +++ b/src/corelib/global/qconfig-bootstrapped.h @@ -99,6 +99,7 @@ #define QT_FEATURE_process -1 #define QT_FEATURE_regularexpression -1 #define QT_FEATURE_renameat2 -1 +#define QT_FEATURE_settings -1 #define QT_FEATURE_sharedmemory -1 #define QT_FEATURE_slog2 -1 #define QT_FEATURE_statx -1 |