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/gui/kernel | |
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/gui/kernel')
-rw-r--r-- | src/gui/kernel/qclipboard.cpp | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/src/gui/kernel/qclipboard.cpp b/src/gui/kernel/qclipboard.cpp index 79a2caea69..eb6c2af6d1 100644 --- a/src/gui/kernel/qclipboard.cpp +++ b/src/gui/kernel/qclipboard.cpp @@ -286,12 +286,7 @@ QString QClipboard::text(QString &subtype, Mode mode) const } const QByteArray rawData = data->data(QLatin1String("text/") + subtype); - -#if QT_CONFIG(textcodec) return qFromUtfEncoded(rawData); -#else // textcodec - return QString::fromUtf8(rawData); -#endif // textcodec } /*! |