From 708d11cc8e6b3078e0ced2f989ebef32689b1b35 Mon Sep 17 00:00:00 2001 From: Evan Teran Date: Fri, 4 Sep 2026 09:20:04 -0400 Subject: [PATCH 1/2] adding a Qt 6.11 build so we can make it work --- .github/workflows/build.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml index 7517bc4b5..259944fcd 100644 --- a/.github/workflows/build.yaml +++ b/.github/workflows/build.yaml @@ -15,7 +15,7 @@ jobs: runs-on: ubuntu-24.04 strategy: matrix: - QT_VERSION: [5.15.*, 6.8.*] + QT_VERSION: [5.15.*, 6.8.*, 6.11.*] steps: - name: Install Dependencies run: sudo apt-get install -y libcapstone-dev libgraphviz-dev From 8938bd070787bac90703747a5b1cea75aa98babb Mon Sep 17 00:00:00 2001 From: Evan Teran Date: Fri, 4 Sep 2026 09:57:13 -0400 Subject: [PATCH 2/2] more Qt 6.11 patches --- src/Debugger.cpp | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/src/Debugger.cpp b/src/Debugger.cpp index 2fd0842e2..589904034 100644 --- a/src/Debugger.cpp +++ b/src/Debugger.cpp @@ -180,7 +180,7 @@ class RunUntilRet : public IDebugEventHandler { IDebugEvent::TRAP_REASON trap_reason = event->trapReason(); IDebugEvent::REASON reason = event->reason(); - qDebug() << QStringLiteral("Event at address 0x%1").arg(address, 0, 16); + qDebug() << QStringLiteral("Event at address 0x%1").arg(address.toPointerString()); /* * An IDebugEvent::TRAP_BREAKPOINT can happen for the following reasons: @@ -251,12 +251,12 @@ class RunUntilRet : public IDebugEventHandler { // Get the instruction edb::Instruction inst(buffer, buffer + size, 0); - qDebug() << QStringLiteral("Scanning for terminator at 0x%1: found %2").arg(address, 0, 16).arg(QString::fromStdString(inst.mnemonic())); + qDebug() << QStringLiteral("Scanning for terminator at 0x%1: found %2").arg(address.toPointerString()).arg(QString::fromStdString(inst.mnemonic())); // Check if it's a proper block terminator (ret/jmp/jcc/hlt) if (inst) { if (is_terminator(inst)) { - qDebug() << QStringLiteral("Found terminator %1 at 0x%2").arg(QString::fromStdString(inst.mnemonic())).arg(address, 0, 16); + qDebug() << QStringLiteral("Found terminator %1 at 0x%2").arg(QString::fromStdString(inst.mnemonic())).arg(address.toPointerString()); // If we already had a breakpoint there, then just continue. if (std::shared_ptr bp = edb::v1::debugger_core->findBreakpoint(address)) { qDebug() << "Already a breakpoint at terminator: " << address.toHexString(); @@ -1968,8 +1968,7 @@ void Debugger::mnuDumpSaveToFile() { if (!filename.isEmpty()) { QFile file(filename); - file.open(QIODevice::WriteOnly); - if (file.isOpen()) { + if (file.open(QIODevice::WriteOnly)) { file.write(s->allBytes()); } }