diff options
| author | Petr Mrázek <peterix@gmail.com> | 2016-01-05 07:32:52 +0100 |
|---|---|---|
| committer | Petr Mrázek <peterix@gmail.com> | 2016-01-05 07:32:52 +0100 |
| commit | 4d0caf6254fdb18f4626a3c7937e64422b40d40c (patch) | |
| tree | 76b037c8f6b6c73f8438b85e8e05a2f59da89c17 /application/dialogs | |
| parent | d1e344f28f643c9fb0318feea0259be8ac72c8f7 (diff) | |
| download | MultiMC-4d0caf6254fdb18f4626a3c7937e64422b40d40c.tar MultiMC-4d0caf6254fdb18f4626a3c7937e64422b40d40c.tar.gz MultiMC-4d0caf6254fdb18f4626a3c7937e64422b40d40c.tar.lz MultiMC-4d0caf6254fdb18f4626a3c7937e64422b40d40c.tar.xz MultiMC-4d0caf6254fdb18f4626a3c7937e64422b40d40c.zip | |
GH-1389 wrap QDesktopServices and QProcess::startDetached
Essentially do not pass some environment variables to subprocesses:
* LD_PRELOAD
* LD_LIBRARY_PATH
* LD_DEBUG
* QT_PLUGIN_PATH
* QT_FONTPATH
Diffstat (limited to 'application/dialogs')
| -rw-r--r-- | application/dialogs/EditAccountDialog.cpp | 4 | ||||
| -rw-r--r-- | application/dialogs/ModEditDialogCommon.cpp | 2 | ||||
| -rw-r--r-- | application/dialogs/ModEditDialogCommon.h | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/application/dialogs/EditAccountDialog.cpp b/application/dialogs/EditAccountDialog.cpp index 7c2ff981..f7e25f6f 100644 --- a/application/dialogs/EditAccountDialog.cpp +++ b/application/dialogs/EditAccountDialog.cpp @@ -15,7 +15,7 @@ #include "EditAccountDialog.h" #include "ui_EditAccountDialog.h" -#include <QDesktopServices> +#include <DesktopServices.h> #include <QUrl> EditAccountDialog::EditAccountDialog(const QString &text, QWidget *parent, int flags) @@ -37,7 +37,7 @@ EditAccountDialog::~EditAccountDialog() void EditAccountDialog::on_label_linkActivated(const QString &link) { - QDesktopServices::openUrl(QUrl(link)); + DesktopServices::openUrl(QUrl(link)); } void EditAccountDialog::setUsername(const QString & user) const diff --git a/application/dialogs/ModEditDialogCommon.cpp b/application/dialogs/ModEditDialogCommon.cpp index 4a2115d8..4201bdad 100644 --- a/application/dialogs/ModEditDialogCommon.cpp +++ b/application/dialogs/ModEditDialogCommon.cpp @@ -28,7 +28,7 @@ void showWebsiteForMod(QWidget *parentDlg, Mod &m) { url = "http://" + url; } - QDesktopServices::openUrl(url); + DesktopServices::openUrl(url); } else { diff --git a/application/dialogs/ModEditDialogCommon.h b/application/dialogs/ModEditDialogCommon.h index e2afb98a..fc5e3c2b 100644 --- a/application/dialogs/ModEditDialogCommon.h +++ b/application/dialogs/ModEditDialogCommon.h @@ -1,6 +1,6 @@ #pragma once #include <QModelIndex> -#include <QDesktopServices> +#include <DesktopServices.h> #include <QWidget> #include <minecraft/Mod.h> |