← Back to branch summary

~bzoltan/kubuntu-packaging/decouple_cmake_plugin

« back to all changes in this revision

Viewing changes to src/plugins/qnx/blackberrydeviceconnection.cpp

  • Committer: Timo Jyrinki
  • Date: 2013-11-15 12:25:23 UTC
  • mfrom: (1.1.28)
  • Revision ID: timo.jyrinki@canonical.com-20131115122523-i2kyamsu4gs2mu1m
New upstream release.

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/plugins/qnx/blackberrydeviceconnection.cpp
1
1
/**************************************************************************
2
2
**
3
 
** Copyright (C) 2011 - 2013 Research In Motion
 
3
** Copyright (C) 2013 BlackBerry Limited. All rights reserved.
4
4
**
5
 
** Contact: Research In Motion (blackberry-qt@qnx.com)
 
5
** Contact: BlackBerry (qt@blackberry.com)
6
6
** Contact: KDAB (info@kdab.com)
7
7
**
8
8
** This file is part of Qt Creator.
32
32
#include "blackberrydeviceconnection.h"
33
33
 
34
34
#include "blackberryconfiguration.h"
 
35
#include "blackberryconfigurationmanager.h"
35
36
#include "qnxutils.h"
36
37
 
37
38
#include <projectexplorer/devicesupport/devicemanager.h>
61
62
void BlackBerryDeviceConnection::connectDevice(const ProjectExplorer::IDevice::ConstPtr &device)
62
63
{
63
64
    Utils::Environment env = Utils::Environment::systemEnvironment();
64
 
    QnxUtils::prependQnxMapToEnvironment(BlackBerryConfiguration::instance().qnxEnv(), env);
 
65
    foreach (const Utils::EnvironmentItem &item, BlackBerryConfigurationManager::instance().defaultQnxEnv())
 
66
        env.appendOrSet(item.name, item.value);
 
67
 
65
68
    m_process->setEnvironment(env.toStringList());
66
69
 
67
70
    m_host = device->sshParameters().host;