summaryrefslogtreecommitdiffstats
path: root/src/corelib/io/qsettings.h
diff options
context:
space:
mode:
authorLars Knoll <lars.knoll@qt.io>2020-04-26 11:45:27 +0200
committerLars Knoll <lars.knoll@qt.io>2020-05-14 07:48:28 +0200
commita383d797727b64770768babffc564d07e02a90b7 (patch)
tree62e3411aac05e964b5feec5a8602b164f549a4fb /src/corelib/io/qsettings.h
parent1cab047d088a397b00f5adc8febeac467fc4831d (diff)
Get rid of QSettings::iniCodec()
Always encodee INI files as utf-8 in Qt6. This is mostly backwards compatible, as old ini files would encode all non ascii characters. [ChangeLog][Important behavioral changes] QSettings will now always encode INI files as utf-8 (and the iniCodec/setIniCode methods are removed). This is a change from Qt 5 and earlier, where QSettings would by default escape all non ascii characters. The behavior is equivalent to what you got in Qt5 by setting a utf-8 iniCodec on the settings object. Settings files written in Qt 5 will still be readable in Qt 6 (unless an iniCodec different from utf-8 was used), but to read Qt6 based ini files in Qt 5 applications, setting the iniCodec to utf-8 is required. Change-Id: Ic7dffcca17779bd5e3dae50d42ce633170289f6c Reviewed-by: Thiago Macieira <thiago.macieira@intel.com> Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
Diffstat (limited to 'src/corelib/io/qsettings.h')
-rw-r--r--src/corelib/io/qsettings.h6
1 files changed, 0 insertions, 6 deletions
diff --git a/src/corelib/io/qsettings.h b/src/corelib/io/qsettings.h
index 07c746d043..0ca5c99432 100644
--- a/src/corelib/io/qsettings.h
+++ b/src/corelib/io/qsettings.h
@@ -179,12 +179,6 @@ public:
QString organizationName() const;
QString applicationName() const;
-#if QT_CONFIG(textcodec)
- void setIniCodec(QTextCodec *codec);
- void setIniCodec(const char *codecName);
- QTextCodec *iniCodec() const;
-#endif
-
static void setDefaultFormat(Format format);
static Format defaultFormat();
#if QT_DEPRECATED_SINCE(5, 13)