Changeset 99851 in vbox

Timestamp:

May 18, 2023 1:20:46 PM (23 months ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

157489

Message:

Config.kmk bugref:10450: Adjust a list of Qt modules for Qt 5/6 on Windows/X11 hosts.

File:

• trunk/Config.kmk (modified) (2 diffs)

trunk/Config.kmk

@@ -7727 +7727 @@
   endif
  else if1of ($(KBUILD_TARGET), linux freebsd netbsd openbsd solaris win)
-  VBOX_QT_MOD += Qt5Core Qt5Gui Qt5Widgets Qt5PrintSupport $(if $(VBOX_GUI_USE_QGL),Qt5OpenGL,)
   if1of ($(KBUILD_TARGET), linux freebsd netbsd openbsd solaris)
-   VBOX_QT_MOD += Qt5DBus Qt5Xml Qt5XcbQpa Qt5X11Extras
-   VBOX_QT_PLUGINS = \
-        plugins/platforms/libqxcb.so \
-        plugins/platformthemes/libqgtk2.so \
-        plugins/platformthemes/libqgtk3.so \
-        plugins/sqldrivers/libqsqlite.so \
-        plugins/styles/libqgtk2style.so \
-        plugins/xcbglintegrations/libqxcb-glx-integration.so
+   ifndef VBOX_WITH_QT6
+    VBOX_QT_MOD += Qt5Core Qt5Gui Qt5Widgets Qt5PrintSupport $(if $(VBOX_GUI_USE_QGL),Qt5OpenGL,)
+    VBOX_QT_MOD += Qt5DBus Qt5Xml Qt5XcbQpa Qt5X11Extras
+    VBOX_QT_PLUGINS = \
+     plugins/platforms/libqxcb.so \
+     plugins/platformthemes/libqgtk2.so \
+     plugins/platformthemes/libqgtk3.so \
+     plugins/sqldrivers/libqsqlite.so \
+     plugins/styles/libqgtk2style.so \
+     plugins/xcbglintegrations/libqxcb-glx-integration.so
+   else # qt6
+    VBOX_QT_MOD += Qt6Core Qt6Gui Qt6Widgets Qt6PrintSupport Qt6StateMachine Qt6Core5Compat $(if $(VBOX_GUI_USE_QGL),Qt6OpenGL,)
+    VBOX_QT_MOD += Qt6DBus Qt6Xml Qt6XcbQpa
+    VBOX_QT_PLUGINS = \
+     plugins/platforms/libqxcbVBox.so \
+     plugins/platformthemes/libqgtk3VBox.so \
+     plugins/sqldrivers/libqsqliteVBox.so \
+     plugins/xcbglintegrations/libqxcb-glx-integrationVBox.so
+   endif # qt6
   else ifeq ($(KBUILD_TARGET),win)
-   VBOX_QT_MOD += Qt5WinExtras
+   ifndef VBOX_WITH_QT6
+    VBOX_QT_MOD += Qt5Core Qt5Gui Qt5Widgets Qt5PrintSupport $(if $(VBOX_GUI_USE_QGL),Qt5OpenGL,)
+    VBOX_QT_MOD += Qt5WinExtras
+   else # qt6
+    VBOX_QT_MOD += Qt6Core Qt6Gui Qt6Widgets Qt6PrintSupport Qt6StateMachine Qt6Core5Compat $(if $(VBOX_GUI_USE_QGL),Qt6OpenGL,)
+   endif # qt6
   endif # win
  endif # linux freebsd netbsd openbsd solaris win
@@ -7746 +7761 @@
    VBOX_QT_MOD  += QtHelp QtNetwork QtSql
   else if1of ($(KBUILD_TARGET), linux freebsd netbsd openbsd solaris win)
-   VBOX_QT_MOD  += Qt5Help Qt5Network Qt5Sql
+   ifndef VBOX_WITH_QT6
+    VBOX_QT_MOD += Qt5Help Qt5Network Qt5Sql
+   else # qt6
+    VBOX_QT_MOD += Qt6Help Qt6Network Qt6Sql
+   endif # qt6
   endif
  endif