diff options
| author | Joerg Bornemann <joerg.bornemann@qt.io> | 2018-04-13 10:10:03 +0200 |
|---|---|---|
| committer | Kai Koehne <kai.koehne@qt.io> | 2018-04-17 15:20:44 +0000 |
| commit | 7566b23f7d4df9898369a9608b000c0364221177 (patch) | |
| tree | e4b4435a3c955c682e7da69014b4b3539d198ab1 /src/webengine/api | |
| parent | 780e8c985b384e7a3b4986075fcb88d50d6fe266 (diff) | |
Make sure we can build with -no-feature-draganddrop
Change-Id: Ib6763a8a3e1ac1ac98caef39f7e6e75c18344424
Reviewed-by: Michael Brüning <michael.bruning@qt.io>
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
Diffstat (limited to 'src/webengine/api')
| -rw-r--r-- | src/webengine/api/qquickwebengineview.cpp | 9 | ||||
| -rw-r--r-- | src/webengine/api/qquickwebengineview_p.h | 2 |
2 files changed, 11 insertions, 0 deletions
diff --git a/src/webengine/api/qquickwebengineview.cpp b/src/webengine/api/qquickwebengineview.cpp index 334def6c4..fde7b40dc 100644 --- a/src/webengine/api/qquickwebengineview.cpp +++ b/src/webengine/api/qquickwebengineview.cpp @@ -1002,7 +1002,14 @@ void QQuickWebEngineViewPrivate::startDragging(const content::DropData &dropData Qt::DropActions allowedActions, const QPixmap &pixmap, const QPoint &offset) { +#if !QT_CONFIG(draganddrop) + Q_UNUSED(dropData); + Q_UNUSED(allowedActions); + Q_UNUSED(pixmap); + Q_UNUSED(offset); +#else adapter->startDragging(q_ptr->window(), dropData, allowedActions, pixmap, offset); +#endif // QT_CONFIG(draganddrop) } bool QQuickWebEngineViewPrivate::isEnabled() const @@ -1364,6 +1371,7 @@ void QQuickWebEngineView::itemChange(ItemChange change, const ItemChangeData &va QQuickItem::itemChange(change, value); } +#if QT_CONFIG(draganddrop) static QPoint mapToScreen(const QQuickItem *item, const QPoint &clientPos) { return item->window()->position() + item->mapToScene(clientPos).toPoint(); @@ -1401,6 +1409,7 @@ void QQuickWebEngineView::dropEvent(QDropEvent *e) e->accept(); d->adapter->endDragging(e->pos(), mapToScreen(this, e->pos())); } +#endif // QT_CONFIG(draganddrop) void QQuickWebEngineView::triggerWebAction(WebAction action) { diff --git a/src/webengine/api/qquickwebengineview_p.h b/src/webengine/api/qquickwebengineview_p.h index 53d7facd3..8d20740e6 100644 --- a/src/webengine/api/qquickwebengineview_p.h +++ b/src/webengine/api/qquickwebengineview_p.h @@ -554,10 +554,12 @@ Q_SIGNALS: protected: void geometryChanged(const QRectF &newGeometry, const QRectF &oldGeometry) override; void itemChange(ItemChange, const ItemChangeData &) override; +#if QT_CONFIG(draganddrop) void dragEnterEvent(QDragEnterEvent *e) override; void dragLeaveEvent(QDragLeaveEvent *e) override; void dragMoveEvent(QDragMoveEvent *e) override; void dropEvent(QDropEvent *e) override; +#endif // QT_CONFIG(draganddrop) private: Q_DECLARE_PRIVATE(QQuickWebEngineView) |