Changeset 769 for trunk/src/gui/kernel/qmime_mac.cpp
- Timestamp:
- Aug 2, 2010, 9:27:30 PM (15 years ago)
- Location:
- trunk
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk
- Property svn:mergeinfo changed
/branches/vendor/nokia/qt/4.6.3 (added) merged: 768 /branches/vendor/nokia/qt/current merged: 767 /branches/vendor/nokia/qt/4.6.2 removed
- Property svn:mergeinfo changed
-
trunk/src/gui/kernel/qmime_mac.cpp
r651 r769 432 432 ret = QString(str); 433 433 } else if (flavor == QLatin1String("public.utf16-plain-text")) { 434 ret = QString ::fromUtf16(reinterpret_cast<const ushort*>(firstData.constData()),435 firstData.size() / sizeof(ushort));434 ret = QString *>(firstData.constData()), 435 )); 436 436 } else { 437 437 qWarning("QMime::convertToMime: unhandled mimetype: %s", qPrintable(mimetype));
Note:
See TracChangeset
for help on using the changeset viewer.