diff options
| author | Karsten Heimrich <karsten.heimrich@qt.io> | 2020-06-17 12:33:40 +0200 |
|---|---|---|
| committer | Karsten Heimrich <karsten.heimrich@qt.io> | 2020-06-20 02:04:38 +0200 |
| commit | 18ec53156ee704fdb4977436fccfdc85333e614b (patch) | |
| tree | df734ce7893d570f4a90f923fcfe9c80ddc3de05 /src/corelib/text/qstringconverter_p.h | |
| parent | 4455de24d453138411c57bae55af18f3fba58d4b (diff) | |
Move QTextCodec support out of QtCore
* Assume UTF-8 on all Unix like systems
* Export some functions to be able to compile QTextCodec once
moved to Qt5Compat.
Task-number: QTBUG-75665
Change-Id: I52ec47a848bc0ba72e9c7689668b1bcc5d736c29
Reviewed-by: Lars Knoll <lars.knoll@qt.io>
Diffstat (limited to 'src/corelib/text/qstringconverter_p.h')
| -rw-r--r-- | src/corelib/text/qstringconverter_p.h | 14 |
1 files changed, 7 insertions, 7 deletions
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) |