diff options
| author | Ivan Solovev <ivan.solovev@qt.io> | 2023-08-18 17:06:15 +0200 |
|---|---|---|
| committer | Ivan Solovev <ivan.solovev@qt.io> | 2023-08-21 15:30:01 +0200 |
| commit | c252bc6d47d325241a00258b3ce66b42a716d788 (patch) | |
| tree | b8a7cbbb5a7905db49d71015510b4a784051f601 /src/webenginequick | |
| parent | ac946f96e1123f2e6ab1ecb883cbebb2d3898b5c (diff) | |
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 <michal.klocek@qt.io>
Diffstat (limited to 'src/webenginequick')
| -rw-r--r-- | src/webenginequick/api/qquickwebengineview.cpp | 5 |
1 files changed, 2 insertions, 3 deletions
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<int>(QQuickWebEngineView::AcceptRequest) == static_cast<int>(QWebEngineNavigationRequest::AcceptRequest)); @@ -96,9 +98,6 @@ Q_STATIC_ASSERT(static_cast<int>(QQuickWebEngineView::NewViewInWindow) Q_STATIC_ASSERT(static_cast<int>(QQuickWebEngineView::NewViewInTab) == static_cast<int>(QWebEngineNewWindowRequest::InNewTab)); Q_STATIC_ASSERT(static_cast<int>(QQuickWebEngineView::NewViewInDialog) == static_cast<int>(QWebEngineNewWindowRequest::InNewDialog)); Q_STATIC_ASSERT(static_cast<int>(QQuickWebEngineView::NewViewInBackgroundTab) == static_cast<int>(QWebEngineNewWindowRequest::InNewBackgroundTab)); - -using LoadStatus = QWebEngineLoadingInfo::LoadStatus; -using ErrorDomain = QWebEngineLoadingInfo::ErrorDomain; Q_STATIC_ASSERT(static_cast<int>(QQuickWebEngineView::NoErrorDomain) == static_cast<int>(ErrorDomain::NoErrorDomain)); Q_STATIC_ASSERT(static_cast<int>(QQuickWebEngineView::InternalErrorDomain) == static_cast<int>(ErrorDomain::InternalErrorDomain)); Q_STATIC_ASSERT(static_cast<int>(QQuickWebEngineView::ConnectionErrorDomain) == static_cast<int>(ErrorDomain::ConnectionErrorDomain)); |