diff options
| author | Mehdi Fekari <mfekari@blackberry.com> | 2013-10-12 19:20:37 +0200 |
|---|---|---|
| committer | Mehdi Fekari <mfekari@blackberry.com> | 2013-10-21 10:24:48 +0200 |
| commit | ab4207acf2f111f44d16ae5d63752ac59b312c1c (patch) | |
| tree | 4e9a3e318f5616d3ff105e89ac0fc9c9c60fa863 /src/plugins/qnx/blackberrydeviceconnection.cpp | |
| parent | 295c68846955efd4ba0c02ac3e8b6d72a07da157 (diff) | |
| download | qt-creator-ab4207acf2f111f44d16ae5d63752ac59b312c1c.tar.gz | |
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>
Diffstat (limited to 'src/plugins/qnx/blackberrydeviceconnection.cpp')
| -rw-r--r-- | src/plugins/qnx/blackberrydeviceconnection.cpp | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/src/plugins/qnx/blackberrydeviceconnection.cpp b/src/plugins/qnx/blackberrydeviceconnection.cpp index a4638fddac..9b80986370 100644 --- a/src/plugins/qnx/blackberrydeviceconnection.cpp +++ b/src/plugins/qnx/blackberrydeviceconnection.cpp @@ -62,10 +62,8 @@ BlackBerryDeviceConnection::BlackBerryDeviceConnection() : void BlackBerryDeviceConnection::connectDevice(const ProjectExplorer::IDevice::ConstPtr &device) { Utils::Environment env = Utils::Environment::systemEnvironment(); - - QMultiMap<QString, QString> qnxEnv = BlackBerryConfigurationManager::instance().defaultQnxEnv(); - if (!qnxEnv.isEmpty()) - QnxUtils::prependQnxMapToEnvironment(qnxEnv, env); + foreach (const Utils::EnvironmentItem &item, BlackBerryConfigurationManager::instance().defaultQnxEnv()) + env.appendOrSet(item.name, item.value); m_process->setEnvironment(env.toStringList()); |