--- a/src/gui/kernel/qmime_mac.cpp Fri Feb 19 23:40:16 2010 +0200
+++ b/src/gui/kernel/qmime_mac.cpp Fri Mar 12 15:46:37 2010 +0200
@@ -431,8 +431,8 @@
firstData.size(), CFStringGetSystemEncoding(), false));
ret = QString(str);
} else if (flavor == QLatin1String("public.utf16-plain-text")) {
- ret = QString::fromUtf16(reinterpret_cast<const ushort *>(firstData.constData()),
- firstData.size() / sizeof(ushort));
+ ret = QString(reinterpret_cast<const QChar *>(firstData.constData()),
+ firstData.size() / sizeof(QChar));
} else {
qWarning("QMime::convertToMime: unhandled mimetype: %s", qPrintable(mimetype));
}