Changeset 99863 in vbox

Timestamp:

May 19, 2023 5:34:53 PM (20 months ago)

Author:

vboxsync

Message:

scm fixes for src\platform\nix\VBoxUtils-nix.h Config.kmk VMM\VMMAll\IEMAllInstructionsThreadedRecompiler.cpp

Location:

trunk

Files:

• Config.kmk (modified) (1 diff)
• src/VBox/Frontends/VirtualBox/src/platform/nix/VBoxUtils-nix.h (modified) (2 diffs)
• src/VBox/VMM/VMMAll/IEMAllInstructionsThreadedRecompiler.cpp (modified) (1 diff)

trunk/Config.kmk

@@ -7732 +7732 @@
     VBOX_QT_MOD += Qt5DBus Qt5Xml Qt5XcbQpa Qt5X11Extras
     VBOX_QT_PLUGINS = \
-     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
+        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
    else # qt6
     VBOX_QT_MOD += Qt6Core Qt6Gui Qt6Widgets Qt6PrintSupport Qt6StateMachine Qt6Core5Compat $(if $(VBOX_GUI_USE_QGL),Qt6OpenGL,)
     VBOX_QT_MOD += Qt6DBus Qt6Xml Qt6XcbQpa
     VBOX_QT_PLUGINS = \
-     plugins/platforms/libqxcbVBox.so \
-     plugins/platformthemes/libqgtk3VBox.so \
-     plugins/sqldrivers/libqsqliteVBox.so \
-     plugins/xcbglintegrations/libqxcb-glx-integrationVBox.so
+        plugins/platforms/libqxcbVBox.so \
+        plugins/platformthemes/libqgtk3VBox.so \
+        plugins/sqldrivers/libqsqliteVBox.so \
+        plugins/xcbglintegrations/libqxcb-glx-integrationVBox.so
    endif # qt6
   else ifeq ($(KBUILD_TARGET),win)

trunk/src/VBox/Frontends/VirtualBox/src/platform/nix/VBoxUtils-nix.h

@@ -26 +26 @@
  */
 
-#ifndef FEQT_INCLUDED_SRC_platform_x11_VBoxUtils_nix_h
-#define FEQT_INCLUDED_SRC_platform_x11_VBoxUtils_nix_h
+#ifndef FEQT_INCLUDED_SRC_platform_nix_VBoxUtils_nix_h
+#define FEQT_INCLUDED_SRC_platform_nix_VBoxUtils_nix_h
 #ifndef RT_WITHOUT_PRAGMA_ONCE
 # pragma once
@@ -161 +161 @@
 }
 
-#endif /* !FEQT_INCLUDED_SRC_platform_x11_VBoxUtils_nix_h */
+#endif /* !FEQT_INCLUDED_SRC_platform_nix_VBoxUtils_nix_h */

trunk/src/VBox/VMM/VMMAll/IEMAllInstructionsThreadedRecompiler.cpp

@@ -151 +151 @@
 
     /** Number of bytes of opcodes covered by this block.
-     * @todo Support discontiguous chunks of opcodes in same block, though maybe 
+     * @todo Support discontiguous chunks of opcodes in same block, though maybe
      *       restrict to the initial page or smth. */
     uint32_t    cbPC;