Changeset 106354 in vbox

Timestamp:

Oct 16, 2024 11:40:22 AM (4 months ago)

Author:

vboxsync

Message:

FE/Qt: bugref:10407. Check Qt version before using QWaylandApplication struct as it is introduced in Qt 6.5.

File:

• trunk/src/VBox/Frontends/VirtualBox/src/platform/nix/VBoxUtils-nix.cpp (modified) (3 diffs)

trunk/src/VBox/Frontends/VirtualBox/src/platform/nix/VBoxUtils-nix.cpp

@@ -65 +65 @@
     if (pX11App)
         return VBGHDISPLAYSERVERTYPE_X11;
+#if QT_VERSION >= QT_VERSION_CHECK(6, 5, 0)
     QNativeInterface::QWaylandApplication *pWaylandApp = qApp->nativeInterface<QNativeInterface::QWaylandApplication>();
     if (pWaylandApp)
         return VBGHDISPLAYSERVERTYPE_PURE_WAYLAND;
+#else
+    if (QGuiApplication::platformName().contains("wayland", Qt::CaseInsensitive))
+        return VBGHDISPLAYSERVERTYPE_PURE_WAYLAND;
+#endif
     return VBGHDISPLAYSERVERTYPE_NONE;
 }
@@ -91 +96 @@
 bool NativeWindowSubsystem::WaylandIsCompositingManagerRunning()
 {
+#if QT_VERSION >= QT_VERSION_CHECK(6, 5, 0)
     QNativeInterface::QWaylandApplication *pWaylandApp = qApp->nativeInterface<QNativeInterface::QWaylandApplication>();
     if (pWaylandApp)
@@ -97 +103 @@
             return true;
     }
+#endif
     return false;
 }