Fix video output on Qt6 for Windows platform

It's due to changes in Qt6: https://doc.qt.io/qt-6/windows-graphics.html
mavlink · Apr 30, 2024 · 7d1dcce · 7d1dcce
1 parent 580a999
commit 7d1dcce
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 3 deletions.
diff --git a/libs/qmlglsink/qt6/gstqt6glutility.cc b/libs/qmlglsink/qt6/gstqt6glutility.cc
@@ -254,7 +254,7 @@ gst_qml6_get_gl_wrapcontext (GstGLDisplay * display,
     gst_gl_display_filter_gl_api (display, gst_gl_context_get_gl_api (*wrap_glcontext));
     gst_gl_context_activate (*wrap_glcontext, FALSE);
   }
-#if 0
+#if 1
 #if GST_GL_HAVE_WINDOW_WIN32 && GST_GL_HAVE_PLATFORM_WGL && defined (HAVE_QT_WIN32)
   g_return_val_if_fail (context != NULL, FALSE);
 

diff --git a/src/main.cc b/src/main.cc
@@ -143,14 +143,18 @@ int main(int argc, char *argv[])
 #endif
 
 #ifdef Q_OS_WIN
+    // Unlike Qt5, Qt6 on Windows use Direct3D by default,
+    // so force it to use OpenGL since it is required by qt6glitem
+    QQuickWindow::setGraphicsApi(QSGRendererInterface::OpenGL);
+
     // Set our own OpenGL buglist
     qputenv("QT_OPENGL_BUGLIST", ":/opengl/resources/opengl/buglist.json");
 
     // Allow for command line override of renderer
     for (int i = 0; i < argc; i++) {
         const QString arg(argv[i]);
-        if (arg == QStringLiteral("-angle")) {
-            QCoreApplication::setAttribute(Qt::AA_UseOpenGLES);
+        if (arg == QStringLiteral("-desktop")) {
+            QCoreApplication::setAttribute(Qt::AA_UseDesktopOpenGL);
             break;
         } else if (arg == QStringLiteral("-swrast")) {
             QCoreApplication::setAttribute(Qt::AA_UseSoftwareOpenGL);