From 755abec636d694b4e9aeedcd1e7d7099f4dfa3d1 Mon Sep 17 00:00:00 2001 From: Jonas Kvinge Date: Sun, 20 Jun 2021 02:48:58 +0200 Subject: [PATCH] Use QProcess::startCommand with Qt 6 --- src/core/utilities.cpp | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/src/core/utilities.cpp b/src/core/utilities.cpp index 0028664f5..420ca4742 100644 --- a/src/core/utilities.cpp +++ b/src/core/utilities.cpp @@ -342,13 +342,17 @@ QString ColorToRgba(const QColor &c) { } #if defined(Q_OS_UNIX) && !defined(Q_OS_MACOS) -void OpenInFileManager(const QString path, const QUrl &url); -void OpenInFileManager(const QString path, const QUrl &url) { +void OpenInFileManager(const QString &path, const QUrl &url); +void OpenInFileManager(const QString &path, const QUrl &url) { if (!url.isLocalFile()) return; QProcess proc; +#if (QT_VERSION >= QT_VERSION_CHECK(6, 0, 0)) + proc.startCommand("xdg-mime query default inode/directory"); +#else proc.start("xdg-mime", QStringList() << "query" << "default" << "inode/directory"); +#endif proc.waitForFinished(); QString desktop_file = proc.readLine().simplified(); QStringList data_dirs = QString(getenv("XDG_DATA_DIRS")).split(":");