From c252bc6d47d325241a00258b3ce66b42a716d788 Mon Sep 17 00:00:00 2001 From: Ivan Solovev Date: Fri, 18 Aug 2023 17:06:15 +0200 Subject: QQuickWebEngineView: move using declarations outside of QT_DEPRECATED_SINCE block Because they are also used in the code which is not guarded by the deprecation checks. Pick-to: 6.6 6.5 Change-Id: I42383ba0f11b08df5602bfa9e0d8d816d2b96be7 Reviewed-by: Michal Klocek --- src/webenginequick/api/qquickwebengineview.cpp | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) (limited to 'src/webenginequick') diff --git a/src/webenginequick/api/qquickwebengineview.cpp b/src/webenginequick/api/qquickwebengineview.cpp index 882b59b6b..ca4ae5a5f 100644 --- a/src/webenginequick/api/qquickwebengineview.cpp +++ b/src/webenginequick/api/qquickwebengineview.cpp @@ -81,6 +81,8 @@ QT_BEGIN_NAMESPACE using namespace QtWebEngineCore; Q_STATIC_ASSERT(int(QQuickWebEngineView::WebActionCount) == int(QWebEnginePage::WebActionCount)); +using LoadStatus = QWebEngineLoadingInfo::LoadStatus; +using ErrorDomain = QWebEngineLoadingInfo::ErrorDomain; #if QT_DEPRECATED_SINCE(6, 2) QT_WARNING_PUSH QT_WARNING_DISABLE_DEPRECATED Q_STATIC_ASSERT(static_cast(QQuickWebEngineView::AcceptRequest) == static_cast(QWebEngineNavigationRequest::AcceptRequest)); @@ -96,9 +98,6 @@ Q_STATIC_ASSERT(static_cast(QQuickWebEngineView::NewViewInWindow) Q_STATIC_ASSERT(static_cast(QQuickWebEngineView::NewViewInTab) == static_cast(QWebEngineNewWindowRequest::InNewTab)); Q_STATIC_ASSERT(static_cast(QQuickWebEngineView::NewViewInDialog) == static_cast(QWebEngineNewWindowRequest::InNewDialog)); Q_STATIC_ASSERT(static_cast(QQuickWebEngineView::NewViewInBackgroundTab) == static_cast(QWebEngineNewWindowRequest::InNewBackgroundTab)); - -using LoadStatus = QWebEngineLoadingInfo::LoadStatus; -using ErrorDomain = QWebEngineLoadingInfo::ErrorDomain; Q_STATIC_ASSERT(static_cast(QQuickWebEngineView::NoErrorDomain) == static_cast(ErrorDomain::NoErrorDomain)); Q_STATIC_ASSERT(static_cast(QQuickWebEngineView::InternalErrorDomain) == static_cast(ErrorDomain::InternalErrorDomain)); Q_STATIC_ASSERT(static_cast(QQuickWebEngineView::ConnectionErrorDomain) == static_cast(ErrorDomain::ConnectionErrorDomain)); -- cgit v1.2.3