From 423f7ab80f814c5f4e4784e70bd3c36c44497314 Mon Sep 17 00:00:00 2001 From: Joerg Bornemann Date: Wed, 16 Dec 2015 12:38:16 +0100 Subject: Implement drag and drop support Create a QDrag for drag and drop operations that are started in the web page. React on drag and drop event of QWidget and QQuickItem. Task-number: QTBUG-43008 Change-Id: If09f09de6e6d5b5f02835985a17cc6bc3262f411 Reviewed-by: Alexandru Croitor Reviewed-by: Allan Sandfeld Jensen --- src/core/type_conversion.h | 11 +++++++++++ 1 file changed, 11 insertions(+) (limited to 'src/core/type_conversion.h') diff --git a/src/core/type_conversion.h b/src/core/type_conversion.h index da0ee3e5c..5cf7267f2 100644 --- a/src/core/type_conversion.h +++ b/src/core/type_conversion.h @@ -46,6 +46,7 @@ #include #include #include +#include #include "base/files/file_path.h" #include "base/time/time.h" #include "content/public/common/file_chooser_file_info.h" @@ -58,6 +59,10 @@ #include "ui/gfx/geometry/rect_f.h" #include "url/gurl.h" +namespace gfx { +class ImageSkiaRep; +} + namespace QtWebEngineCore { inline QString toQt(const base::string16 &string) @@ -83,6 +88,11 @@ inline base::string16 toString16(const QString &qString) #endif } +inline base::NullableString16 toNullableString16(const QString &qString) +{ + return base::NullableString16(toString16(qString), qString.isNull()); +} + inline QUrl toQt(const GURL &url) { return QUrl(QString::fromStdString(url.spec())); @@ -150,6 +160,7 @@ inline QImage toQImage(const SkBitmap &bitmap, QImage::Format format) } QImage toQImage(const SkBitmap &bitmap); +QImage toQImage(const gfx::ImageSkiaRep &imageSkiaRep); inline QMatrix4x4 toQt(const SkMatrix44 &m) { -- cgit v1.2.3