summaryrefslogtreecommitdiffstats
path: root/src/corelib/text/qstringconverter.h
diff options
context:
space:
mode:
authorLars Knoll <lars.knoll@qt.io>2020-04-17 14:29:46 +0200
committerLars Knoll <lars.knoll@qt.io>2020-05-14 07:46:45 +0200
commit94e210faeaf7ec6b8a41d7f707405d99be25e3f0 (patch)
tree8a461181c6e56a27b516e6c888e5b8ebf8b14228 /src/corelib/text/qstringconverter.h
parentea0a08c898fed9cfd8d8eb16613e352740d3eb02 (diff)
Move local8bit conversion over to qutfsupport
Local8Bit is always UTF-8 except for Windows platforms. Also add a Locale encoding to QStringConverter. Change-Id: I8d729931fd4c1d7fc6857696b6442a44def3fd9d Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Diffstat (limited to 'src/corelib/text/qstringconverter.h')
-rw-r--r--src/corelib/text/qstringconverter.h3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/corelib/text/qstringconverter.h b/src/corelib/text/qstringconverter.h
index e91975b70f..d3c0e9a502 100644
--- a/src/corelib/text/qstringconverter.h
+++ b/src/corelib/text/qstringconverter.h
@@ -96,7 +96,8 @@ public:
Utf32,
Utf32LE,
Utf32BE,
- LastEncoding = Utf32BE
+ Locale,
+ LastEncoding = Locale
};
protected: