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/webenginewidgets | |
| 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/webenginewidgets')
| -rw-r--r-- | src/webenginewidgets/api/qwebenginepage.cpp | 7 | ||||
| -rw-r--r-- | src/webenginewidgets/api/qwebengineview.cpp | 2 | ||||
| -rw-r--r-- | src/webenginewidgets/api/qwebengineview.h | 2 |
3 files changed, 11 insertions, 0 deletions
diff --git a/src/webenginewidgets/api/qwebenginepage.cpp b/src/webenginewidgets/api/qwebenginepage.cpp index a8a860f16..8911c63c8 100644 --- a/src/webenginewidgets/api/qwebenginepage.cpp +++ b/src/webenginewidgets/api/qwebenginepage.cpp @@ -1663,7 +1663,14 @@ void QWebEnginePagePrivate::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(view, dropData, allowedActions, pixmap, offset); +#endif // QT_CONFIG(draganddrop) } bool QWebEnginePagePrivate::isEnabled() const diff --git a/src/webenginewidgets/api/qwebengineview.cpp b/src/webenginewidgets/api/qwebengineview.cpp index 649ccb938..80c60e1a8 100644 --- a/src/webenginewidgets/api/qwebengineview.cpp +++ b/src/webenginewidgets/api/qwebengineview.cpp @@ -362,6 +362,7 @@ void QWebEngineView::hideEvent(QHideEvent *event) page()->d_ptr->wasHidden(); } +#if QT_CONFIG(draganddrop) /*! \reimp */ @@ -418,6 +419,7 @@ void QWebEngineView::dropEvent(QDropEvent *e) d->page->d_ptr->adapter->endDragging(e->pos(), mapToGlobal(e->pos())); d->m_dragEntered = false; } +#endif // QT_CONFIG(draganddrop) #ifndef QT_NO_ACCESSIBILITY int QWebEngineViewAccessible::childCount() const diff --git a/src/webenginewidgets/api/qwebengineview.h b/src/webenginewidgets/api/qwebengineview.h index 6abbc1342..77d26b8ec 100644 --- a/src/webenginewidgets/api/qwebengineview.h +++ b/src/webenginewidgets/api/qwebengineview.h @@ -124,10 +124,12 @@ protected: bool event(QEvent*) override; void showEvent(QShowEvent *) override; void hideEvent(QHideEvent *) 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_DISABLE_COPY(QWebEngineView) |