Update QWebEngineWebAuthUxRequest based on 6.7 API review comment

- Modified WebAuthUXState as enum class
- Renamed QWebEngineWebAuthUXRequest as QWebEngineWebAuthUxRequest
- Renamed QWebEngineWebAuthPINRequest as QWebEngineWebAuthPinRequest
- Replaced all occurrence of UX and PIN with Ux and Pin respectively

Fixes: 6.7
Change-Id: Iaf0b4c93e0dfa3508a604f7d6562c4401ff800af
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>

26 files changed, 379 insertions, 383 deletions

diff --git a/examples/webenginequick/quicknanobrowser/BrowserWindow.qml b/examples/webenginequick/quicknanobrowser/BrowserWindow.qml
index bfbe13f6d..266763bd2 100644
--- a/examples/webenginequick/quicknanobrowser/BrowserWindow.qml
+++ b/examples/webenginequick/quicknanobrowser/BrowserWindow.qml
@@ -607,7 +607,7 @@ ApplicationWindow {
                     featurePermissionDialog.feature = feature;
                     featurePermissionDialog.visible = true;
                 }
-                onWebAuthUXRequested: function(request) {
+                onWebAuthUxRequested: function(request) {
                     webAuthDialog.init(request);
                 }
 
diff --git a/examples/webenginequick/quicknanobrowser/WebAuthDialog.qml b/examples/webenginequick/quicknanobrowser/WebAuthDialog.qml
index 4af401237..a7e47e305 100644
--- a/examples/webenginequick/quicknanobrowser/WebAuthDialog.qml
+++ b/examples/webenginequick/quicknanobrowser/WebAuthDialog.qml
@@ -28,10 +28,10 @@ Dialog {
 
     onApplied: {
         switch (webAuthDialog.authrequest.state) {
-            case WebEngineWebAuthUXRequest.CollectPIN:
+            case WebEngineWebAuthUxRequest.CollectPin:
                 webAuthDialog.authrequest.setPin(pinEdit.text);
                 break;
-            case WebEngineWebAuthUXRequest.SelectAccount:
+            case WebEngineWebAuthUxRequest.SelectAccount:
                 webAuthDialog.authrequest.setSelectedAccount(webAuthDialog.selectAccount);
                 break;
              default:
@@ -58,19 +58,19 @@ Dialog {
 
     function setupUI(state) {
         switch (state) {
-        case WebEngineWebAuthUXRequest.SelectAccount:
+        case WebEngineWebAuthUxRequest.SelectAccount:
             setupSelectAccountUI();
             break;
-        case WebEngineWebAuthUXRequest.CollectPIN:
-            setupCollectPIN();
+        case WebEngineWebAuthUxRequest.CollectPin:
+            setupCollectPin();
             break;
-        case WebEngineWebAuthUXRequest.FinishTokenCollection:
+        case WebEngineWebAuthUxRequest.FinishTokenCollection:
             setupFinishCollectToken();
             break;
-        case WebEngineWebAuthUXRequest.RequestFailed:
+        case WebEngineWebAuthUxRequest.RequestFailed:
             setupErrorUI();
             break;
-        case WebEngineWebAuthUXRequest.Completed:
+        case WebEngineWebAuthUxRequest.Completed:
             webAuthDialog.close();
             break;
         }
@@ -176,19 +176,19 @@ Dialog {
         standardButton(Dialog.Cancel).text ="Cancel"
     }
 
-    function setupCollectPIN() {
+    function setupCollectPin() {
         var requestInfo = webAuthDialog.authrequest.pinRequest;
 
         pinEdit.clear();
 
-        if (requestInfo.reason === WebEngineWebAuthUXRequest.Challenge) {
+        if (requestInfo.reason === WebEngineWebAuthUxRequest.Challenge) {
             heading.text = "PIN required";
             description.text = "Enter the PIN for your security key";
             pinLabel.visible = true;
             pinEdit.visible = true;
             confirmPinLabel.visible = false;
             confirmPinEdit.visible = false;
-        } else if (reason === WebEngineWebAuthUXRequest.Set) {
+        } else if (reason === WebEngineWebAuthUxRequest.Set) {
             heading.text = "Set PIN ";
             description.text = "Set new PIN for your security key";
             pinLabel.visible = true;
@@ -207,17 +207,17 @@ Dialog {
     function getPINErrorDetails() {
         var requestInfo = webAuthDialog.authrequest.pinRequest;
         switch (requestInfo.error) {
-        case WebEngineWebAuthUXRequest.NoError:
+        case WebEngineWebAuthUxRequest.NoError:
             return "";
-        case WebEngineWebAuthUXRequest.TooShort:
+        case WebEngineWebAuthUxRequest.TooShort:
             return "Too short";
-        case WebEngineWebAuthUXRequest.InternalUvLocked:
-            return "Internal Uv Locked";
-        case WebEngineWebAuthUXRequest.WrongPIN:
+        case WebEngineWebAuthUxRequest.InternalUvLocked:
+            return "Internal Uv locked";
+        case WebEngineWebAuthUxRequest.WrongPin:
             return "Wrong PIN";
-        case WebEngineWebAuthUXRequest.InvalidCharacters:
-            return "Invalid Characters";
-        case WebEngineWebAuthUXRequest.SameAsCurrentPIN:
+        case WebEngineWebAuthUxRequest.InvalidCharacters:
+            return "Invalid characters";
+        case WebEngineWebAuthUxRequest.SameAsCurrentPin:
             return "Same as current PIN";
         }
     }
@@ -225,34 +225,34 @@ Dialog {
     function getRequestFailureResaon() {
         var requestFailureReason = webAuthDialog.authrequest.requestFailureReason;
         switch (requestFailureReason) {
-        case WebEngineWebAuthUXRequest.Timeout:
+        case WebEngineWebAuthUxRequest.Timeout:
             return " Request Timeout";
-        case WebEngineWebAuthUXRequest.KeyNotRegistered:
+        case WebEngineWebAuthUxRequest.KeyNotRegistered:
             return "Key not registered";
-        case WebEngineWebAuthUXRequest.KeyAlreadyRegistered:
+        case WebEngineWebAuthUxRequest.KeyAlreadyRegistered:
             return "You already registered this device. You don't have to register it again
                     Try agin with different key or device";
-        case WebEngineWebAuthUXRequest.SoftPINBlock:
+        case WebEngineWebAuthUxRequest.SoftPinBlock:
             return "The security key is locked because the wrong PIN was entered too many times.
                     To unlock it, remove and reinsert it.";
-        case WebEngineWebAuthUXRequest.HardPINBlock:
+        case WebEngineWebAuthUxRequest.HardPinBlock:
             return "The security key is locked because the wrong PIN was entered too many times.
                     You'll need to reset the security key.";
-        case WebEngineWebAuthUXRequest.AuthenticatorRemovedDuringPINEntry:
+        case WebEngineWebAuthUxRequest.AuthenticatorRemovedDuringPinEntry:
             return "Authenticator removed during verification. Please reinsert and try again";
-        case WebEngineWebAuthUXRequest.AuthenticatorMissingResidentKeys:
+        case WebEngineWebAuthUxRequest.AuthenticatorMissingResidentKeys:
             return "Authenticator doesn't have resident key support";
-        case WebEngineWebAuthUXRequest.AuthenticatorMissingUserVerification:
+        case WebEngineWebAuthUxRequest.AuthenticatorMissingUserVerification:
             return "Authenticator missing user verification";
-        case WebEngineWebAuthUXRequest.AuthenticatorMissingLargeBlob:
+        case WebEngineWebAuthUxRequest.AuthenticatorMissingLargeBlob:
             return "Authenticator missing Large Blob support";
-        case WebEngineWebAuthUXRequest.NoCommonAlgorithms:
+        case WebEngineWebAuthUxRequest.NoCommonAlgorithms:
             return "No common Algorithms";
-        case WebEngineWebAuthUXRequest.StorageFull:
+        case WebEngineWebAuthUxRequest.StorageFull:
             return "Storage full";
-        case WebEngineWebAuthUXRequest.UserConsentDenied:
+        case WebEngineWebAuthUxRequest.UserConsentDenied:
             return "User consent denied";
-        case WebEngineWebAuthUXRequest.WinUserCancelled:
+        case WebEngineWebAuthUxRequest.WinUserCancelled:
             return "User cancelled request";
         }
     }
diff --git a/examples/webenginequick/quicknanobrowser/doc/src/quicknanobrowser.qdoc b/examples/webenginequick/quicknanobrowser/doc/src/quicknanobrowser.qdoc
index 8f72e67cd..1dc209c2e 100644
--- a/examples/webenginequick/quicknanobrowser/doc/src/quicknanobrowser.qdoc
+++ b/examples/webenginequick/quicknanobrowser/doc/src/quicknanobrowser.qdoc
@@ -146,17 +146,17 @@
 
     \section1 Handling WebAuth/FIDO UX Requests
 
-    We use the \c onWebAuthUXRequested() signal handler to handle requests for
-    WebAuth/FIDO UX. The \c request parameter is an instance of WebEngineWebAuthUXRequest
+    We use the \c onWebAuthUxRequested() signal handler to handle requests for
+    WebAuth/FIDO UX. The \c request parameter is an instance of WebEngineWebAuthUxRequest
     which contains UX request details and APIs required to process the request.
     We use it to construct WebAuthUX dialog and initiates the UX request flow.
 
     \quotefromfile webenginequick/quicknanobrowser/BrowserWindow.qml
-    \skipto onWebAuthUXRequested
+    \skipto onWebAuthUxRequested
     \printuntil }
 
-    The \l WebEngineWebAuthUXRequest object periodically emits the \l
-    {WebEngineWebAuthUXRequest::}{stateChanged} signal to notify potential
+    The \l WebEngineWebAuthUxRequest object periodically emits the \l
+    {WebEngineWebAuthUxRequest::}{stateChanged} signal to notify potential
     observers of the current WebAuth UX states. The observers update the WebAuth
     dialog accordingly. We use onStateChanged() signal handler to handle
     state change requests. See \c WebAuthDialog.qml for an example
diff --git a/examples/webenginewidgets/simplebrowser/doc/src/simplebrowser.qdoc b/examples/webenginewidgets/simplebrowser/doc/src/simplebrowser.qdoc
index 6fc807400..dd7a8b998 100644
--- a/examples/webenginewidgets/simplebrowser/doc/src/simplebrowser.qdoc
+++ b/examples/webenginewidgets/simplebrowser/doc/src/simplebrowser.qdoc
@@ -326,22 +326,22 @@
 
     WebAuth UX requests are associated with \l QWebEnginePage. Whenever an authenticator
     requires user interaction, a UX request is triggered on the QWebEnginePage and
-    the \l QWebEnginePage::webAuthUXRequested signal is emitted with
-    \l QWebEngineWebAuthUXRequest, which in this example is forwarded
+    the \l QWebEnginePage::webAuthUxRequested signal is emitted with
+    \l QWebEngineWebAuthUxRequest, which in this example is forwarded
     to \c WebView::handleAuthenticatorRequired:
 
     \quotefromfile webenginewidgets/simplebrowser/webview.cpp
-    \skipto connect(page, &QWebEnginePage::webAuthUXRequested
-    \printline connect(page, &QWebEnginePage::webAuthUXRequested
+    \skipto connect(page, &QWebEnginePage::webAuthUxRequested
+    \printline connect(page, &QWebEnginePage::webAuthUxRequested
 
     This method creates a WebAuth UX dialog and initiates the UX request flow.
 
     \quotefromfile webenginewidgets/simplebrowser/webview.cpp
-    \skipto void WebView::handleWebAuthUXRequested(QWebEngineWebAuthUXRequest *request)
+    \skipto void WebView::handleWebAuthUxRequested(QWebEngineWebAuthUxRequest *request)
     \printuntil /^\}/
 
-    The \l QWebEngineWebAuthUXRequest object periodically emits the \l
-    {QWebEngineWebAuthUXRequest::}{stateChanged} signal to notify potential
+    The \l QWebEngineWebAuthUxRequest object periodically emits the \l
+    {QWebEngineWebAuthUxRequest::}{stateChanged} signal to notify potential
     observers of the current WebAuth UX states. The observers update the WebAuth
     dialog accordingly. See \c webview.cpp and \c webauthdialog.cpp for an example
     of how these signals can be handled.
diff --git a/examples/webenginewidgets/simplebrowser/webauthdialog.cpp b/examples/webenginewidgets/simplebrowser/webauthdialog.cpp
index f153667fe..d2bded6fe 100644
--- a/examples/webenginewidgets/simplebrowser/webauthdialog.cpp
+++ b/examples/webenginewidgets/simplebrowser/webauthdialog.cpp
@@ -10,7 +10,7 @@
 #include <QPushButton>
 #include <QWebEngineView>
 
-WebAuthDialog::WebAuthDialog(QWebEngineWebAuthUXRequest *request, QWidget *parent)
+WebAuthDialog::WebAuthDialog(QWebEngineWebAuthUxRequest *request, QWidget *parent)
     : QDialog(parent), uxRequest(request), uiWebAuthDialog(new Ui::WebAuthDialog)
 {
     uiWebAuthDialog->setupUi(this);
@@ -70,16 +70,16 @@ WebAuthDialog::~WebAuthDialog()
 void WebAuthDialog::updateDisplay()
 {
     switch (uxRequest->state()) {
-    case QWebEngineWebAuthUXRequest::SelectAccount:
+    case QWebEngineWebAuthUxRequest::WebAuthUxState::SelectAccount:
         setupSelectAccountUI();
         break;
-    case QWebEngineWebAuthUXRequest::CollectPIN:
-        setupCollectPINUI();
+    case QWebEngineWebAuthUxRequest::WebAuthUxState::CollectPin:
+        setupCollectPinUI();
         break;
-    case QWebEngineWebAuthUXRequest::FinishTokenCollection:
+    case QWebEngineWebAuthUxRequest::WebAuthUxState::FinishTokenCollection:
         setupFinishCollectTokenUI();
         break;
-    case QWebEngineWebAuthUXRequest::RequestFailed:
+    case QWebEngineWebAuthUxRequest::WebAuthUxState::RequestFailed:
         setupErrorUI();
         break;
     default:
@@ -126,7 +126,7 @@ void WebAuthDialog::setupFinishCollectTokenUI()
     uiWebAuthDialog->buttonBox->button(QDialogButtonBox::Retry)->setVisible(false);
     scrollArea->setVisible(false);
 }
-void WebAuthDialog::setupCollectPINUI()
+void WebAuthDialog::setupCollectPinUI()
 {
     clearSelectAccountButtons();
     uiWebAuthDialog->m_mainVerticalLayout->addWidget(uiWebAuthDialog->m_pinGroupBox);
@@ -139,15 +139,15 @@ void WebAuthDialog::setupCollectPINUI()
     uiWebAuthDialog->buttonBox->button(QDialogButtonBox::Retry)->setVisible(false);
     scrollArea->setVisible(false);
 
-    QWebEngineWebAuthPINRequest pinRequestInfo = uxRequest->pinRequest();
+    QWebEngineWebAuthPinRequest pinRequestInfo = uxRequest->pinRequest();
 
-    if (pinRequestInfo.reason == QWebEngineWebAuthUXRequest::PINEntryReason::Challenge) {
+    if (pinRequestInfo.reason == QWebEngineWebAuthUxRequest::PinEntryReason::Challenge) {
         uiWebAuthDialog->m_headingLabel->setText(tr("PIN Required"));
         uiWebAuthDialog->m_description->setText(tr("Enter the PIN for your security key"));
         uiWebAuthDialog->m_confirmPinLabel->setVisible(false);
         uiWebAuthDialog->m_confirmPinLineEdit->setVisible(false);
     } else {
-        if (pinRequestInfo.reason == QWebEngineWebAuthUXRequest::PINEntryReason::Set) {
+        if (pinRequestInfo.reason == QWebEngineWebAuthUxRequest::PinEntryReason::Set) {
             uiWebAuthDialog->m_headingLabel->setText(tr("New PIN Required"));
             uiWebAuthDialog->m_description->setText(tr("Set new PIN for your security key"));
         } else {
@@ -160,21 +160,21 @@ void WebAuthDialog::setupCollectPINUI()
 
     QString errorDetails;
     switch (pinRequestInfo.error) {
-    case QWebEngineWebAuthUXRequest::PINEntryError::NoError:
+    case QWebEngineWebAuthUxRequest::PinEntryError::NoError:
         break;
-    case QWebEngineWebAuthUXRequest::PINEntryError::InternalUvLocked:
+    case QWebEngineWebAuthUxRequest::PinEntryError::InternalUvLocked:
         errorDetails = tr("Internal User Verification Locked ");
         break;
-    case QWebEngineWebAuthUXRequest::PINEntryError::WrongPIN:
-        errorDetails = tr("Wrong Pin");
+    case QWebEngineWebAuthUxRequest::PinEntryError::WrongPin:
+        errorDetails = tr("Wrong PIN");
         break;
-    case QWebEngineWebAuthUXRequest::PINEntryError::TooShort:
+    case QWebEngineWebAuthUxRequest::PinEntryError::TooShort:
         errorDetails = tr("Too Short");
         break;
-    case QWebEngineWebAuthUXRequest::PINEntryError::InvalidCharacters:
+    case QWebEngineWebAuthUxRequest::PinEntryError::InvalidCharacters:
         errorDetails = tr("Invalid Characters");
         break;
-    case QWebEngineWebAuthUXRequest::PINEntryError::SameAsCurrentPIN:
+    case QWebEngineWebAuthUxRequest::PinEntryError::SameAsCurrentPin:
         errorDetails = tr("Same as current PIN");
         break;
     }
@@ -193,12 +193,12 @@ void WebAuthDialog::onCancelRequest()
 void WebAuthDialog::onAcceptRequest()
 {
     switch (uxRequest->state()) {
-    case QWebEngineWebAuthUXRequest::SelectAccount:
+    case QWebEngineWebAuthUxRequest::WebAuthUxState::SelectAccount:
         if (buttonGroup->checkedButton()) {
             uxRequest->setSelectedAccount(buttonGroup->checkedButton()->text());
         }
         break;
-    case QWebEngineWebAuthUXRequest::CollectPIN:
+    case QWebEngineWebAuthUxRequest::WebAuthUxState::CollectPin:
         uxRequest->setPin(uiWebAuthDialog->m_pinLineEdit->text());
         break;
     default:
@@ -213,51 +213,51 @@ void WebAuthDialog::setupErrorUI()
     QString errorHeading = tr("Something went wrong");
     bool isVisibleRetry = false;
     switch (uxRequest->requestFailureReason()) {
-    case QWebEngineWebAuthUXRequest::RequestFailureReason::Timeout:
+    case QWebEngineWebAuthUxRequest::RequestFailureReason::Timeout:
         errorDescription = tr("Request Timeout");
         break;
-    case QWebEngineWebAuthUXRequest::RequestFailureReason::KeyNotRegistered:
+    case QWebEngineWebAuthUxRequest::RequestFailureReason::KeyNotRegistered:
         errorDescription = tr("Key not registered");
         break;
-    case QWebEngineWebAuthUXRequest::RequestFailureReason::KeyAlreadyRegistered:
+    case QWebEngineWebAuthUxRequest::RequestFailureReason::KeyAlreadyRegistered:
         errorDescription = tr("You already registered this device."
                               "Try again with device");
         isVisibleRetry = true;
         break;
-    case QWebEngineWebAuthUXRequest::RequestFailureReason::SoftPINBlock:
+    case QWebEngineWebAuthUxRequest::RequestFailureReason::SoftPinBlock:
         errorDescription =
                 tr("The security key is locked because the wrong PIN was entered too many times."
                    "To unlock it, remove and reinsert it.");
         isVisibleRetry = true;
         break;
-    case QWebEngineWebAuthUXRequest::RequestFailureReason::HardPINBlock:
+    case QWebEngineWebAuthUxRequest::RequestFailureReason::HardPinBlock:
         errorDescription =
                 tr("The security key is locked because the wrong PIN was entered too many times."
                    " You'll need to reset the security key.");
         break;
-    case QWebEngineWebAuthUXRequest::RequestFailureReason::AuthenticatorRemovedDuringPINEntry:
+    case QWebEngineWebAuthUxRequest::RequestFailureReason::AuthenticatorRemovedDuringPinEntry:
         errorDescription =
                 tr("Authenticator removed during verification. Please reinsert and try again");
         break;
-    case QWebEngineWebAuthUXRequest::RequestFailureReason::AuthenticatorMissingResidentKeys:
+    case QWebEngineWebAuthUxRequest::RequestFailureReason::AuthenticatorMissingResidentKeys:
         errorDescription = tr("Authenticator doesn't have resident key support");
         break;
-    case QWebEngineWebAuthUXRequest::RequestFailureReason::AuthenticatorMissingUserVerification:
+    case QWebEngineWebAuthUxRequest::RequestFailureReason::AuthenticatorMissingUserVerification:
         errorDescription = tr("Authenticator missing user verification");
         break;
-    case QWebEngineWebAuthUXRequest::RequestFailureReason::AuthenticatorMissingLargeBlob:
+    case QWebEngineWebAuthUxRequest::RequestFailureReason::AuthenticatorMissingLargeBlob:
         errorDescription = tr("Authenticator missing Large Blob support");
         break;
-    case QWebEngineWebAuthUXRequest::RequestFailureReason::NoCommonAlgorithms:
+    case QWebEngineWebAuthUxRequest::RequestFailureReason::NoCommonAlgorithms:
         errorDescription = tr("Authenticator missing Large Blob support");
         break;
-    case QWebEngineWebAuthUXRequest::RequestFailureReason::StorageFull:
+    case QWebEngineWebAuthUxRequest::RequestFailureReason::StorageFull:
         errorDescription = tr("Storage Full");
         break;
-    case QWebEngineWebAuthUXRequest::RequestFailureReason::UserConsentDenied:
+    case QWebEngineWebAuthUxRequest::RequestFailureReason::UserConsentDenied:
         errorDescription = tr("User consent denied");
         break;
-    case QWebEngineWebAuthUXRequest::RequestFailureReason::WinUserCancelled:
+    case QWebEngineWebAuthUxRequest::RequestFailureReason::WinUserCancelled:
         errorDescription = tr("User Cancelled Request");
         break;
     }
diff --git a/examples/webenginewidgets/simplebrowser/webauthdialog.h b/examples/webenginewidgets/simplebrowser/webauthdialog.h
index 352bcd0d4..e759c36f7 100644
--- a/examples/webenginewidgets/simplebrowser/webauthdialog.h
+++ b/examples/webenginewidgets/simplebrowser/webauthdialog.h
@@ -14,20 +14,20 @@ class WebAuthDialog : public QDialog
 {
     Q_OBJECT
 public:
-    WebAuthDialog(QWebEngineWebAuthUXRequest *request, QWidget *parent = nullptr);
+    WebAuthDialog(QWebEngineWebAuthUxRequest *request, QWidget *parent = nullptr);
     ~WebAuthDialog();
 
     void updateDisplay();
 
 private:
-    QWebEngineWebAuthUXRequest *uxRequest;
+    QWebEngineWebAuthUxRequest *uxRequest;
     QButtonGroup *buttonGroup = nullptr;
     QScrollArea *scrollArea = nullptr;
     QWidget *selectAccountWidget = nullptr;
     QVBoxLayout *selectAccountLayout = nullptr;
 
     void setupSelectAccountUI();
-    void setupCollectPINUI();
+    void setupCollectPinUI();
     void setupFinishCollectTokenUI();
     void setupErrorUI();
     void onCancelRequest();
diff --git a/examples/webenginewidgets/simplebrowser/webview.cpp b/examples/webenginewidgets/simplebrowser/webview.cpp
index 136c3681d..95c67c8ce 100644
--- a/examples/webenginewidgets/simplebrowser/webview.cpp
+++ b/examples/webenginewidgets/simplebrowser/webview.cpp
@@ -99,8 +99,8 @@ void WebView::setPage(WebPage *page)
                    &WebView::handleProxyAuthenticationRequired);
         disconnect(oldPage, &QWebEnginePage::registerProtocolHandlerRequested, this,
                    &WebView::handleRegisterProtocolHandlerRequested);
-        disconnect(oldPage, &QWebEnginePage::webAuthUXRequested, this,
-                   &WebView::handleWebAuthUXRequested);
+        disconnect(oldPage, &QWebEnginePage::webAuthUxRequested, this,
+                   &WebView::handleWebAuthUxRequested);
 #if QT_VERSION >= QT_VERSION_CHECK(6, 4, 0)
         disconnect(oldPage, &QWebEnginePage::fileSystemAccessRequested, this,
                    &WebView::handleFileSystemAccessRequested);
@@ -124,7 +124,7 @@ void WebView::setPage(WebPage *page)
     connect(page, &QWebEnginePage::fileSystemAccessRequested, this,
             &WebView::handleFileSystemAccessRequested);
 #endif
-    connect(page, &QWebEnginePage::webAuthUXRequested, this, &WebView::handleWebAuthUXRequested);
+    connect(page, &QWebEnginePage::webAuthUxRequested, this, &WebView::handleWebAuthUxRequested);
 }
 
 int WebView::loadProgress() const
@@ -296,7 +296,7 @@ void WebView::handleProxyAuthenticationRequired(const QUrl &, QAuthenticator *au
     }
 }
 
-void WebView::handleWebAuthUXRequested(QWebEngineWebAuthUXRequest *request)
+void WebView::handleWebAuthUxRequested(QWebEngineWebAuthUxRequest *request)
 {
     if (m_authDialog)
         delete m_authDialog;
@@ -305,14 +305,14 @@ void WebView::handleWebAuthUXRequested(QWebEngineWebAuthUXRequest *request)
     m_authDialog->setModal(false);
     m_authDialog->setWindowFlags(m_authDialog->windowFlags() & ~Qt::WindowContextHelpButtonHint);
 
-    connect(request, &QWebEngineWebAuthUXRequest::stateChanged, this, &WebView::onStateChanged);
+    connect(request, &QWebEngineWebAuthUxRequest::stateChanged, this, &WebView::onStateChanged);
     m_authDialog->show();
 }
 
-void WebView::onStateChanged(QWebEngineWebAuthUXRequest::WebAuthUXState state)
+void WebView::onStateChanged(QWebEngineWebAuthUxRequest::WebAuthUxState state)
 {
-    if (QWebEngineWebAuthUXRequest::Completed == state
-        || QWebEngineWebAuthUXRequest::Cancelled == state) {
+    if (QWebEngineWebAuthUxRequest::WebAuthUxState::Completed == state
+        || QWebEngineWebAuthUxRequest::WebAuthUxState::Cancelled == state) {
         if (m_authDialog) {
             delete m_authDialog;
             m_authDialog = nullptr;
diff --git a/examples/webenginewidgets/simplebrowser/webview.h b/examples/webenginewidgets/simplebrowser/webview.h
index bb4b1f2ad..872950551 100644
--- a/examples/webenginewidgets/simplebrowser/webview.h
+++ b/examples/webenginewidgets/simplebrowser/webview.h
@@ -12,7 +12,7 @@
 #endif
 #include <QWebEnginePage>
 #include <QWebEngineRegisterProtocolHandlerRequest>
-#include <QWebEngineWebAuthUXRequest>
+#include <QWebEngineWebAuthUxRequest>
 
 class WebPage;
 class WebAuthDialog;
@@ -47,12 +47,12 @@ private slots:
     void handleRegisterProtocolHandlerRequested(QWebEngineRegisterProtocolHandlerRequest request);
 #if QT_VERSION >= QT_VERSION_CHECK(6, 4, 0)
     void handleFileSystemAccessRequested(QWebEngineFileSystemAccessRequest request);
-    void handleWebAuthUXRequested(QWebEngineWebAuthUXRequest *request);
+    void handleWebAuthUxRequested(QWebEngineWebAuthUxRequest *request);
 #endif
 
 private:
     void createWebActionTrigger(QWebEnginePage *page, QWebEnginePage::WebAction);
-    void onStateChanged(QWebEngineWebAuthUXRequest::WebAuthUXState state);
+    void onStateChanged(QWebEngineWebAuthUxRequest::WebAuthUxState state);
 
 private:
     int m_loadProgress = 100;
diff --git a/src/core/api/qwebenginepage.cpp b/src/core/api/qwebenginepage.cpp
index f8daa4a61..3bd3aeeb3 100644
--- a/src/core/api/qwebenginepage.cpp
+++ b/src/core/api/qwebenginepage.cpp
@@ -794,10 +794,10 @@ void QWebEnginePagePrivate::ensureInitialized() const
         adapter->loadDefault();
 }
 
-void QWebEnginePagePrivate::showWebAuthDialog(QWebEngineWebAuthUXRequest *request)
+void QWebEnginePagePrivate::showWebAuthDialog(QWebEngineWebAuthUxRequest *request)
 {
     Q_Q(QWebEnginePage);
-    Q_EMIT q->webAuthUXRequested(request);
+    Q_EMIT q->webAuthUxRequested(request);
 }
 
 QWebEnginePage::QWebEnginePage(QObject* parent)
diff --git a/src/core/api/qwebenginepage.h b/src/core/api/qwebenginepage.h
index e47e2a3fd..9ed4e7877 100644
--- a/src/core/api/qwebenginepage.h
+++ b/src/core/api/qwebenginepage.h
@@ -41,7 +41,7 @@ class QWebEngineRegisterProtocolHandlerRequest;
 class QWebEngineScriptCollection;
 class QWebEngineSettings;
 class QWebEngineUrlRequestInterceptor;
-class QWebEngineWebAuthUXRequest;
+class QWebEngineWebAuthUxRequest;
 
 class Q_WEBENGINECORE_EXPORT QWebEnginePage : public QObject
 {
@@ -356,7 +356,7 @@ Q_SIGNALS:
     // TODO: fixme / rewrite bindPageToView
     void _q_aboutToDelete();
 
-    void webAuthUXRequested(QWebEngineWebAuthUXRequest *request);
+    void webAuthUxRequested(QWebEngineWebAuthUxRequest *request);
 
 protected:
     virtual QWebEnginePage *createWindow(WebWindowType type);
diff --git a/src/core/api/qwebenginepage_p.h b/src/core/api/qwebenginepage_p.h
index eb6045da9..a51d8603b 100644
--- a/src/core/api/qwebenginepage_p.h
+++ b/src/core/api/qwebenginepage_p.h
@@ -172,7 +172,7 @@ public:
     void showAutofillPopup(QtWebEngineCore::AutofillPopupController *controller,
                            const QRect &bounds, bool autoselectFirstSuggestion) override;
     void hideAutofillPopup() override;
-    void showWebAuthDialog(QWebEngineWebAuthUXRequest *controller) override;
+    void showWebAuthDialog(QWebEngineWebAuthUxRequest *controller) override;
 
     QtWebEngineCore::ProfileAdapter *profileAdapter() override;
     QtWebEngineCore::WebContentsAdapter *webContentsAdapter() override;
diff --git a/src/core/api/qwebenginewebauthuxrequest.cpp b/src/core/api/qwebenginewebauthuxrequest.cpp
index 4cd9e0ad4..4fc7dd1d1 100644
--- a/src/core/api/qwebenginewebauthuxrequest.cpp
+++ b/src/core/api/qwebenginewebauthuxrequest.cpp
@@ -6,22 +6,22 @@
 #include "authenticator_request_dialog_controller.h"
 
 /*!
-    \qmltype WebEngineWebAuthUXRequest
-    \instantiates QWebEngineWebAuthUXRequest
+    \qmltype WebEngineWebAuthUxRequest
+    \instantiates QWebEngineWebAuthUxRequest
     \inqmlmodule QtWebEngine
     \since QtWebEngine 6.7
     \brief Encapsulates the data of a WebAuth UX request.
 
     Web engine's WebAuth UX requests are passed to the user in the
-    \l WebEngineView::webAuthUXRequested() signal.
+    \l WebEngineView::webAuthUxRequested() signal.
 
     For more information about how to handle web engine authenticator requests, see the
     \l{WebEngine Quick Nano Browser}{Nano Browser}.
 */
 
 /*!
-    \class QWebEngineWebAuthUXRequest
-    \brief The QWebEngineWebAuthUXRequest class encapsulates the data of a WebAuth UX request.
+    \class QWebEngineWebAuthUxRequest
+    \brief The QWebEngineWebAuthUxRequest class encapsulates the data of a WebAuth UX request.
     \since 6.7
 
     \inmodule QtWebEngineCore
@@ -31,19 +31,19 @@
     dialog to users. QtWebEngine currently supports user verification, resident credentials,
     and display request failure UX requests.
 
-    QWebEngineWebAuthUXRequest models a WebAuth UX request throughout its life cycle,
+    QWebEngineWebAuthUxRequest models a WebAuth UX request throughout its life cycle,
     starting with showing a UX dialog, updating it's content through state changes, and
     finally closing the dialog.
 
     WebAuth UX requests are normally triggered when the authenticator requires user interaction.
     It is the QWebEnginePage's responsibility to notify the application of the new WebAuth UX
     requests, which it does by emitting the
-    \l{QWebEnginePage::webAuthUXRequested}{webAuthUXRequested} signal together with a newly
-    created QWebEngineWebAuthUXRequest. The application can then examine this request and
+    \l{QWebEnginePage::webAuthUxRequested}{webAuthUxRequested} signal together with a newly
+    created QWebEngineWebAuthUxRequest. The application can then examine this request and
     display a WebAuth UX dialog.
 
-    The QWebEngineWebAuthUXRequest object periodically emits the \l
-    {QWebEngineWebAuthUXRequest::}{stateChanged} signal to notify potential
+    The QWebEngineWebAuthUxRequest object periodically emits the \l
+    {QWebEngineWebAuthUxRequest::}{stateChanged} signal to notify potential
     observers of the current WebAuth UX states. The observers update the WebAuth dialog
     accordingly.
 
@@ -52,8 +52,8 @@
 */
 
 /*!
-    \struct QWebEngineWebAuthPINRequest
-    \brief The QWebEngineWebAuthPINRequest class encapsulates the data of a PIN WebAuth UX request.
+    \struct QWebEngineWebAuthPinRequest
+    \brief The QWebEngineWebAuthPinRequest class encapsulates the data of a PIN WebAuth UX request.
     \since 6.7
 
     \inmodule QtWebEngineCore
@@ -63,38 +63,38 @@
     \li The reason for the PIN prompt.
     \li The error details for the PIN prompt.
     \li The number of attempts remaining before a hard lock. Should be ignored unless
-        \l{QWebEngineWebAuthPINRequest::reason} is
-        \l{QWebEngineWebAuthUXRequest::PINEntryReason::Challenge}.
+        \l{QWebEngineWebAuthPinRequest::reason} is
+        \l{QWebEngineWebAuthUxRequest::PinEntryReason::Challenge}.
     \li The minimum PIN length the authenticator will accept for the PIN.
     \endlist
     Use this structure to update the WebAuth UX dialog when the WebAuth UX state is \l
-    QWebEngineWebAuthUXRequest::CollectPIN.
+    QWebEngineWebAuthUxRequest::WebAuthUxState::CollectPin.
 */
 
 /*!
-    \property QWebEngineWebAuthPINRequest::reason
+    \property QWebEngineWebAuthPinRequest::reason
     \brief The reason for the PIN prompt.
 */
 
 /*!
-    \property QWebEngineWebAuthPINRequest::error
+    \property QWebEngineWebAuthPinRequest::error
     \brief The error details for the PIN prompt.
 */
 
 /*!
-    \property QWebEngineWebAuthPINRequest::remainingAttempts
+    \property QWebEngineWebAuthPinRequest::remainingAttempts
     \brief The number of attempts remaining before a hard lock. Should be ignored unless
-           \l{QWebEngineWebAuthPINRequest::reason} is
-           \l{QWebEngineWebAuthUXRequest::PINEntryReason::Challenge}.
+           \l{QWebEngineWebAuthPinRequest::reason} is
+           \l{QWebEngineWebAuthUxRequest::PinEntryReason::Challenge}.
 */
 
 /*!
-    \property QWebEngineWebAuthPINRequest::minPinLength
+    \property QWebEngineWebAuthPinRequest::minPinLength
     \brief The minimum PIN length the authenticator will accept for the PIN.
 */
 
 /*!
-    \enum QWebEngineWebAuthUXRequest::WebAuthUXState
+    \enum QWebEngineWebAuthUxRequest::WebAuthUxState
 
     This enum describes the state of the current WebAuth UX request.
 
@@ -102,7 +102,7 @@
     \value SelectAccount The authenticator requires resident credential details.
            The application needs to display an account details dialog, and
            the user needs to select an account to proceed.
-    \value CollectPIN The authenticator requires user verification.
+    \value CollectPin The authenticator requires user verification.
            The application needs to display a PIN request dialog.
     \value FinishTokenCollection The authenticator requires token/user verification (like tap on
            the FIDO key) to complete the process.
@@ -112,7 +112,7 @@
 */
 
 /*!
-    \enum QWebEngineWebAuthUXRequest::PINEntryReason
+    \enum QWebEngineWebAuthUxRequest::PinEntryReason
 
     This enum describes the reasons that may prompt the authenticator to ask for a PIN.
 
@@ -122,20 +122,20 @@
 */
 
 /*!
-    \enum QWebEngineWebAuthUXRequest::PINEntryError
+    \enum QWebEngineWebAuthUxRequest::PinEntryError
 
     This enum describes the errors that may prompt the authenticator to ask for a PIN.
 
     \value NoError No error has occurred.
     \value InternalUvLocked Internal UV is locked, so we are falling back to PIN.
-    \value WrongPIN The PIN the user entered does not match the authenticator PIN.
+    \value WrongPin The PIN the user entered does not match the authenticator PIN.
     \value TooShort The new PIN the user entered is too short.
     \value InvalidCharacters The new PIN the user entered contains invalid characters.
-    \value SameAsCurrentPIN The new PIN the user entered is the same as the currently set PIN.
+    \value SameAsCurrentPin The new PIN the user entered is the same as the currently set PIN.
 */
 
 /*!
-    \enum QWebEngineWebAuthUXRequest::RequestFailureReason
+    \enum QWebEngineWebAuthUxRequest::RequestFailureReason
 
     This enum describes the reason for WebAuth request failure.
 
@@ -143,10 +143,10 @@
     \value KeyNotRegistered Key is not registered with the authenticator.
     \value KeyAlreadyRegistered Key is already registered with the authenticator.
            Try to register with another Key or use another authenticator.
-    \value SoftPINBlock The authenticator is blocked as the user entered the wrong key many times.
-    \value HardPINBlock The authenticator is blocked as the user entered the wrong key many times
+    \value SoftPinBlock The authenticator is blocked as the user entered the wrong key many times.
+    \value HardPinBlock The authenticator is blocked as the user entered the wrong key many times
            and reset the PIN to use the specific authenticator again.
-    \value AuthenticatorRemovedDuringPINEntry Authenticator removed during PIN entry.
+    \value AuthenticatorRemovedDuringPinEntry Authenticator removed during PIN entry.
     \value AuthenticatorMissingResidentKeys Authenticator doesn't have resident key support.
     \value AuthenticatorMissingUserVerification Authenticator doesn't
            have user verification support.
@@ -159,23 +159,23 @@
 */
 
 /*!
-    \fn void QWebEngineWebAuthUXRequest::stateChanged(WebAuthUXState state)
+    \fn void QWebEngineWebAuthUxRequest::stateChanged(WebAuthUxState state)
 
     This signal is emitted whenever the WebAuth UX's \a state changes.
 
-    \sa state, WebAuthUXState
+    \sa state, WebAuthUxState
 */
 
 /*!
-    \qmlsignal void WebEngineWebAuthUXRequest::stateChanged(WebAuthUXState state)
+    \qmlsignal void WebEngineWebAuthUxRequest::stateChanged(WebAuthUxState state)
     This signal is emitted whenever the WebAuth UX's \a state changes.
 
-    \sa state, QWebEngineWebAuthUXRequest::WebAuthUXState
+    \sa state, QWebEngineWebAuthUxRequest::WebAuthUxState
 */
 
 /*! \internal
  */
-QWebEngineWebAuthUXRequestPrivate::QWebEngineWebAuthUXRequestPrivate(
+QWebEngineWebAuthUxRequestPrivate::QWebEngineWebAuthUxRequestPrivate(
         QtWebEngineCore::AuthenticatorRequestDialogController *controller)
     : webAuthDialogController(controller)
 {
@@ -184,134 +184,127 @@ QWebEngineWebAuthUXRequestPrivate::QWebEngineWebAuthUXRequestPrivate(
 
 /*! \internal
  */
-QWebEngineWebAuthUXRequestPrivate::~QWebEngineWebAuthUXRequestPrivate() { }
+QWebEngineWebAuthUxRequestPrivate::~QWebEngineWebAuthUxRequestPrivate() { }
 
 /*! \internal
  */
-void QWebEngineWebAuthUXRequest::handleUXUpdate(WebAuthUXState currentState)
-{
-    Q_D(QWebEngineWebAuthUXRequest);
-
-    d->m_currentState = currentState;
-
-    Q_EMIT stateChanged(d->m_currentState);
-}
-
-/*! \internal
- */
-QWebEngineWebAuthUXRequest::QWebEngineWebAuthUXRequest(QWebEngineWebAuthUXRequestPrivate *p)
+QWebEngineWebAuthUxRequest::QWebEngineWebAuthUxRequest(QWebEngineWebAuthUxRequestPrivate *p)
     : d_ptr(p)
 {
     connect(d_ptr->webAuthDialogController,
-            &QtWebEngineCore::AuthenticatorRequestDialogController::stateChanged, this,
-            &QWebEngineWebAuthUXRequest::handleUXUpdate);
+            &QtWebEngineCore::AuthenticatorRequestDialogController::stateChanged,
+            [this](WebAuthUxState currentState) {
+                Q_D(QWebEngineWebAuthUxRequest);
+                d->m_currentState = currentState;
+                Q_EMIT stateChanged(d->m_currentState);
+            });
 }
 
 /*! \internal
  */
-QWebEngineWebAuthUXRequest::~QWebEngineWebAuthUXRequest() { }
+QWebEngineWebAuthUxRequest::~QWebEngineWebAuthUxRequest() { }
 
 /*!
-    \qmlproperty stringlist WebEngineWebAuthUXRequest::userNames
+    \qmlproperty stringlist WebEngineWebAuthUxRequest::userNames
     \brief The available user names for the resident credential support.
 
     This is needed when the current WebAuth request's UX state is
-    WebEngineWebAuthUXRequest.SelectAccount. The WebAuth dialog displays user names.
+    WebEngineWebAuthUxRequest.SelectAccount. The WebAuth dialog displays user names.
     The user needs to select an account to proceed.
 
-    \sa state setSelectedAccount() QWebEngineWebAuthUXRequest::userNames
+    \sa state setSelectedAccount() QWebEngineWebAuthUxRequest::userNames
 */
 /*!
-    \property QWebEngineWebAuthUXRequest::userNames
+    \property QWebEngineWebAuthUxRequest::userNames
     \brief The available user names for the resident credential support.
     This is needed when the current WebAuth request's UX state is \l SelectAccount.
     The WebAuth dialog displays user names. The user needs to select an account to proceed.
 
     \sa SelectAccount setSelectedAccount()
 */
-QStringList QWebEngineWebAuthUXRequest::userNames() const
+QStringList QWebEngineWebAuthUxRequest::userNames() const
 {
-    const Q_D(QWebEngineWebAuthUXRequest);
+    const Q_D(QWebEngineWebAuthUxRequest);
 
     return d->webAuthDialogController->userNames();
 }
 
 /*!
-    \qmlproperty string WebEngineWebAuthUXRequest::relyingPartyId
+    \qmlproperty string WebEngineWebAuthUxRequest::relyingPartyId
     \brief The WebAuth request's relying party id.
 */
 /*!
-    \property QWebEngineWebAuthUXRequest::relyingPartyId
+    \property QWebEngineWebAuthUxRequest::relyingPartyId
     \brief The WebAuth request's relying party id.
 */
-QString QWebEngineWebAuthUXRequest::relyingPartyId() const
+QString QWebEngineWebAuthUxRequest::relyingPartyId() const
 {
-    const Q_D(QWebEngineWebAuthUXRequest);
+    const Q_D(QWebEngineWebAuthUxRequest);
 
     return d->webAuthDialogController->relyingPartyId();
 }
 
 /*!
-    \qmlproperty QWebEngineWebAuthPINRequest WebEngineWebAuthUXRequest::pinRequest
+    \qmlproperty QWebEngineWebAuthPinRequest WebEngineWebAuthUxRequest::pinRequest
     \brief The WebAuth request's PIN request information.
 
-    \sa QWebEngineWebAuthPINRequest
+    \sa QWebEngineWebAuthPinRequest
 */
 /*!
-    \property QWebEngineWebAuthUXRequest::pinRequest
+    \property QWebEngineWebAuthUxRequest::pinRequest
     \brief The WebAuth request's PIN request information.
 
-    This is needed when the current WebAuth request state is \l CollectPIN.
+    This is needed when the current WebAuth request state is \l CollectPin.
     WebAuth Dialog displays a PIN request dialog. The user needs to enter a PIN and
     invoke \l setPin() to proceed.
 
-    \sa QWebEngineWebAuthPINRequest CollectPIN setPin()
+    \sa QWebEngineWebAuthPinRequest CollectPin setPin()
 */
-QWebEngineWebAuthPINRequest QWebEngineWebAuthUXRequest::pinRequest() const
+QWebEngineWebAuthPinRequest QWebEngineWebAuthUxRequest::pinRequest() const
 {
-    const Q_D(QWebEngineWebAuthUXRequest);
+    const Q_D(QWebEngineWebAuthUxRequest);
 
     return d->webAuthDialogController->pinRequest();
 }
 
 /*!
-    \qmlproperty enumeration WebEngineWebAuthUXRequest::state
+    \qmlproperty enumeration WebEngineWebAuthUxRequest::state
     \brief The WebAuth request's current UX state.
 
-    \value WebEngineWebAuthUXRequest.NotStarted WebAuth UX request not started yet.
-    \value WebEngineWebAuthUXRequest.SelectAccount The authenticator requires
+    \value WebEngineWebAuthUxRequest.NotStarted WebAuth UX request not started yet.
+    \value WebEngineWebAuthUxRequest.SelectAccount The authenticator requires
            resident credential details. The application needs to display an account details dialog,
            and the user needs to select an account to proceed.
-    \value WebEngineWebAuthUXRequest.CollectPIN The authenticator requires user verification.
+    \value WebEngineWebAuthUxRequest.CollectPin The authenticator requires user verification.
            The application needs to display a PIN request dialog.
-    \value WebEngineWebAuthUXRequest.FinishTokenCollection The authenticator requires
+    \value WebEngineWebAuthUxRequest.FinishTokenCollection The authenticator requires
            token/user verification (like tap on the FIDO key) to complete the process.
-    \value WebEngineWebAuthUXRequest.RequestFailed WebAuth request failed. Display error details.
-    \value WebEngineWebAuthUXRequest.Cancelled  WebAuth request is cancelled.
+    \value WebEngineWebAuthUxRequest.RequestFailed WebAuth request failed. Display error details.
+    \value WebEngineWebAuthUxRequest.Cancelled  WebAuth request is cancelled.
            Close the WebAuth dialog.
-    \value WebEngineWebAuthUXRequest.Completed WebAuth request is completed.
+    \value WebEngineWebAuthUxRequest.Completed WebAuth request is completed.
            Close the WebAuth dialog.
 */
 /*!
-    \property QWebEngineWebAuthUXRequest::state
+    \property QWebEngineWebAuthUxRequest::state
     \brief The WebAuth request's current UX state.
 
     \l stateChanged() is emitted when the current state changes.
     Update the WebAuth dialog in reponse to the changes in state.
 */
-QWebEngineWebAuthUXRequest::WebAuthUXState QWebEngineWebAuthUXRequest::state() const
+QWebEngineWebAuthUxRequest::WebAuthUxState QWebEngineWebAuthUxRequest::state() const
 {
     return d_ptr->m_currentState;
 }
 
 /*!
-    \qmlmethod void WebEngineWebAuthUXRequest::setSelectedAccount(const QString &selectedAccount)
+    \qmlmethod void WebEngineWebAuthUxRequest::setSelectedAccount(const QString &selectedAccount)
     Sends the \a selectedAccount name to the authenticator.
     This is needed when the current WebAuth request's UX state is
-    WebEngineWebAuthUXRequest.SelectAccount. The WebAuth request is blocked until the user selects
+    WebEngineWebAuthUxRequest.SelectAccount. The WebAuth request is blocked until the user selects
     an account and invokes this method.
 
-    \sa WebEngineWebAuthUXRequest::userNames state
+    \sa WebEngineWebAuthUxRequest::userNames state
 */
 /*!
     Sends the \a selectedAccount name to the authenticator.
@@ -320,55 +313,55 @@ QWebEngineWebAuthUXRequest::WebAuthUXState QWebEngineWebAuthUXRequest::state() c
 
     \sa userNames SelectAccount
 */
-void QWebEngineWebAuthUXRequest::setSelectedAccount(const QString &selectedAccount)
+void QWebEngineWebAuthUxRequest::setSelectedAccount(const QString &selectedAccount)
 {
-    Q_D(QWebEngineWebAuthUXRequest);
+    Q_D(QWebEngineWebAuthUxRequest);
 
     d->webAuthDialogController->sendSelectAccountResponse(selectedAccount);
 }
 
 /*!
-    \qmlmethod void WebEngineWebAuthUXRequest::setPin(const QString &pin)
+    \qmlmethod void WebEngineWebAuthUxRequest::setPin(const QString &pin)
     Sends the \a pin to the authenticator that prompts for a PIN.
     This is needed when the current WebAuth request's UX state is
-    WebEngineWebAuthUXRequest.CollectPIN. The WebAuth request is blocked until
+    WebEngineWebAuthUxRequest.CollectPin. The WebAuth request is blocked until
     the user responds with a PIN.
 
-    \sa QWebEngineWebAuthPINRequest state
+    \sa QWebEngineWebAuthPinRequest state
 */
 /*!
     Sends the \a pin to the authenticator that prompts for a PIN.
-    This is needed when the current WebAuth request's UX state is \l CollectPIN.
+    This is needed when the current WebAuth request's UX state is \l CollectPin.
     The WebAuth request is blocked until the user responds with a PIN.
 
-    \sa QWebEngineWebAuthPINRequest CollectPIN
+    \sa QWebEngineWebAuthPinRequest CollectPin
 */
-void QWebEngineWebAuthUXRequest::setPin(const QString &pin)
+void QWebEngineWebAuthUxRequest::setPin(const QString &pin)
 {
-    Q_D(QWebEngineWebAuthUXRequest);
+    Q_D(QWebEngineWebAuthUxRequest);
     d->webAuthDialogController->sendCollectPinResponse(pin);
 }
 
 /*!
-    \qmlmethod void WebEngineWebAuthUXRequest::cancel()
+    \qmlmethod void WebEngineWebAuthUxRequest::cancel()
     Cancels the current WebAuth request.
 
-    \sa QWebEngineWebAuthUXRequest::Cancelled, WebEngineWebAuthUXRequest::stateChanged()
+    \sa QWebEngineWebAuthUxRequest::Cancelled, WebEngineWebAuthUxRequest::stateChanged()
 */
 /*!
     Cancels the current WebAuth request.
 
-    \sa QWebEngineWebAuthUXRequest::Cancelled, stateChanged()
+    \sa QWebEngineWebAuthUxRequest::Cancelled, stateChanged()
 */
-void QWebEngineWebAuthUXRequest::cancel()
+void QWebEngineWebAuthUxRequest::cancel()
 {
-    Q_D(QWebEngineWebAuthUXRequest);
+    Q_D(QWebEngineWebAuthUxRequest);
 
     d->webAuthDialogController->reject();
 }
 
 /*!
-    \qmlmethod void WebEngineWebAuthUXRequest::retry()
+    \qmlmethod void WebEngineWebAuthUxRequest::retry()
     Retries the current WebAuth request.
 
     \sa  stateChanged()
@@ -378,52 +371,52 @@ void QWebEngineWebAuthUXRequest::cancel()
 
     \sa  stateChanged()
 */
-void QWebEngineWebAuthUXRequest::retry()
+void QWebEngineWebAuthUxRequest::retry()
 {
-    const Q_D(QWebEngineWebAuthUXRequest);
+    const Q_D(QWebEngineWebAuthUxRequest);
 
     d->webAuthDialogController->retryRequest();
 }
 
 /*!
-    \qmlproperty enumeration WebEngineWebAuthUXRequest::requestFailureReason
+    \qmlproperty enumeration WebEngineWebAuthUxRequest::requestFailureReason
     \brief The WebAuth request's failure reason.
 
-    \value WebEngineWebAuthUXRequest.Timeout The authentication session has timed out.
-    \value WebEngineWebAuthUXRequest.KeyNotRegistered Key is not registered with the authenticator.
-    \value WebEngineWebAuthUXRequest.KeyAlreadyRegistered Key is already registered with
+    \value WebEngineWebAuthUxRequest.Timeout The authentication session has timed out.
+    \value WebEngineWebAuthUxRequest.KeyNotRegistered Key is not registered with the authenticator.
+    \value WebEngineWebAuthUxRequest.KeyAlreadyRegistered Key is already registered with
            the authenticator. Try to register with another key or use another authenticator.
-    \value WebEngineWebAuthUXRequest.SoftPINBlock The authenticator is blocked as the user
+    \value WebEngineWebAuthUxRequest.SoftPinBlock The authenticator is blocked as the user
            entered the wrong key many times.
-    \value WebEngineWebAuthUXRequest.HardPINBlock The authenticator is blocked as the user entered
+    \value WebEngineWebAuthUxRequest.HardPinBlock The authenticator is blocked as the user entered
            the wrong key many times and reset the PIN to use the specific authenticator again.
-    \value WebEngineWebAuthUXRequest.AuthenticatorRemovedDuringPINEntry Authenticator
+    \value WebEngineWebAuthUxRequest.AuthenticatorRemovedDuringPinEntry Authenticator
            removed during PIN entry.
-    \value WebEngineWebAuthUXRequest.AuthenticatorMissingResidentKeys Authenticator doesn't
+    \value WebEngineWebAuthUxRequest.AuthenticatorMissingResidentKeys Authenticator doesn't
            have resident key support.
-    \value WebEngineWebAuthUXRequest.AuthenticatorMissingUserVerification Authenticator doesn't
+    \value WebEngineWebAuthUxRequest.AuthenticatorMissingUserVerification Authenticator doesn't
            have user verification support.
-    \value WebEngineWebAuthUXRequest.AuthenticatorMissingLargeBlob Authenticator doesn't have
+    \value WebEngineWebAuthUxRequest.AuthenticatorMissingLargeBlob Authenticator doesn't have
            large blob support.
-    \value WebEngineWebAuthUXRequest.NoCommonAlgorithms No common algorithm.
-    \value WebEngineWebAuthUXRequest.StorageFull The resident credential could not be created
+    \value WebEngineWebAuthUxRequest.NoCommonAlgorithms No common algorithm.
+    \value WebEngineWebAuthUxRequest.StorageFull The resident credential could not be created
            because the authenticator has insufficient storage.
-    \value WebEngineWebAuthUXRequest.UserConsentDenied User consent denied.
-    \value WebEngineWebAuthUXRequest.WinUserCancelled The user clicked \uicontrol Cancel
+    \value WebEngineWebAuthUxRequest.UserConsentDenied User consent denied.
+    \value WebEngineWebAuthUxRequest.WinUserCancelled The user clicked \uicontrol Cancel
            in the native windows UI.
 
     \sa  stateChanged()
 */
 /*!
-    \property QWebEngineWebAuthUXRequest::requestFailureReason
+    \property QWebEngineWebAuthUxRequest::requestFailureReason
     \brief The WebAuth request's failure reason.
 
-    \sa  stateChanged()  QWebEngineWebAuthUXRequest::RequestFailureReason
+    \sa  stateChanged()  QWebEngineWebAuthUxRequest::RequestFailureReason
 */
-QWebEngineWebAuthUXRequest::RequestFailureReason
-QWebEngineWebAuthUXRequest::requestFailureReason() const
+QWebEngineWebAuthUxRequest::RequestFailureReason
+QWebEngineWebAuthUxRequest::requestFailureReason() const
 {
-    const Q_D(QWebEngineWebAuthUXRequest);
+    const Q_D(QWebEngineWebAuthUxRequest);
 
     return d->webAuthDialogController->requestFailureReason();
 }
diff --git a/src/core/api/qwebenginewebauthuxrequest.h b/src/core/api/qwebenginewebauthuxrequest.h
index 5da99114c..e62b1d459 100644
--- a/src/core/api/qwebenginewebauthuxrequest.h
+++ b/src/core/api/qwebenginewebauthuxrequest.h
@@ -7,53 +7,60 @@
 #include <QtWebEngineCore/qtwebenginecoreglobal.h>
 #include <QtCore/qobject.h>
 
+namespace QtWebEngineCore {
+class AuthenticatorRequestDialogControllerPrivate;
+}
+
 QT_BEGIN_NAMESPACE
 
-class QWebEngineWebAuthUXRequestPrivate;
-struct QWebEngineWebAuthPINRequest;
+class QWebEngineWebAuthUxRequestPrivate;
+struct QWebEngineWebAuthPinRequest;
 
-class Q_WEBENGINECORE_EXPORT QWebEngineWebAuthUXRequest : public QObject
+class Q_WEBENGINECORE_EXPORT QWebEngineWebAuthUxRequest : public QObject
 {
     Q_OBJECT
-public:
-    QWebEngineWebAuthUXRequest(QWebEngineWebAuthUXRequestPrivate *);
-    ~QWebEngineWebAuthUXRequest();
 
-    enum WebAuthUXState {
+    Q_PROPERTY(QStringList userNames READ userNames CONSTANT FINAL)
+    Q_PROPERTY(WebAuthUxState state READ state NOTIFY stateChanged FINAL)
+    Q_PROPERTY(QString relyingPartyId READ relyingPartyId CONSTANT FINAL)
+    Q_PROPERTY(QWebEngineWebAuthPinRequest pinRequest READ pinRequest CONSTANT FINAL)
+    Q_PROPERTY(RequestFailureReason requestFailureReason READ requestFailureReason CONSTANT FINAL)
+public:
+    enum class WebAuthUxState {
         NotStarted,
         SelectAccount,
-        CollectPIN,
+        CollectPin,
         FinishTokenCollection,
         RequestFailed,
         Cancelled,
-        Completed
+        Completed,
     };
-    Q_ENUM(WebAuthUXState)
+    Q_ENUM(WebAuthUxState)
 
-    enum class PINEntryReason : int {
+    enum class PinEntryReason {
         Set,
         Change,
-        Challenge
+        Challenge,
     };
-    Q_ENUM(PINEntryReason)
+    Q_ENUM(PinEntryReason)
 
-    enum class PINEntryError : int {
+    enum class PinEntryError {
         NoError,
         InternalUvLocked,
-        WrongPIN,
+        WrongPin,
         TooShort,
         InvalidCharacters,
-        SameAsCurrentPIN,
+        SameAsCurrentPin,
     };
-    Q_ENUM(PINEntryError)
+    Q_ENUM(PinEntryError)
 
-    enum class RequestFailureReason : int {
+    enum class RequestFailureReason {
         Timeout,
         KeyNotRegistered,
         KeyAlreadyRegistered,
-        SoftPINBlock,
-        HardPINBlock,
-        AuthenticatorRemovedDuringPINEntry,
+        SoftPinBlock,
+        HardPinBlock,
+        AuthenticatorRemovedDuringPinEntry,
         AuthenticatorMissingResidentKeys,
         AuthenticatorMissingUserVerification,
         AuthenticatorMissingLargeBlob,
@@ -64,20 +71,16 @@ public:
     };
     Q_ENUM(RequestFailureReason)
 
-    Q_PROPERTY(QStringList userNames READ userNames CONSTANT FINAL)
-    Q_PROPERTY(WebAuthUXState state READ state NOTIFY stateChanged FINAL)
-    Q_PROPERTY(QString relyingPartyId READ relyingPartyId CONSTANT FINAL)
-    Q_PROPERTY(QWebEngineWebAuthPINRequest pinRequest READ pinRequest CONSTANT FINAL)
-    Q_PROPERTY(RequestFailureReason requestFailureReason READ requestFailureReason CONSTANT FINAL)
+    ~QWebEngineWebAuthUxRequest() override;
 
     QStringList userNames() const;
     QString relyingPartyId() const;
-    QWebEngineWebAuthPINRequest pinRequest() const;
-    WebAuthUXState state() const;
+    QWebEngineWebAuthPinRequest pinRequest() const;
+    WebAuthUxState state() const;
     RequestFailureReason requestFailureReason() const;
 
 Q_SIGNALS:
-    void stateChanged(QWebEngineWebAuthUXRequest::WebAuthUXState state);
+    void stateChanged(QWebEngineWebAuthUxRequest::WebAuthUxState state);
 
 public Q_SLOTS:
     void cancel();
@@ -85,27 +88,26 @@ public Q_SLOTS:
     void setSelectedAccount(const QString &selectedAccount);
     void setPin(const QString &pin);
 
-private Q_SLOTS:
-    void handleUXUpdate(WebAuthUXState currentState);
-
 protected:
-    QScopedPointer<QWebEngineWebAuthUXRequestPrivate> d_ptr;
+    explicit QWebEngineWebAuthUxRequest(QWebEngineWebAuthUxRequestPrivate *);
 
-    Q_DECLARE_PRIVATE(QWebEngineWebAuthUXRequest)
+    std::unique_ptr<QWebEngineWebAuthUxRequestPrivate> d_ptr;
+    friend class QtWebEngineCore::AuthenticatorRequestDialogControllerPrivate;
+    Q_DECLARE_PRIVATE(QWebEngineWebAuthUxRequest)
 };
 
-struct Q_WEBENGINECORE_EXPORT QWebEngineWebAuthPINRequest
+struct Q_WEBENGINECORE_EXPORT QWebEngineWebAuthPinRequest
 {
     Q_GADGET
 
-    Q_PROPERTY(QWebEngineWebAuthUXRequest::PINEntryReason reason MEMBER reason CONSTANT FINAL)
-    Q_PROPERTY(QWebEngineWebAuthUXRequest::PINEntryError error MEMBER error CONSTANT FINAL)
+    Q_PROPERTY(QWebEngineWebAuthUxRequest::PinEntryReason reason MEMBER reason CONSTANT FINAL)
+    Q_PROPERTY(QWebEngineWebAuthUxRequest::PinEntryError error MEMBER error CONSTANT FINAL)
     Q_PROPERTY(qint32 minPinLength MEMBER minPinLength CONSTANT FINAL)
-    Q_PROPERTY(qint32 remainingAttempts MEMBER remainingAttempts CONSTANT FINAL)
+    Q_PROPERTY(int remainingAttempts MEMBER remainingAttempts CONSTANT FINAL)
 public:
-    QWebEngineWebAuthUXRequest::PINEntryReason reason;
-    QWebEngineWebAuthUXRequest::PINEntryError error =
-            QWebEngineWebAuthUXRequest::PINEntryError::NoError;
+    QWebEngineWebAuthUxRequest::PinEntryReason reason;
+    QWebEngineWebAuthUxRequest::PinEntryError error =
+            QWebEngineWebAuthUxRequest::PinEntryError::NoError;
     qint32 minPinLength;
     int remainingAttempts = 0;
 };
diff --git a/src/core/api/qwebenginewebauthuxrequest_p.h b/src/core/api/qwebenginewebauthuxrequest_p.h
index f82be1f44..4c685bac7 100644
--- a/src/core/api/qwebenginewebauthuxrequest_p.h
+++ b/src/core/api/qwebenginewebauthuxrequest_p.h
@@ -26,16 +26,16 @@ class AuthenticatorRequestDialogController;
 
 QT_BEGIN_NAMESPACE
 
-class Q_WEBENGINECORE_EXPORT QWebEngineWebAuthUXRequestPrivate
+class Q_WEBENGINECORE_EXPORT QWebEngineWebAuthUxRequestPrivate
 {
 
 public:
-    QWebEngineWebAuthUXRequestPrivate(
+    QWebEngineWebAuthUxRequestPrivate(
             QtWebEngineCore::AuthenticatorRequestDialogController *controller);
-    ~QWebEngineWebAuthUXRequestPrivate();
+    ~QWebEngineWebAuthUxRequestPrivate();
 
-    QWebEngineWebAuthUXRequest::WebAuthUXState m_currentState =
-            QWebEngineWebAuthUXRequest::NotStarted;
+    QWebEngineWebAuthUxRequest::WebAuthUxState m_currentState =
+            QWebEngineWebAuthUxRequest::WebAuthUxState::NotStarted;
     QtWebEngineCore::AuthenticatorRequestDialogController *webAuthDialogController;
 };
 
diff --git a/src/core/authenticator_request_client_delegate_qt.cpp b/src/core/authenticator_request_client_delegate_qt.cpp
index e999b74ab..5f9fd9ca3 100644
--- a/src/core/authenticator_request_client_delegate_qt.cpp
+++ b/src/core/authenticator_request_client_delegate_qt.cpp
@@ -13,7 +13,7 @@
 
 namespace QtWebEngineCore {
 
-using RequestFailureReason = QWebEngineWebAuthUXRequest::RequestFailureReason;
+using RequestFailureReason = QWebEngineWebAuthUxRequest::RequestFailureReason;
 
 WebAuthenticationDelegateQt::WebAuthenticationDelegateQt() = default;
 
@@ -68,13 +68,13 @@ bool AuthenticatorRequestClientDelegateQt::DoesBlockRequestOnFailure(
         break;
     case InterestingFailureReason::kAuthenticatorRemovedDuringPINEntry:
         m_dialogController->handleRequestFailure(
-                RequestFailureReason::AuthenticatorRemovedDuringPINEntry);
+                RequestFailureReason::AuthenticatorRemovedDuringPinEntry);
         break;
     case InterestingFailureReason::kHardPINBlock:
-        m_dialogController->handleRequestFailure(RequestFailureReason::HardPINBlock);
+        m_dialogController->handleRequestFailure(RequestFailureReason::HardPinBlock);
         break;
     case InterestingFailureReason::kSoftPINBlock:
-        m_dialogController->handleRequestFailure(RequestFailureReason::SoftPINBlock);
+        m_dialogController->handleRequestFailure(RequestFailureReason::SoftPinBlock);
         break;
     case InterestingFailureReason::kKeyAlreadyRegistered:
         m_dialogController->handleRequestFailure(RequestFailureReason::KeyAlreadyRegistered);
@@ -177,7 +177,8 @@ void AuthenticatorRequestClientDelegateQt::OnTransportAvailabilityEnumerated(
 {
     // Show dialog only after this step;
     // If m_isUiDisabled is set or another UI request in progress return
-    if (m_isUiDisabled || m_dialogController->state() != QWebEngineWebAuthUXRequest::NotStarted)
+    if (m_isUiDisabled
+        || m_dialogController->state() != QWebEngineWebAuthUxRequest::WebAuthUxState::NotStarted)
         return;
 
     // Start WebAuth UX
@@ -196,13 +197,13 @@ void AuthenticatorRequestClientDelegateQt::CollectPIN(
 {
 
     m_providePinCallback = std::move(provide_pin_cb);
-    QWebEngineWebAuthPINRequest pinRequestInfo;
+    QWebEngineWebAuthPinRequest pinRequestInfo;
 
-    pinRequestInfo.reason = static_cast<QWebEngineWebAuthUXRequest::PINEntryReason>(options.reason);
-    pinRequestInfo.error = static_cast<QWebEngineWebAuthUXRequest::PINEntryError>(options.error);
+    pinRequestInfo.reason = static_cast<QWebEngineWebAuthUxRequest::PinEntryReason>(options.reason);
+    pinRequestInfo.error = static_cast<QWebEngineWebAuthUxRequest::PinEntryError>(options.error);
     pinRequestInfo.remainingAttempts = options.attempts;
     pinRequestInfo.minPinLength = options.min_pin_length;
-    m_dialogController->collectPIN(pinRequestInfo);
+    m_dialogController->collectPin(pinRequestInfo);
 }
 
 void AuthenticatorRequestClientDelegateQt::FinishCollectToken()
diff --git a/src/core/authenticator_request_dialog_controller.cpp b/src/core/authenticator_request_dialog_controller.cpp
index f71aeaa39..73fb4e7f3 100644
--- a/src/core/authenticator_request_dialog_controller.cpp
+++ b/src/core/authenticator_request_dialog_controller.cpp
@@ -11,20 +11,21 @@
 #include "qwebenginewebauthuxrequest_p.h"
 #include "qwebenginewebauthuxrequest.h"
 
-using PINEntryError = QWebEngineWebAuthUXRequest::PINEntryError;
-using PINEntryReason = QWebEngineWebAuthUXRequest::PINEntryReason;
+using PinEntryError = QWebEngineWebAuthUxRequest::PinEntryError;
+using PinEntryReason = QWebEngineWebAuthUxRequest::PinEntryReason;
+using WebAuthUxState = QWebEngineWebAuthUxRequest::WebAuthUxState;
 
 namespace QtWebEngineCore {
 
-ASSERT_ENUMS_MATCH(PINEntryReason::Set, device::pin::PINEntryReason::kSet)
-ASSERT_ENUMS_MATCH(PINEntryReason::Change, device::pin::PINEntryReason::kChange)
-ASSERT_ENUMS_MATCH(PINEntryReason::Challenge, device::pin::PINEntryReason::kChallenge)
-ASSERT_ENUMS_MATCH(PINEntryError::WrongPIN, device::pin::PINEntryError::kWrongPIN)
-ASSERT_ENUMS_MATCH(PINEntryError::TooShort, device::pin::PINEntryError::kTooShort)
-ASSERT_ENUMS_MATCH(PINEntryError::SameAsCurrentPIN, device::pin::PINEntryError::kSameAsCurrentPIN)
-ASSERT_ENUMS_MATCH(PINEntryError::NoError, device::pin::PINEntryError::kNoError)
-ASSERT_ENUMS_MATCH(PINEntryError::InvalidCharacters, device::pin::PINEntryError::kInvalidCharacters)
-ASSERT_ENUMS_MATCH(PINEntryError::InternalUvLocked, device::pin::PINEntryError::kInternalUvLocked)
+ASSERT_ENUMS_MATCH(PinEntryReason::Set, device::pin::PINEntryReason::kSet)
+ASSERT_ENUMS_MATCH(PinEntryReason::Change, device::pin::PINEntryReason::kChange)
+ASSERT_ENUMS_MATCH(PinEntryReason::Challenge, device::pin::PINEntryReason::kChallenge)
+ASSERT_ENUMS_MATCH(PinEntryError::WrongPin, device::pin::PINEntryError::kWrongPIN)
+ASSERT_ENUMS_MATCH(PinEntryError::TooShort, device::pin::PINEntryError::kTooShort)
+ASSERT_ENUMS_MATCH(PinEntryError::SameAsCurrentPin, device::pin::PINEntryError::kSameAsCurrentPIN)
+ASSERT_ENUMS_MATCH(PinEntryError::NoError, device::pin::PINEntryError::kNoError)
+ASSERT_ENUMS_MATCH(PinEntryError::InvalidCharacters, device::pin::PINEntryError::kInvalidCharacters)
+ASSERT_ENUMS_MATCH(PinEntryError::InternalUvLocked, device::pin::PINEntryError::kInternalUvLocked)
 
 AuthenticatorRequestDialogControllerPrivate::AuthenticatorRequestDialogControllerPrivate(
         content::RenderFrameHost *renderFrameHost,
@@ -58,10 +59,10 @@ void AuthenticatorRequestDialogControllerPrivate::showWebAuthDialog()
 
     if (adapterClient) {
 
-        QWebEngineWebAuthUXRequestPrivate *itemPrivate =
-                new QWebEngineWebAuthUXRequestPrivate(q_ptr);
+        QWebEngineWebAuthUxRequestPrivate *itemPrivate =
+                new QWebEngineWebAuthUxRequestPrivate(q_ptr);
 
-        m_request = new QWebEngineWebAuthUXRequest(itemPrivate);
+        m_request = new QWebEngineWebAuthUxRequest(itemPrivate);
 
         adapterClient->showWebAuthDialog(m_request);
         m_isDialogCreated = true;
@@ -74,18 +75,18 @@ void AuthenticatorRequestDialogControllerPrivate::selectAccount(const QStringLis
 {
     m_userList.clear();
     m_userList = userList;
-    setCurrentState(QWebEngineWebAuthUXRequest::SelectAccount);
+    setCurrentState(WebAuthUxState::SelectAccount);
 }
 
-void AuthenticatorRequestDialogControllerPrivate::collectPIN(QWebEngineWebAuthPINRequest pinRequest)
+void AuthenticatorRequestDialogControllerPrivate::collectPin(QWebEngineWebAuthPinRequest pinRequest)
 {
     m_pinRequest = pinRequest;
-    setCurrentState(QWebEngineWebAuthUXRequest::CollectPIN);
+    setCurrentState(WebAuthUxState::CollectPin);
 }
 
 void AuthenticatorRequestDialogControllerPrivate::finishCollectToken()
 {
-    setCurrentState(QWebEngineWebAuthUXRequest::FinishTokenCollection);
+    setCurrentState(WebAuthUxState::FinishTokenCollection);
 }
 
 QStringList AuthenticatorRequestDialogControllerPrivate::userNames() const
@@ -97,11 +98,11 @@ void AuthenticatorRequestDialogControllerPrivate::finishRequest()
 {
     if (!m_isDialogCreated)
         return;
-    setCurrentState(QWebEngineWebAuthUXRequest::Completed);
+    setCurrentState(WebAuthUxState::Completed);
 }
 
 void AuthenticatorRequestDialogControllerPrivate::setCurrentState(
-        QWebEngineWebAuthUXRequest::WebAuthUXState uxState)
+        QWebEngineWebAuthUxRequest::WebAuthUxState uxState)
 {
     if (!m_isStarted) {
         // Dialog isn't showing yet. Remember to show this step when it appears.
@@ -119,8 +120,8 @@ void AuthenticatorRequestDialogControllerPrivate::setCurrentState(
     } else {
         Q_EMIT q_ptr->stateChanged(m_currentState);
 
-        if (m_currentState == QWebEngineWebAuthUXRequest::Cancelled
-            || m_currentState == QWebEngineWebAuthUXRequest::Completed) {
+        if (m_currentState == QWebEngineWebAuthUxRequest::WebAuthUxState::Cancelled
+            || m_currentState == QWebEngineWebAuthUxRequest::WebAuthUxState::Completed) {
             m_isDialogCreated = false;
         }
     }
@@ -128,7 +129,7 @@ void AuthenticatorRequestDialogControllerPrivate::setCurrentState(
 
 void AuthenticatorRequestDialogControllerPrivate::cancelRequest()
 {
-    setCurrentState(QWebEngineWebAuthUXRequest::Cancelled);
+    setCurrentState(WebAuthUxState::Cancelled);
     content::GetUIThreadTaskRunner({})->PostTask(
             FROM_HERE,
             base::BindOnce(&AuthenticatorRequestClientDelegateQt::onCancelRequest,
@@ -152,7 +153,7 @@ void AuthenticatorRequestDialogControllerPrivate::sendSelectAccountResponse(
                            m_authenticatorRequestDelegate, selectedAccount));
 }
 
-QWebEngineWebAuthUXRequest::WebAuthUXState
+QWebEngineWebAuthUxRequest::WebAuthUxState
 AuthenticatorRequestDialogControllerPrivate::state() const
 {
     return m_currentState;
@@ -181,16 +182,16 @@ QString AuthenticatorRequestDialogControllerPrivate::relyingPartyId() const
     return m_relyingPartyId;
 }
 
-QWebEngineWebAuthPINRequest AuthenticatorRequestDialogControllerPrivate::pinRequest()
+QWebEngineWebAuthPinRequest AuthenticatorRequestDialogControllerPrivate::pinRequest()
 {
     return m_pinRequest;
 }
 
 void AuthenticatorRequestDialogControllerPrivate::handleRequestFailure(
-        QWebEngineWebAuthUXRequest::RequestFailureReason reason)
+        QWebEngineWebAuthUxRequest::RequestFailureReason reason)
 {
     m_requestFailureReason = reason;
-    setCurrentState(QWebEngineWebAuthUXRequest::RequestFailed);
+    setCurrentState(WebAuthUxState::RequestFailed);
 }
 
 void AuthenticatorRequestDialogControllerPrivate::sendCollectPinResponse(const QString &pin)
@@ -201,7 +202,7 @@ void AuthenticatorRequestDialogControllerPrivate::sendCollectPinResponse(const Q
                            m_authenticatorRequestDelegate, pin));
 }
 
-QWebEngineWebAuthUXRequest::RequestFailureReason
+QWebEngineWebAuthUxRequest::RequestFailureReason
 AuthenticatorRequestDialogControllerPrivate::requestFailureReason() const
 {
     return m_requestFailureReason;
@@ -222,9 +223,9 @@ void AuthenticatorRequestDialogController::selectAccount(const QStringList &user
     d_ptr->selectAccount(userList);
 }
 
-void AuthenticatorRequestDialogController::collectPIN(QWebEngineWebAuthPINRequest pinRequest)
+void AuthenticatorRequestDialogController::collectPin(QWebEngineWebAuthPinRequest pinRequest)
 {
-    d_ptr->collectPIN(pinRequest);
+    d_ptr->collectPin(pinRequest);
 }
 
 QStringList AuthenticatorRequestDialogController::userNames() const
@@ -232,7 +233,7 @@ QStringList AuthenticatorRequestDialogController::userNames() const
     return d_ptr->userNames();
 }
 
-QWebEngineWebAuthPINRequest AuthenticatorRequestDialogController::pinRequest()
+QWebEngineWebAuthPinRequest AuthenticatorRequestDialogController::pinRequest()
 {
     return d_ptr->pinRequest();
 }
@@ -257,7 +258,7 @@ void AuthenticatorRequestDialogController::finishRequest()
     d_ptr->finishRequest();
 }
 
-QWebEngineWebAuthUXRequest::WebAuthUXState AuthenticatorRequestDialogController::state() const
+QWebEngineWebAuthUxRequest::WebAuthUxState AuthenticatorRequestDialogController::state() const
 {
     return d_ptr->state();
 }
@@ -278,7 +279,7 @@ QString AuthenticatorRequestDialogController::relyingPartyId() const
 }
 
 void AuthenticatorRequestDialogController::handleRequestFailure(
-        QWebEngineWebAuthUXRequest::RequestFailureReason reason)
+        QWebEngineWebAuthUxRequest::RequestFailureReason reason)
 {
     d_ptr->handleRequestFailure(reason);
 }
@@ -293,7 +294,7 @@ void AuthenticatorRequestDialogController::sendCollectPinResponse(const QString
     d_ptr->sendCollectPinResponse(pin);
 }
 
-QWebEngineWebAuthUXRequest::RequestFailureReason
+QWebEngineWebAuthUxRequest::RequestFailureReason
 AuthenticatorRequestDialogController::requestFailureReason() const
 {
     return d_ptr->requestFailureReason();
diff --git a/src/core/authenticator_request_dialog_controller.h b/src/core/authenticator_request_dialog_controller.h
index 51a564929..98e8dcf90 100644
--- a/src/core/authenticator_request_dialog_controller.h
+++ b/src/core/authenticator_request_dialog_controller.h
@@ -24,26 +24,26 @@ public:
     void sendSelectAccountResponse(const QString &account);
     void sendCollectPinResponse(const QString &pin);
     QStringList userNames() const;
-    QWebEngineWebAuthPINRequest pinRequest();
+    QWebEngineWebAuthPinRequest pinRequest();
     void reject();
     AuthenticatorRequestDialogController(AuthenticatorRequestDialogControllerPrivate *);
 
-    QWebEngineWebAuthUXRequest::WebAuthUXState state() const;
+    QWebEngineWebAuthUxRequest::WebAuthUxState state() const;
     QString relyingPartyId() const;
     void retryRequest();
-    QWebEngineWebAuthUXRequest::RequestFailureReason requestFailureReason() const;
+    QWebEngineWebAuthUxRequest::RequestFailureReason requestFailureReason() const;
 
 Q_SIGNALS:
-    void stateChanged(QWebEngineWebAuthUXRequest::WebAuthUXState state);
+    void stateChanged(QWebEngineWebAuthUxRequest::WebAuthUxState state);
 
 private:
     void selectAccount(const QStringList &userList);
-    void collectPIN(QWebEngineWebAuthPINRequest pinRequest);
+    void collectPin(QWebEngineWebAuthPinRequest pinRequest);
     void finishCollectToken();
     void startRequest(bool bIsConditionalRequest);
     void finishRequest();
     void setRelyingPartyId(const std::string &rpId);
-    void handleRequestFailure(QWebEngineWebAuthUXRequest::RequestFailureReason reason);
+    void handleRequestFailure(QWebEngineWebAuthUxRequest::RequestFailureReason reason);
 
     QScopedPointer<AuthenticatorRequestDialogControllerPrivate> d_ptr;
     friend class AuthenticatorRequestClientDelegateQt;
diff --git a/src/core/authenticator_request_dialog_controller_p.h b/src/core/authenticator_request_dialog_controller_p.h
index cf3cf3c98..5e7333d56 100644
--- a/src/core/authenticator_request_dialog_controller_p.h
+++ b/src/core/authenticator_request_dialog_controller_p.h
@@ -27,17 +27,17 @@ public:
     void selectAccount(const QStringList &userList);
     QStringList userNames() const;
     QString relyingPartyId() const;
-    QWebEngineWebAuthUXRequest::WebAuthUXState state() const;
-    QWebEngineWebAuthPINRequest pinRequest();
-    QWebEngineWebAuthUXRequest::RequestFailureReason requestFailureReason() const;
+    QWebEngineWebAuthUxRequest::WebAuthUxState state() const;
+    QWebEngineWebAuthPinRequest pinRequest();
+    QWebEngineWebAuthUxRequest::RequestFailureReason requestFailureReason() const;
     void sendSelectAccountResponse(const QString &selectedAccount);
-    void setCurrentState(QWebEngineWebAuthUXRequest::WebAuthUXState uxState);
+    void setCurrentState(QWebEngineWebAuthUxRequest::WebAuthUxState uxState);
     void setRelyingPartyId(const QString &rpId);
 
     // Support pin functionality
-    void collectPIN(QWebEngineWebAuthPINRequest pinRequestInfo);
+    void collectPin(QWebEngineWebAuthPinRequest pinRequestInfo);
     void finishCollectToken();
-    void handleRequestFailure(QWebEngineWebAuthUXRequest::RequestFailureReason reason);
+    void handleRequestFailure(QWebEngineWebAuthUxRequest::RequestFailureReason reason);
     void sendCollectPinResponse(const QString &pin);
 
     // Deleting dialog;
@@ -53,25 +53,24 @@ public:
 private:
     content::RenderFrameHost *m_renderFrameHost;
     QStringList m_userList;
-    //    QString m_selectedAccount;
     QString m_pin;
     QString m_relyingPartyId;
 
     bool m_isStarted = false;
     bool m_isConditionalRequest = false;
-    QWebEngineWebAuthUXRequest::WebAuthUXState m_currentState =
-            QWebEngineWebAuthUXRequest::NotStarted;
+    QWebEngineWebAuthUxRequest::WebAuthUxState m_currentState =
+            QWebEngineWebAuthUxRequest::WebAuthUxState::NotStarted;
     base::WeakPtr<AuthenticatorRequestClientDelegateQt> m_authenticatorRequestDelegate;
     bool m_isDialogCreated = false;
-    QWebEngineWebAuthPINRequest m_pinRequest;
+    QWebEngineWebAuthPinRequest m_pinRequest;
 
-    QWebEngineWebAuthUXRequest *m_request = nullptr;
-    QWebEngineWebAuthUXRequest::RequestFailureReason m_requestFailureReason;
+    QWebEngineWebAuthUxRequest *m_request = nullptr;
+    QWebEngineWebAuthUxRequest::RequestFailureReason m_requestFailureReason;
 
     // m_pendingState holds requested steps until the UI is shown. The UI is only
     // shown once the TransportAvailabilityInfo is available, but authenticators
     // may request, e.g., PIN entry prior to that.
-    absl::optional<QWebEngineWebAuthUXRequest::WebAuthUXState> m_pendingState;
+    absl::optional<QWebEngineWebAuthUxRequest::WebAuthUxState> m_pendingState;
 };
 
 } // namespace QtWebEngineCore
diff --git a/src/core/doc/src/qwebenginepage_lgpl.qdoc b/src/core/doc/src/qwebenginepage_lgpl.qdoc
index f82f33e6f..b6f855cb3 100644
--- a/src/core/doc/src/qwebenginepage_lgpl.qdoc
+++ b/src/core/doc/src/qwebenginepage_lgpl.qdoc
@@ -818,7 +818,7 @@
 */
 
 /*!
-    \fn void QWebEnginePage::webAuthUXRequested(QWebEngineWebAuthUXRequest *request);
+    \fn void QWebEnginePage::webAuthUxRequested(QWebEngineWebAuthUxRequest *request);
     \since 6.7
 
     This signal is emitted when a WebAuth authenticator needs user interaction
@@ -826,5 +826,5 @@
 
     The \a request contains the information and API required to complete the WebAuth UX request.
 
-    \sa QWebEngineWebAuthUXRequest
+    \sa QWebEngineWebAuthUxRequest
 */
diff --git a/src/core/web_contents_adapter_client.h b/src/core/web_contents_adapter_client.h
index 7ab3d7b93..1a1474644 100644
--- a/src/core/web_contents_adapter_client.h
+++ b/src/core/web_contents_adapter_client.h
@@ -36,7 +36,7 @@ QT_FORWARD_DECLARE_CLASS(QWebEngineUrlRequestInterceptor)
 QT_FORWARD_DECLARE_CLASS(QWebEngineContextMenuRequest)
 QT_FORWARD_DECLARE_CLASS(QWebEngineCertificateError)
 QT_FORWARD_DECLARE_CLASS(QWebEngineSettings)
-QT_FORWARD_DECLARE_CLASS(QWebEngineWebAuthUXRequest)
+QT_FORWARD_DECLARE_CLASS(QWebEngineWebAuthUxRequest)
 
 namespace content {
 struct DropData;
@@ -218,7 +218,7 @@ public:
     virtual ProfileAdapter *profileAdapter() = 0;
     virtual WebContentsAdapter* webContentsAdapter() = 0;
     virtual void releaseProfile() = 0;
-    virtual void showWebAuthDialog(QWebEngineWebAuthUXRequest *request) = 0;
+    virtual void showWebAuthDialog(QWebEngineWebAuthUxRequest *request) = 0;
 };
 
 } // namespace QtWebEngineCore
diff --git a/src/webenginequick/api/qquickwebengineforeigntypes_p.h b/src/webenginequick/api/qquickwebengineforeigntypes_p.h
index 153262928..2d205254e 100644
--- a/src/webenginequick/api/qquickwebengineforeigntypes_p.h
+++ b/src/webenginequick/api/qquickwebengineforeigntypes_p.h
@@ -222,11 +222,11 @@ namespace ForeginWebEngineFileSystemAccessRequestNamespace
     QML_ADDED_IN_VERSION(6, 4)
 };
 
-struct ForeignWebEngineWebAuthUXRequest
+struct ForeignWebEngineWebAuthUxRequest
 {
     Q_GADGET
-    QML_FOREIGN(QWebEngineWebAuthUXRequest)
-    QML_NAMED_ELEMENT(WebEngineWebAuthUXRequest)
+    QML_FOREIGN(QWebEngineWebAuthUxRequest)
+    QML_NAMED_ELEMENT(WebEngineWebAuthUxRequest)
     QML_ADDED_IN_VERSION(6, 7)
     QML_UNCREATABLE("")
 };
diff --git a/src/webenginequick/api/qquickwebengineview.cpp b/src/webenginequick/api/qquickwebengineview.cpp
index b8c2ee68c..4b90dab82 100644
--- a/src/webenginequick/api/qquickwebengineview.cpp
+++ b/src/webenginequick/api/qquickwebengineview.cpp
@@ -1319,10 +1319,10 @@ void QQuickWebEngineViewPrivate::hideTouchSelectionMenu()
     ui()->hideTouchSelectionMenu();
 }
 
-void QQuickWebEngineViewPrivate::showWebAuthDialog(QWebEngineWebAuthUXRequest *request)
+void QQuickWebEngineViewPrivate::showWebAuthDialog(QWebEngineWebAuthUxRequest *request)
 {
     Q_Q(QQuickWebEngineView);
-    Q_EMIT q->webAuthUXRequested(request);
+    Q_EMIT q->webAuthUxRequested(request);
 }
 
 bool QQuickWebEngineView::isLoading() const
diff --git a/src/webenginequick/api/qquickwebengineview_p.h b/src/webenginequick/api/qquickwebengineview_p.h
index b3a4ea74d..e7f8d8492 100644
--- a/src/webenginequick/api/qquickwebengineview_p.h
+++ b/src/webenginequick/api/qquickwebengineview_p.h
@@ -52,7 +52,7 @@ class QWebEngineNewWindowRequest;
 class QWebEngineRegisterProtocolHandlerRequest;
 class QQuickWebEngineScriptCollection;
 class QQuickWebEngineTouchSelectionMenuRequest;
-class QWebEngineWebAuthUXRequest;
+class QWebEngineWebAuthUxRequest;
 
 class Q_WEBENGINEQUICK_EXPORT QQuickWebEngineView : public QQuickItem {
     Q_OBJECT
@@ -554,7 +554,7 @@ Q_SIGNALS:
     Q_REVISION(6,3) void touchSelectionMenuRequested(QQuickWebEngineTouchSelectionMenuRequest *request);
     Q_REVISION(6,4) void touchHandleDelegateChanged();
     Q_REVISION(6,4) void fileSystemAccessRequested(const QWebEngineFileSystemAccessRequest &request);
-    Q_REVISION(6, 7) void webAuthUXRequested(QWebEngineWebAuthUXRequest *request);
+    Q_REVISION(6, 7) void webAuthUxRequested(QWebEngineWebAuthUxRequest *request);
     Q_REVISION(6,7) void desktopMediaRequested(const QWebEngineDesktopMediaRequest &request);
 
 protected:
diff --git a/src/webenginequick/api/qquickwebengineview_p_p.h b/src/webenginequick/api/qquickwebengineview_p_p.h
index c1dcade5b..ee7da99b9 100644
--- a/src/webenginequick/api/qquickwebengineview_p_p.h
+++ b/src/webenginequick/api/qquickwebengineview_p_p.h
@@ -133,7 +133,7 @@ public:
     void showAutofillPopup(QtWebEngineCore::AutofillPopupController *controller,
                            const QRect &bounds, bool autoselectFirstSuggestion) override;
     void hideAutofillPopup() override;
-    void showWebAuthDialog(QWebEngineWebAuthUXRequest *request) override;
+    void showWebAuthDialog(QWebEngineWebAuthUxRequest *request) override;
 
     void updateAction(QQuickWebEngineView::WebAction) const;
     bool adoptWebContents(QtWebEngineCore::WebContentsAdapter *webContents);
diff --git a/src/webenginequick/doc/src/webengineview_lgpl.qdoc b/src/webenginequick/doc/src/webengineview_lgpl.qdoc
index cce7fa9b0..20b6b2e60 100644
--- a/src/webenginequick/doc/src/webengineview_lgpl.qdoc
+++ b/src/webenginequick/doc/src/webengineview_lgpl.qdoc
@@ -1564,7 +1564,7 @@
 */
 
 /*!
-    \qmlsignal WebEngineView::webAuthUXRequested(QWebEngineWebAuthUXRequest *request);
+    \qmlsignal WebEngineView::webAuthUxRequested(QWebEngineWebAuthUxRequest *request);
     \since QtWebEngine 6.7
 
     This signal is emitted when a WebAuth authenticator requires user interaction
@@ -1572,7 +1572,7 @@
 
     The \a request contains the information and API required to complete the WebAuth UX request.
 
-    \sa QWebEngineWebAuthUXRequest
+    \sa QWebEngineWebAuthUxRequest
 */
 
     \sa {WebEngine Qt Quick Custom Touch Handle Example}
diff --git a/tests/auto/quick/publicapi/tst_publicapi.cpp b/tests/auto/quick/publicapi/tst_publicapi.cpp
index 4f43719de..21b1e52c5 100644
--- a/tests/auto/quick/publicapi/tst_publicapi.cpp
+++ b/tests/auto/quick/publicapi/tst_publicapi.cpp
@@ -24,7 +24,7 @@
 #include <QtWebEngineCore/QWebEngineDownloadRequest>
 #include <QtWebEngineCore/QWebEngineScript>
 #include <QtWebEngineCore/QWebEngineLoadingInfo>
-#include <QtWebEngineCore/QWebEngineWebAuthUXRequest>
+#include <QtWebEngineCore/QWebEngineWebAuthUxRequest>
 #include <private/qquickwebengineview_p.h>
 #include <private/qquickwebengineaction_p.h>
 #include <private/qquickwebengineclientcertificateselection_p.h>
@@ -74,8 +74,8 @@ static const QList<const QMetaObject *> typesToCheck = QList<const QMetaObject *
     << &QWebEngineQuotaRequest::staticMetaObject
     << &QWebEngineRegisterProtocolHandlerRequest::staticMetaObject
     << &QQuickWebEngineTouchSelectionMenuRequest::staticMetaObject
-    << &QWebEngineWebAuthUXRequest::staticMetaObject
-    << &QWebEngineWebAuthPINRequest::staticMetaObject
+    << &QWebEngineWebAuthUxRequest::staticMetaObject
+    << &QWebEngineWebAuthPinRequest::staticMetaObject
     ;
 
 static QList<QMetaEnum> knownEnumNames = QList<QMetaEnum>()
@@ -828,50 +828,50 @@ static const QStringList expectedAPI = QStringList()
     << "QWebEngineNotification.click() --> void"
     << "QWebEngineNotification.close() --> void"
     << "QWebEngineNotification.closed() --> void"
-    << "QQuickWebEngineView.webAuthUXRequested(QWebEngineWebAuthUXRequest*) --> void"
-    << "QWebEngineWebAuthUXRequest.NotStarted --> WebAuthUXState"
-    << "QWebEngineWebAuthUXRequest.SelectAccount --> WebAuthUXState"
-    << "QWebEngineWebAuthUXRequest.CollectPIN --> WebAuthUXState"
-    << "QWebEngineWebAuthUXRequest.FinishTokenCollection --> WebAuthUXState"
-    << "QWebEngineWebAuthUXRequest.RequestFailed --> WebAuthUXState"
-    << "QWebEngineWebAuthUXRequest.Cancelled --> WebAuthUXState"
-    << "QWebEngineWebAuthUXRequest.Completed --> WebAuthUXState"
-    << "QWebEngineWebAuthUXRequest.PINEntryReason.Set --> PINEntryReason"
-    << "QWebEngineWebAuthUXRequest.PINEntryReason.Change --> PINEntryReason"
-    << "QWebEngineWebAuthUXRequest.PINEntryReason.Challenge --> PINEntryReason"
-    << "QWebEngineWebAuthUXRequest.PINEntryError.NoError --> PINEntryError"
-    << "QWebEngineWebAuthUXRequest.PINEntryError.InternalUvLocked --> PINEntryError"
-    << "QWebEngineWebAuthUXRequest.PINEntryError.WrongPIN --> PINEntryError"
-    << "QWebEngineWebAuthUXRequest.PINEntryError.TooShort --> PINEntryError"
-    << "QWebEngineWebAuthUXRequest.PINEntryError.InvalidCharacters --> PINEntryError"
-    << "QWebEngineWebAuthUXRequest.PINEntryError.SameAsCurrentPIN --> PINEntryError"
-    << "QWebEngineWebAuthUXRequest.RequestFailureReason.Timeout --> RequestFailureReason"
-    << "QWebEngineWebAuthUXRequest.RequestFailureReason.KeyNotRegistered --> RequestFailureReason"
-    << "QWebEngineWebAuthUXRequest.RequestFailureReason.KeyAlreadyRegistered --> RequestFailureReason"
-    << "QWebEngineWebAuthUXRequest.RequestFailureReason.SoftPINBlock --> RequestFailureReason"
-    << "QWebEngineWebAuthUXRequest.RequestFailureReason.HardPINBlock --> RequestFailureReason"
-    << "QWebEngineWebAuthUXRequest.RequestFailureReason.AuthenticatorRemovedDuringPINEntry --> RequestFailureReason"
-    << "QWebEngineWebAuthUXRequest.RequestFailureReason.AuthenticatorMissingResidentKeys --> RequestFailureReason"
-    << "QWebEngineWebAuthUXRequest.RequestFailureReason.AuthenticatorMissingUserVerification --> RequestFailureReason"
-    << "QWebEngineWebAuthUXRequest.RequestFailureReason.AuthenticatorMissingLargeBlob --> RequestFailureReason"
-    << "QWebEngineWebAuthUXRequest.RequestFailureReason.NoCommonAlgorithms --> RequestFailureReason"
-    << "QWebEngineWebAuthUXRequest.RequestFailureReason.StorageFull --> RequestFailureReason"
-    << "QWebEngineWebAuthUXRequest.RequestFailureReason.UserConsentDenied --> RequestFailureReason"
-    << "QWebEngineWebAuthUXRequest.RequestFailureReason.WinUserCancelled --> RequestFailureReason"
-    << "QWebEngineWebAuthUXRequest.userNames --> QStringList"
-    << "QWebEngineWebAuthUXRequest.state --> QWebEngineWebAuthUXRequest::WebAuthUXState"
-    << "QWebEngineWebAuthUXRequest.relyingPartyId --> QString"
-    << "QWebEngineWebAuthUXRequest.pinRequest --> QWebEngineWebAuthPINRequest"
-    << "QWebEngineWebAuthUXRequest.requestFailureReason --> QWebEngineWebAuthUXRequest::RequestFailureReason"
-    << "QWebEngineWebAuthUXRequest.stateChanged(QWebEngineWebAuthUXRequest::WebAuthUXState) --> void"
-    << "QWebEngineWebAuthUXRequest.cancel() --> void"
-    << "QWebEngineWebAuthUXRequest.retry() --> void"
-    << "QWebEngineWebAuthUXRequest.setSelectedAccount(QString) --> void"
-    << "QWebEngineWebAuthUXRequest.setPin(QString) --> void"
-    << "QWebEngineWebAuthPINRequest.reason --> QWebEngineWebAuthUXRequest::PINEntryReason"
-    << "QWebEngineWebAuthPINRequest.error --> QWebEngineWebAuthUXRequest::PINEntryError"
-    << "QWebEngineWebAuthPINRequest.minPinLength --> int"
-    << "QWebEngineWebAuthPINRequest.remainingAttempts --> int"
+    << "QQuickWebEngineView.webAuthUxRequested(QWebEngineWebAuthUxRequest*) --> void"
+    << "QWebEngineWebAuthUxRequest.WebAuthUxState.NotStarted --> WebAuthUxState"
+    << "QWebEngineWebAuthUxRequest.WebAuthUxState.SelectAccount --> WebAuthUxState"
+    << "QWebEngineWebAuthUxRequest.WebAuthUxState.CollectPin --> WebAuthUxState"
+    << "QWebEngineWebAuthUxRequest.WebAuthUxState.FinishTokenCollection --> WebAuthUxState"
+    << "QWebEngineWebAuthUxRequest.WebAuthUxState.RequestFailed --> WebAuthUxState"
+    << "QWebEngineWebAuthUxRequest.WebAuthUxState.Cancelled --> WebAuthUxState"
+    << "QWebEngineWebAuthUxRequest.WebAuthUxState.Completed --> WebAuthUxState"
+    << "QWebEngineWebAuthUxRequest.PinEntryReason.Set --> PinEntryReason"
+    << "QWebEngineWebAuthUxRequest.PinEntryReason.Change --> PinEntryReason"
+    << "QWebEngineWebAuthUxRequest.PinEntryReason.Challenge --> PinEntryReason"
+    << "QWebEngineWebAuthUxRequest.PinEntryError.NoError --> PinEntryError"
+    << "QWebEngineWebAuthUxRequest.PinEntryError.InternalUvLocked --> PinEntryError"
+    << "QWebEngineWebAuthUxRequest.PinEntryError.WrongPin --> PinEntryError"
+    << "QWebEngineWebAuthUxRequest.PinEntryError.TooShort --> PinEntryError"
+    << "QWebEngineWebAuthUxRequest.PinEntryError.InvalidCharacters --> PinEntryError"
+    << "QWebEngineWebAuthUxRequest.PinEntryError.SameAsCurrentPin --> PinEntryError"
+    << "QWebEngineWebAuthUxRequest.RequestFailureReason.Timeout --> RequestFailureReason"
+    << "QWebEngineWebAuthUxRequest.RequestFailureReason.KeyNotRegistered --> RequestFailureReason"
+    << "QWebEngineWebAuthUxRequest.RequestFailureReason.KeyAlreadyRegistered --> RequestFailureReason"
+    << "QWebEngineWebAuthUxRequest.RequestFailureReason.SoftPinBlock --> RequestFailureReason"
+    << "QWebEngineWebAuthUxRequest.RequestFailureReason.HardPinBlock --> RequestFailureReason"
+    << "QWebEngineWebAuthUxRequest.RequestFailureReason.AuthenticatorRemovedDuringPinEntry --> RequestFailureReason"
+    << "QWebEngineWebAuthUxRequest.RequestFailureReason.AuthenticatorMissingResidentKeys --> RequestFailureReason"
+    << "QWebEngineWebAuthUxRequest.RequestFailureReason.AuthenticatorMissingUserVerification --> RequestFailureReason"
+    << "QWebEngineWebAuthUxRequest.RequestFailureReason.AuthenticatorMissingLargeBlob --> RequestFailureReason"
+    << "QWebEngineWebAuthUxRequest.RequestFailureReason.NoCommonAlgorithms --> RequestFailureReason"
+    << "QWebEngineWebAuthUxRequest.RequestFailureReason.StorageFull --> RequestFailureReason"
+    << "QWebEngineWebAuthUxRequest.RequestFailureReason.UserConsentDenied --> RequestFailureReason"
+    << "QWebEngineWebAuthUxRequest.RequestFailureReason.WinUserCancelled --> RequestFailureReason"
+    << "QWebEngineWebAuthUxRequest.userNames --> QStringList"
+    << "QWebEngineWebAuthUxRequest.state --> QWebEngineWebAuthUxRequest::WebAuthUxState"
+    << "QWebEngineWebAuthUxRequest.relyingPartyId --> QString"
+    << "QWebEngineWebAuthUxRequest.pinRequest --> QWebEngineWebAuthPinRequest"
+    << "QWebEngineWebAuthUxRequest.requestFailureReason --> QWebEngineWebAuthUxRequest::RequestFailureReason"
+    << "QWebEngineWebAuthUxRequest.stateChanged(QWebEngineWebAuthUxRequest::WebAuthUxState) --> void"
+    << "QWebEngineWebAuthUxRequest.cancel() --> void"
+    << "QWebEngineWebAuthUxRequest.retry() --> void"
+    << "QWebEngineWebAuthUxRequest.setSelectedAccount(QString) --> void"
+    << "QWebEngineWebAuthUxRequest.setPin(QString) --> void"
+    << "QWebEngineWebAuthPinRequest.reason --> QWebEngineWebAuthUxRequest::PinEntryReason"
+    << "QWebEngineWebAuthPinRequest.error --> QWebEngineWebAuthUxRequest::PinEntryError"
+    << "QWebEngineWebAuthPinRequest.minPinLength --> int"
+    << "QWebEngineWebAuthPinRequest.remainingAttempts --> int"
     ;
 
 static bool isCheckedEnum(QMetaType t)