From 4bd713d56aa9bb86bc96ea9cb0c64cbf94bf43d4 Mon Sep 17 00:00:00 2001 From: Konstantin Tokarev Date: Mon, 24 Apr 2017 22:40:03 +0300 Subject: Import WebKit commit 3040e0455efecd271f1aeef53cf287e75486a70d Change-Id: I7df106cef8ce93ce33e49ad6fb0d202cd066d87c Reviewed-by: Konstantin Tokarev --- Source/WebKit/qt/declarative/plugin.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'Source/WebKit/qt/declarative/plugin.cpp') diff --git a/Source/WebKit/qt/declarative/plugin.cpp b/Source/WebKit/qt/declarative/plugin.cpp index bcd4c1187..8141914ad 100644 --- a/Source/WebKit/qt/declarative/plugin.cpp +++ b/Source/WebKit/qt/declarative/plugin.cpp @@ -37,19 +37,19 @@ QT_BEGIN_NAMESPACE -class WebKitQmlPlugin : public QQmlExtensionPlugin { +class WebKitQmlPlugin final : public QQmlExtensionPlugin { Q_PLUGIN_METADATA(IID QQmlExtensionInterface_iid FILE "plugin.json") Q_OBJECT public: #if defined(HAVE_WEBKIT2) - void initializeEngine(QQmlEngine* engine, const char* uri) override + void initializeEngine(QQmlEngine* engine, const char* uri) final { Q_UNUSED(uri); engine->addImageProvider(QLatin1String("webicon"), new QWebIconImageProvider); } #endif - void registerTypes(const char* uri) override + void registerTypes(const char* uri) final { Q_ASSERT(QLatin1String(uri) == QLatin1String("QtWebKit")); -- cgit v1.2.1