path: root/src/platformsupport/clipboard/
diff options
authorRichard Moe Gustavsen <>2016-10-26 11:19:19 +0200
committerRichard Moe Gustavsen <>2016-10-26 12:14:23 +0000
commit4e196159077a820e99bc8bd306d31d0ccaa17c57 (patch)
treea91536c15d54a742921878d04759f17a67213e63 /src/platformsupport/clipboard/
parente8b55a6d2a6e44337b75dd0d116b1b020a437631 (diff)
qmacmime: convert UTF-16 using QTextCodec
The current implementation of QMacPasteboardMimeUnicodeText didn't contain any logic to handle unicode text with a byte order mark (BOM). According to the docs (*), 'public.utf16-plain-text' can have an optional BOM. Because of that, Qt would fail encoding UTF-16 text from the pasteboard if it had a BOM. Additionally, perhaps because of a bug in iOS 10, UTF-16 text placed on the pasteboard by Qt ends up being encoded wrong by native apps, unless the text has a BOM. Rather than hard-coding UTF-16 encoding/decoding in qmacmime, we now leave it to QTextCodec. QTextCodec will add a BOM by default, and can handle decoding of UTF-16 both with, and without, a BOM. *: Task-number: QTBUG-56229 Change-Id: I3a08deb0262350c67e5622cf23eb3c3a4907ec39 Reviewed-by: Tor Arne Vestbø <>
Diffstat (limited to 'src/platformsupport/clipboard/')
1 files changed, 2 insertions, 3 deletions
diff --git a/src/platformsupport/clipboard/ b/src/platformsupport/clipboard/
index 2e3257cfcf..cdb5d6b08e 100644
--- a/src/platformsupport/clipboard/
+++ b/src/platformsupport/clipboard/
@@ -405,8 +405,7 @@ QVariant QMacPasteboardMimeUnicodeText::convertToMime(const QString &mimetype, Q
if (flavor == QLatin1String("public.utf8-plain-text")) {
ret = QString::fromUtf8(firstData);
} else if (flavor == QLatin1String("public.utf16-plain-text")) {
- ret = QString(reinterpret_cast<const QChar *>(firstData.constData()),
- firstData.size() / sizeof(QChar));
+ ret = QTextCodec::codecForName("UTF-16")->toUnicode(firstData);
} else {
qWarning("QMime::convertToMime: unhandled mimetype: %s", qPrintable(mimetype));
@@ -420,7 +419,7 @@ QList<QByteArray> QMacPasteboardMimeUnicodeText::convertFromMime(const QString &
if (flavor == QLatin1String("public.utf8-plain-text"))
else if (flavor == QLatin1String("public.utf16-plain-text"))
- ret.append(QByteArray((char*)string.utf16(), string.length()*2));
+ ret.append(QTextCodec::codecForName("UTF-16")->fromUnicode(string));
return ret;