diff --git a/src/lib/plugins/qml/api/extensionscheme/qmlwebengineurlrequestjob.h b/src/lib/plugins/qml/api/extensionscheme/qmlwebengineurlrequestjob.h --- a/src/lib/plugins/qml/api/extensionscheme/qmlwebengineurlrequestjob.h +++ b/src/lib/plugins/qml/api/extensionscheme/qmlwebengineurlrequestjob.h @@ -70,7 +70,6 @@ Q_INVOKABLE void reply(const QVariantMap &map); private: QWebEngineUrlRequestJob *m_job = nullptr; - QString initiator() const; QString requestUrl() const; QString requestMethod() const; diff --git a/src/lib/plugins/qml/api/extensionscheme/qmlwebengineurlrequestjob.cpp b/src/lib/plugins/qml/api/extensionscheme/qmlwebengineurlrequestjob.cpp --- a/src/lib/plugins/qml/api/extensionscheme/qmlwebengineurlrequestjob.cpp +++ b/src/lib/plugins/qml/api/extensionscheme/qmlwebengineurlrequestjob.cpp @@ -59,13 +59,16 @@ buffer->seek(0); m_job->reply(contentType, buffer); } - QString QmlWebEngineUrlRequestJob::initiator() const { if (!m_job) { return QString(); } - return QString::fromUtf8(m_job->initiator().toEncoded()); + QString initiatorString; +#if QTWEBENGINE_VERSION >= QT_VERSION_CHECK(5, 11, 0) + initiatorString = QString::fromUtf8(m_job->initiator().toEncoded()); +#endif + return initiatorString; } QString QmlWebEngineUrlRequestJob::requestUrl() const diff --git a/src/lib/plugins/qml/qmlplugininterface.h b/src/lib/plugins/qml/qmlplugininterface.h --- a/src/lib/plugins/qml/qmlplugininterface.h +++ b/src/lib/plugins/qml/qmlplugininterface.h @@ -49,15 +49,15 @@ public: explicit QmlPluginInterface(); - ~QmlPluginInterface(); - DesktopFile metaData() const; - void init(InitState state, const QString &settingsPath); - void unload(); - bool testPlugin(); + ~QmlPluginInterface() override; + DesktopFile metaData() const override; + void init(InitState state, const QString &settingsPath) override; + void unload() override; + bool testPlugin() override; void setEngine(QQmlEngine *engine); void setName(const QString &name); void populateWebViewMenu(QMenu *menu, WebView *webview, const WebHitTestResult &webHitTestResult) override; - void showSettings(QWidget *parent = nullptr); + void showSettings(QWidget *parent = nullptr) override; bool mouseDoubleClick(Qz::ObjectName type, QObject *obj, QMouseEvent *event) override; bool mousePress(Qz::ObjectName type, QObject *obj, QMouseEvent *event) override; diff --git a/src/lib/plugins/qml/qmlpluginloader.cpp b/src/lib/plugins/qml/qmlpluginloader.cpp --- a/src/lib/plugins/qml/qmlpluginloader.cpp +++ b/src/lib/plugins/qml/qmlpluginloader.cpp @@ -66,7 +66,7 @@ m_component = new QQmlComponent(m_engine, QDir(m_path).filePath(m_entryPoint)); m_engine->setExtensionPath(m_path); m_engine->setExtensionName(m_name); -#ifdef HAVE_LIBINTL +#if HAVE_LIBINTL auto i18n = new QmlI18n(m_name); m_engine->globalObject().setProperty(QSL("__falkon_i18n"), m_engine->newQObject(i18n)); m_engine->globalObject().setProperty(QSL("i18n"), m_engine->evaluate(QSL("function (s) { return __falkon_i18n.i18n(s) }")));