diff options
Diffstat (limited to 'games/multimc/files/patch-api_gui_DesktopServices.cpp')
| -rw-r--r-- | games/multimc/files/patch-api_gui_DesktopServices.cpp | 60 |
1 files changed, 30 insertions, 30 deletions
diff --git a/games/multimc/files/patch-api_gui_DesktopServices.cpp b/games/multimc/files/patch-api_gui_DesktopServices.cpp index 40db6824a165..eb4fd1561b29 100644 --- a/games/multimc/files/patch-api_gui_DesktopServices.cpp +++ b/games/multimc/files/patch-api_gui_DesktopServices.cpp @@ -1,4 +1,4 @@ ---- api/gui/DesktopServices.cpp.orig 2017-12-18 00:19:43 UTC +--- api/gui/DesktopServices.cpp.orig 2019-02-20 23:45:36 UTC +++ api/gui/DesktopServices.cpp @@ -7,7 +7,7 @@ /** @@ -9,48 +9,48 @@ #include <unistd.h> #include <errno.h> -@@ -83,7 +83,7 @@ bool openDirectory(const QString &path, - { - return QDesktopServices::openUrl(QUrl::fromLocalFile(dir.absolutePath())); - }; +@@ -83,7 +83,7 @@ bool openDirectory(const QString &path, bool ensureExi + { + return QDesktopServices::openUrl(QUrl::fromLocalFile(dir.absolutePath())); + }; -#if defined(Q_OS_LINUX) -+#if defined(Q_OS_LINUX) || defined (Q_OS_FREEBSD) - return IndirectOpen(f); ++#if defined(Q_OS_LINUX) || defined(Q_OS_FREEBSD) + return IndirectOpen(f); #else - return f(); + return f(); @@ -97,7 +97,7 @@ bool openFile(const QString &path) - { - return QDesktopServices::openUrl(QUrl::fromLocalFile(path)); - }; + { + return QDesktopServices::openUrl(QUrl::fromLocalFile(path)); + }; -#if defined(Q_OS_LINUX) -+#if defined(Q_OS_LINUX) || defined (Q_OS_FREEBSD) - return IndirectOpen(f); ++#if defined(Q_OS_LINUX) || defined(Q_OS_FREEBSD) + return IndirectOpen(f); #else - return f(); + return f(); @@ -107,7 +107,7 @@ bool openFile(const QString &path) bool openFile(const QString &application, const QString &path, const QString &workingDirectory, qint64 *pid) { - qDebug() << "Opening file" << path << "using" << application; + qDebug() << "Opening file" << path << "using" << application; -#if defined(Q_OS_LINUX) -+#if defined(Q_OS_LINUX) || defined (Q_OS_FREEBSD) - // FIXME: the pid here is fake. So if something depends on it, it will likely misbehave - return IndirectOpen([&]() - { -@@ -121,7 +121,7 @@ bool openFile(const QString &application ++#if defined(Q_OS_LINUX) || defined(Q_OS_FREEBSD) + // FIXME: the pid here is fake. So if something depends on it, it will likely misbehave + return IndirectOpen([&]() + { +@@ -121,7 +121,7 @@ bool openFile(const QString &application, const QStrin bool run(const QString &application, const QStringList &args, const QString &workingDirectory, qint64 *pid) { - qDebug() << "Running" << application << "with args" << args.join(' '); + qDebug() << "Running" << application << "with args" << args.join(' '); -#if defined(Q_OS_LINUX) -+#if defined(Q_OS_LINUX) || defined (Q_OS_FREEBSD) - // FIXME: the pid here is fake. So if something depends on it, it will likely misbehave - return IndirectOpen([&]() - { ++#if defined(Q_OS_LINUX) || defined(Q_OS_FREEBSD) + // FIXME: the pid here is fake. So if something depends on it, it will likely misbehave + return IndirectOpen([&]() + { @@ -139,7 +139,7 @@ bool openUrl(const QUrl &url) - { - return QDesktopServices::openUrl(url); - }; + { + return QDesktopServices::openUrl(url); + }; -#if defined(Q_OS_LINUX) +#if defined(Q_OS_LINUX) || defined(Q_OS_FREEBSD) - return IndirectOpen(f); + return IndirectOpen(f); #else - return f(); + return f(); |