From 4d0caf6254fdb18f4626a3c7937e64422b40d40c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Petr=20Mr=C3=A1zek?= <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/GuiUtil.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'application/GuiUtil.cpp')

diff --git a/application/GuiUtil.cpp b/application/GuiUtil.cpp
index cc06d711..f10095c1 100644
--- a/application/GuiUtil.cpp
+++ b/application/GuiUtil.cpp
@@ -1,7 +1,6 @@
 #include "GuiUtil.h"
 
 #include <QClipboard>
-#include <QDesktopServices>
 #include <QApplication>
 #include <QFileDialog>
 
@@ -11,6 +10,7 @@
 
 #include "MultiMC.h"
 #include <settings/SettingsObject.h>
+#include <DesktopServices.h>
 #include <BuildConfig.h>
 
 void GuiUtil::uploadPaste(const QString &text, QWidget *parentWidget)
@@ -42,7 +42,7 @@ void GuiUtil::uploadPaste(const QString &text, QWidget *parentWidget)
 	{
 		const QString link = paste->pasteLink();
 		setClipboardText(link);
-		QDesktopServices::openUrl(link);
+		DesktopServices::openUrl(link);
 		CustomMessageBox::selectable(
 			parentWidget, QObject::tr("Upload finished"),
 			QObject::tr("The <a href=\"%1\">link to the uploaded log</a> has been opened in "
-- 
cgit v1.2.3