Ignore:
Timestamp:
Aug 2, 2010, 9:27:30 PM (15 years ago)
Author:
Dmitry A. Kuminov
Message:

trunk: Merged in qt 4.6.3 sources from branches/vendor/nokia/qt.

Location:
trunk
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • trunk

  • trunk/src/gui/kernel/qmime_mac.cpp

    r651 r769  
    432432        ret = QString(str);
    433433    } 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                      ));
    436436    } else {
    437437        qWarning("QMime::convertToMime: unhandled mimetype: %s", qPrintable(mimetype));
Note: See TracChangeset for help on using the changeset viewer.