2 files changed, 9 insertions, 9 deletions
diff --git a/src/corelib/text/qstring.cpp b/src/corelib/text/qstring.cpp
index 6e5415055c..16e9f1d63b 100644
--- a/src/corelib/text/qstring.cpp
+++ b/src/corelib/text/qstring.cpp
@@ -611,7 +611,7 @@ bool QtPrivate::isValidUtf16(QStringView s) noexcept
 }
 
 // conversion between Latin 1 and UTF-16
-void qt_from_latin1(char16_t *dst, const char *str, size_t size) noexcept
+Q_CORE_EXPORT void qt_from_latin1(char16_t *dst, const char *str, size_t size) noexcept
 {
     /* SIMD:
      * Unpacking with SSE has been shown to improve performance on recent CPUs
@@ -5092,7 +5092,7 @@ QString QString::fromLocal8Bit_helper(const char *str, int size)
     This function can be used to process incoming data incrementally as long as
     all UTF-8 characters are terminated within the incoming data. Any
     unterminated characters at the end of the string will be replaced or
-    suppressed. In order to do stateful decoding, please use \l QTextDecoder.
+    suppressed. In order to do stateful decoding, please use \l QStringDecoder.
 
     \sa toUtf8(), fromLatin1(), fromLocal8Bit()
 */
diff --git a/src/corelib/text/qstringconverter_p.h b/src/corelib/text/qstringconverter_p.h
index 6f961259ef..83ffb889cb 100644
--- a/src/corelib/text/qstringconverter_p.h
+++ b/src/corelib/text/qstringconverter_p.h
@@ -288,10 +288,10 @@ struct QUtf8
 {
     static QChar *convertToUnicode(QChar *, const char *, qsizetype) noexcept;
     static QString convertToUnicode(const char *, qsizetype);
-    static QString convertToUnicode(const char *, qsizetype, QStringConverter::State *);
+    Q_CORE_EXPORT static QString convertToUnicode(const char *, qsizetype, QStringConverter::State *);
     static QChar *convertToUnicode(QChar *out, const char *in, qsizetype length, QStringConverter::State *state);
     static QByteArray convertFromUnicode(const QChar *, qsizetype);
-    static QByteArray convertFromUnicode(const QChar *, qsizetype, QStringConverter::State *);
+    Q_CORE_EXPORT static QByteArray convertFromUnicode(const QChar *, qsizetype, QStringConverter::State *);
     static char *convertFromUnicode(char *out, QStringView in, QStringConverter::State *state);
     struct ValidUtf8Result {
         bool isValidUtf8;
@@ -304,21 +304,21 @@ struct QUtf8
 
 struct QUtf16
 {
-    static QString convertToUnicode(const char *, qsizetype, QStringConverter::State *, DataEndianness = DetectEndianness);
+    Q_CORE_EXPORT static QString convertToUnicode(const char *, qsizetype, QStringConverter::State *, DataEndianness = DetectEndianness);
     static QChar *convertToUnicode(QChar *out, const char *chars, qsizetype len, QStringConverter::State *state, DataEndianness endian);
-    static QByteArray convertFromUnicode(const QChar *, qsizetype, QStringConverter::State *, DataEndianness = DetectEndianness);
+    Q_CORE_EXPORT static QByteArray convertFromUnicode(const QChar *, qsizetype, QStringConverter::State *, DataEndianness = DetectEndianness);
     static char *convertFromUnicode(char *out, QStringView in, QStringConverter::State *state, DataEndianness endian);
 };
 
 struct QUtf32
 {
     static QChar *convertToUnicode(QChar *out, const char *chars, qsizetype len, QStringConverter::State *state, DataEndianness endian);
-    static QString convertToUnicode(const char *, qsizetype, QStringConverter::State *, DataEndianness = DetectEndianness);
-    static QByteArray convertFromUnicode(const QChar *, qsizetype, QStringConverter::State *, DataEndianness = DetectEndianness);
+    Q_CORE_EXPORT static QString convertToUnicode(const char *, qsizetype, QStringConverter::State *, DataEndianness = DetectEndianness);
+    Q_CORE_EXPORT static QByteArray convertFromUnicode(const QChar *, qsizetype, QStringConverter::State *, DataEndianness = DetectEndianness);
     static char *convertFromUnicode(char *out, QStringView in, QStringConverter::State *state, DataEndianness endian);
 };
 
-struct QLocal8Bit
+struct Q_CORE_EXPORT QLocal8Bit
 {
 #if !defined(Q_OS_WIN) || defined(QT_BOOTSTRAPPED)
     static QString convertToUnicode(const char *chars, qsizetype len, QStringConverter::State *state)