From ebe01ce9942e570f23b40793e97cf02b6f3616ee Mon Sep 17 00:00:00 2001
From: =?utf8?q?Jos=C3=A9=20Fonseca?= <jose.r.fonseca@gmail.com>
Date: Sun, 9 Dec 2012 13:05:24 +0000
Subject: [PATCH] qapitrace: Adjust PATH only once and for all.

---
 gui/main.cpp         |  7 +++++++
 gui/retracer.cpp     | 13 -------------
 gui/retracer.h       |  2 --
 gui/traceprocess.cpp | 10 ----------
 gui/trimprocess.cpp  | 10 ----------
 5 files changed, 7 insertions(+), 35 deletions(-)

diff --git a/gui/main.cpp b/gui/main.cpp
index 0ed50ed..3ae56db 100644
--- a/gui/main.cpp
+++ b/gui/main.cpp
@@ -32,6 +32,13 @@ int main(int argc, char **argv)
     qRegisterMetaType<ApiTrace::SearchResult>();
     qRegisterMetaType<ApiTrace::SearchRequest>();
     qRegisterMetaType<QList<QImage> >();
+
+#ifndef Q_OS_WIN
+    QString path = qgetenv("PATH");
+    path = QLatin1String(APITRACE_BINARY_DIR) + QLatin1String(":") + path;
+    qputenv("PATH", path.toLatin1());
+#endif
+
     QStringList args = app.arguments();
 
     int i = 1;
diff --git a/gui/retracer.cpp b/gui/retracer.cpp
index 738367e..2928ed6 100644
--- a/gui/retracer.cpp
+++ b/gui/retracer.cpp
@@ -137,19 +137,6 @@ Retracer::Retracer(QObject *parent)
       m_profilePixels(false)
 {
     qRegisterMetaType<QList<ApiTraceError> >();
-
-#ifdef Q_OS_WIN
-    QString format = QLatin1String("%1;");
-#else
-    QString format = QLatin1String("%1:");
-#endif
-    QString buildPath = format.arg(APITRACE_BINARY_DIR);
-    m_processEnvironment = QProcessEnvironment::systemEnvironment();
-    m_processEnvironment.insert("PATH", buildPath +
-                                m_processEnvironment.value("PATH"));
-
-    qputenv("PATH",
-            m_processEnvironment.value("PATH").toLatin1());
 }
 
 QString Retracer::fileName() const
diff --git a/gui/retracer.h b/gui/retracer.h
index e889d88..af1a3d9 100644
--- a/gui/retracer.h
+++ b/gui/retracer.h
@@ -65,8 +65,6 @@ private:
     bool m_profileGpu;
     bool m_profileCpu;
     bool m_profilePixels;
-
-    QProcessEnvironment m_processEnvironment;
 };
 
 #endif
diff --git a/gui/traceprocess.cpp b/gui/traceprocess.cpp
index 6f4d0b9..8d57e52 100644
--- a/gui/traceprocess.cpp
+++ b/gui/traceprocess.cpp
@@ -15,16 +15,6 @@ TraceProcess::TraceProcess(QObject *parent)
             this, SLOT(traceFinished()));
     connect(m_process, SIGNAL(error(QProcess::ProcessError)),
             this, SLOT(traceError(QProcess::ProcessError)));
-
-#ifdef Q_OS_WIN
-    QString format = QLatin1String("%1;");
-#else
-    QString format = QLatin1String("%1:");
-#endif
-    QString buildPath = format.arg(APITRACE_BINARY_DIR);
-    QProcessEnvironment env = QProcessEnvironment::systemEnvironment();
-    env.insert("PATH", buildPath + env.value("PATH"));
-    qputenv("PATH", env.value("PATH").toLatin1());
 }
 
 TraceProcess::~TraceProcess()
diff --git a/gui/trimprocess.cpp b/gui/trimprocess.cpp
index c23475d..34639c6 100644
--- a/gui/trimprocess.cpp
+++ b/gui/trimprocess.cpp
@@ -15,16 +15,6 @@ TrimProcess::TrimProcess(QObject *parent)
             this, SLOT(trimFinished()));
     connect(m_process, SIGNAL(error(QProcess::ProcessError)),
             this, SLOT(trimError(QProcess::ProcessError)));
-
-#ifdef Q_OS_WIN
-    QString format = QLatin1String("%1;");
-#else
-    QString format = QLatin1String("%1:");
-#endif
-    QString buildPath = format.arg(APITRACE_BINARY_DIR);
-    QProcessEnvironment env = QProcessEnvironment::systemEnvironment();
-    env.insert("PATH", buildPath + env.value("PATH"));
-    qputenv("PATH", env.value("PATH").toLatin1());
 }
 
 TrimProcess::~TrimProcess()
-- 
2.43.0