diff options
author | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2021-07-06 15:46:38 +0200 |
---|---|---|
committer | Qt Cherry-pick Bot <cherrypick_bot@qt-project.org> | 2021-07-09 17:58:00 +0000 |
commit | 8c10136c6676d3790ad64b3d448a1a1f09a9ff76 (patch) | |
tree | 963a56c0823c0bf3c4779ab6b42577b58cfec506 /src/webenginequick | |
parent | 70e04420eb8fbd61d7f4afd293d3ac135ca7ffd6 (diff) |
Remove outdated QT_VERSION_CHECKs
Change-Id: I4c4b78af0bd7da5912b5e0136f9cfdb3c4268a7e
Reviewed-by: Kirill Burtsev <kirill.burtsev@qt.io>
(cherry picked from commit e62dde53f093dd2c404a65cf99e854081396632b)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
Diffstat (limited to 'src/webenginequick')
4 files changed, 0 insertions, 16 deletions
diff --git a/src/webenginequick/api/qquickwebengineclientcertificateselection.cpp b/src/webenginequick/api/qquickwebengineclientcertificateselection.cpp index 3a42366b6..e06cfa4d2 100644 --- a/src/webenginequick/api/qquickwebengineclientcertificateselection.cpp +++ b/src/webenginequick/api/qquickwebengineclientcertificateselection.cpp @@ -39,8 +39,6 @@ #include "qquickwebengineclientcertificateselection_p.h" -#if QT_VERSION >= QT_VERSION_CHECK(5, 12, 0) - #include "client_cert_select_controller.h" QT_BEGIN_NAMESPACE @@ -223,5 +221,3 @@ QUrl QQuickWebEngineClientCertificateSelection::host() const } QT_END_NAMESPACE - -#endif // QT_VERSION >= QT_VERSION_CHECK(5, 12, 0) diff --git a/src/webenginequick/api/qquickwebengineclientcertificateselection_p.h b/src/webenginequick/api/qquickwebengineclientcertificateselection_p.h index 1171692bd..54cf54cfb 100644 --- a/src/webenginequick/api/qquickwebengineclientcertificateselection_p.h +++ b/src/webenginequick/api/qquickwebengineclientcertificateselection_p.h @@ -61,8 +61,6 @@ #include <QtQml/QQmlListProperty> #include <QtQml/qqmlregistration.h> -#if QT_VERSION >= QT_VERSION_CHECK(5, 12, 0) - namespace QtWebEngineCore { class ClientCertSelectController; } @@ -139,6 +137,4 @@ Q_DECLARE_METATYPE(QQuickWebEngineClientCertificateOption *) Q_DECLARE_METATYPE(QQmlListProperty<QQuickWebEngineClientCertificateOption>) Q_DECLARE_METATYPE(QQuickWebEngineClientCertificateSelection *) -#endif - #endif // QQUICKWEBENGINECERTSELECTION_P_H diff --git a/src/webenginequick/api/qquickwebengineview.cpp b/src/webenginequick/api/qquickwebengineview.cpp index 7688c38cd..23d89440d 100644 --- a/src/webenginequick/api/qquickwebengineview.cpp +++ b/src/webenginequick/api/qquickwebengineview.cpp @@ -299,15 +299,11 @@ void QQuickWebEngineViewPrivate::allowCertificateError(const QWebEngineCertifica void QQuickWebEngineViewPrivate::selectClientCert( const QSharedPointer<QtWebEngineCore::ClientCertSelectController> &controller) { -#if QT_VERSION >= QT_VERSION_CHECK(5, 12, 0) Q_Q(QQuickWebEngineView); QQuickWebEngineClientCertificateSelection *certSelection = new QQuickWebEngineClientCertificateSelection(controller); // mark the object for gc by creating temporary jsvalue qmlEngine(q)->newQObject(certSelection); Q_EMIT q->selectClientCertificate(certSelection); -#else - Q_UNUSED(controller); -#endif } static QQuickWebEngineView::Feature toFeature(QtWebEngineCore::ProfileAdapter::PermissionType type) diff --git a/src/webenginequick/render_widget_host_view_qt_delegate_quick.cpp b/src/webenginequick/render_widget_host_view_qt_delegate_quick.cpp index 38d787bd4..a2b089ec7 100644 --- a/src/webenginequick/render_widget_host_view_qt_delegate_quick.cpp +++ b/src/webenginequick/render_widget_host_view_qt_delegate_quick.cpp @@ -94,11 +94,7 @@ QRectF RenderWidgetHostViewQtDelegateQuick::viewGeometry() const const QPointF p2 = mapToGlobal(mapFromScene(QPointF(width(), height()))); QRectF geometry = QRectF(p1, p2).normalized(); // But keep the size untransformed to behave like other QQuickItems. -#if QT_VERSION >= QT_VERSION_CHECK(5, 10, 0) geometry.setSize(size()); -#else - geometry.setSize(QSizeF(width(), height())); -#endif return geometry; } |