From ab4207acf2f111f44d16ae5d63752ac59b312c1c Mon Sep 17 00:00:00 2001 From: Mehdi Fekari Date: Sat, 12 Oct 2013 19:20:37 +0200 Subject: Qnx: Use Utils::Environment for qnx environment MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Change-Id: I499ca9be0abc15fc0c57847ff288e80612a536fe Reviewed-by: Tobias Nätterlund Reviewed-by: Tobias Hunger --- src/plugins/qnx/blackberrydeviceconnection.cpp | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) (limited to 'src/plugins/qnx/blackberrydeviceconnection.cpp') 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 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()); -- cgit v1.2.1