Changeset 101556 in vbox

Timestamp:

Oct 23, 2023 2:28:12 PM (15 months ago)

Author:

vboxsync

Message:

Main, ExtPacks/Puel and FE/VBoxManage: bugref:10450: Get rid of Qt5 stuff.

Location:

trunk/src/VBox

Files:

• Frontends/VBoxManage/Makefile.kmk (modified) (1 diff)
• Main/Makefile.kmk (modified) (2 diffs)

trunk/src/VBox/Frontends/VBoxManage/Makefile.kmk

@@ -131 +131 @@
   #     $(addsuffix /VBoxManageBuiltInHelp.h,$(addprefix $(VBoxManage_0_OUTDIR)/,$(VBOX_APPROVED_VBOXMANAGE_DOCBOOK_LANGUAGES)))
 
-  # define qt tools for translation
-  ifndef VBOX_WITH_QT6
-   USES += qt5
-  else
-   USES += qt6
-  endif
+  # define qt6 tools for translation
+  USES += qt6
 
   PROGRAMS += VBoxManageNls

trunk/src/VBox/Main/Makefile.kmk

@@ -1476 +1476 @@
   ifndef VBOX_ONLY_EXTPACKS
    LIBRARIES += VBoxCOM-GUI
-   ifndef VBOX_WITH_QT6
-    USES += qt5
-   else
-    USES += qt6
-   endif
+   USES += qt6
    VBoxCOM-GUI_TEMPLATE = $(if-expr defined(VBOX_WITH_HARDENING),VBoxQtGuiDll,VBoxQtGuiExe)
    VBoxCOM-GUI_EXTENDS = VBoxCOM
@@ -1486 +1482 @@
  endif
 
- # define qt5 tools for translation even if VBOX_ONLY_EXTPACKS is enabled
+ # define qt6 tools for translation even if VBOX_ONLY_EXTPACKS is enabled
  ifdef VBOX_WITH_NLS
-  ifndef VBOX_WITH_QT6
-   USES += qt5
-  else
-   USES += qt6
-  endif
+  USES += qt6
  endif