diff options
| author | Tobias Nätterlund <tobias.naetterlund.qnx@kdab.com> | 2013-10-24 08:03:11 +0200 |
|---|---|---|
| committer | Tobias Nätterlund <tobias.naetterlund@kdab.com> | 2013-10-24 11:38:49 +0200 |
| commit | 5c28544a167dfcc86eb13072bfedd436843a870b (patch) | |
| tree | 9baca0ee5e11b68964690babc9481ba3c18489e1 /src/plugins/qnx/blackberrydeviceconnection.cpp | |
| parent | 1daac296477402e37f7812a6224facf63cec6769 (diff) | |
| download | qt-creator-5c28544a167dfcc86eb13072bfedd436843a870b.tar.gz | |
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: Mehdi Fekari <mfekari@blackberry.com>
Reviewed-by: Nicolas Arnaud-Cormos <nicolas@kdab.com>
Diffstat (limited to 'src/plugins/qnx/blackberrydeviceconnection.cpp')
| -rw-r--r-- | src/plugins/qnx/blackberrydeviceconnection.cpp | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/src/plugins/qnx/blackberrydeviceconnection.cpp b/src/plugins/qnx/blackberrydeviceconnection.cpp index 9b80986370..3db96567a5 100644 --- a/src/plugins/qnx/blackberrydeviceconnection.cpp +++ b/src/plugins/qnx/blackberrydeviceconnection.cpp @@ -62,8 +62,7 @@ BlackBerryDeviceConnection::BlackBerryDeviceConnection() : void BlackBerryDeviceConnection::connectDevice(const ProjectExplorer::IDevice::ConstPtr &device) { Utils::Environment env = Utils::Environment::systemEnvironment(); - foreach (const Utils::EnvironmentItem &item, BlackBerryConfigurationManager::instance().defaultQnxEnv()) - env.appendOrSet(item.name, item.value); + env.modify(BlackBerryConfigurationManager::instance().defaultQnxEnv()); m_process->setEnvironment(env.toStringList()); |