diff options
| author | Allan Sandfeld Jensen <allan.jensen@theqtcompany.com> | 2016-06-17 10:54:16 +0200 |
|---|---|---|
| committer | Allan Sandfeld Jensen <allan.jensen@theqtcompany.com> | 2016-06-17 10:54:16 +0200 |
| commit | 807adfeec9f9dadb651e401b7dd69eeccda4dd7a (patch) | |
| tree | 98790b3b20d4a49a6ce359ff4baa2f1934cba16e /src/webengine/api/qquickwebengineview_p.h | |
| parent | 1e52779f3c287d82820c91ddb0e9f666eef9054a (diff) | |
| parent | 528088cb61eaacb63e87ea8e06f59d1536e43799 (diff) | |
Merge remote-tracking branch 'origin/5.6' into 5.7
Change-Id: If4d8a25f5a2192a658d031252435935cbc675725
Diffstat (limited to 'src/webengine/api/qquickwebengineview_p.h')
| -rw-r--r-- | src/webengine/api/qquickwebengineview_p.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/webengine/api/qquickwebengineview_p.h b/src/webengine/api/qquickwebengineview_p.h index b72f79f30..b9555d2d9 100644 --- a/src/webengine/api/qquickwebengineview_p.h +++ b/src/webengine/api/qquickwebengineview_p.h @@ -503,8 +503,8 @@ Q_SIGNALS: Q_REVISION(3) void webChannelWorldChanged(uint); protected: - void geometryChanged(const QRectF &newGeometry, const QRectF &oldGeometry); - void itemChange(ItemChange, const ItemChangeData &); + void geometryChanged(const QRectF &newGeometry, const QRectF &oldGeometry) Q_DECL_OVERRIDE; + void itemChange(ItemChange, const ItemChangeData &) Q_DECL_OVERRIDE; void dragEnterEvent(QDragEnterEvent *e) Q_DECL_OVERRIDE; void dragLeaveEvent(QDragLeaveEvent *e) Q_DECL_OVERRIDE; void dragMoveEvent(QDragMoveEvent *e) Q_DECL_OVERRIDE; |