Martchus
/
syncthingtray
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Adapt Qt WebKit specific code to latest adjustments

This commit is contained in:
Martchus 2018-10-28 16:29:11 +01:00
parent 2ee1bc0c63
commit e43a6c1c98
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
widgets/webview/webpage.cpp
View File

@ -223,7 +223,7 @@ void WebPage::handleSslErrors(QNetworkReply *reply, const QList<QSslError> &erro
{
Q_UNUSED(errors)
if (m_dlg && reply->request().url().host() == m_view->url().host()) {
reply->ignoreSslErrors(m_dlg->settings().expectedSslErrors);
reply->ignoreSslErrors(m_dlg->connectionSettings().expectedSslErrors);
}
}
#endif

4
widgets/webview/webpage.h
View File

@ -35,8 +35,8 @@ protected:
void javaScriptConsoleMessage(
QWebEnginePage::JavaScriptConsoleMessageLevel level, const QString &message, int lineNumber, const QString &sourceID) override;
#else
bool acceptNavigationRequest(QWebFrame *frame, const QNetworkRequest &request, NavigationType type);
void javaScriptConsoleMessage(const QString &message, int lineNumber, const QString &sourceID);
bool acceptNavigationRequest(QWebFrame *frame, const QNetworkRequest &request, NavigationType type) override;
void javaScriptConsoleMessage(const QString &message, int lineNumber, const QString &sourceID) override;
#endif
private slots: