https://bugs.kde.org/show_bug.cgi?id=396619
caulier.gil...@gmail.com changed:
What |Removed |Added
----------------------------------------------------------------------------
Resolution|DUPLICATE |FIXED
Component|Export-Flickr |Bundle-AppImage
Version Fixed In| |6.0.0
--- Comment #5 from caulier.gil...@gmail.com ---
Git commit 2eb13d7ceab223675a86bbdac0a1065b206c2954 by Gilles Caulier.
Committed on 14/08/2018 at 21:48.
Pushed by cgilles into branch 'master'.
use system() call instead QProcess
M +6 -13 project/bundles/3rdparty/ext_qt/qt-appimage-support.patch
https://commits.kde.org/digikam/2eb13d7ceab223675a86bbdac0a1065b206c2954
diff --git a/project/bundles/3rdparty/ext_qt/qt-appimage-support.patch
b/project/bundles/3rdparty/ext_qt/qt-appimage-support.patch
index 781ed92ca8..dd6d99b250 100644
--- a/project/bundles/3rdparty/ext_qt/qt-appimage-support.patch
+++ b/project/bundles/3rdparty/ext_qt/qt-appimage-support.patch
@@ -2,7 +2,7 @@ diff --git
a/qtbase/src/platformsupport/services/genericunix/qgenericunixservice
index cdb5d33859..5a2bd5f724 100644
--- a/qtbase/src/platformsupport/services/genericunix/qgenericunixservices.cpp
+++ b/qtbase/src/platformsupport/services/genericunix/qgenericunixservices.cpp
-@@ -146,7 +146,30 @@ static inline bool launch(const QString &launcher, const
QUrl &url)
+@@ -146,7 +146,23 @@ static inline bool launch(const QString &launcher, const
QUrl &url)
#if !QT_CONFIG(process)
const bool ok = ::system(qPrintable(command + QLatin1String(" &")));
#else
@@ -17,20 +17,13 @@ index cdb5d33859..5a2bd5f724 100644
+ {
+ qDebug() << "Adjusting environment variables for AppImage bundle";
+
-+ env.insert(QLatin1String("LD_LIBRARY_PATH"),
-+
env.value(QLatin1String("APPIMAGE_ORIGINAL_LD_LIBRARY_PATH")));
-+ env.insert(QLatin1String("QT_PLUGIN_PATH"),
-+
env.value(QLatin1String("APPIMAGE_ORIGINAL_QT_PLUGIN_PATH")));
-+ env.insert(QLatin1String("XDG_DATA_DIRS"),
-+
env.value(QLatin1String("APPIMAGE_ORIGINAL_XDG_DATA_DIRS")));
-+ env.insert(QLatin1String("PATH"),
-+ env.value(QLatin1String("APPIMAGE_ORIGINAL_PATH")));
++ setenv("LD_LIBRARY_PATH",
env.value(QLatin1String("APPIMAGE_ORIGINAL_LD_LIBRARY_PATH")).toLatin1().data(),
1);
++ setenv("QT_PLUGIN_PATH",
env.value(QLatin1String("APPIMAGE_ORIGINAL_QT_PLUGIN_PATH")).toLatin1().data(),
1);
++ setenv("XDG_DATA_DIRS",
env.value(QLatin1String("APPIMAGE_ORIGINAL_XDG_DATA_DIRS")).toLatin1().data(),
1);
++ setenv("PATH",
env.value(QLatin1String("APPIMAGE_ORIGINAL_PATH")).toLatin1().data(),
1);
+ }
+
-+ QProcess process;
-+ process.setProcessEnvironment(env);
-+ process.setProgram(command);
-+ const bool ok = process.startDetached();
++ const bool ok = ::system(qPrintable(command + QLatin1String(" &")));
#endif
if (!ok)
qWarning("Launch failed (%s)", qPrintable(command));
--
You are receiving this mail because:
You are watching all bug changes.
