VirtualBox

Changeset 99848 in vbox for trunk


Ignore:
Timestamp:
May 18, 2023 1:04:42 PM (17 months ago)
Author:
vboxsync
Message:

bugref:10450: Teach Config.kmk how to find Qt6 on Windows host.

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/Config.kmk

    r99847 r99848  
    76667666   endif
    76677667  else if1of ($(KBUILD_TARGET), win)
    7668    VBOX_PATH_QT := $(rsort $(wildcard $(KBUILD_DEVTOOLS_TRG)/qt/v5*))
    7669    VBOX_PATH_QT := $(firstword $(filter %-$(tolower $(VBOX_VCC_TOOL_STEM)),$(VBOX_PATH_QT)) \
    7670                 $(filter-out %-vcc100 %-vcc110 %-vcc120 %-vcc140 %-vcc141 %-vcc142 %-vcc143 %-vcc150, $(VBOX_PATH_QT)))
    7671    ifdef VBOX_PATH_QT
    7672     PATH_SDK_QT5  := $(VBOX_PATH_QT)
    7673     PATH_TOOL_QT5 := $(VBOX_PATH_QT)
    7674    endif
     7668   ifndef VBOX_WITH_QT6
     7669    VBOX_PATH_QT := $(rsort $(wildcard $(KBUILD_DEVTOOLS_TRG)/qt/v5*))
     7670    VBOX_PATH_QT := $(firstword $(filter %-$(tolower $(VBOX_VCC_TOOL_STEM)),$(VBOX_PATH_QT)) \
     7671        $(filter-out %-vcc100 %-vcc110 %-vcc120 %-vcc140 %-vcc141 %-vcc142 %-vcc143 %-vcc150, $(VBOX_PATH_QT)))
     7672    ifdef VBOX_PATH_QT
     7673     PATH_SDK_QT5  := $(VBOX_PATH_QT)
     7674     PATH_TOOL_QT5 := $(VBOX_PATH_QT)
     7675    endif
     7676   else # qt6
     7677    VBOX_PATH_QT := $(rsort $(wildcard $(KBUILD_DEVTOOLS_TRG)/qt/v6*))
     7678    VBOX_PATH_QT := $(firstword $(filter %-$(tolower $(VBOX_VCC_TOOL_STEM)),$(VBOX_PATH_QT)) \
     7679        $(filter-out %-vcc100 %-vcc110 %-vcc120 %-vcc140 %-vcc141 %-vcc142 %-vcc143 %-vcc150, $(VBOX_PATH_QT)))
     7680    ifdef VBOX_PATH_QT
     7681     PATH_SDK_QT6  := $(VBOX_PATH_QT)
     7682     PATH_TOOL_QT6 := $(VBOX_PATH_QT)
     7683    endif
     7684   endif # qt6
    76757685  else if1of ($(KBUILD_TARGET), linux solaris)
    7676    VBOX_PATH_QT ?= $(lastword $(sort $(wildcard $(KBUILD_DEVTOOLS_TRG)/qt/v5*)))
     7686    VBOX_PATH_QT ?= $(lastword $(sort $(wildcard $(KBUILD_DEVTOOLS_TRG)/qt/v5*)))
    76777687   ifneq ($(VBOX_PATH_QT),)
    76787688    VBOX_WITH_ORACLE_QT = 1
     
    77137723  endif
    77147724 else if1of ($(KBUILD_TARGET), linux freebsd netbsd openbsd solaris win)
    7715   VBOX_QT_MOD += Qt5Core Qt5Gui Qt5Widgets Qt5PrintSupport $(if $(VBOX_GUI_USE_QGL),Qt5OpenGL,)
     7725    VBOX_QT_MOD += Qt5Core Qt5Gui Qt5Widgets Qt5PrintSupport $(if $(VBOX_GUI_USE_QGL),Qt5OpenGL,)
    77167726  if1of ($(KBUILD_TARGET), linux freebsd netbsd openbsd solaris)
    7717    VBOX_QT_MOD += Qt5DBus Qt5Xml Qt5XcbQpa Qt5X11Extras
    7718    VBOX_QT_PLUGINS = \
    7719         plugins/platforms/libqxcb.so \
    7720         plugins/platformthemes/libqgtk2.so \
    7721         plugins/platformthemes/libqgtk3.so \
    7722         plugins/sqldrivers/libqsqlite.so \
    7723         plugins/styles/libqgtk2style.so \
    7724         plugins/xcbglintegrations/libqxcb-glx-integration.so
     7727    VBOX_QT_MOD += Qt5DBus Qt5Xml Qt5XcbQpa Qt5X11Extras
     7728    VBOX_QT_PLUGINS = \
     7729     plugins/platforms/libqxcb.so \
     7730     plugins/platformthemes/libqgtk2.so \
     7731     plugins/platformthemes/libqgtk3.so \
     7732     plugins/sqldrivers/libqsqlite.so \
     7733     plugins/styles/libqgtk2style.so \
     7734     plugins/xcbglintegrations/libqxcb-glx-integration.so
    77257735  else ifeq ($(KBUILD_TARGET),win)
    7726    VBOX_QT_MOD += Qt5WinExtras
     7736    VBOX_QT_MOD += Qt5WinExtras
    77277737  endif # win
    77287738 endif # linux freebsd netbsd openbsd solaris win
     
    77327742   VBOX_QT_MOD  += QtHelp QtNetwork QtSql
    77337743  else if1of ($(KBUILD_TARGET), linux freebsd netbsd openbsd solaris win)
    7734    VBOX_QT_MOD += Qt5Help Qt5Network Qt5Sql
     7744    VBOX_QT_MOD += Qt5Help Qt5Network Qt5Sql
    77357745  endif
    77367746 endif
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