1 files changed, 12 insertions, 0 deletions
diff --git a/src/corelib/text/qstringconverter_p.h b/src/corelib/text/qstringconverter_p.h
index edbe1b5484..5c530cf1bd 100644
--- a/src/corelib/text/qstringconverter_p.h
+++ b/src/corelib/text/qstringconverter_p.h
@@ -52,6 +52,7 @@ struct QLatin1
     static char *convertFromUnicode(char *out, QStringView in, QStringConverter::State *state) noexcept;
 
     // Defined in qstring.cpp
+    Q_CORE_EXPORT
     static char *convertFromUnicode(char *out, QStringView in) noexcept;
 };
 
@@ -69,18 +70,27 @@ struct QUtf8BaseTraits
     static void appendByte(qchar8_t *&ptr, qchar8_t b)
     { *ptr++ = b; }
 
+    static uchar peekByte(const char *ptr, qsizetype n = 0)
+    { return ptr[n]; }
+
     static uchar peekByte(const uchar *ptr, qsizetype n = 0)
     { return ptr[n]; }
 
     static uchar peekByte(const qchar8_t *ptr, qsizetype n = 0)
     { return ptr[n]; }
 
+    static qptrdiff availableBytes(const char *ptr, const char *end)
+    { return end - ptr; }
+
     static qptrdiff availableBytes(const uchar *ptr, const uchar *end)
     { return end - ptr; }
 
     static qptrdiff availableBytes(const qchar8_t *ptr, const qchar8_t *end)
     { return end - ptr; }
 
+    static void advanceByte(const char *&ptr, qsizetype n = 1)
+    { ptr += n; }
+
     static void advanceByte(const uchar *&ptr, qsizetype n = 1)
     { ptr += n; }
 
@@ -362,6 +372,7 @@ struct Q_CORE_EXPORT QLocal8Bit
         }
         return r > 0;
     }
+    static QString convertToUnicode_sys(QByteArrayView, quint32, QStringConverter::State *);
     static QString convertToUnicode_sys(QByteArrayView, QStringConverter::State *);
     static QString convertToUnicode(QByteArrayView in, QStringConverter::State *state)
     {
@@ -369,6 +380,7 @@ struct Q_CORE_EXPORT QLocal8Bit
             return QUtf8::convertToUnicode(in, state);
         return convertToUnicode_sys(in, state);
     }
+    static QByteArray convertFromUnicode_sys(QStringView, quint32, QStringConverter::State *);
     static QByteArray convertFromUnicode_sys(QStringView, QStringConverter::State *);
     static QByteArray convertFromUnicode(QStringView in, QStringConverter::State *state)
     {