Changeset 101554 in vbox for trunk/src/VBox/Debugger

Timestamp:

Oct 23, 2023 2:16:21 PM (16 months ago)

Author:

vboxsync

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

159631

Message:

Debugger: bugref:10450: Get rid of Qt5 stuff.

Location:

trunk/src/VBox/Debugger

Files:

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

trunk/src/VBox/Debugger/Makefile.kmk

@@ -141 +141 @@
  # Debugger GUI component (Qt).
  #
- ifndef VBOX_WITH_QT6
-  USES += qt5
- else
-  USES += qt6
- endif
+ USES += qt6
  DLLS += VBoxDbg
  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
@@ -164 +157 @@
         VBoxDbgConsole.cpp \
         VBoxDbgStatsQt.cpp
- ifdef VBOX_WITH_QT6
-  VBoxDbg_CXXFLAGS.win += /permissive-
- endif
+ VBoxDbg_CXXFLAGS.win += /permissive-
  VBoxDbg_LDFLAGS.darwin = \
         -install_name $(VBOX_DYLD_EXECUTABLE_PATH)/VBoxDbg.dylib

trunk/src/VBox/Debugger/VBoxDbgGui.cpp

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