Changeset 103369 in vbox for trunk

Timestamp:

Feb 14, 2024 7:39:03 PM (12 months ago)

Author:

vboxsync

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

161686

Message:

Config.kmk, Installer, FE/Qt: bugref:10450: A try to get rid of Qt[6]Core5Compat lib.

Location:

trunk

Files:

• Config.kmk (modified) (4 diffs)
• src/VBox/Frontends/VirtualBox/src/precomp_gcc.h (modified) (1 diff)
• src/VBox/Frontends/VirtualBox/src/precomp_vcc.h (modified) (1 diff)
• src/VBox/Installer/linux/debian/rules (modified) (1 diff)
• src/VBox/Installer/win/VBoxMergeApp.wxi (modified) (1 diff)

trunk/Config.kmk

@@ -7803 +7803 @@
   VBOX_QT_MOD := QtCore QtGui QtWidgets QtPrintSupport QtHelp QtNetwork QtSql
   ifdef VBOX_WITH_QT6
-   VBOX_QT_MOD += QtStateMachine QtCore5Compat
+   VBOX_QT_MOD += QtStateMachine
   else
    VBOX_QT_MOD += QtMacExtras
@@ -7820 +7820 @@
         plugins/xcbglintegrations/libqxcb-glx-integration.so
    else # qt6
-    VBOX_QT_MOD += Qt6Core Qt6Gui Qt6Widgets Qt6PrintSupport Qt6StateMachine Qt6Core5Compat
+    VBOX_QT_MOD += Qt6Core Qt6Gui Qt6Widgets Qt6PrintSupport Qt6StateMachine
     VBOX_QT_MOD += Qt6DBus Qt6Xml Qt6XcbQpa Qt6Help Qt6Network Qt6Sql
     VBOX_QT_PLUGINS = \
@@ -7834 +7834 @@
     VBOX_QT_MOD += Qt5WinExtras Qt5Help Qt5Network Qt5Sql
    else # qt6
-    VBOX_QT_MOD += Qt6Core Qt6Gui Qt6Widgets Qt6PrintSupport Qt6StateMachine Qt6Core5Compat Qt6Help Qt6Network Qt6Sql
+    VBOX_QT_MOD += Qt6Core Qt6Gui Qt6Widgets Qt6PrintSupport Qt6StateMachine Qt6Help Qt6Network Qt6Sql
    endif # qt6
   endif # win
@@ -7879 +7879 @@
   TEMPLATE_VBoxQtGuiExe_LRCTOOL := QT6
   TEMPLATE_VBoxQtGuiExe_SDKS    := QT6
-  TEMPLATE_VBoxQtGuiExe_QT_MODULES := Core5Compat
  endif
  TEMPLATE_VBoxQtGuiExe_QT_INFIX = $(VBOX_QT_INFIX)

trunk/src/VBox/Frontends/VirtualBox/src/precomp_gcc.h

@@ -56 +56 @@
 #include <QtCore/qglobal.h> /* 591 */
 #include <QtCore/qvariant.h> /* 588 */
-#include <QtCore/qregexp.h> /* 587 */
 #include <QtCore/qversiontagging.h> /* 585 */
 #include <QtCore/qtypeinfo.h> /* 585 */

trunk/src/VBox/Frontends/VirtualBox/src/precomp_vcc.h

@@ -90 +90 @@
 #include <qiterator.h>
 #include <qlist.h>
-#include <qregexp.h>
 #include <qstringlist.h>
 #include <qstringmatcher.h>

trunk/src/VBox/Installer/linux/debian/rules

@@ -350 +350 @@
         dh_strip --keep-debug \
             $(addprefix --exclude=lib,$(addsuffix VBox.so.6,\
-              Qt6Core Qt6Gui Qt6Widgets Qt6PrintSupport Qt6StateMachine Qt6Core5Compat Qt6DBus Qt6Xml Qt6XcbQpa Qt6Help Qt6Network Qt6Sql))
+              Qt6Core Qt6Gui Qt6Widgets Qt6PrintSupport Qt6StateMachine Qt6DBus Qt6Xml Qt6XcbQpa Qt6Help Qt6Network Qt6Sql))
   endif
         mkdir -p $(bldbase)/$(verpkg)-dbg/usr/lib/$(package)

trunk/src/VBox/Installer/win/VBoxMergeApp.wxi

@@ -368 +368 @@
         <File Id="file_Qt6StateMachine$(var.VBOX_QT_INFIX).dll" Name="Qt6StateMachine$(var.VBOX_QT_INFIX).dll"
               Source="$(env.PATH_OUT)\bin\Qt6StateMachine$(var.VBOX_QT_INFIX).dll" />
-        <File Id="file_Qt6Core5Compat$(var.VBOX_QT_INFIX).dll" Name="Qt6Core5Compat$(var.VBOX_QT_INFIX).dll"
-              Source="$(env.PATH_OUT)\bin\Qt6Core5Compat$(var.VBOX_QT_INFIX).dll" />
         <File Id="file_Qt6Help$(var.VBOX_QT_INFIX).dll" Name="Qt6Help$(var.VBOX_QT_INFIX).dll"
               Source="$(env.PATH_OUT)\bin\Qt6Help$(var.VBOX_QT_INFIX).dll" />