Restore enums for QQuickWebEngineView from old-new API classes

Restore SC, but at least deprecate these enums in view

Change-Id: Ic2a263b0ec175c56b8bf450fae9576bfefca2928
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
(cherry picked from commit 97eb62fe8ff83ae77103f5d8ae10debb1a5ff16b)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>

3 files changed, 64 insertions, 2 deletions

diff --git a/src/webenginequick/api/qquickwebengineview.cpp b/src/webenginequick/api/qquickwebengineview.cpp
index 562814128..cf1bff708 100644
--- a/src/webenginequick/api/qquickwebengineview.cpp
+++ b/src/webenginequick/api/qquickwebengineview.cpp
@@ -102,6 +102,22 @@
 QT_BEGIN_NAMESPACE
 using namespace QtWebEngineCore;
 
+#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));
+Q_STATIC_ASSERT(static_cast<int>(QQuickWebEngineView::IgnoreRequest)            == static_cast<int>(QWebEngineNavigationRequest::IgnoreRequest));
+Q_STATIC_ASSERT(static_cast<int>(QQuickWebEngineView::LinkClickedNavigation)    == static_cast<int>(QWebEngineNavigationRequest::LinkClickedNavigation));
+Q_STATIC_ASSERT(static_cast<int>(QQuickWebEngineView::TypedNavigation)          == static_cast<int>(QWebEngineNavigationRequest::TypedNavigation));
+Q_STATIC_ASSERT(static_cast<int>(QQuickWebEngineView::FormSubmittedNavigation)  == static_cast<int>(QWebEngineNavigationRequest::FormSubmittedNavigation));
+Q_STATIC_ASSERT(static_cast<int>(QQuickWebEngineView::BackForwardNavigation)    == static_cast<int>(QWebEngineNavigationRequest::BackForwardNavigation));
+Q_STATIC_ASSERT(static_cast<int>(QQuickWebEngineView::ReloadNavigation)         == static_cast<int>(QWebEngineNavigationRequest::ReloadNavigation));
+Q_STATIC_ASSERT(static_cast<int>(QQuickWebEngineView::OtherNavigation)          == static_cast<int>(QWebEngineNavigationRequest::OtherNavigation));
+Q_STATIC_ASSERT(static_cast<int>(QQuickWebEngineView::RedirectNavigation)       == static_cast<int>(QWebEngineNavigationRequest::RedirectNavigation));
+Q_STATIC_ASSERT(static_cast<int>(QQuickWebEngineView::NewViewInWindow)          == static_cast<int>(QWebEngineNewWindowRequest::InNewWindow));
+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));
@@ -115,6 +131,8 @@ Q_STATIC_ASSERT(static_cast<int>(QQuickWebEngineView::LoadStartedStatus)   == st
 Q_STATIC_ASSERT(static_cast<int>(QQuickWebEngineView::LoadStoppedStatus)   == static_cast<int>(LoadStatus::LoadStoppedStatus));
 Q_STATIC_ASSERT(static_cast<int>(QQuickWebEngineView::LoadFailedStatus)    == static_cast<int>(LoadStatus::LoadFailedStatus));
 Q_STATIC_ASSERT(static_cast<int>(QQuickWebEngineView::LoadSucceededStatus) == static_cast<int>(LoadStatus::LoadSucceededStatus));
+QT_WARNING_POP
+#endif
 
 #ifndef QT_NO_ACCESSIBILITY
 static QAccessibleInterface *webAccessibleFactory(const QString &, QObject *object)
diff --git a/src/webenginequick/api/qquickwebengineview_p.h b/src/webenginequick/api/qquickwebengineview_p.h
index 22617dd7b..3d3356a4e 100644
--- a/src/webenginequick/api/qquickwebengineview_p.h
+++ b/src/webenginequick/api/qquickwebengineview_p.h
@@ -146,7 +146,28 @@ public:
     QSizeF contentsSize() const;
     QPointF scrollPosition() const;
 
-    enum LoadStatus {
+#if QT_DEPRECATED_SINCE(6, 2)
+QT_WARNING_PUSH QT_WARNING_DISABLE_DEPRECATED
+    enum QT_DEPRECATED NavigationRequestAction {
+        AcceptRequest,
+        // Make room in the valid range of the enum so
+        // we can expose extra actions.
+        IgnoreRequest = 0xFF
+    };
+    Q_ENUM(NavigationRequestAction)
+
+    enum QT_DEPRECATED NavigationType {
+        LinkClickedNavigation,
+        TypedNavigation,
+        FormSubmittedNavigation,
+        BackForwardNavigation,
+        ReloadNavigation,
+        OtherNavigation,
+        RedirectNavigation,
+    };
+    Q_ENUM(NavigationType)
+
+    enum QT_DEPRECATED LoadStatus {
         LoadStartedStatus,
         LoadStoppedStatus,
         LoadSucceededStatus,
@@ -154,7 +175,7 @@ public:
     };
     Q_ENUM(LoadStatus)
 
-    enum ErrorDomain {
+    enum QT_DEPRECATED ErrorDomain {
          NoErrorDomain,
          InternalErrorDomain,
          ConnectionErrorDomain,
@@ -165,6 +186,16 @@ public:
     };
     Q_ENUM(ErrorDomain)
 
+    enum QT_DEPRECATED NewViewDestination {
+        NewViewInWindow,
+        NewViewInTab,
+        NewViewInDialog,
+        NewViewInBackgroundTab
+    };
+    Q_ENUM(NewViewDestination)
+QT_WARNING_POP
+#endif
+
     enum Feature {
         MediaAudioCapture,
         MediaVideoCapture,
diff --git a/tests/auto/quick/publicapi/tst_publicapi.cpp b/tests/auto/quick/publicapi/tst_publicapi.cpp
index d8767edb7..c8e09f1c2 100644
--- a/tests/auto/quick/publicapi/tst_publicapi.cpp
+++ b/tests/auto/quick/publicapi/tst_publicapi.cpp
@@ -716,6 +716,19 @@ static const QStringList expectedAPI = QStringList()
     << "QQuickWebEngineView.loadingChanged(QWebEngineLoadingInfo) --> void"
     << "QQuickWebEngineView.navigationRequested(QWebEngineNavigationRequest*) --> void"
     << "QQuickWebEngineView.newWindowRequested(QQuickWebEngineNewWindowRequest*) --> void"
+    << "QQuickWebEngineView.AcceptRequest --> NavigationRequestAction"
+    << "QQuickWebEngineView.IgnoreRequest --> NavigationRequestAction"
+    << "QQuickWebEngineView.BackForwardNavigation --> NavigationType"
+    << "QQuickWebEngineView.FormSubmittedNavigation --> NavigationType"
+    << "QQuickWebEngineView.LinkClickedNavigation --> NavigationType"
+    << "QQuickWebEngineView.OtherNavigation --> NavigationType"
+    << "QQuickWebEngineView.RedirectNavigation --> NavigationType"
+    << "QQuickWebEngineView.ReloadNavigation --> NavigationType"
+    << "QQuickWebEngineView.TypedNavigation --> NavigationType"
+    << "QQuickWebEngineView.NewViewInBackgroundTab --> NewViewDestination"
+    << "QQuickWebEngineView.NewViewInDialog --> NewViewDestination"
+    << "QQuickWebEngineView.NewViewInTab --> NewViewDestination"
+    << "QQuickWebEngineView.NewViewInWindow --> NewViewDestination"
     << "QQuickWebEngineView.pdfPrintingFinished(QString,bool) --> void"
     << "QQuickWebEngineView.printRequested() --> void"
     << "QQuickWebEngineView.printToPdf(QJSValue) --> void"