From 4d0caf6254fdb18f4626a3c7937e64422b40d40c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Petr=20Mr=C3=A1zek?= 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/pages/ScreenshotsPage.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'application/pages/ScreenshotsPage.cpp') diff --git a/application/pages/ScreenshotsPage.cpp b/application/pages/ScreenshotsPage.cpp index 2b2fe31f..5b406f3d 100644 --- a/application/pages/ScreenshotsPage.cpp +++ b/application/pages/ScreenshotsPage.cpp @@ -12,7 +12,6 @@ #include #include #include -#include #include #include @@ -26,6 +25,7 @@ #include "RWStorage.h" #include +#include typedef RWStorage SharedIconCache; typedef std::shared_ptr SharedIconCachePtr; @@ -271,12 +271,12 @@ void ScreenshotsPage::onItemActivated(QModelIndex index) return; auto info = m_model->fileInfo(index); QString fileName = info.absoluteFilePath(); - FS::openFileInDefaultProgram(info.absoluteFilePath()); + DesktopServices::openFile(info.absoluteFilePath()); } void ScreenshotsPage::on_viewFolderBtn_clicked() { - FS::openDirInDefaultProgram(m_folder, true); + DesktopServices::openDirectory(m_folder, true); } void ScreenshotsPage::on_uploadBtn_clicked() @@ -312,7 +312,7 @@ void ScreenshotsPage::on_uploadBtn_clicked() auto link = QString("https://imgur.com/a/%1").arg(imgurAlbum->id()); QClipboard *clipboard = QApplication::clipboard(); clipboard->setText(link); - QDesktopServices::openUrl(link); + DesktopServices::openUrl(link); CustomMessageBox::selectable( this, tr("Upload finished"), tr("The link to the uploaded album has been opened in the " -- cgit v1.2.3