diff options
author | Peter Varga <pvarga@inf.u-szeged.hu> | 2019-11-21 11:19:34 +0100 |
---|---|---|
committer | Peter Varga <pvarga@inf.u-szeged.hu> | 2019-11-28 14:08:48 +0100 |
commit | 468c2d9a6d7b95b7dacc5372726860e7ccf14fb4 (patch) | |
tree | 76ef7b901ee3fb77ebf194fce23689ec73fca73e /examples/webenginewidgets/simplebrowser/webpage.cpp | |
parent | 7e653262ec32a3cfa8280df9e1e7d214d333d2f8 (diff) | |
download | qtwebengine-468c2d9a6d7b95b7dacc5372726860e7ccf14fb4.tar.gz |
Fix build of simplebrowser against 5.12
Change-Id: Ifbcf7f70ddbed7768e5e7b7231661a69d6d9f1a1
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
Diffstat (limited to 'examples/webenginewidgets/simplebrowser/webpage.cpp')
-rw-r--r-- | examples/webenginewidgets/simplebrowser/webpage.cpp | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/examples/webenginewidgets/simplebrowser/webpage.cpp b/examples/webenginewidgets/simplebrowser/webpage.cpp index 2e49f651f..9f7038cdb 100644 --- a/examples/webenginewidgets/simplebrowser/webpage.cpp +++ b/examples/webenginewidgets/simplebrowser/webpage.cpp @@ -76,6 +76,7 @@ bool WebPage::certificateError(const QWebEngineCertificateError &error) { QWidget *mainWindow = view()->window(); +#if QT_VERSION >= QT_VERSION_CHECK(5, 14, 0) QWebEngineCertificateError deferredError = error; deferredError.defer(); @@ -83,6 +84,9 @@ bool WebPage::certificateError(const QWebEngineCertificateError &error) if (!error.deferred()) { QMessageBox::critical(mainWindow, tr("Certificate Error"), error.errorDescription()); } else { +#else + if (error.isOverridable()) { +#endif QDialog dialog(mainWindow); dialog.setModal(true); dialog.setWindowFlags(dialog.windowFlags() & ~Qt::WindowContextHelpButtonHint); @@ -95,6 +99,7 @@ bool WebPage::certificateError(const QWebEngineCertificateError &error) certificateDialog.m_errorLabel->setText(error.errorDescription()); dialog.setWindowTitle(tr("Certificate Error")); +#if QT_VERSION >= QT_VERSION_CHECK(5, 14, 0) if (dialog.exec() == QDialog::Accepted) error.ignoreCertificateError(); else @@ -102,6 +107,13 @@ bool WebPage::certificateError(const QWebEngineCertificateError &error) } }); return true; +#else + return dialog.exec() == QDialog::Accepted; + } + + QMessageBox::critical(mainWindow, tr("Certificate Error"), error.errorDescription()); + return false; +#endif } void WebPage::handleAuthenticationRequired(const QUrl &requestUrl, QAuthenticator *auth) |