summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichal Klocek <michal.klocek@qt.io>2021-05-06 09:06:04 +0200
committerMichal Klocek <michal.klocek@qt.io>2021-05-22 14:10:29 +0200
commit08130fdf90b931a3dda61928ea6d71fbd35c6d73 (patch)
tree7d4b04e48a302852471c06769b3b760243a1c3d3
parent10e6a10abb4913638360b4152cf016c5f7e3ff8e (diff)
Clean headers
Fix errors from the 'clean headers' task on coin. Change-Id: I058697e726228800c0fd3220b1d40ac154efb47c Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
-rw-r--r--src/core/compositor/compositor.h2
-rw-r--r--src/core/web_contents_adapter_client.h2
-rw-r--r--src/webenginequick/render_widget_host_view_qt_delegate_quick.h2
-rw-r--r--src/webenginewidgets/render_widget_host_view_qt_delegate_widget.h2
4 files changed, 4 insertions, 4 deletions
diff --git a/src/core/compositor/compositor.h b/src/core/compositor/compositor.h
index 6e9a13e48..7968e8201 100644
--- a/src/core/compositor/compositor.h
+++ b/src/core/compositor/compositor.h
@@ -177,7 +177,7 @@ public:
protected:
Compositor(Type type) : m_type(type) { }
- ~Compositor() = default;
+ virtual ~Compositor() = default;
private:
template<typename T>
diff --git a/src/core/web_contents_adapter_client.h b/src/core/web_contents_adapter_client.h
index d9fab8fbb..b0bddf5b8 100644
--- a/src/core/web_contents_adapter_client.h
+++ b/src/core/web_contents_adapter_client.h
@@ -69,7 +69,7 @@ QT_FORWARD_DECLARE_CLASS(QWebEngineRegisterProtocolHandlerRequest)
QT_FORWARD_DECLARE_CLASS(QWebEngineUrlRequestInfo)
QT_FORWARD_DECLARE_CLASS(QWebEngineUrlRequestInterceptor)
QT_FORWARD_DECLARE_CLASS(QWebEngineContextMenuRequest)
-QT_FORWARD_DECLARE_CLASS(QWebEngineCertificateError);
+QT_FORWARD_DECLARE_CLASS(QWebEngineCertificateError)
QT_FORWARD_DECLARE_CLASS(QWebEngineSettings)
namespace content {
diff --git a/src/webenginequick/render_widget_host_view_qt_delegate_quick.h b/src/webenginequick/render_widget_host_view_qt_delegate_quick.h
index 015b9cdf4..0fd4d380f 100644
--- a/src/webenginequick/render_widget_host_view_qt_delegate_quick.h
+++ b/src/webenginequick/render_widget_host_view_qt_delegate_quick.h
@@ -105,7 +105,7 @@ protected:
void itemChange(ItemChange change, const ItemChangeData &value) override;
QSGNode *updatePaintNode(QSGNode *, UpdatePaintNodeData *) override;
-private slots:
+private Q_SLOTS:
void onBeforeRendering();
void onWindowPosChanged();
void onHide();
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 d106cf351..d1414a918 100644
--- a/src/webenginewidgets/render_widget_host_view_qt_delegate_widget.h
+++ b/src/webenginewidgets/render_widget_host_view_qt_delegate_widget.h
@@ -97,7 +97,7 @@ protected:
QVariant inputMethodQuery(Qt::InputMethodQuery query) const override;
void adapterClientChanged(WebContentsAdapterClient *client) override;
-private slots:
+private Q_SLOTS:
void onWindowPosChanged();
void connectRemoveParentBeforeParentDelete();
void removeParentBeforeParentDelete();