Changeset 88141 in vbox

Timestamp:

Mar 16, 2021 4:39:47 PM (4 years ago)

Author:

vboxsync

Message:

Makefile.kmk, Installer, FE/Qt: bugref:9532: Missed macOS style plugin.

Location:

trunk

Files:

• Makefile.kmk (modified) (1 diff)
• src/VBox/Frontends/VirtualBox/src/main.cpp (modified) (1 diff)
• src/VBox/Installer/darwin/Makefile.kmk (modified) (1 diff)

trunk/Makefile.kmk

@@ -200 +200 @@
         $(PATH_SDK_QT5)/plugins/platforms/libqcocoa$(SUFF_DLL)=>plugins/platforms/libqcocoa$(SUFF_DLL) \
         $(PATH_SDK_QT5)/plugins/platforms/libqminimal$(SUFF_DLL)=>plugins/platforms/libqminimal$(SUFF_DLL) \
-        $(PATH_SDK_QT5)/plugins/platforms/libqoffscreen$(SUFF_DLL)=>plugins/platforms/libqoffscreen$(SUFF_DLL)
+        $(PATH_SDK_QT5)/plugins/platforms/libqoffscreen$(SUFF_DLL)=>plugins/platforms/libqoffscreen$(SUFF_DLL) \
+        $(PATH_SDK_QT5)/plugins/styles/libqmacstyle$(SUFF_DLL)=>plugins/styles/libqmacstyle$(SUFF_DLL)
  ifdef VBOX_WITH_QT_DSYMS
   qt5-bin_SOURCES += $(foreach qtplat, libqcocoa libqminimal libqoffscreen, \
         $(PATH_SDK_QT5)/plugins/platforms/$(qtplat)$(SUFF_DLL).dSYM/Contents/Info.plist=>plugins/platforms/$(qtplat)$(SUFF_DLL).dSYM/Contents/Info.plist \
         $(PATH_SDK_QT5)/plugins/platforms/$(qtplat)$(SUFF_DLL).dSYM/Contents/Resources/DWARF/$(qtplat)$(SUFF_DLL)=>plugins/platforms/$(qtplat)$(SUFF_DLL).dSYM/Contents/Resources/DWARF/$(qtplat)$(SUFF_DLL))
+  qt5-bin_SOURCES += $(foreach qtstyl, libqmacstyle, \
+        $(PATH_SDK_QT5)/plugins/styles/$(qtstyl)$(SUFF_DLL).dSYM/Contents/Info.plist=>plugins/styles/$(qtstyl)$(SUFF_DLL).dSYM/Contents/Info.plist \
+        $(PATH_SDK_QT5)/plugins/styles/$(qtstyl)$(SUFF_DLL).dSYM/Contents/Resources/DWARF/$(qtstyl)$(SUFF_DLL)=>plugins/styles/$(qtstyl)$(SUFF_DLL).dSYM/Contents/Resources/DWARF/$(qtstyl)$(SUFF_DLL))
  endif
  qt5-bin_SYMLINKS = $(foreach qtmod, $(VBOX_QT_MOD_NAMES), \

trunk/src/VBox/Frontends/VirtualBox/src/main.cpp

@@ -492 +492 @@
         ::darwinDisableIconsInMenus();
 
-# if QT_VERSION >= QT_VERSION_CHECK(5, 15, 2)
-        // WORKAROUND:
-        // Unable to detect fusion if app
-        // built with SDK less than 10.14
-        a.setStyle("fusion");
-# endif
 #endif /* VBOX_WS_MAC */
 

trunk/src/VBox/Installer/darwin/Makefile.kmk

@@ -521 +521 @@
         plugins/platforms/libqcocoa$(SUFF_DLL) \
         plugins/platforms/libqminimal$(SUFF_DLL) \
-        plugins/platforms/libqoffscreen$(SUFF_DLL)
+        plugins/platforms/libqoffscreen$(SUFF_DLL) \
+        plugins/styles/libqmacstyle$(SUFF_DLL)
 VBOX_DI_VBAPP_MISC_FILES += \
         $(foreach qtmod, $(VBOX_QT_MOD_NAMES), Frameworks/$(qtmod).framework/Versions/$(VBOX_QT_VERSION_MAJOR)/Resources/Info.plist)