diff options
author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-02-12 01:13:46 (GMT) |
---|---|---|
committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-02-12 01:13:46 (GMT) |
commit | 0f6b319105b7e4305bc5ac1c5091f8a55be9b545 (patch) | |
tree | 24916212a2e49bf623f6a6f265c5643128c204fb /src/gui/kernel/qclipboard_mac.cpp | |
parent | c633ce4346fa04584e5168b77924ca6a42601435 (diff) | |
parent | 86372d8d9bf081b2a1ab2df7942f41309b1842fa (diff) | |
download | Qt-0f6b319105b7e4305bc5ac1c5091f8a55be9b545.zip Qt-0f6b319105b7e4305bc5ac1c5091f8a55be9b545.tar.gz Qt-0f6b319105b7e4305bc5ac1c5091f8a55be9b545.tar.bz2 |
Merge branch 'master' of scm.dev.nokia.troll.no:qt/mobility-staging into master-integration
* 'master' of scm.dev.nokia.troll.no:qt/mobility-staging: (165 commits)
Add 'We mean it.' header.
Use provided typedef for QNetworkConfigurationPrivatePointer.
Fix public includes.
Document networkSessionOnline() signal and mark as internal.
Tag new classes as since 4.7.
Fix documentation.
Remove debug.
Update copyright year to 2010.
We don't need to migrate cached replies.
Fix after reworking to use signals/slots.
Remove debug.
Rename and remove unused private slots.
Add comments to private state enums.
Revert "(ODBC) Use wchar_t instead of assuming 2 bytes."
Move check for range header support to before deleting backend.
Don't try to migrate finished or aborted requests.
Clarify TemporaryNetworkFailureError docs.
Remove functions used for testing.
Connect signals between QNAM and QNetworkReplyImpl.
Fix networkAccessEnabled implementation.
...
Diffstat (limited to 'src/gui/kernel/qclipboard_mac.cpp')
-rw-r--r-- | src/gui/kernel/qclipboard_mac.cpp | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/src/gui/kernel/qclipboard_mac.cpp b/src/gui/kernel/qclipboard_mac.cpp index f3a971d..49a6cc8 100644 --- a/src/gui/kernel/qclipboard_mac.cpp +++ b/src/gui/kernel/qclipboard_mac.cpp @@ -388,6 +388,18 @@ QMacPasteboard::setMimeData(QMimeData *mime_src) clear_helper(); QStringList formats = mime_src->formats(); +#ifdef QT_MAC_USE_COCOA + // QMimeData sub classes reimplementing the formats() might not expose the + // temporary "application/x-qt-mime-type-name" mimetype. So check the existence + // of this mime type while doing drag and drop. + QString dummyMimeType(QLatin1String("application/x-qt-mime-type-name")); + if (!formats.contains(dummyMimeType)) { + QByteArray dummyType = mime_src->data(dummyMimeType); + if (!dummyType.isEmpty()) { + formats.append(dummyMimeType); + } + } +#endif for(int f = 0; f < formats.size(); ++f) { QString mimeType = formats.at(f); for (QList<QMacPasteboardMime *>::Iterator it = availableConverters.begin(); it != availableConverters.end(); ++it) { |