VirtualBox

Changeset 94050 in vbox for trunk


Ignore:
Timestamp:
Mar 2, 2022 1:41:09 AM (3 years ago)
Author:
vboxsync
Message:

/Config.kmk: Qt6 adjustments for darwin.arm64. bugref:9898

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/Config.kmk

    r94002 r94050  
    746746ifeq ($(KBUILD_TARGET),darwin)
    747747 VBOX_WITH_COCOA_QT = 1
     748endif
     749# Use Qt6 instead of Qt5.
     750if1of ($(KBUILD_TARGET).$(KBUILD_TARGET_ARCH), darwin.arm64)
     751 VBOX_WITH_QT6 := 1
    748752endif
    749753# Enable the QHelp based help function in UI.
     
    12011205 ifeq ($(KBUILD_TARGET_ARCH),arm64)
    12021206  # No Qt yet, so no GUI, NLS or qhelp.
    1203   VBOX_WITH_QTGUI :=
    1204   VBOX_WITH_DEBUGGER_GUI :=
    12051207  VBOX_WITH_NLS :=
    12061208  VBOX_WITH_MAIN_NLS :=
     
    77417743   TEMPLATE_VBOXQTGUIEXE_OBJCXXFLAGS += $(VBOX_GCC_WERR)
    77427744  endif
     7745  ifdef VBOX_WITH_QT6
     7746   TEMPLATE_VBOXQTGUIEXE_OBJCXXFLAGS += -std=gnu++17
     7747  endif
    77437748  TEMPLATE_VBOXQTGUIEXE_OBJCXXFLAGS.x86 = $(TEMPLATE_VBOXQTGUIEXE_CXXFLAGS.x86)
    77447749  TEMPLATE_VBOXQTGUIEXE_OBJCXXFLAGS.amd64 = $(TEMPLATE_VBOXQTGUIEXE_CXXFLAGS.amd64)
     
    77657770   TEMPLATE_VBOXQTGUIEXE_PCHFLAGS.darwin    += $(TEMPLATE_VBOXQTGUIEXE_CXXFLAGS.darwin)
    77667771   TEMPLATE_VBOXQTGUIEXE_OBJCFLAGS.darwin   += $(VBOX_DARWIN_DEF_SDK_OBJCFLAGS)
    7767    TEMPLATE_VBOXQTGUIEXE_OBJCXXFLAGS.darwin += $(VBOX_DARWIN_DEF_SDK_OBJCXXFLAGS) $(VBOX_GCC_std)
     7772   ifdef VBOX_WITH_QT6
     7773    TEMPLATE_VBOXQTGUIEXE_OBJCXXFLAGS.darwin += $(VBOX_DARWIN_DEF_SDK_OBJCXXFLAGS)
     7774   else
     7775    TEMPLATE_VBOXQTGUIEXE_OBJCXXFLAGS.darwin += $(VBOX_DARWIN_DEF_SDK_OBJCXXFLAGS)  $(VBOX_GCC_std)
     7776   endif
    77687777   TEMPLATE_VBOXQTGUIEXE_LDFLAGS.darwin     += $(VBOX_DARWIN_DEF_SDK_LDFLAGS) -bind_at_load -Wl,-headerpad_max_install_names
    77697778   TEMPLATE_VBOXQTGUIEXE_LIBS +=
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