From b94ca56d69947ff1be802edc82ad5ea7d7d435ec Mon Sep 17 00:00:00 2001 From: borgmanJeremy <46930769+borgmanJeremy@users.noreply.github.com> Date: Wed, 10 Jun 2026 18:00:05 -0500 Subject: [PATCH 1/2] Move to macos 26 to try to fix intel build (#4723) --- .github/workflows/MacOS-pack.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/MacOS-pack.yml b/.github/workflows/MacOS-pack.yml index 81113d8042..1a370f138c 100644 --- a/.github/workflows/MacOS-pack.yml +++ b/.github/workflows/MacOS-pack.yml @@ -29,11 +29,11 @@ jobs: matrix: dist: - { - os: macos-15, + os: macos-26, arch: arm64 } - { - os: macos-15, + os: macos-26-intel, arch: intel } runs-on: ${{ matrix.dist.os }} From e408812d77ff1835957f85796c4cf737466bd69d Mon Sep 17 00:00:00 2001 From: borgmanJeremy <46930769+borgmanJeremy@users.noreply.github.com> Date: Wed, 10 Jun 2026 18:00:40 -0500 Subject: [PATCH 2/2] Moving to Qt cmd parser (#4722) --- src/tools/launcher/applauncherwidget.cpp | 5 +++-- src/tools/launcher/terminallauncher.cpp | 8 ++++++-- src/tools/launcher/terminallauncher.h | 2 +- 3 files changed, 10 insertions(+), 5 deletions(-) diff --git a/src/tools/launcher/applauncherwidget.cpp b/src/tools/launcher/applauncherwidget.cpp index e0b6e92cc1..c3e1f303f4 100644 --- a/src/tools/launcher/applauncherwidget.cpp +++ b/src/tools/launcher/applauncherwidget.cpp @@ -25,6 +25,7 @@ #include namespace { + #if defined(Q_OS_WIN) QMap catIconNames({ { "Graphics", "image.svg" }, { "Utility", "apps.svg" } }); @@ -140,7 +141,7 @@ void AppLauncherWidget::launch(const QModelIndex& index) QStringList prog_args; prog_args << command; #else - QStringList prog_args = command.split(" "); + QStringList prog_args = QProcess::splitCommand(command); #endif // no quotes because it is going in an array! static const QRegularExpression regexp("(\\%.)"); @@ -158,7 +159,7 @@ void AppLauncherWidget::launch(const QModelIndex& index) bool inTerminal = index.data(Qt::UserRole + 1).toBool() || m_terminalCheckbox->isChecked(); if (inTerminal) { - bool ok = TerminalLauncher::launchDetached(command); + bool ok = TerminalLauncher::launchDetached(prog_args); if (!ok) { QMessageBox::about( this, tr("Error"), tr("Unable to launch in terminal.")); diff --git a/src/tools/launcher/terminallauncher.cpp b/src/tools/launcher/terminallauncher.cpp index 3dea39c378..686f65afc6 100644 --- a/src/tools/launcher/terminallauncher.cpp +++ b/src/tools/launcher/terminallauncher.cpp @@ -42,8 +42,12 @@ TerminalApp TerminalLauncher::getPreferedTerminal() return res; } -bool TerminalLauncher::launchDetached(const QString& command) +bool TerminalLauncher::launchDetached(const QStringList& args) { TerminalApp app = getPreferedTerminal(); - return QProcess::startDetached(app.name, { app.arg, command }); + if (app.name.isEmpty()) + return false; + QStringList termArgs = { app.arg }; + termArgs.append(args); + return QProcess::startDetached(app.name, termArgs); } diff --git a/src/tools/launcher/terminallauncher.h b/src/tools/launcher/terminallauncher.h index 02f1684607..392fba28df 100644 --- a/src/tools/launcher/terminallauncher.h +++ b/src/tools/launcher/terminallauncher.h @@ -17,7 +17,7 @@ class TerminalLauncher : public QObject public: explicit TerminalLauncher(QObject* parent = nullptr); - static bool launchDetached(const QString& command); + static bool launchDetached(const QStringList& args); private: static TerminalApp getPreferedTerminal();