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/widgets | |
| 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/widgets')
| -rw-r--r-- | application/widgets/PageContainer.cpp | 4 | ||||
| -rw-r--r-- | application/widgets/ServerStatus.cpp | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/application/widgets/PageContainer.cpp b/application/widgets/PageContainer.cpp index 66d94e6c..90aad26e 100644 --- a/application/widgets/PageContainer.cpp +++ b/application/widgets/PageContainer.cpp @@ -25,13 +25,13 @@ #include <QLabel> #include <QDialogButtonBox> #include <QGridLayout> -#include <QDesktopServices> #include "MultiMC.h" #include "settings/SettingsObject.h" #include "widgets/IconLabel.h" #include "PageContainer_p.h" #include <MultiMC.h> +#include <DesktopServices.h> class PageEntryFilterModel : public QSortFilterProxyModel { @@ -195,7 +195,7 @@ void PageContainer::help() QString pageId = m_currentPage->helpPage(); if (pageId.isEmpty()) return; - QDesktopServices::openUrl(QUrl("https://github.com/MultiMC/MultiMC5/wiki/" + pageId)); + DesktopServices::openUrl(QUrl("https://github.com/MultiMC/MultiMC5/wiki/" + pageId)); } } diff --git a/application/widgets/ServerStatus.cpp b/application/widgets/ServerStatus.cpp index f0a7f97a..4602dde5 100644 --- a/application/widgets/ServerStatus.cpp +++ b/application/widgets/ServerStatus.cpp @@ -2,6 +2,7 @@ #include "LineSeparator.h" #include "IconLabel.h" #include "status/StatusChecker.h" +#include <DesktopServices.h> #include "MultiMC.h" @@ -11,7 +12,6 @@ #include <QMap> #include <QToolButton> #include <QAction> -#include <QDesktopServices> class ClickableLabel : public QLabel { @@ -127,7 +127,7 @@ void ServerStatus::addStatus(QString key, QString name) void ServerStatus::clicked() { - QDesktopServices::openUrl(QUrl("https://help.mojang.com/")); + DesktopServices::openUrl(QUrl("https://help.mojang.com/")); } void ServerStatus::setStatus(QString key, int value) |