Use the original appimage environment for launching perfparser

This ensures that it works on systems that don't yet have Qt 5.10
used for building, as we will then properly pickup the Qt bundled
within the appimage.

Fixes: #197

src/main.cpp

@@ -27,11 +27,13 @@
 
 #include <QApplication>
 #include <QCommandLineParser>
+#include <QProcessEnvironment>
 #include <QFile>
 
 #include "hotspot-config.h"
 #include "mainwindow.h"
 #include "models/data.h"
+#include "util.h"
 
 #include <ThreadWeaver/ThreadWeaver>
 #include <QThread>
@@ -44,6 +46,20 @@ int main(int argc, char** argv)
     QCoreApplication::setApplicationVersion(QStringLiteral(HOTSPOT_VERSION_STRING));
 
     QApplication app(argc, argv);
+
+    // init
+    Util::appImageEnvironment();
+
+#if APPIMAGE_BUILD
+
+    // cleanup the environment when we are running from within the AppImage
+    // to allow launching system applications using Qt without them loading
+    // the bundled Qt we ship in the AppImage
+    auto LD_LIBRARY_PATH = qgetenv("LD_LIBRARY_PATH");
+    LD_LIBRARY_PATH.remove(0, LD_LIBRARY_PATH.indexOf(':') + 1);
+    qputenv("LD_LIBRARY_PATH", LD_LIBRARY_PATH);
+#endif
+
     app.setWindowIcon(QIcon(QStringLiteral(":/images/icons/512-hotspot_app_icon.png")));
     qRegisterMetaType<Data::Summary>();
     qRegisterMetaType<Data::BottomUp>();
@@ -150,14 +166,5 @@ int main(int argc, char** argv)
         window->show();
     }
 
-#if APPIMAGE_BUILD
-    // cleanup the environment when we are running from within the AppImage
-    // to allow launching system applications using Qt without them loading
-    // the bundled Qt we ship in the AppImage
-    auto LD_LIBRARY_PATH = qgetenv("LD_LIBRARY_PATH");
-    LD_LIBRARY_PATH.remove(0, LD_LIBRARY_PATH.indexOf(':') + 1);
-    qputenv("LD_LIBRARY_PATH", LD_LIBRARY_PATH);
-#endif
-
     return app.exec();
 }

src/parsers/perf/perfparser.cpp

@@ -545,6 +545,7 @@ class PerfParserPrivate : public QObject
         buffer.buffer().reserve(1024);
         buffer.open(QIODevice::ReadOnly);
         stream.setDevice(&buffer);
+        process.setProcessEnvironment(Util::appImageEnvironment());
         process.setProcessChannelMode(QProcess::ForwardedErrorChannel);
 
         if (qEnvironmentVariableIntValue("HOTSPOT_GENERATE_SCRIPT_OUTPUT")) {

src/util.cpp

@@ -33,6 +33,7 @@
 #include <QDebug>
 #include <QDir>
 #include <QFileInfo>
+#include <QProcessEnvironment>
 
 #include <initializer_list>
 
@@ -225,3 +226,9 @@ QString Util::formatTooltip(const QString& location, const Data::LocationCost& c
     }
     return QString(QLatin1String("<qt>") + toolTip + QLatin1String("</qt>"));
 }
+
+QProcessEnvironment Util::appImageEnvironment()
+{
+    static const auto env = QProcessEnvironment::systemEnvironment();
+    return env;
+}

src/util.h

@@ -32,6 +32,7 @@
 #include <QtGlobal>
 
 class QString;
+class QProcessEnvironment;
 
 namespace Data {
 struct Symbol;
@@ -69,4 +70,8 @@ QString formatTooltip(int id, const Data::Symbol& symbol, const Data::Costs& sel
                       const Data::Costs& inclusiveCosts);
 QString formatTooltip(const Data::Symbol& symbol, const Data::ItemCost& itemCost, const Data::Costs& totalCosts);
 QString formatTooltip(const QString& location, const Data::LocationCost& cost, const Data::Costs& totalCosts);
+
+// the process environment including the custom AppImage-specific LD_LIBRARY_PATH
+// this is initialized on the first call and cached internally afterwards
+QProcessEnvironment appImageEnvironment();
 }