From 21defbea953c36bba6eeec5ea6f7cf6d3cd310d8 Mon Sep 17 00:00:00 2001 From: Vas Crabb Date: Sat, 4 Apr 2026 07:00:33 +1100 Subject: Fix up more stuff for upgraded tools, etc. docs: It's no longer possible to get a working Qt 5 setup with MSYS2, and there's no 32-bit Qt 6 package. Updated docs to reflect this. Use Qt 6 on Windows, use qmake to find moc. Fixed linking on Windows with static SDL3. input/input_dinput.cpp: Support SDL3. --- src/osd/modules/debugger/debugqt.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/osd/modules/debugger/debugqt.cpp') diff --git a/src/osd/modules/debugger/debugqt.cpp b/src/osd/modules/debugger/debugqt.cpp index aeae07324e4..da600c4c58e 100644 --- a/src/osd/modules/debugger/debugqt.cpp +++ b/src/osd/modules/debugger/debugqt.cpp @@ -70,7 +70,7 @@ public: virtual void wait_for_debugger(device_t &device, bool firststop) override; virtual void debugger_update() override; #if defined(_WIN32) && !defined(SDLMAME_WIN32) - virtual bool nativeEventFilter(const QByteArray &eventType, void *message, long *) override + virtual bool nativeEventFilter(const QByteArray &eventType, void *message, qintptr *result) override { winwindow_qt_filter(message); return false; -- cgit v1.2.3 From 59ddfd7606f140a9b3cf95820d888bc9eaccc604 Mon Sep 17 00:00:00 2001 From: Vas Crabb Date: Tue, 7 Apr 2026 07:11:28 +1000 Subject: debugger/qt: Fixed build with Qt 6 on AArch64. --- src/osd/modules/debugger/debugqt.cpp | 16 ++++++++++------ src/osd/modules/debugger/qt/debuggerview.h | 4 ++++ src/osd/modules/debugger/qt/windowqt.h | 4 ++++ 3 files changed, 18 insertions(+), 6 deletions(-) (limited to 'src/osd/modules/debugger/debugqt.cpp') diff --git a/src/osd/modules/debugger/debugqt.cpp b/src/osd/modules/debugger/debugqt.cpp index da600c4c58e..f14c7d7dc6a 100644 --- a/src/osd/modules/debugger/debugqt.cpp +++ b/src/osd/modules/debugger/debugqt.cpp @@ -13,12 +13,6 @@ #if (USE_QTDEBUG) -#include - -#include -#include -#include - #include "emu.h" #include "config.h" #include "debugger.h" @@ -34,6 +28,16 @@ #include "util/xmlfile.h" +#ifdef __aarch64__ +#include // QtCore/qyieldcpu.h uses __yield() without #including this, causing an error +#endif + +#include +#include +#include + +#include + #if defined(SDLMAME_UNIX) || defined(SDLMAME_WIN32) extern int sdl_entered_debugger; diff --git a/src/osd/modules/debugger/qt/debuggerview.h b/src/osd/modules/debugger/qt/debuggerview.h index cc68dd69d30..1c1580cac15 100644 --- a/src/osd/modules/debugger/qt/debuggerview.h +++ b/src/osd/modules/debugger/qt/debuggerview.h @@ -7,6 +7,10 @@ #include "debug/debugvw.h" +#ifdef __aarch64__ +#include // QtCore/qyieldcpu.h uses __yield() without #including this, causing an error +#endif + #include #include diff --git a/src/osd/modules/debugger/qt/windowqt.h b/src/osd/modules/debugger/qt/windowqt.h index b5e933e8a0c..9be59919cda 100644 --- a/src/osd/modules/debugger/qt/windowqt.h +++ b/src/osd/modules/debugger/qt/windowqt.h @@ -5,6 +5,10 @@ #include "../xmlconfig.h" +#ifdef __aarch64__ +#include // QtCore/qyieldcpu.h uses __yield() without #including this, causing an error +#endif + #include #include -- cgit v1.2.3