VirtualBox

Changeset 106170 in vbox


Ignore:
Timestamp:
Sep 27, 2024 4:53:29 PM (4 months ago)
Author:
vboxsync
Message:

Config.kmk, Makefile.kmk, FE/Qt: bugref:10450: Get rid of VBOX_WITH_QT6 define and old possibility to build with our own Qt5 tool which was impossible already.

Location:
trunk
Files:
3 edited

Legend:

Unmodified
Added
Removed

  • trunk/Config.kmk

    r106061 r106170  
    836836 VBOX_WITH_COCOA_QT = 1
    837837endif
    838 # Use Qt6 instead of Qt5.
    839 VBOX_WITH_QT6 := 1
    840838
    841839# VBox Ballooning Control frontend.
    … …  
    39543952# but now that is causing issues with Qt 6.x.
    39553953#
    3956 ifndef VBOX_WITH_QT6
    3957  VBOX_VCC_WCHAR_T_VARIANT = -Zc:wchar_t-
    3958 else
    3959  VBOX_VCC_WCHAR_T_VARIANT = -Zc:wchar_t
    3960 endif
     3954VBOX_VCC_WCHAR_T_VARIANT = -Zc:wchar_t
    39613955
    39623956
    … …  
    79057899  else if1of ($(KBUILD_TARGET), win)
    79067900   ## @todo kBuild: Use qfilter[-out] here once kmk.exe is updated.
    7907    ifndef VBOX_WITH_QT6
    7908     VBOX_PATH_QT := $(rversortfiles $(qwildcard ,$(KBUILD_DEVTOOLS_TRG)/qt/v5*))
    7909     VBOX_PATH_QT := $(firstfile $(filter %-$(tolower $(VBOX_VCC_TOOL_STEM)),$(VBOX_PATH_QT)) \
    7910                 $(filter-out %-vcc100 %-vcc110 %-vcc120 %-vcc140 %-vcc141 %-vcc142 %-vcc143 %-vcc150, $(VBOX_PATH_QT)))
    7911     ifdef VBOX_PATH_QT
    7912      PATH_SDK_QT5  := $(VBOX_PATH_QT)
    7913      PATH_TOOL_QT5 := $(VBOX_PATH_QT)
    7914     endif
    7915    else # qt6
    7916     VBOX_PATH_QT := $(rversortfiles $(qwildcard ,$(KBUILD_DEVTOOLS_TRG)/qt/v6*))
    7917     VBOX_PATH_QT := $(firstfile $(filter %-$(tolower $(VBOX_VCC_TOOL_STEM)),$(VBOX_PATH_QT)) \
    7918                 $(filter-out %-vcc100 %-vcc110 %-vcc120 %-vcc140 %-vcc141 %-vcc142 %-vcc143 %-vcc150, $(VBOX_PATH_QT)))
    7919     ifdef VBOX_PATH_QT
    7920      PATH_SDK_QT6  := $(VBOX_PATH_QT)
    7921      PATH_TOOL_QT6 := $(VBOX_PATH_QT)
    7922     endif
    7923    endif # qt6
     7901   VBOX_PATH_QT := $(rversortfiles $(qwildcard ,$(KBUILD_DEVTOOLS_TRG)/qt/v6*))
     7902   VBOX_PATH_QT := $(firstfile $(filter %-$(tolower $(VBOX_VCC_TOOL_STEM)),$(VBOX_PATH_QT)) \
     7903                $(filter-out %-vcc100 %-vcc110 %-vcc120 %-vcc140 %-vcc141 %-vcc142 %-vcc143 %-vcc150, $(VBOX_PATH_QT)))
     7904   ifdef VBOX_PATH_QT
     7905    PATH_SDK_QT6  := $(VBOX_PATH_QT)
     7906    PATH_TOOL_QT6 := $(VBOX_PATH_QT)
     7907   endif
    79247908  else if1of ($(KBUILD_TARGET), linux solaris)
    7925    ifndef VBOX_WITH_QT6
    7926     VBOX_PATH_QT ?= $(firstfile $(versortfiles $(qwildcard ,$(KBUILD_DEVTOOLS_TRG)/qt/v5*)))
    7927    else
    7928     VBOX_PATH_QT ?= $(firstfile $(versortfiles $(qwildcard ,$(KBUILD_DEVTOOLS_TRG)/qt/v6*)))
    7929    endif
     7909   VBOX_PATH_QT ?= $(firstfile $(versortfiles $(qwildcard ,$(KBUILD_DEVTOOLS_TRG)/qt/v6*)))
    79307910   ifneq ($(VBOX_PATH_QT),)
    79317911    VBOX_WITH_ORACLE_QT = 1
    … …  
    79377917
    79387918 ifdef VBOX_WITH_ORACLE_QT
    7939   if !defined(VBOX_WITH_QT6) || "$(KBUILD_TARGET)" != "darwin"
     7919  if "$(KBUILD_TARGET)" != "darwin"
    79407920   VBOX_QT_INFIX := VBox$(VBOX_QT_DBG)
    79417921  endif
    … …  
    79527932
    79537933 ifeq ($(KBUILD_TARGET),darwin)
    7954   VBOX_QT_MOD := QtCore QtGui QtWidgets QtPrintSupport QtHelp QtNetwork QtSql
    7955   ifdef VBOX_WITH_QT6
    7956    VBOX_QT_MOD += QtStateMachine
    7957   else
    7958    VBOX_QT_MOD += QtMacExtras
    7959   endif
     7934  VBOX_QT_MOD := QtCore QtGui QtWidgets QtPrintSupport QtHelp QtNetwork QtSql QtStateMachine
    79607935 else if1of ($(KBUILD_TARGET), linux freebsd netbsd openbsd solaris win)
    79617936  if1of ($(KBUILD_TARGET), linux freebsd netbsd openbsd solaris)
    7962    ifndef VBOX_WITH_QT6
    7963     VBOX_QT_MOD += Qt5Core Qt5Gui Qt5Widgets Qt5PrintSupport $(if $(VBOX_GUI_USE_QGL),Qt5OpenGL,)
    7964     VBOX_QT_MOD += Qt5DBus Qt5Xml Qt5XcbQpa Qt5X11Extras Qt5Help Qt5Network Qt5Sql
    7965     VBOX_QT_PLUGINS = \
    7966         plugins/platforms/libqxcb.so \
    7967         plugins/platformthemes/libqgtk2.so \
    7968         plugins/platformthemes/libqgtk3.so \
    7969         plugins/sqldrivers/libqsqlite.so \
    7970         plugins/styles/libqgtk2style.so \
    7971         plugins/xcbglintegrations/libqxcb-glx-integration.so
    7972    else # qt6
    7973     VBOX_QT_MOD += Qt6Core Qt6Gui Qt6Widgets Qt6PrintSupport Qt6StateMachine
    7974     VBOX_QT_MOD += Qt6DBus Qt6Xml Qt6XcbQpa Qt6Help Qt6Network Qt6Sql
    7975     VBOX_QT_PLUGINS = \
    7976         plugins/platforms/libqxcbVBox.so \
    7977         plugins/platformthemes/libqgtk2VBox.so \
    7978         plugins/platformthemes/libqgtk3VBox.so \
    7979         plugins/sqldrivers/libqsqliteVBox.so \
    7980         plugins/styles/libqgtk2styleVBox.so
    7981    endif # qt6
     7937   VBOX_QT_MOD += Qt6Core Qt6Gui Qt6Widgets Qt6PrintSupport Qt6StateMachine
     7938   VBOX_QT_MOD += Qt6DBus Qt6Xml Qt6XcbQpa Qt6Help Qt6Network Qt6Sql
     7939   VBOX_QT_PLUGINS = \
     7940        plugins/platforms/libqxcbVBox.so \
     7941        plugins/platformthemes/libqgtk2VBox.so \
     7942        plugins/platformthemes/libqgtk3VBox.so \
     7943        plugins/sqldrivers/libqsqliteVBox.so \
     7944        plugins/styles/libqgtk2styleVBox.so
    79827945  else ifeq ($(KBUILD_TARGET),win)
    7983    ifndef VBOX_WITH_QT6
    7984     VBOX_QT_MOD += Qt5Core Qt5Gui Qt5Widgets Qt5PrintSupport $(if $(VBOX_GUI_USE_QGL),Qt5OpenGL,)
    7985     VBOX_QT_MOD += Qt5WinExtras Qt5Help Qt5Network Qt5Sql
    7986    else # qt6
    7987     VBOX_QT_MOD += Qt6Core Qt6Gui Qt6Widgets Qt6PrintSupport Qt6StateMachine Qt6Help Qt6Network Qt6Sql
    7988    endif # qt6
     7946   VBOX_QT_MOD += Qt6Core Qt6Gui Qt6Widgets Qt6PrintSupport Qt6StateMachine Qt6Help Qt6Network Qt6Sql
    79897947  endif # win
    79907948 endif # linux freebsd netbsd openbsd solaris win
    … …  
    80147972 #
    80157973 TEMPLATE_VBoxQtGuiExe = VBox Qt GUI Executable
    8016  ifndef VBOX_WITH_QT6
    8017   TEMPLATE_VBoxQtGuiExe_USES    := qt5
    8018   TEMPLATE_VBoxQtGuiExe_QTTOOL  := QT5
    8019   TEMPLATE_VBoxQtGuiExe_MOCTOOL := QT5
    8020   TEMPLATE_VBoxQtGuiExe_UICTOOL := QT5
    8021   TEMPLATE_VBoxQtGuiExe_RCCTOOL := QT5
    8022   TEMPLATE_VBoxQtGuiExe_LRCTOOL := QT5
    8023   TEMPLATE_VBoxQtGuiExe_SDKS    := QT5
    8024  else
    8025   TEMPLATE_VBoxQtGuiExe_USES    := qt6
    8026   TEMPLATE_VBoxQtGuiExe_QTTOOL  := QT6
    8027   TEMPLATE_VBoxQtGuiExe_MOCTOOL := QT6
    8028   TEMPLATE_VBoxQtGuiExe_UICTOOL := QT6
    8029   TEMPLATE_VBoxQtGuiExe_RCCTOOL := QT6
    8030   TEMPLATE_VBoxQtGuiExe_LRCTOOL := QT6
    8031   TEMPLATE_VBoxQtGuiExe_SDKS    := QT6
    8032  endif
     7974 TEMPLATE_VBoxQtGuiExe_USES    := qt6
     7975 TEMPLATE_VBoxQtGuiExe_QTTOOL  := QT6
     7976 TEMPLATE_VBoxQtGuiExe_MOCTOOL := QT6
     7977 TEMPLATE_VBoxQtGuiExe_UICTOOL := QT6
     7978 TEMPLATE_VBoxQtGuiExe_RCCTOOL := QT6
     7979 TEMPLATE_VBoxQtGuiExe_LRCTOOL := QT6
     7980 TEMPLATE_VBoxQtGuiExe_SDKS    := QT6
    80337981 TEMPLATE_VBoxQtGuiExe_QT_INFIX = $(VBOX_QT_INFIX)
    80347982 TEMPLATE_VBoxQtGuiExe_DEFS = IN_RING3 QT_NO_DEBUG QT_THREAD_SUPPORT QT_SHARED HAVE_CONFIG_H $(ARCH_BITS_DEFS)
    … …  
    81568104   TEMPLATE_VBoxQtGuiExe_CXXFLAGS += $(VBOX_GCC_Wno-deprecated-declarations)
    81578105  endif
    8158   ifdef VBOX_WITH_QT6
    8159    TEMPLATE_VBoxQtGuiExe_CXXFLAGS += -std=gnu++17
    8160   endif
     8106  TEMPLATE_VBoxQtGuiExe_CXXFLAGS += -std=gnu++17
    81618107  TEMPLATE_VBoxQtGuiExe_CXXFLAGS.x86 = -m32
    81628108  TEMPLATE_VBoxQtGuiExe_CXXFLAGS.amd64 = -m64
    … …  
    81778123   TEMPLATE_VBoxQtGuiExe_OBJCXXFLAGS += $(VBOX_GCC_WERR)
    81788124  endif
    8179   ifdef VBOX_WITH_QT6
    8180    TEMPLATE_VBoxQtGuiExe_OBJCXXFLAGS += -std=gnu++17
    8181   endif
     8125  TEMPLATE_VBoxQtGuiExe_OBJCXXFLAGS += -std=gnu++17
    81828126  TEMPLATE_VBoxQtGuiExe_OBJCXXFLAGS.x86 = $(TEMPLATE_VBoxQtGuiExe_CXXFLAGS.x86)
    81838127  TEMPLATE_VBoxQtGuiExe_OBJCXXFLAGS.amd64 = $(TEMPLATE_VBoxQtGuiExe_CXXFLAGS.amd64)
    … …  
    82058149   TEMPLATE_VBoxQtGuiExe_PCHFLAGS.darwin    += $(TEMPLATE_VBoxQtGuiExe_CXXFLAGS.darwin)
    82068150   TEMPLATE_VBoxQtGuiExe_OBJCFLAGS.darwin   += $(VBOX_DARWIN_DEF_SDK_OBJCFLAGS)
    8207    ifdef VBOX_WITH_QT6
    8208     TEMPLATE_VBoxQtGuiExe_OBJCXXFLAGS.darwin += $(VBOX_DARWIN_DEF_SDK_OBJCXXFLAGS)
    8209    else
    8210     TEMPLATE_VBoxQtGuiExe_OBJCXXFLAGS.darwin += $(VBOX_DARWIN_DEF_SDK_OBJCXXFLAGS)  $(VBOX_GCC_std)
    8211    endif
     8151   TEMPLATE_VBoxQtGuiExe_OBJCXXFLAGS.darwin += $(VBOX_DARWIN_DEF_SDK_OBJCXXFLAGS)
    82128152   TEMPLATE_VBoxQtGuiExe_LDFLAGS.darwin     += $(VBOX_DARWIN_DEF_SDK_LDFLAGS) -bind_at_load -Wl,-headerpad_max_install_names
    82138153   TEMPLATE_VBoxQtGuiExe_LIBS +=
    … …  
    82828222
    82838223 ifeq ($(KBUILD_TARGET),darwin)
    8284   ifndef VBOX_WITH_QT6
    8285    TEMPLATE_VBoxQtGuiExe_POST_CMDS = $(QUIET)install_name_tool $(foreach qtmod, $(VBOX_QT_MOD_NAMES), \
    8286                 $(foreach prefix, @executable_path/../Frameworks/ $(VBOX_PATH_QT)/Frameworks/ $(PATH_SDK_QT5)/, \
    8287                         -change "$(prefix)$(qtmod).framework/Versions/5/$(qtmod)" \
    8288                         "$(if $(VBOX_WITH_HARDENING),/Applications/VirtualBox.app/Contents/Frameworks,@rpath)/$(qtmod).framework/Versions/5/$(qtmod)" ) ) "$(out)"
    8289   else
    8290    TEMPLATE_VBoxQtGuiExe_POST_CMDS = $(QUIET)install_name_tool $(foreach qtmod, $(VBOX_QT_MOD_NAMES), \
    8291                 $(foreach prefix, @executable_path/../Frameworks/ $(VBOX_PATH_QT)/Frameworks/ $(PATH_SDK_QT6)/, \
    8292                         -change "$(prefix)$(qtmod).framework/Versions/A/$(qtmod)" \
    8293                         "$(if $(VBOX_WITH_HARDENING),/Applications/VirtualBox.app/Contents/Frameworks,@rpath)/$(qtmod).framework/Versions/A/$(qtmod)" ) ) "$(out)"
    8294   endif
     8224  TEMPLATE_VBoxQtGuiExe_POST_CMDS = $(QUIET)install_name_tool $(foreach qtmod, $(VBOX_QT_MOD_NAMES), \
     8225                $(foreach prefix, @executable_path/../Frameworks/ $(VBOX_PATH_QT)/Frameworks/ $(PATH_SDK_QT6)/, \
     8226                        -change "$(prefix)$(qtmod).framework/Versions/A/$(qtmod)" \
     8227                        "$(if $(VBOX_WITH_HARDENING),/Applications/VirtualBox.app/Contents/Frameworks,@rpath)/$(qtmod).framework/Versions/A/$(qtmod)" ) ) "$(out)"
    82958228 endif
    82968229
    … …  
    83248257 TEMPLATE_VBoxNLS = VBox NLS template for installing translation files
    83258258 TEMPLATE_VBoxNLS_EXTENDS = VBoxR3Static
    8326  ifndef VBOX_WITH_QT6
    8327   TEMPLATE_VBoxNLS_USES   := qt5
    8328   TEMPLATE_VBoxNLS_QTTOOL := QT5
    8329  else
    8330   TEMPLATE_VBoxNLS_USES   := qt6
    8331   TEMPLATE_VBoxNLS_QTTOOL := QT6
    8332  endif
     8259 TEMPLATE_VBoxNLS_USES   := qt6
     8260 TEMPLATE_VBoxNLS_QTTOOL := QT6
    83338261 TEMPLATE_VBoxNLS_QT_INFIX = $(VBOX_QT_INFIX)
    83348262 TEMPLATE_VBoxNLS_INSTTYPE = none

  • trunk/Makefile.kmk

    r106061 r106170  
    229229 #
    230230 if defined(VBOX_WITH_QTGUI) && !defined(VBOX_ONLY_SDK) && "$(KBUILD_TARGET)" == "darwin"
    231   ifdef VBOX_WITH_QT6
    232    include $(KBUILD_PATH)/units/qt6.kmk
    233    VBOX_QT_FWRK_VER := A
    234    VBOX_QT_PATH     := $(PATH_SDK_QT6)
    235    VBOX_QT_PATH_LIB := $(PATH_SDK_QT6_LIB)
    236   else
    237    include $(KBUILD_PATH)/units/qt5.kmk
    238    VBOX_QT_FWRK_VER := 5
    239    VBOX_QT_PATH     := $(PATH_SDK_QT5)
    240    VBOX_QT_PATH_LIB := $(PATH_SDK_QT5_LIB)
    241   endif
     231  include $(KBUILD_PATH)/units/qt6.kmk
     232  VBOX_QT_FWRK_VER := A
     233  VBOX_QT_PATH     := $(PATH_SDK_QT6)
     234  VBOX_QT_PATH_LIB := $(PATH_SDK_QT6_LIB)
    242235
    243236  INSTALLS += qt-bin
    … …  
    259252        $(VBOX_QT_PATH)/plugins/styles/libqmacstyle$(SUFF_DLL)=>plugins/styles/libqmacstyle$(SUFF_DLL)
    260253  ifdef VBOX_WITH_QT_DSYMS
    261    ifndef VBOX_WITH_QT6
    262     qt-bin_SOURCES += $(foreach qtplat, libqcocoa libqminimal libqoffscreen, \
    263                 $(VBOX_QT_PATH)/plugins/platforms/$(qtplat)$(SUFF_DLL).dSYM/Contents/Info.plist=>plugins/platforms/$(qtplat)$(SUFF_DLL).dSYM/Contents/Info.plist \
    264                 $(VBOX_QT_PATH)/plugins/platforms/$(qtplat)$(SUFF_DLL).dSYM/Contents/Resources/DWARF/$(qtplat)$(SUFF_DLL)=>plugins/platforms/$(qtplat)$(SUFF_DLL).dSYM/Contents/Resources/DWARF/$(qtplat)$(SUFF_DLL))
    265     qt-bin_SOURCES += $(foreach qtsqldrv, libqsqlite, \
    266                 $(VBOX_QT_PATH)/plugins/sqldrivers/$(qtsqldrv)$(SUFF_DLL).dSYM/Contents/Info.plist=>plugins/sqldrivers/$(qtsqldrv)$(SUFF_DLL).dSYM/Contents/Info.plist \
    267                 $(VBOX_QT_PATH)/plugins/sqldrivers/$(qtsqldrv)$(SUFF_DLL).dSYM/Contents/Resources/DWARF/$(qtsqldrv)$(SUFF_DLL)=>plugins/sqldrivers/$(qtsqldrv)$(SUFF_DLL).dSYM/Contents/Resources/DWARF/$(qtsqldrv)$(SUFF_DLL))
    268     qt-bin_SOURCES += $(foreach qtstyl, libqmacstyle, \
    269                 $(VBOX_QT_PATH)/plugins/styles/$(qtstyl)$(SUFF_DLL).dSYM/Contents/Info.plist=>plugins/styles/$(qtstyl)$(SUFF_DLL).dSYM/Contents/Info.plist \
    270                 $(VBOX_QT_PATH)/plugins/styles/$(qtstyl)$(SUFF_DLL).dSYM/Contents/Resources/DWARF/$(qtstyl)$(SUFF_DLL)=>plugins/styles/$(qtstyl)$(SUFF_DLL).dSYM/Contents/Resources/DWARF/$(qtstyl)$(SUFF_DLL))
    271    else # qt6
    272     qt-bin_SOURCES += $(foreach qtplat, qcocoa qminimal qoffscreen, \
    273                 $(VBOX_QT_PATH)/plugins/platforms/lib$(qtplat)$(SUFF_DLL).dSYM/Contents/Info.plist=>plugins/platforms/lib$(qtplat)$(SUFF_DLL).dSYM/Contents/Info.plist \
    274                 $(VBOX_QT_PATH)/plugins/platforms/lib$(qtplat)$(SUFF_DLL).dSYM/Contents/Resources/DWARF/$(qtplat)=>plugins/platforms/lib$(qtplat)$(SUFF_DLL).dSYM/Contents/Resources/DWARF/$(qtplat))
    275     qt-bin_SOURCES += $(foreach qtsqldrv, qsqlite, \
    276                 $(VBOX_QT_PATH)/plugins/sqldrivers/lib$(qtsqldrv)$(SUFF_DLL).dSYM/Contents/Info.plist=>plugins/sqldrivers/lib$(qtsqldrv)$(SUFF_DLL).dSYM/Contents/Info.plist \
    277                 $(VBOX_QT_PATH)/plugins/sqldrivers/lib$(qtsqldrv)$(SUFF_DLL).dSYM/Contents/Resources/DWARF/$(qtsqldrv)=>plugins/sqldrivers/lib$(qtsqldrv)$(SUFF_DLL).dSYM/Contents/Resources/DWARF/$(qtsqldrv))
    278     qt-bin_SOURCES += $(foreach qtstyl, qmacstyle, \
    279                 $(VBOX_QT_PATH)/plugins/styles/lib$(qtstyl)$(SUFF_DLL).dSYM/Contents/Info.plist=>plugins/styles/lib$(qtstyl)$(SUFF_DLL).dSYM/Contents/Info.plist \
    280                 $(VBOX_QT_PATH)/plugins/styles/lib$(qtstyl)$(SUFF_DLL).dSYM/Contents/Resources/DWARF/$(qtstyl)=>plugins/styles/lib$(qtstyl)$(SUFF_DLL).dSYM/Contents/Resources/DWARF/$(qtstyl))
    281    endif # qt6
     254   qt-bin_SOURCES += $(foreach qtplat, qcocoa qminimal qoffscreen, \
     255                $(VBOX_QT_PATH)/plugins/platforms/lib$(qtplat)$(SUFF_DLL).dSYM/Contents/Info.plist=>plugins/platforms/lib$(qtplat)$(SUFF_DLL).dSYM/Contents/Info.plist \
     256                $(VBOX_QT_PATH)/plugins/platforms/lib$(qtplat)$(SUFF_DLL).dSYM/Contents/Resources/DWARF/$(qtplat)=>plugins/platforms/lib$(qtplat)$(SUFF_DLL).dSYM/Contents/Resources/DWARF/$(qtplat))
     257   qt-bin_SOURCES += $(foreach qtsqldrv, qsqlite, \
     258                $(VBOX_QT_PATH)/plugins/sqldrivers/lib$(qtsqldrv)$(SUFF_DLL).dSYM/Contents/Info.plist=>plugins/sqldrivers/lib$(qtsqldrv)$(SUFF_DLL).dSYM/Contents/Info.plist \
     259                $(VBOX_QT_PATH)/plugins/sqldrivers/lib$(qtsqldrv)$(SUFF_DLL).dSYM/Contents/Resources/DWARF/$(qtsqldrv)=>plugins/sqldrivers/lib$(qtsqldrv)$(SUFF_DLL).dSYM/Contents/Resources/DWARF/$(qtsqldrv))
     260   qt-bin_SOURCES += $(foreach qtstyl, qmacstyle, \
     261                $(VBOX_QT_PATH)/plugins/styles/lib$(qtstyl)$(SUFF_DLL).dSYM/Contents/Info.plist=>plugins/styles/lib$(qtstyl)$(SUFF_DLL).dSYM/Contents/Info.plist \
     262                $(VBOX_QT_PATH)/plugins/styles/lib$(qtstyl)$(SUFF_DLL).dSYM/Contents/Resources/DWARF/$(qtstyl)=>plugins/styles/lib$(qtstyl)$(SUFF_DLL).dSYM/Contents/Resources/DWARF/$(qtstyl))
    282263  endif
    283264  qt-bin_SYMLINKS = $(foreach qtmod, $(VBOX_QT_MOD_NAMES), \
    … …  
    296277 else if defined(VBOX_WITH_QTGUI) && !defined(VBOX_ONLY_SDK) && (defined(VBOX_WITH_ORACLE_QT) || defined(VBOX_WITH_QT_PAYLOAD))
    297278  # win x11
    298   ifndef VBOX_WITH_QT6
    299    include $(KBUILD_PATH)/units/qt5.kmk
    300   else
    301    include $(KBUILD_PATH)/units/qt6.kmk
    302   endif
     279  include $(KBUILD_PATH)/units/qt6.kmk
    303280
    304281  INSTALLS += qt-bin
    … …  
    307284
    308285  ifeq ($(KBUILD_TARGET),win)
    309    ifndef VBOX_WITH_QT6
    310     qt-bin_SOURCES = \
    311         $(foreach qtmod,$(VBOX_QT_MOD_NAMES),$(call VBOX_RE_SIGN_DLL_FN,qt-bin,$(PATH_SDK_QT5)/bin/$(qtmod)$(SUFF_DLL)))
    312     qt-bin_SOURCES += \
    313         $(call VBOX_RE_SIGN_DLL_FN,qt-bin,$(PATH_SDK_QT5)/plugins/platforms/qwindows$(VBOX_QT_DBG)$(SUFF_DLL))=>platforms/qwindows$(VBOX_QT_DBG)$(SUFF_DLL) \
    314         $(call VBOX_RE_SIGN_DLL_FN,qt-bin,$(PATH_SDK_QT5)/plugins/platforms/qminimal$(VBOX_QT_DBG)$(SUFF_DLL))=>platforms/qminimal$(VBOX_QT_DBG)$(SUFF_DLL) \
    315         $(call VBOX_RE_SIGN_DLL_FN,qt-bin,$(PATH_SDK_QT5)/plugins/platforms/qoffscreen$(VBOX_QT_DBG)$(SUFF_DLL))=>platforms/qoffscreen$(VBOX_QT_DBG)$(SUFF_DLL) \
    316         $(call VBOX_RE_SIGN_DLL_FN,qt-bin,$(PATH_SDK_QT5)/plugins/sqldrivers/qsqlite$(VBOX_QT_DBG)$(SUFF_DLL))=>sqldrivers/qsqlite$(VBOX_QT_DBG)$(SUFF_DLL) \
    317         $(call VBOX_RE_SIGN_DLL_FN,qt-bin,$(PATH_SDK_QT5)/plugins/styles/qwindowsvistastyle$(VBOX_QT_DBG)$(SUFF_DLL))=>styles/qwindowsvistastyle$(VBOX_QT_DBG)$(SUFF_DLL)
    318     ifdef VBOX_WITH_QT_PDBS
    319      qt-bin_SOURCES += $(foreach qtmod,$(VBOX_QT_MOD_NAMES),$(wildcard $(PATH_SDK_QT5)/qt*/$(VBOX_PATH_QT_LIB)/$(qtmod).pdb))
    320     endif
    321    else # qt6
    322     qt-bin_SOURCES = \
    323         $(foreach qtmod,$(VBOX_QT_MOD_NAMES),$(call VBOX_RE_SIGN_DLL_FN,qt-bin,$(PATH_SDK_QT6)/bin/$(qtmod)$(SUFF_DLL)))
    324     qt-bin_SOURCES += \
    325         $(call VBOX_RE_SIGN_DLL_FN,qt-bin,$(PATH_SDK_QT6)/plugins/platforms/qwindows$(VBOX_QT_POSTFIX)$(VBOX_QT_DBG)$(SUFF_DLL))=>platforms/qwindows$(VBOX_QT_POSTFIX)$(VBOX_QT_DBG)$(SUFF_DLL) \
    326         $(call VBOX_RE_SIGN_DLL_FN,qt-bin,$(PATH_SDK_QT6)/plugins/platforms/qminimal$(VBOX_QT_POSTFIX)$(VBOX_QT_DBG)$(SUFF_DLL))=>platforms/qminimal$(VBOX_QT_POSTFIX)$(VBOX_QT_DBG)$(SUFF_DLL) \
    327         $(call VBOX_RE_SIGN_DLL_FN,qt-bin,$(PATH_SDK_QT6)/plugins/platforms/qoffscreen$(VBOX_QT_POSTFIX)$(VBOX_QT_DBG)$(SUFF_DLL))=>platforms/qoffscreen$(VBOX_QT_POSTFIX)$(VBOX_QT_DBG)$(SUFF_DLL) \
    328         $(call VBOX_RE_SIGN_DLL_FN,qt-bin,$(PATH_SDK_QT6)/plugins/sqldrivers/qsqlite$(VBOX_QT_POSTFIX)$(VBOX_QT_DBG)$(SUFF_DLL))=>sqldrivers/qsqlite$(VBOX_QT_POSTFIX)$(VBOX_QT_DBG)$(SUFF_DLL) \
    329         $(call VBOX_RE_SIGN_DLL_FN,qt-bin,$(PATH_SDK_QT6)/plugins/styles/qwindowsvistastyle$(VBOX_QT_POSTFIX)$(VBOX_QT_DBG)$(SUFF_DLL))=>styles/qwindowsvistastyle$(VBOX_QT_POSTFIX)$(VBOX_QT_DBG)$(SUFF_DLL)
    330     ifdef VBOX_WITH_QT_PDBS
    331      qt-bin_SOURCES += $(foreach qtmod,$(VBOX_QT_MOD_NAMES),$(wildcard $(PATH_SDK_QT6)/qt*/$(VBOX_PATH_QT_LIB)/$(qtmod).pdb))
    332     endif
    333    endif # qt6
     286   qt-bin_SOURCES = \
     287        $(foreach qtmod,$(VBOX_QT_MOD_NAMES),$(call VBOX_RE_SIGN_DLL_FN,qt-bin,$(PATH_SDK_QT6)/bin/$(qtmod)$(SUFF_DLL)))
     288   qt-bin_SOURCES += \
     289        $(call VBOX_RE_SIGN_DLL_FN,qt-bin,$(PATH_SDK_QT6)/plugins/platforms/qwindows$(VBOX_QT_POSTFIX)$(VBOX_QT_DBG)$(SUFF_DLL))=>platforms/qwindows$(VBOX_QT_POSTFIX)$(VBOX_QT_DBG)$(SUFF_DLL) \
     290        $(call VBOX_RE_SIGN_DLL_FN,qt-bin,$(PATH_SDK_QT6)/plugins/platforms/qminimal$(VBOX_QT_POSTFIX)$(VBOX_QT_DBG)$(SUFF_DLL))=>platforms/qminimal$(VBOX_QT_POSTFIX)$(VBOX_QT_DBG)$(SUFF_DLL) \
     291        $(call VBOX_RE_SIGN_DLL_FN,qt-bin,$(PATH_SDK_QT6)/plugins/platforms/qoffscreen$(VBOX_QT_POSTFIX)$(VBOX_QT_DBG)$(SUFF_DLL))=>platforms/qoffscreen$(VBOX_QT_POSTFIX)$(VBOX_QT_DBG)$(SUFF_DLL) \
     292        $(call VBOX_RE_SIGN_DLL_FN,qt-bin,$(PATH_SDK_QT6)/plugins/sqldrivers/qsqlite$(VBOX_QT_POSTFIX)$(VBOX_QT_DBG)$(SUFF_DLL))=>sqldrivers/qsqlite$(VBOX_QT_POSTFIX)$(VBOX_QT_DBG)$(SUFF_DLL) \
     293        $(call VBOX_RE_SIGN_DLL_FN,qt-bin,$(PATH_SDK_QT6)/plugins/styles/qwindowsvistastyle$(VBOX_QT_POSTFIX)$(VBOX_QT_DBG)$(SUFF_DLL))=>styles/qwindowsvistastyle$(VBOX_QT_POSTFIX)$(VBOX_QT_DBG)$(SUFF_DLL)
     294   ifdef VBOX_WITH_QT_PDBS
     295    qt-bin_SOURCES += $(foreach qtmod,$(VBOX_QT_MOD_NAMES),$(wildcard $(PATH_SDK_QT6)/qt*/$(VBOX_PATH_QT_LIB)/$(qtmod).pdb))
     296   endif
    334297
    335298  else # x11
    336    ifndef VBOX_WITH_QT6
    337     VBOX_QT_VERSION       := 5.15.2
    338     VBOX_QT_VERSION_MAJOR := 5
    339    else
    340     VBOX_QT_VERSION       := 6.5.3
    341     VBOX_QT_VERSION_MAJOR := 6
    342    endif
     299   VBOX_QT_VERSION       := 6.5.3
     300   VBOX_QT_VERSION_MAJOR := 6
    343301   ifdef VBOX_WITH_HARDENING
    344302    # The wildcards are necessary to install the libs instead of the symlinks

  • trunk/src/VBox/Frontends/VirtualBox/Makefile.kmk

    r106061 r106170  
    107107VirtualBox_SDKS.win       = ReorderCompilerIncs $(VBOX_WINPSDK) $(VBOX_WINDDK)
    108108VirtualBox_DEFS           =
    109 ifdef VBOX_WITH_QT6 # moc is too stupid to parse #if QT_VERSION > xxx, '#ifdef VBOX_IS_QT6_OR_LATER' works though (no spaces).
    110  VirtualBox_DEFS         += VBOX_IS_QT6_OR_LATER
    111 endif
     109VirtualBox_DEFS          += VBOX_IS_QT6_OR_LATER
    112110VirtualBox_DEFS.debug     = VBOX_CHECK_STATE # QT_FATAL_ASSERT
    113111VirtualBox_DEFS.linux     = VBOX_WS_NIX QT_NO_DEPRECATED_WARNINGS
    … …  
    124122 VirtualBox_DEFS.darwin += VBOX_WITH_VMNET
    125123endif
    126 ifndef VBOX_WITH_QT6 # qt6: The UICocoaSpecialControls needs restructuring because QMacCocoaViewContainer is gone. Too lazy for now.
    127  VirtualBox_DEFS.darwin   += VBOX_DARWIN_USE_NATIVE_CONTROLS
    128 endif
     124# qt6: The UICocoaSpecialControls needs restructuring because QMacCocoaViewContainer is gone. Too lazy for now.
     125# VirtualBox_DEFS.darwin   += VBOX_DARWIN_USE_NATIVE_CONTROLS
    129126VirtualBox_DEFS.win       += UNICODE QT_DLL
    130127# Sort alphabetically!
    … …  
    178175VirtualBoxVM_SDKS.win       = ReorderCompilerIncs $(VBOX_WINPSDK) $(VBOX_WINDDK)
    179176VirtualBoxVM_DEFS           = VBOX_RUNTIME_UI
    180 ifdef VBOX_WITH_QT6 # moc is too stupid to parse #if QT_VERSION > xxx, '#ifdef VBOX_IS_QT6_OR_LATER' works though (no spaces).
    181  VirtualBoxVM_DEFS         += VBOX_IS_QT6_OR_LATER
    182 endif
     177VirtualBoxVM_DEFS          += VBOX_IS_QT6_OR_LATER
    183178VirtualBoxVM_DEFS.debug     = VBOX_CHECK_STATE # QT_FATAL_ASSERT
    184179VirtualBoxVM_DEFS.linux     = VBOX_WS_NIX QT_NO_DEPRECATED_WARNINGS
    … …  
    195190 VirtualBoxVM_DEFS.darwin   += VBOX_WITH_VMNET
    196191endif
    197 ifndef VBOX_WITH_QT6 # qt6: The UICocoaSpecialControls needs restructuring because QMacCocoaViewContainer is gone. Too lazy for now.
    198  VirtualBoxVM_DEFS.darwin   += VBOX_DARWIN_USE_NATIVE_CONTROLS
    199 endif
     192# qt6: The UICocoaSpecialControls needs restructuring because QMacCocoaViewContainer is gone. Too lazy for now.
     193# VirtualBoxVM_DEFS.darwin   += VBOX_DARWIN_USE_NATIVE_CONTROLS
    200194VirtualBoxVM_DEFS.win       += UNICODE QT_DLL
    201195# Sort alphabetically!
    … …  
    243237UICommon_NAME = UICommon
    244238UICommon_DEFS         = VBOX_GUI_LIBRARY
    245 ifdef VBOX_WITH_QT6 # moc is too stupid to parse #if QT_VERSION > xxx, '#ifdef VBOX_IS_QT6_OR_LATER' works though (no spaces).
    246  UICommon_DEFS       += VBOX_IS_QT6_OR_LATER
    247 endif
     239UICommon_DEFS        += VBOX_IS_QT6_OR_LATER
    248240UICommon_DEFS.darwin  = VBOX_WS_MAC
    249241UICommon_DEFS.freebsd = VBOX_WS_NIX
    … …  
    255247 UICommon_DEFS.darwin += VBOX_WITH_VMNET
    256248endif
    257 ifndef VBOX_WITH_QT6 # qt6: The UICocoaSpecialControls needs restructuring because QMacCocoaViewContainer is gone. Too lazy for now.
    258  UICommon_DEFS.darwin += VBOX_DARWIN_USE_NATIVE_CONTROLS
    259 endif
     249# qt6: The UICocoaSpecialControls needs restructuring because QMacCocoaViewContainer is gone. Too lazy for now.
     250# UICommon_DEFS.darwin += VBOX_DARWIN_USE_NATIVE_CONTROLS
    260251#UICommon_DEFS.win     += UNICODE QT_DLL
    261252# Sort alphabetically!
Note: See TracChangeset for help on using the changeset viewer.

© 2024 Oracle Support Privacy / Do Not Sell My Info Terms of Use Trademark Policy Automated Access Etiquette