qapitrace: Adjust PATH only once and for all.

diff --git a/gui/main.cpp b/gui/main.cpp
index 0ed50ed8f2b33506f931f570d9662430d59712ec..3ae56db1768ecc6528446006e2f4c77146fb74c8 100644 (file)
--- 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 738367e1830c394f2808ab8a234355dd8de8e48a..2928ed63f321f31e34667e2448e1b8f765f2fdbf 100644 (file)
--- 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 e889d8887cf3753ce609d86daefa6233d7134ddf..af1a3d9f7b727b70f1173dcc058980bba590f6a6 100644 (file)
--- 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 6f4d0b9350da147249bbf1e522fd8c51d6de4384..8d57e525f0617b901a124369f1deb07da2c995a4 100644 (file)
--- 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 c23475d50d86a62e078594f6786073628f4ebd9a..34639c634d4893ad55d38617ebc0a7307c9f53c7 100644 (file)
--- 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()