merge mainline changes into qt6

2026-09-25 15:06:43 -05:00
parent 9ecdda1572 31df8b476b
commit 8d661d2b31
30 changed files with 2965 additions and 450 deletions
@@ -509,14 +509,13 @@ void SteamVRTabController::launchBindingUI()
        qCritical()
            << "failed to get input handle? is your right controller on?";
    }
+    bool desktopShow = false;
    if ( parent->isDesktopMode() )
    {
-        QDesktopServices::openUrl(
-            QUrl( "http://127.0.0.1:27062/dashboard/controllerbinding.html" ) );
-        return;
+        desktopShow = true;
    }
    auto error = vr::VRInput()->OpenBindingUI(
-        application_strings::applicationKey, actionHandle, inputHandle, false );
+        application_strings::applicationKey, actionHandle, inputHandle, desktopShow );
    if ( error != vr::VRInputError_None )
    {
        qCritical() << "Input Error: " << error;