diff options
author | Liang Qi <liang.qi@qt.io> | 2016-05-20 06:08:18 +0200 |
---|---|---|
committer | Liang Qi <liang.qi@qt.io> | 2016-05-20 06:08:18 +0200 |
commit | 6c344184df2dd6573681a0d2022daa55b6a36f38 (patch) | |
tree | 91493089f958b95138bdbd3f838188450e4349bb /src/core/clipboard_qt.cpp | |
parent | bfc5eb719d30decaf5c65e2747d49a6eec28794d (diff) | |
parent | bc317d32a65eb08da7df10bec6417829533cfc3a (diff) |
Merge remote-tracking branch 'origin/5.6' into 5.7
Conflicts:
src/3rdparty
src/core/browser_context_adapter.cpp
src/core/web_contents_adapter.cpp
tests/auto/widgets/qwebenginepage/BLACKLIST
Change-Id: I45ee0a33f6316f585555d58fede8072fe514aecf
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 cd57995ea..bd62f4872 100644 --- a/src/core/clipboard_qt.cpp +++ b/src/core/clipboard_qt.cpp @@ -285,6 +285,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; @@ -328,8 +330,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()); |