From 4d0caf6254fdb18f4626a3c7937e64422b40d40c Mon Sep 17 00:00:00 2001
From: Petr Mrázek <peterix@gmail.com>
Date: Tue, 5 Jan 2016 07:32:52 +0100
Subject: 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
---
 application/widgets/PageContainer.cpp | 4 ++--
 application/widgets/ServerStatus.cpp  | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

(limited to 'application/widgets')

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)
-- 
cgit