feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Device support: Provide SSH connection parameters in internal variables.

Browse Source 
Example use case: User is developing for embedded Linux system without
an SFTP server. Now deployment can be done via a custom process step
using scp without the need to duplicate all the connection data.

Change-Id: Ib1f71080d106864e5f5345fd36f7cc226a515916
Reviewed-by: hjk <hjk121@nokiamail.com>
This commit is contained in:
Christian Kandeler
2014-02-05 14:44:54 +01:00
parent fe13d33907
commit 0f9827e4a5
4 changed files with 47 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
src/plugins/projectexplorer/projectmacroexpander.cpp
View File

@@ -29,9 +29,11 @@
#include "projectmacroexpander.h"
#include "kit.h"
#include "kitinformation.h"
#include "projectexplorerconstants.h"
#include <coreplugin/variablemanager.h>
#include <ssh/sshconnection.h>
using namespace ProjectExplorer;
@@ -69,6 +71,30 @@ bool ProjectMacroExpander::resolveProjectMacro(const QString &name, QString *ret
} else if (name == QLatin1String(ProjectExplorer::Constants::VAR_CURRENTBUILD_NAME)) {
result = m_bcName;
found = true;
} else if (name == QLatin1String(ProjectExplorer::Constants::VAR_CURRENTDEVICE_HOSTADDRESS)) {
const IDevice::ConstPtr device = DeviceKitInformation::device(m_kit);
if (device) {
result = device->sshParameters().host;
found = true;
}
} else if (name == QLatin1String(ProjectExplorer::Constants::VAR_CURRENTDEVICE_SSHPORT)) {
const IDevice::ConstPtr device = DeviceKitInformation::device(m_kit);
if (device) {
result = QString::number(device->sshParameters().port);
found = true;
}
} else if (name == QLatin1String(ProjectExplorer::Constants::VAR_CURRENTDEVICE_USERNAME)) {
const IDevice::ConstPtr device = DeviceKitInformation::device(m_kit);
if (device) {
result = device->sshParameters().userName;
found = true;
}
} else if (name == QLatin1String(ProjectExplorer::Constants::VAR_CURRENTDEVICE_PRIVATEKEYFILE)) {
const IDevice::ConstPtr device = DeviceKitInformation::device(m_kit);
if (device) {
result = device->sshParameters().privateKeyFile;
found = true;
}
}
if (ret)
*ret = result;