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/webenginewidgets/render_widget_host_view_qt_delegate_widget.h | |
| parent | 1e52779f3c287d82820c91ddb0e9f666eef9054a (diff) | |
| parent | 528088cb61eaacb63e87ea8e06f59d1536e43799 (diff) | |
Merge remote-tracking branch 'origin/5.6' into 5.7
Change-Id: If4d8a25f5a2192a658d031252435935cbc675725
Diffstat (limited to 'src/webenginewidgets/render_widget_host_view_qt_delegate_widget.h')
| -rw-r--r-- | src/webenginewidgets/render_widget_host_view_qt_delegate_widget.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/webenginewidgets/render_widget_host_view_qt_delegate_widget.h b/src/webenginewidgets/render_widget_host_view_qt_delegate_widget.h index e98e06417..9fd0cdc48 100644 --- a/src/webenginewidgets/render_widget_host_view_qt_delegate_widget.h +++ b/src/webenginewidgets/render_widget_host_view_qt_delegate_widget.h @@ -91,7 +91,7 @@ protected: void initializeGL() Q_DECL_OVERRIDE; void paintGL() Q_DECL_OVERRIDE; - QVariant inputMethodQuery(Qt::InputMethodQuery query) const; + QVariant inputMethodQuery(Qt::InputMethodQuery query) const Q_DECL_OVERRIDE; private slots: void onWindowPosChanged(); |