1 files changed, 22 insertions, 7 deletions
diff --git a/src/plugins/qnx/blackberryndkprocess.cpp b/src/plugins/qnx/blackberryndkprocess.cpp
index a148c9741b..e7939172c0 100644
--- a/src/plugins/qnx/blackberryndkprocess.cpp
+++ b/src/plugins/qnx/blackberryndkprocess.cpp
@@ -31,6 +31,7 @@
 
 #include "blackberryndkprocess.h"
 #include "blackberryconfiguration.h"
+#include "blackberryconfigurationmanager.h"
 
 #include <utils/hostosinfo.h>
 
@@ -52,16 +53,24 @@ BlackBerryNdkProcess::BlackBerryNdkProcess(const QString &command, QObject *pare
             this, SLOT(processError(QProcess::ProcessError)));
 }
 
-QString BlackBerryNdkProcess::command() const
+const QString BlackBerryNdkProcess::resolveNdkToolPath(const QString &tool)
 {
-    QString command = BlackBerryConfiguration::instance()
-        .qnxEnv().value(QLatin1String("QNX_HOST"))
-        + (QLatin1String("/usr/bin/")) + m_command;
+    QString toolPath;
+    QMultiMap<QString, QString> qnxEnv = BlackBerryConfigurationManager::instance().defaultQnxEnv();
+    if (!qnxEnv.isEmpty()) {
+        toolPath = qnxEnv.value(QLatin1String("QNX_HOST"))
+                + (QLatin1String("/usr/bin/")) + tool;
+
+        if (Utils::HostOsInfo::isWindowsHost())
+            toolPath += QLatin1String(".bat");
+    }
 
-    if (Utils::HostOsInfo::isWindowsHost())
-        command += QLatin1String(".bat");
+    return toolPath;
+}
 
-    return command;
+QString BlackBerryNdkProcess::command() const
+{
+    return resolveNdkToolPath(m_command);
 }
 
 void BlackBerryNdkProcess::start(const QStringList &arguments)
@@ -69,6 +78,8 @@ void BlackBerryNdkProcess::start(const QStringList &arguments)
     if (m_process->state() != QProcess::NotRunning)
         return;
 
+    resetResults();
+
     m_process->start(command(), arguments);
 }
 
@@ -146,5 +157,9 @@ void BlackBerryNdkProcess::processData(const QString &line)
     Q_UNUSED(line);
 }
 
+void BlackBerryNdkProcess::resetResults()
+{
+}
+
 } // namespace Internal
 } // namespace Qnx