diff options
author | Konstantin Tokarev <annulen@yandex.ru> | 2017-04-24 22:40:03 +0300 |
---|---|---|
committer | Konstantin Tokarev <annulen@yandex.ru> | 2017-04-25 18:29:55 +0000 |
commit | 4bd713d56aa9bb86bc96ea9cb0c64cbf94bf43d4 (patch) | |
tree | 02bd448d49627f059df0d8036fbdb9d9ee883a50 /Source/WebKit/qt/declarative/plugin.cpp | |
parent | bd3f57b00bee3088971209a0ebc513eb1ef4ba14 (diff) | |
download | qtwebkit-4bd713d56aa9bb86bc96ea9cb0c64cbf94bf43d4.tar.gz |
Import WebKit commit 3040e0455efecd271f1aeef53cf287e75486a70d
Change-Id: I7df106cef8ce93ce33e49ad6fb0d202cd066d87c
Reviewed-by: Konstantin Tokarev <annulen@yandex.ru>
Diffstat (limited to 'Source/WebKit/qt/declarative/plugin.cpp')
-rw-r--r-- | Source/WebKit/qt/declarative/plugin.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
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")); |