diff options
| author | Oswald Buddenhagen <oswald.buddenhagen@qt.io> | 2018-11-09 13:27:11 +0100 |
|---|---|---|
| committer | Oswald Buddenhagen <oswald.buddenhagen@qt.io> | 2018-11-09 13:27:12 +0100 |
| commit | c69f43594fc921fea82377e7b31a7f55f718051d (patch) | |
| tree | 37d30b254f0c24f9588dcb3e8f1b47becdba8ef1 /src/platformsupport/clipboard/qmacmime.mm | |
| parent | 9137691e745039f8ad9cdee2594a958e244ba341 (diff) | |
| parent | dec7961709c90f6977d2447f7fa6c6625af41cb2 (diff) | |
Merge 5.11 into 5.11.3
Change-Id: I9a84ca8038a65daab50b6205bc7e1e3b5b5098aa
Diffstat (limited to 'src/platformsupport/clipboard/qmacmime.mm')
| -rw-r--r-- | src/platformsupport/clipboard/qmacmime.mm | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/src/platformsupport/clipboard/qmacmime.mm b/src/platformsupport/clipboard/qmacmime.mm index 09901ba0a5..8fa45dd50b 100644 --- a/src/platformsupport/clipboard/qmacmime.mm +++ b/src/platformsupport/clipboard/qmacmime.mm @@ -418,8 +418,10 @@ QVariant QMacPasteboardMimeUnicodeText::convertToMime(const QString &mimetype, Q QVariant ret; if (flavor == QLatin1String("public.utf8-plain-text")) { ret = QString::fromUtf8(firstData); +#if QT_CONFIG(textcodec) } else if (flavor == QLatin1String("public.utf16-plain-text")) { ret = QTextCodec::codecForName("UTF-16")->toUnicode(firstData); +#endif } else { qWarning("QMime::convertToMime: unhandled mimetype: %s", qPrintable(mimetype)); } @@ -432,8 +434,10 @@ QList<QByteArray> QMacPasteboardMimeUnicodeText::convertFromMime(const QString & QString string = data.toString(); if (flavor == QLatin1String("public.utf8-plain-text")) ret.append(string.toUtf8()); +#if QT_CONFIG(textcodec) else if (flavor == QLatin1String("public.utf16-plain-text")) ret.append(QTextCodec::codecForName("UTF-16")->fromUnicode(string)); +#endif return ret; } |