[pull] master from flameshot-org:master

.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 }}

src/tools/launcher/applauncherwidget.cpp

@@ -25,6 +25,7 @@
 #include <QTemporaryFile>
 
 namespace {
+
 #if defined(Q_OS_WIN)
 QMap<QString, QString> 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."));

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);
 }

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();