diff options
| author | Joerg Bornemann <joerg.bornemann@qt.io> | 2016-05-18 14:55:13 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2016-05-19 18:47:23 +0000 |
| commit | f4b806ffbc2f11a5a64fab2856dfe68ae7d603c8 (patch) | |
| tree | e0549b086cdb024b5c360c1a949b5a9988873049 /src/core/clipboard_qt.cpp | |
| parent | f2370c0d09998f382364a9a58932cf717c28a764 (diff) | |
Fix pasting images to web pages
WebKit expects pasted images to have the MIME type image/png (see code
and comment in DataObjectItem::getAsFile()).
Task-number: QTBUG-53409
Change-Id: I2b0c1244d309687ad190db26c5b00718ed0c4258
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
Diffstat (limited to 'src/core/clipboard_qt.cpp')
| -rw-r--r-- | src/core/clipboard_qt.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/core/clipboard_qt.cpp b/src/core/clipboard_qt.cpp index 9ac5c7a17..e632c5583 100644 --- a/src/core/clipboard_qt.cpp +++ b/src/core/clipboard_qt.cpp @@ -282,6 +282,8 @@ void ClipboardQt::ReadAvailableTypes(ui::ClipboardType type, std::vector<base::s types->clear(); const QMimeData *mimeData = QGuiApplication::clipboard()->mimeData(type == ui::CLIPBOARD_TYPE_COPY_PASTE ? QClipboard::Clipboard : QClipboard::Selection); + if (mimeData->hasImage()) + types->push_back(toString16(QStringLiteral("image/png"))); Q_FOREACH (const QString &mimeType, mimeData->formats()) types->push_back(toString16(mimeType)); *contains_filenames = false; @@ -325,8 +327,6 @@ void ClipboardQt::ReadRTF(ui::ClipboardType type, std::string* result) const SkBitmap ClipboardQt::ReadImage(ui::ClipboardType type) const { - // FIXME: Untested, pasting image data seems to only be supported through - // FileReader.readAsDataURL in JavaScript and this isn't working down the pipe for some reason. const QMimeData *mimeData = QGuiApplication::clipboard()->mimeData(type == ui::CLIPBOARD_TYPE_COPY_PASTE ? QClipboard::Clipboard : QClipboard::Selection); QImage image = qvariant_cast<QImage>(mimeData->imageData()); |