Changeset 89486 in vbox for trunk/src/VBox

Timestamp:

Jun 3, 2021 3:51:10 PM (4 years ago)

Author:

vboxsync

Message:

Config.kmk, Installer/linux and Installer/solaris: Passing gtk2 style/theme plugins from recent Qt 5.15.2 tool r353 to self-built VBox and Linux/Solaris packages; This should fix missed GTK2 style support.

Location:

trunk/src/VBox/Installer

Files:

• linux/Makefile.kmk (modified) (1 diff)
• linux/debian/rules (modified) (1 diff)
• linux/rpm/VirtualBox.tmpl.spec (modified) (1 diff)
• solaris/Makefile.kmk (modified) (1 diff)

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

@@ -521 +521 @@
           archive/plugins/platformthemes \
           archive/plugins/sqldrivers \
+          archive/plugins/styles \
           archive/plugins/xcbglintegrations,) \
         $(if $(VBOX_WITH_PYTHON),\

trunk/src/VBox/Installer/linux/debian/rules

@@ -281 +281 @@
                 $(prefix)/usr/lib/$(package)/*.so.5 \
                 $(prefix)/usr/lib/$(package)/plugins/platforms/*.so; \
+                $(prefix)/usr/lib/$(package)/plugins/platformthemes/*.so; \
                 $(prefix)/usr/lib/$(package)/plugins/sqldrivers/*.so; \
+                $(prefix)/usr/lib/$(package)/plugins/styles/*.so; \
                 $(prefix)/usr/lib/$(package)/plugins/xcbglintegrations/*.so; \
             echo "[Paths]" > $(prefix)/usr/lib/$(package)/qt.conf; \

trunk/src/VBox/Installer/linux/rpm/VirtualBox.tmpl.spec

@@ -202 +202 @@
     $RPM_BUILD_ROOT/usr/lib/virtualbox/*.so.5 \
     $RPM_BUILD_ROOT/usr/lib/virtualbox/plugins/platforms/*.so \
+    $RPM_BUILD_ROOT/usr/lib/virtualbox/plugins/platformthemes/*.so \
     $RPM_BUILD_ROOT/usr/lib/virtualbox/plugins/sqldrivers/*.so \
+    $RPM_BUILD_ROOT/usr/lib/virtualbox/plugins/styles/*.so \
     $RPM_BUILD_ROOT/usr/lib/virtualbox/plugins/xcbglintegrations/*.so || true
   echo "[Paths]" > $RPM_BUILD_ROOT/usr/lib/virtualbox/qt.conf

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

@@ -368 +368 @@
         libQt5WidgetsVBox.so.5 \
         plugins/platforms/libqxcb.so \
+        plugins/platformthemes/libqgtk2.so \
         plugins/platformthemes/libqgtk3.so \
         plugins/sqldrivers/libqsqlite.so \
+        plugins/styles/libqgtk2style.so \
         plugins/xcbglintegrations/libqxcb-glx-integration.so \
         $(if $(VBOX_GUI_USE_QGL),libQt5OpenGLVBox.so.5,)