Changeset 106170 in vbox for trunk/src

Timestamp:

Sep 27, 2024 4:53:29 PM (2 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.

File:

• trunk/src/VBox/Frontends/VirtualBox/Makefile.kmk (modified) (6 diffs)

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

@@ -107 +107 @@
 VirtualBox_SDKS.win       = ReorderCompilerIncs $(VBOX_WINPSDK) $(VBOX_WINDDK)
 VirtualBox_DEFS           =
-ifdef VBOX_WITH_QT6 # moc is too stupid to parse #if QT_VERSION > xxx, '#ifdef VBOX_IS_QT6_OR_LATER' works though (no spaces).
- VirtualBox_DEFS         += VBOX_IS_QT6_OR_LATER
-endif
+VirtualBox_DEFS          += VBOX_IS_QT6_OR_LATER
 VirtualBox_DEFS.debug     = VBOX_CHECK_STATE # QT_FATAL_ASSERT
 VirtualBox_DEFS.linux     = VBOX_WS_NIX QT_NO_DEPRECATED_WARNINGS
@@ -124 +122 @@
  VirtualBox_DEFS.darwin += VBOX_WITH_VMNET
 endif
-ifndef VBOX_WITH_QT6 # qt6: The UICocoaSpecialControls needs restructuring because QMacCocoaViewContainer is gone. Too lazy for now.
- VirtualBox_DEFS.darwin   += VBOX_DARWIN_USE_NATIVE_CONTROLS
-endif
+# qt6: The UICocoaSpecialControls needs restructuring because QMacCocoaViewContainer is gone. Too lazy for now.
+# VirtualBox_DEFS.darwin   += VBOX_DARWIN_USE_NATIVE_CONTROLS
 VirtualBox_DEFS.win       += UNICODE QT_DLL
 # Sort alphabetically!
@@ -178 +175 @@
 VirtualBoxVM_SDKS.win       = ReorderCompilerIncs $(VBOX_WINPSDK) $(VBOX_WINDDK)
 VirtualBoxVM_DEFS           = VBOX_RUNTIME_UI
-ifdef VBOX_WITH_QT6 # moc is too stupid to parse #if QT_VERSION > xxx, '#ifdef VBOX_IS_QT6_OR_LATER' works though (no spaces).
- VirtualBoxVM_DEFS         += VBOX_IS_QT6_OR_LATER
-endif
+VirtualBoxVM_DEFS          += VBOX_IS_QT6_OR_LATER
 VirtualBoxVM_DEFS.debug     = VBOX_CHECK_STATE # QT_FATAL_ASSERT
 VirtualBoxVM_DEFS.linux     = VBOX_WS_NIX QT_NO_DEPRECATED_WARNINGS
@@ -195 +190 @@
  VirtualBoxVM_DEFS.darwin   += VBOX_WITH_VMNET
 endif
-ifndef VBOX_WITH_QT6 # qt6: The UICocoaSpecialControls needs restructuring because QMacCocoaViewContainer is gone. Too lazy for now.
- VirtualBoxVM_DEFS.darwin   += VBOX_DARWIN_USE_NATIVE_CONTROLS
-endif
+# qt6: The UICocoaSpecialControls needs restructuring because QMacCocoaViewContainer is gone. Too lazy for now.
+# VirtualBoxVM_DEFS.darwin   += VBOX_DARWIN_USE_NATIVE_CONTROLS
 VirtualBoxVM_DEFS.win       += UNICODE QT_DLL
 # Sort alphabetically!
@@ -243 +237 @@
 UICommon_NAME = UICommon
 UICommon_DEFS         = VBOX_GUI_LIBRARY
-ifdef VBOX_WITH_QT6 # moc is too stupid to parse #if QT_VERSION > xxx, '#ifdef VBOX_IS_QT6_OR_LATER' works though (no spaces).
- UICommon_DEFS       += VBOX_IS_QT6_OR_LATER
-endif
+UICommon_DEFS        += VBOX_IS_QT6_OR_LATER
 UICommon_DEFS.darwin  = VBOX_WS_MAC
 UICommon_DEFS.freebsd = VBOX_WS_NIX
@@ -255 +247 @@
  UICommon_DEFS.darwin += VBOX_WITH_VMNET
 endif
-ifndef VBOX_WITH_QT6 # qt6: The UICocoaSpecialControls needs restructuring because QMacCocoaViewContainer is gone. Too lazy for now.
- UICommon_DEFS.darwin += VBOX_DARWIN_USE_NATIVE_CONTROLS
-endif
+# qt6: The UICocoaSpecialControls needs restructuring because QMacCocoaViewContainer is gone. Too lazy for now.
+# UICommon_DEFS.darwin += VBOX_DARWIN_USE_NATIVE_CONTROLS
 #UICommon_DEFS.win     += UNICODE QT_DLL
 # Sort alphabetically!