summaryrefslogtreecommitdiffstatshomepage
path: root/src/osd/modules/debugger/qt/memorywindow.cpp
diff options
context:
space:
mode:
author Jindřich Makovička <makovick@gmail.com>2023-07-14 16:04:57 +0200
committer GitHub <noreply@github.com>2023-07-14 10:04:57 -0400
commit4649cf024839d90b5ac202652367ede62d2dacd4 (patch)
tree4e6ded6091dd94a1a00690eaa9278b04cc949ca2 /src/osd/modules/debugger/qt/memorywindow.cpp
parent8e4f4c24c0d31e53060bf25415a1e8f3316932f5 (diff)
Allow the use of either Qt5 or Qt6 on Linux (#11413)
* Look for MOC in QT_HOME/libexec if not found in QT_HOME/bin * Use the Qt6* libraries if the Qt version is >= 6 * Switch the include paths for QAction & QActionGroup for Qt >= 6 * Replace the deprecated + operator for keys with |
Diffstat (limited to 'src/osd/modules/debugger/qt/memorywindow.cpp')
-rw-r--r--src/osd/modules/debugger/qt/memorywindow.cpp4
1 files changed, 4 insertions, 0 deletions
diff --git a/src/osd/modules/debugger/qt/memorywindow.cpp b/src/osd/modules/debugger/qt/memorywindow.cpp
index a2213846c93..030eb4ab24d 100644
--- a/src/osd/modules/debugger/qt/memorywindow.cpp
+++ b/src/osd/modules/debugger/qt/memorywindow.cpp
@@ -12,7 +12,11 @@
#include <QtGui/QClipboard>
#include <QtGui/QKeyEvent>
#include <QtGui/QMouseEvent>
+#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0)
+#include <QtGui/QActionGroup>
+#else
#include <QtWidgets/QActionGroup>
+#endif
#include <QtWidgets/QApplication>
#include <QtWidgets/QHBoxLayout>
#include <QtWidgets/QMenu>