VirtualBox

Changeset 94796 in vbox for trunk


Ignore:
Timestamp:
May 3, 2022 2:19:44 PM (2 years ago)
Author:
vboxsync
Message:

FE/Qt: qt6: Correction to r150306, do ifndef VBOX_WITH_QT6 rather than ifn1of ($(KBUILD_TARGET_ARCH), arm64) to disable VBOX_DARWIN_USE_NATIVE_CONTROLS. bugref:9898

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/src/VBox/Frontends/VirtualBox/Makefile.kmk

    r94709 r94796  
    115115VirtualBox_DEFS.darwin    += VBOX_WITH_TRANSLUCENT_SEAMLESS # VBOX_WITH_MASKED_SEAMLESS
    116116VirtualBox_DEFS.win       += VBOX_WITH_MASKED_SEAMLESS # VBOX_WITH_TRANSLUCENT_SEAMLESS
    117 ifn1of ($(KBUILD_TARGET_ARCH), arm64) # qt6: The UICocoaSpecialControls needs restructuring because QMacCocoaViewContainer is gone. Too lazy for now.
     117ifndef VBOX_WITH_QT6 # qt6: The UICocoaSpecialControls needs restructuring because QMacCocoaViewContainer is gone. Too lazy for now.
    118118 VirtualBox_DEFS.darwin   += VBOX_DARWIN_USE_NATIVE_CONTROLS
    119119endif
     
    180180 VirtualBoxVM_DEFS.darwin   += VBOX_WITH_VMNET
    181181endif
    182 ifn1of ($(KBUILD_TARGET_ARCH), arm64) # qt6: The UICocoaSpecialControls needs restructuring because QMacCocoaViewContainer is gone. Too lazy for now.
     182ifndef VBOX_WITH_QT6 # qt6: The UICocoaSpecialControls needs restructuring because QMacCocoaViewContainer is gone. Too lazy for now.
    183183 VirtualBoxVM_DEFS.darwin   += VBOX_DARWIN_USE_NATIVE_CONTROLS
    184184endif
     
    238238 UICommon_DEFS.darwin += VBOX_WITH_VMNET
    239239endif
    240 ifn1of ($(KBUILD_TARGET_ARCH), arm64) # qt6: The UICocoaSpecialControls needs restructuring because QMacCocoaViewContainer is gone. Too lazy for now.
     240ifndef VBOX_WITH_QT6 # qt6: The UICocoaSpecialControls needs restructuring because QMacCocoaViewContainer is gone. Too lazy for now.
    241241 UICommon_DEFS.darwin += VBOX_DARWIN_USE_NATIVE_CONTROLS
    242242endif
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