Qnx: Use Utils::Environment for qnx environment

Change-Id: I499ca9be0abc15fc0c57847ff288e80612a536fe
Reviewed-by: Tobias Nätterlund <tobias.naetterlund@kdab.com>
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>

1 files changed, 4 insertions, 30 deletions

diff --git a/src/plugins/qnx/qnxqtversion.cpp b/src/plugins/qnx/qnxqtversion.cpp
index 9ac03c81fa..e134123088 100644
--- a/src/plugins/qnx/qnxqtversion.cpp
+++ b/src/plugins/qnx/qnxqtversion.cpp
@@ -33,6 +33,8 @@
 
 #include "qnxconstants.h"
 
+#include "qnxutils.h"
+
 #include <coreplugin/featureprovider.h>
 #include <utils/hostosinfo.h>
 
@@ -92,35 +94,7 @@ QString QnxQtVersion::sdkDescription() const
     return tr("QNX Software Development Platform:");
 }
 
-QMultiMap<QString, QString> QnxQtVersion::environment() const
+QList<Utils::EnvironmentItem> QnxQtVersion::environment() const
 {
-    // Mimic what the SDP installer puts into the system environment
-
-    QMultiMap<QString, QString> environment;
-
-    if (Utils::HostOsInfo::isWindowsHost()) {
-        // TODO:
-        //environment.insert(QLatin1String("QNX_CONFIGURATION"), QLatin1String("/etc/qnx"));
-        environment.insert(QLatin1String(Constants::QNX_TARGET_KEY), sdkPath() + QLatin1String("/target/qnx6"));
-        environment.insert(QLatin1String(Constants::QNX_HOST_KEY), sdkPath() + QLatin1String("/host/win32/x86"));
-
-        environment.insert(QLatin1String("PATH"), sdkPath() + QLatin1String("/host/win32/x86/usr/bin"));
-
-        // TODO:
-        //environment.insert(QLatin1String("PATH"), QLatin1String("/etc/qnx/bin"));
-    } else if (Utils::HostOsInfo::isAnyUnixHost()) {
-        environment.insert(QLatin1String("QNX_CONFIGURATION"), QLatin1String("/etc/qnx"));
-        environment.insert(QLatin1String(Constants::QNX_TARGET_KEY), sdkPath() + QLatin1String("/target/qnx6"));
-        environment.insert(QLatin1String(Constants::QNX_HOST_KEY), sdkPath() + QLatin1String("/host/linux/x86"));
-
-        environment.insert(QLatin1String("PATH"), sdkPath() + QLatin1String("/host/linux/x86/usr/bin"));
-        environment.insert(QLatin1String("PATH"), QLatin1String("/etc/qnx/bin"));
-
-        environment.insert(QLatin1String("LD_LIBRARY_PATH"), sdkPath() + QLatin1String("/host/linux/x86/usr/lib"));
-    }
-
-    environment.insert(QLatin1String("QNX_JAVAHOME"), sdkPath() + QLatin1String("/_jvm"));
-    environment.insert(QLatin1String("MAKEFLAGS"), QLatin1String("-I") + sdkPath() + QLatin1String("/target/qnx6/usr/include"));
-
-    return environment;
+    return QnxUtils::qnxEnvironment(sdkPath());
 }