Replace Q_DECL_OVERRIDE with override

Change-Id: I5fb337a83bfc98c23b2f3cd51839feb40fad010e
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>

18 files changed, 283 insertions, 283 deletions

diff --git a/src/core/clipboard_qt.h b/src/core/clipboard_qt.h
index 20b51a599..2089208bf 100644
--- a/src/core/clipboard_qt.h
+++ b/src/core/clipboard_qt.h
@@ -82,7 +82,7 @@ public:
     void ReadBookmark(base::string16* title, std::string* url) const override;
     void ReadData(const FormatType& format, std::string* result) const override;
 
-    virtual void OnPreShutdown() Q_DECL_OVERRIDE { }
+    void OnPreShutdown() override { }
 
 protected:
     void WriteObjects(ui::ClipboardType type, const ObjectMap& objects) override;
diff --git a/src/core/network_delegate_qt.h b/src/core/network_delegate_qt.h
index 590b3b20c..75d141ceb 100644
--- a/src/core/network_delegate_qt.h
+++ b/src/core/network_delegate_qt.h
@@ -73,29 +73,29 @@ public:
                                       const net::CompletionCallback &callback);
 
     // net::NetworkDelegate implementation
-    virtual int OnBeforeURLRequest(net::URLRequest* request, const net::CompletionCallback& callback, GURL* newUrl) override;
-    virtual void OnURLRequestDestroyed(net::URLRequest* request) override;
-    virtual bool OnCanSetCookie(const net::URLRequest&, const std::string&, net::CookieOptions*) override;
-    virtual int OnBeforeStartTransaction(net::URLRequest *request, const net::CompletionCallback &callback, net::HttpRequestHeaders *headers) override;
+    int OnBeforeURLRequest(net::URLRequest* request, const net::CompletionCallback& callback, GURL* newUrl) override;
+    void OnURLRequestDestroyed(net::URLRequest* request) override;
+    bool OnCanSetCookie(const net::URLRequest&, const std::string&, net::CookieOptions*) override;
+    int OnBeforeStartTransaction(net::URLRequest *request, const net::CompletionCallback &callback, net::HttpRequestHeaders *headers) override;
     virtual void OnBeforeSendHeaders(net::URLRequest* request, const net::ProxyInfo& proxy_info,
                                      const net::ProxyRetryInfoMap& proxy_retry_info, net::HttpRequestHeaders* headers) override;
-    virtual void OnStartTransaction(net::URLRequest *request, const net::HttpRequestHeaders &headers) override;
-    virtual int OnHeadersReceived(net::URLRequest*, const net::CompletionCallback&, const net::HttpResponseHeaders*, scoped_refptr<net::HttpResponseHeaders>*, GURL*) override;
-    virtual void OnBeforeRedirect(net::URLRequest*, const GURL&) override;
-    virtual void OnResponseStarted(net::URLRequest*) override;
-    virtual void OnNetworkBytesReceived(net::URLRequest*, int64_t) override;
-    virtual void OnNetworkBytesSent(net::URLRequest *, int64_t) override;
-    virtual void OnCompleted(net::URLRequest*, bool) override;
-    virtual void OnPACScriptError(int, const base::string16&) override;
-    virtual net::NetworkDelegate::AuthRequiredResponse OnAuthRequired(net::URLRequest*, const net::AuthChallengeInfo&, const AuthCallback&, net::AuthCredentials*) override;
-    virtual bool OnCanGetCookies(const net::URLRequest&, const net::CookieList&) override;
-    virtual bool OnCanAccessFile(const net::URLRequest& request, const base::FilePath& path) const override;
-    virtual bool OnCanEnablePrivacyMode(const GURL&, const GURL&) const override;
-    virtual bool OnAreExperimentalCookieFeaturesEnabled() const override;
-    virtual bool OnCancelURLRequestWithPolicyViolatingReferrerHeader(const net::URLRequest&, const GURL&, const GURL&) const override;
+    void OnStartTransaction(net::URLRequest *request, const net::HttpRequestHeaders &headers) override;
+    int OnHeadersReceived(net::URLRequest*, const net::CompletionCallback&, const net::HttpResponseHeaders*, scoped_refptr<net::HttpResponseHeaders>*, GURL*) override;
+    void OnBeforeRedirect(net::URLRequest*, const GURL&) override;
+    void OnResponseStarted(net::URLRequest*) override;
+    void OnNetworkBytesReceived(net::URLRequest*, int64_t) override;
+    void OnNetworkBytesSent(net::URLRequest *, int64_t) override;
+    void OnCompleted(net::URLRequest*, bool) override;
+    void OnPACScriptError(int, const base::string16&) override;
+    net::NetworkDelegate::AuthRequiredResponse OnAuthRequired(net::URLRequest*, const net::AuthChallengeInfo&, const AuthCallback&, net::AuthCredentials*) override;
+    bool OnCanGetCookies(const net::URLRequest&, const net::CookieList&) override;
+    bool OnCanAccessFile(const net::URLRequest& request, const base::FilePath& path) const override;
+    bool OnCanEnablePrivacyMode(const GURL&, const GURL&) const override;
+    bool OnAreExperimentalCookieFeaturesEnabled() const override;
+    bool OnCancelURLRequestWithPolicyViolatingReferrerHeader(const net::URLRequest&, const GURL&, const GURL&) const override;
 
