equal
deleted
inserted
replaced
530 || c_flavor == QLatin1String("public.utf8-plain-text")); |
530 || c_flavor == QLatin1String("public.utf8-plain-text")); |
531 if (checkForUtf16 || c_flavor == QLatin1String("public.utf16-plain-text")) { |
531 if (checkForUtf16 || c_flavor == QLatin1String("public.utf16-plain-text")) { |
532 // Try to get the NSStringPboardType from NSPasteboard, newlines are mapped |
532 // Try to get the NSStringPboardType from NSPasteboard, newlines are mapped |
533 // correctly (as '\n') in this data. The 'public.utf16-plain-text' type |
533 // correctly (as '\n') in this data. The 'public.utf16-plain-text' type |
534 // usually maps newlines to '\r' instead. |
534 // usually maps newlines to '\r' instead. |
535 QString str = qt_mac_get_pasteboardString(); |
535 QString str = qt_mac_get_pasteboardString(paste); |
536 if (!str.isEmpty()) |
536 if (!str.isEmpty()) |
537 return str; |
537 return str; |
538 } |
538 } |
539 if (checkForUtf16 && hasFlavor(QLatin1String("public.utf16-plain-text"))) |
539 if (checkForUtf16 && hasFlavor(QLatin1String("public.utf16-plain-text"))) |
540 c_flavor = QLatin1String("public.utf16-plain-text"); |
540 c_flavor = QLatin1String("public.utf16-plain-text"); |