Packman Build Service PMBS

_service:obs_scm:vlc-beta-20260316.eaead7c79.obscpio/modules/gui/qt/maininterface/compositor_dcomp.cpp -> _service:obs_scm:vlc-beta-20260316.5e140d9b8.obscpio/modules/gui/qt/maininterface/compositor_dcomp.cpp Changed

@@ -138,7 +138,7 @@
         return false;
     }
 
-    const QString& sceneGraphBackend = qEnvironmentVariable("QT_QUICK_BACKEND");
+    QString sceneGraphBackend = qEnvironmentVariable("QT_QUICK_BACKEND");
     if (!sceneGraphBackend.isEmpty() /* if empty, RHI is used */ &&
         sceneGraphBackend != QLatin1String("rhi"))
     {
@@ -153,6 +153,16 @@
         // the environment variable.
         return false;
     }
+    else
+    {
+        // If `QQuickWindow::setGraphicsApi()` is used with a non-RHI
+        // mode such as `software`, Qt at the moment adjusts the scene
+        // graph backend but not the `QQuickWindow::graphicsApi()`.
+        // Until Qt does that, we need to check it here additionally:
+        sceneGraphBackend = QQuickWindow::sceneGraphBackend();
+        if (!sceneGraphBackend.isEmpty() && sceneGraphBackend != QLatin1String("rhi"))
+            return false;
+    }
 
     const auto graphicsApi = QQuickWindow::graphicsApi();
     if (graphicsApi != QSGRendererInterface::Direct3D11 &&

_service:obs_scm:vlc-beta-20260316.eaead7c79.obscpio/modules/gui/qt/maininterface/compositor_x11.cpp -> _service:obs_scm:vlc-beta-20260316.5e140d9b8.obscpio/modules/gui/qt/maininterface/compositor_x11.cpp Changed

@@ -96,11 +96,27 @@
         return false;
     }
 
-    if (QQuickWindow::graphicsApi() != QSGRendererInterface::OpenGL)
+    const QString& sceneGraphBackend = qEnvironmentVariable("QT_QUICK_BACKEND");
+    if (!sceneGraphBackend.isEmpty() /* if empty, RHI is used */ &&
+        sceneGraphBackend != QLatin1String("rhi") &&
+        sceneGraphBackend != QLatin1String("software"))
     {
-        msg_Warn(m_intf, "Running on X11, but graphics api is not OpenGL." \
-                         "CompositorX11 only supports OpenGL for now.\n" \
-                         "FIXME: Support vulkan as well.");
+        // No RHI means no OpenGL, the graphics API check below is
+        // only relevant when RHI is in use. If QT_QUICK_BACKEND is
+        // set to software or openvg, then `QQuickWindow::graphicsApi()`
+        // might still report OpenGL until the scene graph is initialized.
+        // Unlike `QQuickWindow::graphicsApi()`, `sceneGraphBackend()`
+        // is only valid after the window is constructed, so instead
+        // of using `QQuickWindow::sceneGraphBackend()`, simply probe
+        // the environment variable.
+        return false;
+    }
+
+    const auto graphicsApi = QQuickWindow::graphicsApi();
+    if (graphicsApi != QSGRendererInterface::OpenGL &&
+        graphicsApi != QSGRendererInterface::Software)
+    {
+        msg_Warn(m_intf, "CompositorX11: Only software mode and rhi opengl are supported!");
         return false;
     }

_service:obs_scm:vlc-beta-20260316.eaead7c79.obscpio/modules/gui/qt/maininterface/mainctx.hpp -> _service:obs_scm:vlc-beta-20260316.5e140d9b8.obscpio/modules/gui/qt/maininterface/mainctx.hpp Changed

@@ -260,22 +260,6 @@
     void setVideoSurfaceProvider(VideoSurfaceProvider* videoSurfaceProvider);
 
     int mouseHideTimeout() const { return m_mouseHideTimeout; }
-
-    Q_INVOKABLE static inline bool useTopLevelWindowForToolTip() {
-        assert(qGuiApp);
-        if constexpr (QT_VERSION < QT_VERSION_CHECK(6, 8, 0))
-            return false; // Feature is not available
-#ifndef QT_STATIC // We have patched contrib Qt to fix both of the spotted Qt bugs
-        if constexpr (QT_VERSION < QT_VERSION_CHECK(6, 8, 2))
-            return false; // This feature was not tested properly upstream, and often causes crashes (QTBUG-131898, #28919).
-#endif
-        if constexpr (QT_VERSION < QT_VERSION_CHECK(6, 9, 2))
-        {
-            static const bool isWayland = qGuiApp->platformName().startsWith(QLatin1String("wayland"));
-            return !isWayland; // QTBUG-135158
-        }
-        return true;
-    }
     
     Q_INVOKABLE bool backdropBlurRequested() const { return var_InheritBool(p_intf, "qt-backdrop-blur"); }

_service:obs_scm:vlc-beta-20260316.eaead7c79.obscpio/modules/gui/qt/playlist/qml/PlaylistDelegate.qml -> _service:obs_scm:vlc-beta-20260316.5e140d9b8.obscpio/modules/gui/qt/playlist/qml/PlaylistDelegate.qml Changed

_service:obs_scm:vlc-beta-20260316.eaead7c79.obscpio/modules/gui/qt/widgets/qml/ToolTipExt.qml -> _service:obs_scm:vlc-beta-20260316.5e140d9b8.obscpio/modules/gui/qt/widgets/qml/ToolTipExt.qml Changed

_service:obs_scm:vlc-beta.obsinfo Changed

Changes of Revision 287