Commit 5c28544a authored by Tobias Nätterlund's avatar Tobias Nätterlund Committed by Tobias Nätterlund
Browse files

QNX: Fix broken environment



On systems where QNX_HOST (et al.) are already set by the QNX SDP
installer, just appending to QNX_HOST collides with finding the
Connect.jar package when connecting to a device.

Change-Id: I5d3547396384fe5b421c4b601b52476a23cdfa89
Reviewed-by: default avatarMehdi Fekari <mfekari@blackberry.com>
Reviewed-by: Nicolas Arnaud-Cormos's avatarNicolas Arnaud-Cormos <nicolas@kdab.com>
parent 1daac296
...@@ -62,8 +62,7 @@ BlackBerryDeviceConnection::BlackBerryDeviceConnection() : ...@@ -62,8 +62,7 @@ BlackBerryDeviceConnection::BlackBerryDeviceConnection() :
void BlackBerryDeviceConnection::connectDevice(const ProjectExplorer::IDevice::ConstPtr &device) void BlackBerryDeviceConnection::connectDevice(const ProjectExplorer::IDevice::ConstPtr &device)
{ {
Utils::Environment env = Utils::Environment::systemEnvironment(); Utils::Environment env = Utils::Environment::systemEnvironment();
foreach (const Utils::EnvironmentItem &item, BlackBerryConfigurationManager::instance().defaultQnxEnv()) env.modify(BlackBerryConfigurationManager::instance().defaultQnxEnv());
env.appendOrSet(item.name, item.value);
m_process->setEnvironment(env.toStringList()); m_process->setEnvironment(env.toStringList());
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment