Changeset 99853 in vbox

Timestamp:

May 18, 2023 2:40:43 PM (2 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

157491

Message:

Debugger/Gui: ​bugref:10450: Some Qt6 compatibility stuff.

Location:

trunk/src/VBox/Debugger

Files:

• Makefile.kmk (modified) (1 diff)
• VBoxDbgGui.cpp (modified) (1 diff)

trunk/src/VBox/Debugger/Makefile.kmk

@@ -149 +149 @@
  VBoxDbg_TEMPLATE = VBoxQtGuiDll
  VBoxDbg_DEFS = IN_DBG_R3
+ ifdef VBOX_WITH_QT6
+  VBoxDbg_DEFS += VBOX_IS_QT6_OR_LATER
+ endif
  VBoxDbg_INCS = .
  VBoxDbg_QT_MODULES = Core Gui Widgets

trunk/src/VBox/Debugger/VBoxDbgGui.cpp

@@ -296 +296 @@
     if (SUCCEEDED(hrc))
     {
+#ifndef VBOX_IS_QT6_OR_LATER
         strName = QString::fromUtf16((const ushort *)bstr);
+#else
+        strName = QString::fromUtf16((char16_t *)bstr);
+#endif
         SysFreeString(bstr);
     }