Changeset 94067 in vbox for trunk/src/VBox/Frontends/VirtualBox

Timestamp:

Mar 2, 2022 9:04:24 PM (3 years ago)

Author:

vboxsync

Message:

FE/Qt: qt6: Just disable VBOX_DARWIN_USE_NATIVE_CONTROLS for arm64 for now, as qt6 doesn't have QMacCocoaViewContainer and the workaround requires some code restructuring (TODO for later). There is no MacExtras module in qt6, so disable that in the Makefile. bugref:9898

Location:

trunk/src/VBox/Frontends/VirtualBox

Files:

• Makefile.kmk (modified) (7 diffs)
• src/platform/darwin/UICocoaSpecialControls.h (modified) (3 diffs)
• src/platform/darwin/UICocoaSpecialControls.mm (modified) (2 diffs)

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

@@ -115 +115 @@
 VirtualBox_DEFS.darwin    += VBOX_WITH_TRANSLUCENT_SEAMLESS # VBOX_WITH_MASKED_SEAMLESS
 VirtualBox_DEFS.win       += VBOX_WITH_MASKED_SEAMLESS # VBOX_WITH_TRANSLUCENT_SEAMLESS
-VirtualBox_DEFS.darwin    += VBOX_DARWIN_USE_NATIVE_CONTROLS
+ifn1of ($(KBUILD_TARGET_ARCH), arm64) # qt6: The UICocoaSpecialControls needs restructuring because QMacCocoaViewContainer is gone. Too lazy for now.
+ VirtualBox_DEFS.darwin   += VBOX_DARWIN_USE_NATIVE_CONTROLS
+endif
 VirtualBox_DEFS.win       += UNICODE QT_DLL
 VirtualBox_DEFS           += \
@@ -175 +177 @@
 VirtualBoxVM_DEFS.darwin    += VBOX_WITH_TRANSLUCENT_SEAMLESS # VBOX_WITH_MASKED_SEAMLESS
 VirtualBoxVM_DEFS.win       += VBOX_WITH_MASKED_SEAMLESS # VBOX_WITH_TRANSLUCENT_SEAMLESS
-VirtualBoxVM_DEFS.darwin    += \
-        VBOX_DARWIN_USE_NATIVE_CONTROLS \
-        $(if $(VBOX_WITH_VMNET),VBOX_WITH_VMNET)
+ifdef VBOX_WITH_VMNET
+ VirtualBoxVM_DEFS.darwin   += VBOX_WITH_VMNET
+endif
+ifn1of ($(KBUILD_TARGET_ARCH), arm64) # qt6: The UICocoaSpecialControls needs restructuring because QMacCocoaViewContainer is gone. Too lazy for now.
+ VirtualBoxVM_DEFS.darwin   += VBOX_DARWIN_USE_NATIVE_CONTROLS
+endif
 VirtualBoxVM_DEFS.win       += UNICODE QT_DLL
 VirtualBoxVM_DEFS           += \
@@ -230 +235 @@
 UICommon_DEFS.win     = VBOX_WS_WIN
 UICommon_DEFS.debug   = VBOX_CHECK_STATE # QT_FATAL_ASSERT
-UICommon_DEFS.darwin  += \
-        VBOX_DARWIN_USE_NATIVE_CONTROLS \
-        $(if $(VBOX_WITH_VMNET),VBOX_WITH_VMNET)
+ifdef VBOX_WITH_VMNET
+ UICommon_DEFS.darwin += VBOX_WITH_VMNET
+endif
+ifn1of ($(KBUILD_TARGET_ARCH), arm64) # qt6: The UICocoaSpecialControls needs restructuring because QMacCocoaViewContainer is gone. Too lazy for now.
+ UICommon_DEFS.darwin += VBOX_DARWIN_USE_NATIVE_CONTROLS
+endif
 #UICommon_DEFS.win     += UNICODE QT_DLL
 UICommon_DEFS         += \
@@ -1583 +1591 @@
  VirtualBox_QT_MODULES.solaris += X11Extras
  VirtualBox_QT_MODULES.freebsd += X11Extras
-endif
-VirtualBox_QT_MODULES.darwin  += MacExtras
+ VirtualBox_QT_MODULES.darwin  += MacExtras
+endif
 VirtualBox_QT_MODULES.win     += WinExtras
 ifdef VBOX_GUI_WITH_QTGLFRAMEBUFFER
@@ -1604 +1612 @@
  VirtualBoxVM_QT_MODULES.solaris += X11Extras
  VirtualBoxVM_QT_MODULES.freebsd += X11Extras
-endif
-VirtualBoxVM_QT_MODULES.darwin  += MacExtras
+ VirtualBoxVM_QT_MODULES.darwin  += MacExtras
+endif
 VirtualBoxVM_QT_MODULES.win     += WinExtras
 ifdef VBOX_GUI_WITH_QTGLFRAMEBUFFER
@@ -1636 +1644 @@
 UICommon_QT_MODULES.freebsd  += DBus
 UICommon_QT_MODULES.freebsd  += Xml
-UICommon_QT_MODULES.darwin   += MacExtras
+ifndef VBOX_WITH_QT6
+ UICommon_QT_MODULES.darwin  += MacExtras
+endif
 UICommon_QT_MODULES.win      += WinExtras
 
@@ -1961 +1971 @@
  tstDarwinKeyboard_SOURCES = \
         src/platform/darwin/tstDarwinKeyboard.cpp \
-        src/platform/darwin/DarwinKeyboard.cpp
- tstDarwinKeyboard_SOURCES.amd64 = \
+        src/platform/darwin/DarwinKeyboard.cpp \
         src/platform/darwin/CocoaEventHelper.mm
  tstDarwinKeyboard_LDFLAGS = -framework IOKit -framework Carbon -framework AppKit

trunk/src/VBox/Frontends/VirtualBox/src/platform/darwin/UICocoaSpecialControls.h

@@ -21 +21 @@
 # pragma once
 #endif
+#ifdef VBOX_DARWIN_USE_NATIVE_CONTROLS
 
 /* Qt includes: */
-#include <QMacCocoaViewContainer>
 #include <QWidget>
+#ifndef VBOX_IS_QT6_OR_LATER
+# include <QMacCocoaViewContainer>
+#endif
 
 /* GUI includes: */
@@ -35 +38 @@
 /** QMacCocoaViewContainer extension,
   * used as cocoa button container. */
-class SHARED_LIBRARY_STUFF UICocoaButton : public QMacCocoaViewContainer
+class SHARED_LIBRARY_STUFF UICocoaButton
+#ifdef VBOX_IS_QT6_OR_LATER
+    : public QWidget
+#else
+    : public QMacCocoaViewContainer
+#endif
 {
     Q_OBJECT
@@ -77 +85 @@
 };
 
+#endif /* VBOX_DARWIN_USE_NATIVE_CONTROLS */
 #endif /* !FEQT_INCLUDED_SRC_platform_darwin_UICocoaSpecialControls_h */
 

trunk/src/VBox/Frontends/VirtualBox/src/platform/darwin/UICocoaSpecialControls.mm

@@ -15 +15 @@
  * hope that it will be useful, but WITHOUT ANY WARRANTY of any kind.
  */
+
+#ifdef VBOX_DARWIN_USE_NATIVE_CONTROLS
 
 /* Qt includes: */
@@ -164 +166 @@
 }
 
+#endif /* VBOX_DARWIN_USE_NATIVE_CONTROLS */
+