1 files changed, 6 insertions, 1 deletions
diff --git a/src/corelib/text/qstringconverter_base.h b/src/corelib/text/qstringconverter_base.h
index 68900da8f0..d6b6fcb484 100644
--- a/src/corelib/text/qstringconverter_base.h
+++ b/src/corelib/text/qstringconverter_base.h
@@ -13,6 +13,7 @@
 
 #include <QtCore/qglobal.h> // QT_{BEGIN,END}_NAMESPACE
 #include <QtCore/qflags.h> // Q_DECLARE_FLAGS
+#include <QtCore/qcontainerfwd.h>
 
 #include <cstring>
 
@@ -88,12 +89,14 @@ public:
 
     enum Encoding {
         Utf8,
+#ifndef QT_BOOTSTRAPPED
         Utf16,
         Utf16LE,
         Utf16BE,
         Utf32,
         Utf32LE,
         Utf32BE,
+#endif
         Latin1,
         System,
         LastEncoding = System
@@ -129,7 +132,7 @@ protected:
         : iface(nullptr)
     {}
     constexpr explicit QStringConverter(Encoding encoding, Flags f)
-        : iface(&encodingInterfaces[int(encoding)]), state(f)
+        : iface(&encodingInterfaces[qsizetype(encoding)]), state(f)
     {}
     constexpr explicit QStringConverter(const Interface *i) noexcept
         : iface(i)
@@ -159,6 +162,8 @@ public:
     encodingForData(QByteArrayView data, char16_t expectedFirstCharacter = 0) noexcept;
     Q_CORE_EXPORT static std::optional<Encoding> encodingForHtml(QByteArrayView data);
 
+    Q_CORE_EXPORT static QStringList availableCodecs();
+
 protected:
     const Interface *iface;
     State state;