diff options
| author | Liang Qi <liang.qi@qt.io> | 2017-01-25 11:45:23 +0100 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2017-01-25 11:45:23 +0100 |
| commit | acf7f38b2b4a5d6427dca9b6538e3394cfde2d94 (patch) | |
| tree | fcd5eeb1006b01a4596cce5956bfe32f3c055d29 /src/core/web_contents_adapter.h | |
| parent | c2447a308882ba3691d66b2c28df197f571518c7 (diff) | |
| parent | 349ef9870917e8cf2c189fed4a970023b19ba24a (diff) | |
Merge remote-tracking branch 'origin/5.8' into dev
Conflicts:
src/3rdparty
tests/auto/widgets/qwebengineview/tst_qwebengineview.cpp
Change-Id: I070173576fc4be53689ce0dd9e1fd4133f5814da
Diffstat (limited to 'src/core/web_contents_adapter.h')
| -rw-r--r-- | src/core/web_contents_adapter.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/core/web_contents_adapter.h b/src/core/web_contents_adapter.h index cb7f9b461..0accd3be5 100644 --- a/src/core/web_contents_adapter.h +++ b/src/core/web_contents_adapter.h @@ -168,7 +168,7 @@ public: Qt::DropActions allowedActions, const QPixmap &pixmap, const QPoint &offset); void enterDrag(QDragEnterEvent *e, const QPoint &screenPos); Qt::DropAction updateDragPosition(QDragMoveEvent *e, const QPoint &screenPos); - void updateDragAction(Qt::DropAction action); + void updateDragAction(int action); void finishDragUpdate(); void endDragging(const QPoint &clientPos, const QPoint &screenPos); void leaveDrag(); |