-    virtual bool OnCanQueueReportingReport(const url::Origin& origin) const override;
-    virtual bool OnCanSendReportingReport(const url::Origin& origin) const override;
+    bool OnCanQueueReportingReport(const url::Origin& origin) const override;
+    bool OnCanSendReportingReport(const url::Origin& origin) const override;
     virtual bool OnCanSetReportingClient(const url::Origin& origin,
                                          const GURL& endpoint) const override;
     virtual bool OnCanUseReportingClient(const url::Origin& origin,
diff --git a/src/core/quota_permission_context_qt.h b/src/core/quota_permission_context_qt.h
index 68d768ac6..99e07eec7 100644
--- a/src/core/quota_permission_context_qt.h
+++ b/src/core/quota_permission_context_qt.h
@@ -42,7 +42,7 @@
 
 #include "content/public/browser/quota_permission_context.h"
 
-#include <QtCore/qcompilerdetection.h> // Needed for Q_DECL_OVERRIDE
+#include <QtCore/qcompilerdetection.h> // Needed for override
 
 namespace QtWebEngineCore {
 
@@ -50,7 +50,7 @@ class QuotaPermissionContextQt : public content::QuotaPermissionContext {
 public:
     void RequestQuotaPermission(const content::StorageQuotaParams &params,
                                 int render_process_id,
-                                const PermissionCallback &callback) Q_DECL_OVERRIDE;
+                                const PermissionCallback &callback) override;
 
     void dispatchCallbackOnIOThread(const PermissionCallback &callback,
                                     QuotaPermissionContext::QuotaPermissionResponse response);
diff --git a/src/core/renderer/web_channel_ipc_transport.cpp b/src/core/renderer/web_channel_ipc_transport.cpp
index cec8344b6..aaf831fb6 100644
--- a/src/core/renderer/web_channel_ipc_transport.cpp
+++ b/src/core/renderer/web_channel_ipc_transport.cpp
@@ -66,7 +66,7 @@ public:
 private:
     content::RenderView *GetRenderView(v8::Isolate *isolate);
     WebChannelTransport() { }
-    virtual gin::ObjectTemplateBuilder GetObjectTemplateBuilder(v8::Isolate *isolate) override;
+    gin::ObjectTemplateBuilder GetObjectTemplateBuilder(v8::Isolate *isolate) override;
 
     bool NativeQtSendMessage(gin::Arguments *args)
     {
diff --git a/src/core/ssl_host_state_delegate_qt.h b/src/core/ssl_host_state_delegate_qt.h
index 7cc63b339..6d05ea366 100644
--- a/src/core/ssl_host_state_delegate_qt.h
+++ b/src/core/ssl_host_state_delegate_qt.h
@@ -61,14 +61,14 @@ public:
     ~SSLHostStateDelegateQt();
 
     // content::SSLHostStateDelegate implementation:
-    virtual void AllowCert(const std::string &, const net::X509Certificate &cert, net::CertStatus error) override;
-    virtual void Clear(const base::Callback<bool(const std::string&)>& host_filter) override;
+    void AllowCert(const std::string &, const net::X509Certificate &cert, net::CertStatus error) override;
+    void Clear(const base::Callback<bool(const std::string&)>& host_filter) override;
     virtual CertJudgment QueryPolicy(const std::string &host, const net::X509Certificate &cert,
                                      net::CertStatus error,bool *expired_previous_decision) override;
-    virtual void HostRanInsecureContent(const std::string& host, int child_id, InsecureContentType content_type) override;
-    virtual bool DidHostRunInsecureContent(const std::string& host, int child_id, InsecureContentType content_type) const override;
-    virtual void RevokeUserAllowExceptions(const std::string &host) override;
-    virtual bool HasAllowException(const std::string &host) const override;
+    void HostRanInsecureContent(const std::string& host, int child_id, InsecureContentType content_type) override;
+    bool DidHostRunInsecureContent(const std::string& host, int child_id, InsecureContentType content_type) const override;
+    void RevokeUserAllowExceptions(const std::string &host) override;
+    bool HasAllowException(const std::string &host) const override;
 
 private:
     std::map<std::string, CertPolicy> m_certPolicyforHost;
diff --git a/src/plugins/qwebengineview/qwebengineview_plugin.h b/src/plugins/qwebengineview/qwebengineview_plugin.h
index 7c6f02e2a..cd0d8b3d5 100644
--- a/src/plugins/qwebengineview/qwebengineview_plugin.h
+++ b/src/plugins/qwebengineview/qwebengineview_plugin.h
@@ -83,17 +83,17 @@ class QWebEngineViewPlugin: public QObject, public QDesignerCustomWidgetInterfac
 public:
     explicit QWebEngineViewPlugin(QObject *parent = Q_NULLPTR);
 
-    QString name() const Q_DECL_OVERRIDE;
-    QString group() const Q_DECL_OVERRIDE;
-    QString toolTip() const Q_DECL_OVERRIDE;
-    QString whatsThis() const Q_DECL_OVERRIDE;
-    QString includeFile() const Q_DECL_OVERRIDE;
-    QIcon icon() const Q_DECL_OVERRIDE;
-    bool isContainer() const Q_DECL_OVERRIDE;
-    QWidget *createWidget(QWidget *parent) Q_DECL_OVERRIDE;
-    bool isInitialized() const Q_DECL_OVERRIDE;
-    void initialize(QDesignerFormEditorInterface *core) Q_DECL_OVERRIDE;
-    QString domXml() const Q_DECL_OVERRIDE;
+    QString name() const override;
+    QString group() const override;
+    QString toolTip() const override;
+    QString whatsThis() const override;
+    QString includeFile() const override;
+    QIcon icon() const override;
+    bool isContainer() const override;
+    QWidget *createWidget(QWidget *parent) override;
+    bool isInitialized() const override;
+    void initialize(QDesignerFormEditorInterface *core) override;
+    QString domXml() const override;
 
 private:
     bool m_initialized;
diff --git a/src/webengine/api/qquickwebengineprofile_p.h b/src/webengine/api/qquickwebengineprofile_p.h
index 1828f8085..5be82a4f5 100644
--- a/src/webengine/api/qquickwebengineprofile_p.h
+++ b/src/webengine/api/qquickwebengineprofile_p.h
@@ -77,8 +77,8 @@ public:
     void cancelDownload(quint32 downloadId);
     void downloadDestroyed(quint32 downloadId);
 
-    void downloadRequested(DownloadItemInfo &info) Q_DECL_OVERRIDE;
-    void downloadUpdated(const DownloadItemInfo &info) Q_DECL_OVERRIDE;
+    void downloadRequested(DownloadItemInfo &info) override;
+    void downloadUpdated(const DownloadItemInfo &info) override;
 
     // QQmlListPropertyHelpers
     static void userScripts_append(QQmlListProperty<QQuickWebEngineScript> *p, QQuickWebEngineScript *script);
diff --git a/src/webengine/api/qquickwebengineview_p.h b/src/webengine/api/qquickwebengineview_p.h
index 57f74ad01..59636188f 100644
--- a/src/webengine/api/qquickwebengineview_p.h
+++ b/src/webengine/api/qquickwebengineview_p.h
@@ -476,7 +476,7 @@ public:
     Q_ENUM(PrintedPageOrientation)
 
     // QmlParserStatus
-    virtual void componentComplete() Q_DECL_OVERRIDE;
+    void componentComplete() override;
 
     QQuickWebEngineProfile *profile() const;
     void setProfile(QQuickWebEngineProfile *);
@@ -562,12 +562,12 @@ Q_SIGNALS:
 #endif
 
 protected:
-    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;
-    void dropEvent(QDropEvent *e) Q_DECL_OVERRIDE;
+    void geometryChanged(const QRectF &newGeometry, const QRectF &oldGeometry) override;
+    void itemChange(ItemChange, const ItemChangeData &) override;
+    void dragEnterEvent(QDragEnterEvent *e) override;
+    void dragLeaveEvent(QDragLeaveEvent *e) override;
+    void dragMoveEvent(QDragMoveEvent *e) override;
+    void dropEvent(QDropEvent *e) override;
 
 private:
     Q_DECLARE_PRIVATE(QQuickWebEngineView)
diff --git a/src/webengine/api/qquickwebengineview_p_p.h b/src/webengine/api/qquickwebengineview_p_p.h
index af19c7765..6ba9f62b8 100644
--- a/src/webengine/api/qquickwebengineview_p_p.h
+++ b/src/webengine/api/qquickwebengineview_p_p.h
@@ -89,67 +89,67 @@ public:
 
     QtWebEngineCore::UIDelegatesManager *ui();
 
-    virtual QtWebEngineCore::RenderWidgetHostViewQtDelegate* CreateRenderWidgetHostViewQtDelegate(QtWebEngineCore::RenderWidgetHostViewQtDelegateClient *client) Q_DECL_OVERRIDE;
-    virtual QtWebEngineCore::RenderWidgetHostViewQtDelegate* CreateRenderWidgetHostViewQtDelegateForPopup(QtWebEngineCore::RenderWidgetHostViewQtDelegateClient *client) Q_DECL_OVERRIDE;
-    virtual void titleChanged(const QString&) Q_DECL_OVERRIDE;
-    virtual void urlChanged(const QUrl&) Q_DECL_OVERRIDE;
-    virtual void iconChanged(const QUrl&) Q_DECL_OVERRIDE;
-    virtual void loadProgressChanged(int progress) Q_DECL_OVERRIDE;
-    virtual void didUpdateTargetURL(const QUrl&) Q_DECL_OVERRIDE;
-    virtual void selectionChanged() Q_DECL_OVERRIDE { }
-    virtual void recentlyAudibleChanged(bool recentlyAudible) Q_DECL_OVERRIDE;
-    virtual QRectF viewportRect() const Q_DECL_OVERRIDE;
-    virtual qreal dpiScale() const Q_DECL_OVERRIDE;
-    virtual QColor backgroundColor() const Q_DECL_OVERRIDE;
-    virtual void loadStarted(const QUrl &provisionalUrl, bool isErrorPage = false) Q_DECL_OVERRIDE;
-    virtual void loadCommitted() Q_DECL_OVERRIDE;
-    virtual void loadVisuallyCommitted() Q_DECL_OVERRIDE;
-    virtual void loadFinished(bool success, const QUrl &url, bool isErrorPage = false, int errorCode = 0, const QString &errorDescription = QString()) Q_DECL_OVERRIDE;
-    virtual void focusContainer() Q_DECL_OVERRIDE;
-    virtual void unhandledKeyEvent(QKeyEvent *event) Q_DECL_OVERRIDE;
-    virtual void adoptNewWindow(QSharedPointer<QtWebEngineCore::WebContentsAdapter> newWebContents, WindowOpenDisposition disposition, bool userGesture, const QRect &, const QUrl &targetUrl) Q_DECL_OVERRIDE;
-    virtual bool isBeingAdopted() Q_DECL_OVERRIDE;
-    virtual void close() Q_DECL_OVERRIDE;
-    virtual void windowCloseRejected() Q_DECL_OVERRIDE;
-    virtual void requestFullScreenMode(const QUrl &origin, bool fullscreen) Q_DECL_OVERRIDE;
-    virtual bool isFullScreenMode() const Q_DECL_OVERRIDE;
-    virtual bool contextMenuRequested(const QtWebEngineCore::WebEngineContextMenuData &) Q_DECL_OVERRIDE;
-    virtual void navigationRequested(int navigationType, const QUrl &url, int &navigationRequestAction, bool isMainFrame) Q_DECL_OVERRIDE;
-    virtual void javascriptDialog(QSharedPointer<QtWebEngineCore::JavaScriptDialogController>) Q_DECL_OVERRIDE;
-    virtual void runFileChooser(QSharedPointer<QtWebEngineCore::FilePickerController>) Q_DECL_OVERRIDE;
-    virtual void showColorDialog(QSharedPointer<QtWebEngineCore::ColorChooserController>) Q_DECL_OVERRIDE;
-    virtual void didRunJavaScript(quint64, const QVariant&) Q_DECL_OVERRIDE;
-    virtual void didFetchDocumentMarkup(quint64, const QString&) Q_DECL_OVERRIDE { }
-    virtual void didFetchDocumentInnerText(quint64, const QString&) Q_DECL_OVERRIDE { }
-    virtual void didFindText(quint64, int) Q_DECL_OVERRIDE;
-    virtual void didPrintPage(quint64 requestId, const QByteArray &result) Q_DECL_OVERRIDE;
-    virtual void didPrintPageToPdf(const QString &filePath, bool success) Q_DECL_OVERRIDE;
-    virtual void passOnFocus(bool reverse) Q_DECL_OVERRIDE;
-    virtual void javaScriptConsoleMessage(JavaScriptConsoleMessageLevel level, const QString& message, int lineNumber, const QString& sourceID) Q_DECL_OVERRIDE;
-    virtual void authenticationRequired(QSharedPointer<QtWebEngineCore::AuthenticationDialogController>) Q_DECL_OVERRIDE;
-    virtual void runMediaAccessPermissionRequest(const QUrl &securityOrigin, MediaRequestFlags requestFlags) Q_DECL_OVERRIDE;
-    virtual void runMouseLockPermissionRequest(const QUrl &securityOrigin) Q_DECL_OVERRIDE;
-    virtual void runQuotaPermissionRequest(QSharedPointer<QtWebEngineCore::QuotaPermissionController>) Q_DECL_OVERRIDE;
-    virtual QObject *accessibilityParentObject() Q_DECL_OVERRIDE;
-    virtual QtWebEngineCore::WebEngineSettings *webEngineSettings() const Q_DECL_OVERRIDE;
-    virtual void allowCertificateError(const QSharedPointer<CertificateErrorController> &errorController) Q_DECL_OVERRIDE;
-    virtual void runGeolocationPermissionRequest(QUrl const&) Q_DECL_OVERRIDE;
-    virtual void showValidationMessage(const QRect &anchor, const QString &mainText, const QString &subText) Q_DECL_OVERRIDE;
-    virtual void hideValidationMessage() Q_DECL_OVERRIDE;
-    virtual void moveValidationMessage(const QRect &anchor) Q_DECL_OVERRIDE;
+    QtWebEngineCore::RenderWidgetHostViewQtDelegate* CreateRenderWidgetHostViewQtDelegate(QtWebEngineCore::RenderWidgetHostViewQtDelegateClient *client) override;
+    QtWebEngineCore::RenderWidgetHostViewQtDelegate* CreateRenderWidgetHostViewQtDelegateForPopup(QtWebEngineCore::RenderWidgetHostViewQtDelegateClient *client) override;
+    void titleChanged(const QString&) override;
+    void urlChanged(const QUrl&) override;
+    void iconChanged(const QUrl&) override;
+    void loadProgressChanged(int progress) override;
+    void didUpdateTargetURL(const QUrl&) override;
+    void selectionChanged() override { }
+    void recentlyAudibleChanged(bool recentlyAudible) override;
+    QRectF viewportRect() const override;
+    qreal dpiScale() const override;
+    QColor backgroundColor() const override;
+    void loadStarted(const QUrl &provisionalUrl, bool isErrorPage = false) override;
+    void loadCommitted() override;
+    void loadVisuallyCommitted() override;
+    void loadFinished(bool success, const QUrl &url, bool isErrorPage = false, int errorCode = 0, const QString &errorDescription = QString()) override;
+    void focusContainer() override;
+    void unhandledKeyEvent(QKeyEvent *event) override;
+    void adoptNewWindow(QSharedPointer<QtWebEngineCore::WebContentsAdapter> newWebContents, WindowOpenDisposition disposition, bool userGesture, const QRect &, const QUrl &targetUrl) override;
+    bool isBeingAdopted() override;
+    void close() override;
+    void windowCloseRejected() override;
+    void requestFullScreenMode(const QUrl &origin, bool fullscreen) override;
+    bool isFullScreenMode() const override;
+    bool contextMenuRequested(const QtWebEngineCore::WebEngineContextMenuData &) override;
+    void navigationRequested(int navigationType, const QUrl &url, int &navigationRequestAction, bool isMainFrame) override;
+    void javascriptDialog(QSharedPointer<QtWebEngineCore::JavaScriptDialogController>) override;
+    void runFileChooser(QSharedPointer<QtWebEngineCore::FilePickerController>) override;
+    void showColorDialog(QSharedPointer<QtWebEngineCore::ColorChooserController>) override;
+    void didRunJavaScript(quint64, const QVariant&) override;
+    void didFetchDocumentMarkup(quint64, const QString&) override { }
+    void didFetchDocumentInnerText(quint64, const QString&) override { }
+    void didFindText(quint64, int) override;
+    void didPrintPage(quint64 requestId, const QByteArray &result) override;
+    void didPrintPageToPdf(const QString &filePath, bool success) override;
+    void passOnFocus(bool reverse) override;
+    void javaScriptConsoleMessage(JavaScriptConsoleMessageLevel level, const QString& message, int lineNumber, const QString& sourceID) override;
+    void authenticationRequired(QSharedPointer<QtWebEngineCore::AuthenticationDialogController>) override;
+    void runMediaAccessPermissionRequest(const QUrl &securityOrigin, MediaRequestFlags requestFlags) override;
+    void runMouseLockPermissionRequest(const QUrl &securityOrigin) override;
+    void runQuotaPermissionRequest(QSharedPointer<QtWebEngineCore::QuotaPermissionController>) override;
+    QObject *accessibilityParentObject() override;
+    QtWebEngineCore::WebEngineSettings *webEngineSettings() const override;
+    void allowCertificateError(const QSharedPointer<CertificateErrorController> &errorController) override;
+    void runGeolocationPermissionRequest(QUrl const&) override;
+    void showValidationMessage(const QRect &anchor, const QString &mainText, const QString &subText) override;
+    void hideValidationMessage() override;
+    void moveValidationMessage(const QRect &anchor) override;
     virtual void renderProcessTerminated(RenderProcessTerminationStatus terminationStatus,
-                                     int exitCode) Q_DECL_OVERRIDE;
-    virtual void requestGeometryChange(const QRect &geometry) Q_DECL_OVERRIDE { Q_UNUSED(geometry); }
-    virtual void updateScrollPosition(const QPointF &position) Q_DECL_OVERRIDE;
-    virtual void updateContentsSize(const QSizeF &size) Q_DECL_OVERRIDE;
+                                     int exitCode) override;
+    void requestGeometryChange(const QRect &geometry) override { Q_UNUSED(geometry); }
+    void updateScrollPosition(const QPointF &position) override;
+    void updateContentsSize(const QSizeF &size) override;
     void startDragging(const content::DropData &dropData, Qt::DropActions allowedActions,
-                       const QPixmap &pixmap, const QPoint &offset) Q_DECL_OVERRIDE;
-    virtual bool isEnabled() const Q_DECL_OVERRIDE;
-    virtual void setToolTip(const QString &toolTipText) Q_DECL_OVERRIDE;
-    const QObject *holdingQObject() const Q_DECL_OVERRIDE;
+                       const QPixmap &pixmap, const QPoint &offset) override;
+    bool isEnabled() const override;
+    void setToolTip(const QString &toolTipText) override;
+    const QObject *holdingQObject() const override;
 
-    virtual QSharedPointer<QtWebEngineCore::BrowserContextAdapter> browserContextAdapter() Q_DECL_OVERRIDE;
-    QtWebEngineCore::WebContentsAdapter *webContentsAdapter() Q_DECL_OVERRIDE;
+    QSharedPointer<QtWebEngineCore::BrowserContextAdapter> browserContextAdapter() override;
+    QtWebEngineCore::WebContentsAdapter *webContentsAdapter() override;
 
     void setDevicePixelRatio(qreal);
     void adoptWebContents(QtWebEngineCore::WebContentsAdapter *webContents);
@@ -200,13 +200,13 @@ class QQuickWebEngineViewAccessible : public QAccessibleObject
 {
 public:
     QQuickWebEngineViewAccessible(QQuickWebEngineView *o);
-    QAccessibleInterface *parent() const Q_DECL_OVERRIDE;
-    int childCount() const Q_DECL_OVERRIDE;
-    QAccessibleInterface *child(int index) const Q_DECL_OVERRIDE;
-    int indexOfChild(const QAccessibleInterface*) const Q_DECL_OVERRIDE;
-    QString text(QAccessible::Text) const Q_DECL_OVERRIDE;
-    QAccessible::Role role() const Q_DECL_OVERRIDE;
-    QAccessible::State state() const Q_DECL_OVERRIDE;
+    QAccessibleInterface *parent() const override;
+    int childCount() const override;
+    QAccessibleInterface *child(int index) const override;
+    int indexOfChild(const QAccessibleInterface*) const override;
+    QString text(QAccessible::Text) const override;
+    QAccessible::Role role() const override;
+    QAccessible::State state() const override;
 
 private:
     QQuickWebEngineView *engineView() const { return static_cast<QQuickWebEngineView*>(object()); }
diff --git a/src/webengine/plugin/plugin.cpp b/src/webengine/plugin/plugin.cpp
index ddd748f41..077762352 100644
--- a/src/webengine/plugin/plugin.cpp
+++ b/src/webengine/plugin/plugin.cpp
@@ -66,13 +66,13 @@ class QtWebEnginePlugin : public QQmlExtensionPlugin
     Q_OBJECT
     Q_PLUGIN_METADATA(IID QQmlExtensionInterface_iid)
 public:
-    virtual void initializeEngine(QQmlEngine *engine, const char *uri) Q_DECL_OVERRIDE
+    void initializeEngine(QQmlEngine *engine, const char *uri) override
     {
         Q_UNUSED(uri);
         engine->addImageProvider(QQuickWebEngineFaviconProvider::identifier(), new QQuickWebEngineFaviconProvider);
     }
 
-    virtual void registerTypes(const char *uri) Q_DECL_OVERRIDE
+    void registerTypes(const char *uri) override
     {
         Q_ASSERT(QLatin1String(uri) == QLatin1String("QtWebEngine"));
 
diff --git a/src/webengine/render_widget_host_view_qt_delegate_quick.h b/src/webengine/render_widget_host_view_qt_delegate_quick.h
index 7a08e915b..3a79b20af 100644
--- a/src/webengine/render_widget_host_view_qt_delegate_quick.h
+++ b/src/webengine/render_widget_host_view_qt_delegate_quick.h
@@ -52,49 +52,49 @@ class RenderWidgetHostViewQtDelegateQuick : public QQuickItem, public RenderWidg
 public:
     RenderWidgetHostViewQtDelegateQuick(RenderWidgetHostViewQtDelegateClient *client, bool isPopup);
 
-    virtual void initAsChild(WebContentsAdapterClient* container) Q_DECL_OVERRIDE;
-    virtual void initAsPopup(const QRect&) Q_DECL_OVERRIDE;
-    virtual QRectF screenRect() const Q_DECL_OVERRIDE;
-    virtual QRectF contentsRect() const Q_DECL_OVERRIDE;
-    virtual void setKeyboardFocus() Q_DECL_OVERRIDE;
-    virtual bool hasKeyboardFocus() Q_DECL_OVERRIDE;
-    virtual void lockMouse() Q_DECL_OVERRIDE;
-    virtual void unlockMouse() Q_DECL_OVERRIDE;
-    virtual void show() Q_DECL_OVERRIDE;
-    virtual void hide() Q_DECL_OVERRIDE;
-    virtual bool isVisible() const Q_DECL_OVERRIDE;
-    virtual QWindow* window() const Q_DECL_OVERRIDE;
-    virtual QSGTexture *createTextureFromImage(const QImage &) Q_DECL_OVERRIDE;
-    virtual QSGLayer *createLayer() Q_DECL_OVERRIDE;
-    virtual QSGInternalImageNode *createImageNode() Q_DECL_OVERRIDE;
-    virtual QSGTextureNode *createTextureNode() Q_DECL_OVERRIDE;
-    virtual QSGRectangleNode *createRectangleNode() Q_DECL_OVERRIDE;
-    virtual void update() Q_DECL_OVERRIDE;
-    virtual void updateCursor(const QCursor &) Q_DECL_OVERRIDE;
-    virtual void resize(int width, int height) Q_DECL_OVERRIDE;
-    virtual void move(const QPoint&) Q_DECL_OVERRIDE { }
-    virtual void inputMethodStateChanged(bool editorVisible) Q_DECL_OVERRIDE;
-    virtual void setInputMethodHints(Qt::InputMethodHints) Q_DECL_OVERRIDE { }
+    void initAsChild(WebContentsAdapterClient* container) override;
+    void initAsPopup(const QRect&) override;
+    QRectF screenRect() const override;
+    QRectF contentsRect() const override;
+    void setKeyboardFocus() override;
+    bool hasKeyboardFocus() override;
+    void lockMouse() override;
+    void unlockMouse() override;
+    void show() override;
+    void hide() override;
+    bool isVisible() const override;
+    QWindow* window() const override;
+    QSGTexture *createTextureFromImage(const QImage &) override;
+    QSGLayer *createLayer() override;
+    QSGInternalImageNode *createImageNode() override;
+    QSGTextureNode *createTextureNode() override;
+    QSGRectangleNode *createRectangleNode() override;
+    void update() override;
+    void updateCursor(const QCursor &) override;
+    void resize(int width, int height) override;
+    void move(const QPoint&) override { }
+    void inputMethodStateChanged(bool editorVisible) override;
+    void setInputMethodHints(Qt::InputMethodHints) override { }
     // The QtQuick view doesn't have a backbuffer of its own and doesn't need this
-    virtual void setClearColor(const QColor &) Q_DECL_OVERRIDE { }
+    void setClearColor(const QColor &) override { }
 
 protected:
-    virtual bool event(QEvent *event) Q_DECL_OVERRIDE;
-    virtual void focusInEvent(QFocusEvent *event) Q_DECL_OVERRIDE;
-    virtual void focusOutEvent(QFocusEvent *event) Q_DECL_OVERRIDE;
-    virtual void mousePressEvent(QMouseEvent *event) Q_DECL_OVERRIDE;
-    virtual void mouseMoveEvent(QMouseEvent *event) Q_DECL_OVERRIDE;
-    virtual void mouseReleaseEvent(QMouseEvent *event) Q_DECL_OVERRIDE;
-    virtual void keyPressEvent(QKeyEvent *event) Q_DECL_OVERRIDE;
-    virtual void keyReleaseEvent(QKeyEvent *event) Q_DECL_OVERRIDE;
-    virtual void wheelEvent(QWheelEvent *event) Q_DECL_OVERRIDE;
-    virtual void touchEvent(QTouchEvent *event) Q_DECL_OVERRIDE;
-    virtual void hoverMoveEvent(QHoverEvent *event) Q_DECL_OVERRIDE;
-    virtual QVariant inputMethodQuery(Qt::InputMethodQuery query) const Q_DECL_OVERRIDE;
-    virtual void inputMethodEvent(QInputMethodEvent *event) Q_DECL_OVERRIDE;
-    virtual void geometryChanged(const QRectF &newGeometry, const QRectF &oldGeometry) Q_DECL_OVERRIDE;
-    virtual void itemChange(ItemChange change, const ItemChangeData &value) Q_DECL_OVERRIDE;
-    virtual QSGNode *updatePaintNode(QSGNode *, UpdatePaintNodeData *) Q_DECL_OVERRIDE;
+    bool event(QEvent *event) override;
+    void focusInEvent(QFocusEvent *event) override;
+    void focusOutEvent(QFocusEvent *event) override;
+    void mousePressEvent(QMouseEvent *event) override;
+    void mouseMoveEvent(QMouseEvent *event) override;
+    void mouseReleaseEvent(QMouseEvent *event) override;
+    void keyPressEvent(QKeyEvent *event) override;
+    void keyReleaseEvent(QKeyEvent *event) override;
+    void wheelEvent(QWheelEvent *event) override;
+    void touchEvent(QTouchEvent *event) override;
+    void hoverMoveEvent(QHoverEvent *event) override;
+    QVariant inputMethodQuery(Qt::InputMethodQuery query) const override;
+    void inputMethodEvent(QInputMethodEvent *event) override;
+    void geometryChanged(const QRectF &newGeometry, const QRectF &oldGeometry) override;
+    void itemChange(ItemChange change, const ItemChangeData &value) override;
+    QSGNode *updatePaintNode(QSGNode *, UpdatePaintNodeData *) override;
 
 private slots:
     void onWindowPosChanged();
diff --git a/src/webengine/render_widget_host_view_qt_delegate_quickwindow.h b/src/webengine/render_widget_host_view_qt_delegate_quickwindow.h
index 057b91c75..c4a1ac67b 100644
--- a/src/webengine/render_widget_host_view_qt_delegate_quickwindow.h
+++ b/src/webengine/render_widget_host_view_qt_delegate_quickwindow.h
@@ -55,30 +55,30 @@ public:
     RenderWidgetHostViewQtDelegateQuickWindow(RenderWidgetHostViewQtDelegate *realDelegate);
     ~RenderWidgetHostViewQtDelegateQuickWindow();
 
-    virtual void initAsChild(WebContentsAdapterClient* container) Q_DECL_OVERRIDE;
-    virtual void initAsPopup(const QRect&) Q_DECL_OVERRIDE;
-    virtual QRectF screenRect() const Q_DECL_OVERRIDE;
-    virtual QRectF contentsRect() const Q_DECL_OVERRIDE;
-    virtual void setKeyboardFocus() Q_DECL_OVERRIDE {}
-    virtual bool hasKeyboardFocus() Q_DECL_OVERRIDE { return false; }
-    virtual void lockMouse() Q_DECL_OVERRIDE {}
-    virtual void unlockMouse() Q_DECL_OVERRIDE {}
-    virtual void show() Q_DECL_OVERRIDE;
-    virtual void hide() Q_DECL_OVERRIDE;
-    virtual bool isVisible() const Q_DECL_OVERRIDE;
-    virtual QWindow* window() const Q_DECL_OVERRIDE;
-    virtual QSGTexture *createTextureFromImage(const QImage &) Q_DECL_OVERRIDE;
-    virtual QSGLayer *createLayer() Q_DECL_OVERRIDE;
-    virtual QSGInternalImageNode *createImageNode() Q_DECL_OVERRIDE;
-    virtual QSGTextureNode *createTextureNode() Q_DECL_OVERRIDE;
-    virtual QSGRectangleNode *createRectangleNode() Q_DECL_OVERRIDE;
-    virtual void update() Q_DECL_OVERRIDE;
-    virtual void updateCursor(const QCursor &) Q_DECL_OVERRIDE;
-    virtual void resize(int width, int height) Q_DECL_OVERRIDE;
-    virtual void move(const QPoint &screenPos) Q_DECL_OVERRIDE;
-    virtual void inputMethodStateChanged(bool) Q_DECL_OVERRIDE {}
-    virtual void setInputMethodHints(Qt::InputMethodHints) Q_DECL_OVERRIDE { }
-    virtual void setClearColor(const QColor &) Q_DECL_OVERRIDE { }
+    void initAsChild(WebContentsAdapterClient* container) override;
+    void initAsPopup(const QRect&) override;
+    QRectF screenRect() const override;
+    QRectF contentsRect() const override;
+    void setKeyboardFocus() override {}
+    bool hasKeyboardFocus() override { return false; }
+    void lockMouse() override {}
+    void unlockMouse() override {}
+    void show() override;
+    void hide() override;
+    bool isVisible() const override;
+    QWindow* window() const override;
+    QSGTexture *createTextureFromImage(const QImage &) override;
+    QSGLayer *createLayer() override;
+    QSGInternalImageNode *createImageNode() override;
+    QSGTextureNode *createTextureNode() override;
+    QSGRectangleNode *createRectangleNode() override;
+    void update() override;
+    void updateCursor(const QCursor &) override;
+    void resize(int width, int height) override;
+    void move(const QPoint &screenPos) override;
+    void inputMethodStateChanged(bool) override {}
+    void setInputMethodHints(Qt::InputMethodHints) override { }
+    void setClearColor(const QColor &) override { }
 
 private:
     QScopedPointer<RenderWidgetHostViewQtDelegate> m_realDelegate;
diff --git a/src/webenginewidgets/api/qwebenginepage_p.h b/src/webenginewidgets/api/qwebenginepage_p.h
index 0f18f8d8a..1724a9dde 100644
--- a/src/webenginewidgets/api/qwebenginepage_p.h
+++ b/src/webenginewidgets/api/qwebenginepage_p.h
@@ -82,70 +82,70 @@ public:
     QWebEnginePagePrivate(QWebEngineProfile *profile = 0);
     ~QWebEnginePagePrivate();
 
-    virtual QtWebEngineCore::RenderWidgetHostViewQtDelegate* CreateRenderWidgetHostViewQtDelegate(QtWebEngineCore::RenderWidgetHostViewQtDelegateClient *client) Q_DECL_OVERRIDE;
-    virtual QtWebEngineCore::RenderWidgetHostViewQtDelegate* CreateRenderWidgetHostViewQtDelegateForPopup(QtWebEngineCore::RenderWidgetHostViewQtDelegateClient *client) Q_DECL_OVERRIDE { return CreateRenderWidgetHostViewQtDelegate(client); }
-    virtual void titleChanged(const QString&) Q_DECL_OVERRIDE;
-    virtual void urlChanged(const QUrl&) Q_DECL_OVERRIDE;
-    virtual void iconChanged(const QUrl&) Q_DECL_OVERRIDE;
-    virtual void loadProgressChanged(int progress) Q_DECL_OVERRIDE;
-    virtual void didUpdateTargetURL(const QUrl&) Q_DECL_OVERRIDE;
-    virtual void selectionChanged() Q_DECL_OVERRIDE;
-    virtual void recentlyAudibleChanged(bool recentlyAudible) Q_DECL_OVERRIDE;
-    virtual QRectF viewportRect() const Q_DECL_OVERRIDE;
-    virtual qreal dpiScale() const Q_DECL_OVERRIDE;
-    virtual QColor backgroundColor() const Q_DECL_OVERRIDE;
-    virtual void loadStarted(const QUrl &provisionalUrl, bool isErrorPage = false) Q_DECL_OVERRIDE;
-    virtual void loadCommitted() Q_DECL_OVERRIDE;
-    virtual void loadVisuallyCommitted() Q_DECL_OVERRIDE { }
-    virtual void loadFinished(bool success, const QUrl &url, bool isErrorPage = false, int errorCode = 0, const QString &errorDescription = QString()) Q_DECL_OVERRIDE;
-    virtual void focusContainer() Q_DECL_OVERRIDE;
-    virtual void unhandledKeyEvent(QKeyEvent *event) Q_DECL_OVERRIDE;
-    virtual void adoptNewWindow(QSharedPointer<QtWebEngineCore::WebContentsAdapter> newWebContents, WindowOpenDisposition disposition, bool userGesture, const QRect &initialGeometry, const QUrl &targetUrl) Q_DECL_OVERRIDE;
+    QtWebEngineCore::RenderWidgetHostViewQtDelegate* CreateRenderWidgetHostViewQtDelegate(QtWebEngineCore::RenderWidgetHostViewQtDelegateClient *client) override;
+    QtWebEngineCore::RenderWidgetHostViewQtDelegate* CreateRenderWidgetHostViewQtDelegateForPopup(QtWebEngineCore::RenderWidgetHostViewQtDelegateClient *client) override { return CreateRenderWidgetHostViewQtDelegate(client); }
+    void titleChanged(const QString&) override;
+    void urlChanged(const QUrl&) override;
+    void iconChanged(const QUrl&) override;
+    void loadProgressChanged(int progress) override;
+    void didUpdateTargetURL(const QUrl&) override;
+    void selectionChanged() override;
+    void recentlyAudibleChanged(bool recentlyAudible) override;
+    QRectF viewportRect() const override;
+    qreal dpiScale() const override;
+    QColor backgroundColor() const override;
+    void loadStarted(const QUrl &provisionalUrl, bool isErrorPage = false) override;
+    void loadCommitted() override;
+    void loadVisuallyCommitted() override { }
+    void loadFinished(bool success, const QUrl &url, bool isErrorPage = false, int errorCode = 0, const QString &errorDescription = QString()) override;
+    void focusContainer() override;
+    void unhandledKeyEvent(QKeyEvent *event) override;
+    void adoptNewWindow(QSharedPointer<QtWebEngineCore::WebContentsAdapter> newWebContents, WindowOpenDisposition disposition, bool userGesture, const QRect &initialGeometry, const QUrl &targetUrl) override;
     void adoptNewWindowImpl(QWebEnginePage *newPage,
             const QSharedPointer<QtWebEngineCore::WebContentsAdapter> &newWebContents,
             const QRect &initialGeometry);
-    virtual bool isBeingAdopted() Q_DECL_OVERRIDE;
-    virtual void close() Q_DECL_OVERRIDE;
-    virtual void windowCloseRejected() Q_DECL_OVERRIDE;
-    virtual bool contextMenuRequested(const QtWebEngineCore::WebEngineContextMenuData &data) Q_DECL_OVERRIDE;
-    virtual void navigationRequested(int navigationType, const QUrl &url, int &navigationRequestAction, bool isMainFrame) Q_DECL_OVERRIDE;
-    virtual void requestFullScreenMode(const QUrl &origin, bool fullscreen) Q_DECL_OVERRIDE;
-    virtual bool isFullScreenMode() const Q_DECL_OVERRIDE;
-    virtual void javascriptDialog(QSharedPointer<QtWebEngineCore::JavaScriptDialogController>) Q_DECL_OVERRIDE;
-    virtual void runFileChooser(QSharedPointer<QtWebEngineCore::FilePickerController>) Q_DECL_OVERRIDE;
-    virtual void showColorDialog(QSharedPointer<QtWebEngineCore::ColorChooserController>) Q_DECL_OVERRIDE;
-    virtual void didRunJavaScript(quint64 requestId, const QVariant& result) Q_DECL_OVERRIDE;
-    virtual void didFetchDocumentMarkup(quint64 requestId, const QString& result) Q_DECL_OVERRIDE;
-    virtual void didFetchDocumentInnerText(quint64 requestId, const QString& result) Q_DECL_OVERRIDE;
-    virtual void didFindText(quint64 requestId, int matchCount) Q_DECL_OVERRIDE;
-    virtual void didPrintPage(quint64 requestId, const QByteArray &result) Q_DECL_OVERRIDE;
-    virtual void didPrintPageToPdf(const QString &filePath, bool success) Q_DECL_OVERRIDE;
-    virtual void passOnFocus(bool reverse) Q_DECL_OVERRIDE;
-    virtual void javaScriptConsoleMessage(JavaScriptConsoleMessageLevel level, const QString& message, int lineNumber, const QString& sourceID) Q_DECL_OVERRIDE;
-    virtual void authenticationRequired(QSharedPointer<QtWebEngineCore::AuthenticationDialogController>) Q_DECL_OVERRIDE;
-    virtual void runMediaAccessPermissionRequest(const QUrl &securityOrigin, MediaRequestFlags requestFlags) Q_DECL_OVERRIDE;
-    virtual void runGeolocationPermissionRequest(const QUrl &securityOrigin) Q_DECL_OVERRIDE;
-    virtual void runMouseLockPermissionRequest(const QUrl &securityOrigin) Q_DECL_OVERRIDE;
-    virtual void runQuotaPermissionRequest(QSharedPointer<QtWebEngineCore::QuotaPermissionController>) Q_DECL_OVERRIDE;
-    virtual QObject *accessibilityParentObject() Q_DECL_OVERRIDE;
-    virtual QtWebEngineCore::WebEngineSettings *webEngineSettings() const Q_DECL_OVERRIDE;
-    virtual void allowCertificateError(const QSharedPointer<CertificateErrorController> &controller) Q_DECL_OVERRIDE;
-    virtual void showValidationMessage(const QRect &anchor, const QString &mainText, const QString &subText) Q_DECL_OVERRIDE;
-    virtual void hideValidationMessage() Q_DECL_OVERRIDE;
-    virtual void moveValidationMessage(const QRect &anchor) Q_DECL_OVERRIDE;
+    bool isBeingAdopted() override;
+    void close() override;
+    void windowCloseRejected() override;
+    bool contextMenuRequested(const QtWebEngineCore::WebEngineContextMenuData &data) override;
+    void navigationRequested(int navigationType, const QUrl &url, int &navigationRequestAction, bool isMainFrame) override;
+    void requestFullScreenMode(const QUrl &origin, bool fullscreen) override;
+    bool isFullScreenMode() const override;
+    void javascriptDialog(QSharedPointer<QtWebEngineCore::JavaScriptDialogController>) override;
+    void runFileChooser(QSharedPointer<QtWebEngineCore::FilePickerController>) override;
+    void showColorDialog(QSharedPointer<QtWebEngineCore::ColorChooserController>) override;
+    void didRunJavaScript(quint64 requestId, const QVariant& result) override;
+    void didFetchDocumentMarkup(quint64 requestId, const QString& result) override;
+    void didFetchDocumentInnerText(quint64 requestId, const QString& result) override;
+    void didFindText(quint64 requestId, int matchCount) override;
+    void didPrintPage(quint64 requestId, const QByteArray &result) override;
+    void didPrintPageToPdf(const QString &filePath, bool success) override;
+    void passOnFocus(bool reverse) override;
+    void javaScriptConsoleMessage(JavaScriptConsoleMessageLevel level, const QString& message, int lineNumber, const QString& sourceID) override;
+    void authenticationRequired(QSharedPointer<QtWebEngineCore::AuthenticationDialogController>) override;
+    void runMediaAccessPermissionRequest(const QUrl &securityOrigin, MediaRequestFlags requestFlags) override;
+    void runGeolocationPermissionRequest(const QUrl &securityOrigin) override;
+    void runMouseLockPermissionRequest(const QUrl &securityOrigin) override;
+    void runQuotaPermissionRequest(QSharedPointer<QtWebEngineCore::QuotaPermissionController>) override;
+    QObject *accessibilityParentObject() override;
+    QtWebEngineCore::WebEngineSettings *webEngineSettings() const override;
+    void allowCertificateError(const QSharedPointer<CertificateErrorController> &controller) override;
+    void showValidationMessage(const QRect &anchor, const QString &mainText, const QString &subText) override;
+    void hideValidationMessage() override;
+    void moveValidationMessage(const QRect &anchor) override;
     virtual void renderProcessTerminated(RenderProcessTerminationStatus terminationStatus,
-                                     int exitCode) Q_DECL_OVERRIDE;
-    virtual void requestGeometryChange(const QRect &geometry) Q_DECL_OVERRIDE;
-    virtual void updateScrollPosition(const QPointF &position) Q_DECL_OVERRIDE;
-    virtual void updateContentsSize(const QSizeF &size) Q_DECL_OVERRIDE;
+                                     int exitCode) override;
+    void requestGeometryChange(const QRect &geometry) override;
+    void updateScrollPosition(const QPointF &position) override;
+    void updateContentsSize(const QSizeF &size) override;
     void startDragging(const content::DropData &dropData, Qt::DropActions allowedActions,
-                       const QPixmap &pixmap, const QPoint &offset) Q_DECL_OVERRIDE;
-    virtual bool isEnabled() const Q_DECL_OVERRIDE;
-    virtual void setToolTip(const QString &toolTipText) Q_DECL_OVERRIDE;
-    const QObject *holdingQObject() const Q_DECL_OVERRIDE;
+                       const QPixmap &pixmap, const QPoint &offset) override;
+    bool isEnabled() const override;
+    void setToolTip(const QString &toolTipText) override;
+    const QObject *holdingQObject() const override;
 
-    virtual QSharedPointer<QtWebEngineCore::BrowserContextAdapter> browserContextAdapter() Q_DECL_OVERRIDE;
-    QtWebEngineCore::WebContentsAdapter *webContentsAdapter() Q_DECL_OVERRIDE;
+    QSharedPointer<QtWebEngineCore::BrowserContextAdapter> browserContextAdapter() override;
+    QtWebEngineCore::WebContentsAdapter *webContentsAdapter() override;
 
     void updateAction(QWebEnginePage::WebAction) const;
     void updateNavigationActions();
diff --git a/src/webenginewidgets/api/qwebengineprofile_p.h b/src/webenginewidgets/api/qwebengineprofile_p.h
index c5a75f6d4..ffb28ec6d 100644
--- a/src/webenginewidgets/api/qwebengineprofile_p.h
+++ b/src/webenginewidgets/api/qwebengineprofile_p.h
@@ -78,8 +78,8 @@ public:
 
     void downloadDestroyed(quint32 downloadId);
 
-    void downloadRequested(DownloadItemInfo &info) Q_DECL_OVERRIDE;
-    void downloadUpdated(const DownloadItemInfo &info) Q_DECL_OVERRIDE;
+    void downloadRequested(DownloadItemInfo &info) override;
+    void downloadUpdated(const DownloadItemInfo &info) override;
 
 private:
     QWebEngineProfile *q_ptr;
diff --git a/src/webenginewidgets/api/qwebengineview.h b/src/webenginewidgets/api/qwebengineview.h
index 487cc2316..795e011ad 100644
--- a/src/webenginewidgets/api/qwebengineview.h
+++ b/src/webenginewidgets/api/qwebengineview.h
@@ -103,7 +103,7 @@ public:
     void findText(const QString &subString, QWebEnginePage::FindFlags options = QWebEnginePage::FindFlags(), const QWebEngineCallback<bool> &resultCallback = QWebEngineCallback<bool>());
 #endif
 
-    virtual QSize sizeHint() const Q_DECL_OVERRIDE;
+    QSize sizeHint() const override;
     QWebEngineSettings *settings() const;
 
 public Q_SLOTS:
@@ -126,14 +126,14 @@ Q_SIGNALS:
 
 protected:
     virtual QWebEngineView *createWindow(QWebEnginePage::WebWindowType type);
-    virtual void contextMenuEvent(QContextMenuEvent*) Q_DECL_OVERRIDE;
-    virtual bool event(QEvent*) Q_DECL_OVERRIDE;
-    virtual void showEvent(QShowEvent *) Q_DECL_OVERRIDE;
-    virtual void hideEvent(QHideEvent *) Q_DECL_OVERRIDE;
-    void dragEnterEvent(QDragEnterEvent *e) Q_DECL_OVERRIDE;
-    void dragLeaveEvent(QDragLeaveEvent *e) Q_DECL_OVERRIDE;
-    void dragMoveEvent(QDragMoveEvent *e) Q_DECL_OVERRIDE;
-    void dropEvent(QDropEvent *e) Q_DECL_OVERRIDE;
+    void contextMenuEvent(QContextMenuEvent*) override;
+    bool event(QEvent*) override;
+    void showEvent(QShowEvent *) override;
+    void hideEvent(QHideEvent *) override;
+    void dragEnterEvent(QDragEnterEvent *e) override;
+    void dragLeaveEvent(QDragLeaveEvent *e) override;
+    void dragMoveEvent(QDragMoveEvent *e) override;
+    void dropEvent(QDropEvent *e) override;
 
 private:
     Q_DISABLE_COPY(QWebEngineView)
diff --git a/src/webenginewidgets/api/qwebengineview_p.h b/src/webenginewidgets/api/qwebengineview_p.h
index f3a37225b..7f0cdac45 100644
--- a/src/webenginewidgets/api/qwebengineview_p.h
+++ b/src/webenginewidgets/api/qwebengineview_p.h
@@ -80,9 +80,9 @@ public:
     QWebEngineViewAccessible(QWebEngineView *o) : QAccessibleWidget(o)
     {}
 
-    int childCount() const Q_DECL_OVERRIDE;
-    QAccessibleInterface *child(int index) const Q_DECL_OVERRIDE;
-    int indexOfChild(const QAccessibleInterface *child) const Q_DECL_OVERRIDE;
+    int childCount() const override;
+    QAccessibleInterface *child(int index) const override;
+    int indexOfChild(const QAccessibleInterface *child) const override;
 
 private:
     QWebEngineView *view() const { return static_cast<QWebEngineView*>(object()); }
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 fb33c55c7..f971a3ee6 100644
--- a/src/webenginewidgets/render_widget_host_view_qt_delegate_widget.h
+++ b/src/webenginewidgets/render_widget_host_view_qt_delegate_widget.h
@@ -53,38 +53,38 @@ class RenderWidgetHostViewQtDelegateWidget : public QQuickWidget, public RenderW
 public:
     RenderWidgetHostViewQtDelegateWidget(RenderWidgetHostViewQtDelegateClient *client, QWidget *parent = 0);
 
-    virtual void initAsChild(WebContentsAdapterClient* container) Q_DECL_OVERRIDE;
-    virtual void initAsPopup(const QRect&) Q_DECL_OVERRIDE;
-    virtual QRectF screenRect() const Q_DECL_OVERRIDE;
-    virtual QRectF contentsRect() const Q_DECL_OVERRIDE;
-    virtual void setKeyboardFocus() Q_DECL_OVERRIDE;
-    virtual bool hasKeyboardFocus() Q_DECL_OVERRIDE;
-    virtual void lockMouse() Q_DECL_OVERRIDE;
-    virtual void unlockMouse() Q_DECL_OVERRIDE;
-    virtual void show() Q_DECL_OVERRIDE;
-    virtual void hide() Q_DECL_OVERRIDE;
-    virtual bool isVisible() const Q_DECL_OVERRIDE;
-    virtual QWindow* window() const Q_DECL_OVERRIDE;
-    virtual QSGTexture *createTextureFromImage(const QImage &) Q_DECL_OVERRIDE;
-    virtual QSGLayer *createLayer() Q_DECL_OVERRIDE;
-    virtual QSGInternalImageNode *createImageNode() Q_DECL_OVERRIDE;
-    virtual QSGTextureNode *createTextureNode() Q_DECL_OVERRIDE;
-    virtual QSGRectangleNode *createRectangleNode() Q_DECL_OVERRIDE;
-    virtual void update() Q_DECL_OVERRIDE;
-    virtual void updateCursor(const QCursor &) Q_DECL_OVERRIDE;
-    virtual void resize(int width, int height) Q_DECL_OVERRIDE;
-    virtual void move(const QPoint &screenPos) Q_DECL_OVERRIDE;
-    virtual void inputMethodStateChanged(bool editorVisible) Q_DECL_OVERRIDE;
-    virtual void setInputMethodHints(Qt::InputMethodHints) Q_DECL_OVERRIDE;
-    virtual void setClearColor(const QColor &color) Q_DECL_OVERRIDE;
+    void initAsChild(WebContentsAdapterClient* container) override;
+    void initAsPopup(const QRect&) override;
+    QRectF screenRect() const override;
+    QRectF contentsRect() const override;
+    void setKeyboardFocus() override;
+    bool hasKeyboardFocus() override;
+    void lockMouse() override;
+    void unlockMouse() override;
+    void show() override;
+    void hide() override;
+    bool isVisible() const override;
+    QWindow* window() const override;
+    QSGTexture *createTextureFromImage(const QImage &) override;
+    QSGLayer *createLayer() override;
+    QSGInternalImageNode *createImageNode() override;
+    QSGTextureNode *createTextureNode() override;
+    QSGRectangleNode *createRectangleNode() override;
+    void update() override;
+    void updateCursor(const QCursor &) override;
+    void resize(int width, int height) override;
+    void move(const QPoint &screenPos) override;
+    void inputMethodStateChanged(bool editorVisible) override;
+    void setInputMethodHints(Qt::InputMethodHints) override;
+    void setClearColor(const QColor &color) override;
 
 protected:
-    bool event(QEvent *event) Q_DECL_OVERRIDE;
-    void resizeEvent(QResizeEvent *resizeEvent) Q_DECL_OVERRIDE;
-    void showEvent(QShowEvent *) Q_DECL_OVERRIDE;
-    void hideEvent(QHideEvent *) Q_DECL_OVERRIDE;
+    bool event(QEvent *event) override;
+    void resizeEvent(QResizeEvent *resizeEvent) override;
+    void showEvent(QShowEvent *) override;
+    void hideEvent(QHideEvent *) override;
 
-    QVariant inputMethodQuery(Qt::InputMethodQuery query) const Q_DECL_OVERRIDE;
+    QVariant inputMethodQuery(Qt::InputMethodQuery query) const override;
 
 private slots:
     void onWindowPosChanged();
diff --git a/src/webenginewidgets/ui/messagebubblewidget_p.h b/src/webenginewidgets/ui/messagebubblewidget_p.h
index 8815d1ba4..6898aea13 100644
--- a/src/webenginewidgets/ui/messagebubblewidget_p.h
+++ b/src/webenginewidgets/ui/messagebubblewidget_p.h
@@ -73,7 +73,7 @@ public:
     static void moveBubble(QWebEngineView *view, const QRect &anchor);
 
 protected:
-    void paintEvent(QPaintEvent *) Q_DECL_OVERRIDE;
+    void paintEvent(QPaintEvent *) override;
 
 private:
     void createBubble(const int maxWidth, const QString &mainText, const QString &subText);