diff options
| author | Andy Shaw <andy.shaw@theqtcompany.com> | 2016-03-17 15:37:39 +0100 |
|---|---|---|
| committer | Jake Petroules <jake.petroules@qt.io> | 2016-07-13 16:55:48 +0000 |
| commit | 1e843b41b6b2ba164615543a5683800d074e60f4 (patch) | |
| tree | 9a6df5c71b680fa1411e0b89d78df45c563792fd /src/platformsupport/clipboard | |
| parent | 5cbe16be78121b503104f57c4aab03b378823e64 (diff) | |
Mac: Read in the string with QString::fromUtf8() as it is UTF8 encoded
Task-number: QTBUG-47358
Change-Id: I50943867d3a57c4db4fe20e55e60d097742e9104
Reviewed-by: Jake Petroules <jake.petroules@qt.io>
Reviewed-by: jian liang <jianliang79@gmail.com>
Diffstat (limited to 'src/platformsupport/clipboard')
| -rw-r--r-- | src/platformsupport/clipboard/qmacmime.mm | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/src/platformsupport/clipboard/qmacmime.mm b/src/platformsupport/clipboard/qmacmime.mm index 317648956c..2e3257cfcf 100644 --- a/src/platformsupport/clipboard/qmacmime.mm +++ b/src/platformsupport/clipboard/qmacmime.mm @@ -403,9 +403,7 @@ QVariant QMacPasteboardMimeUnicodeText::convertToMime(const QString &mimetype, Q // I can only handle two types (system and unicode) so deal with them that way QVariant ret; if (flavor == QLatin1String("public.utf8-plain-text")) { - ret = QString(QCFString(CFStringCreateWithBytes(kCFAllocatorDefault, - reinterpret_cast<const UInt8 *>(firstData.constData()), - firstData.size(), CFStringGetSystemEncoding(), false))); + ret = QString::fromUtf8(firstData); } else if (flavor == QLatin1String("public.utf16-plain-text")) { ret = QString(reinterpret_cast<const QChar *>(firstData.constData()), firstData.size() / sizeof(QChar)); |