diff options
author | Orgad Shaneh <orgad.shaneh@audiocodes.com> | 2012-08-21 14:45:42 +0300 |
---|---|---|
committer | Tobias Hunger <tobias.hunger@nokia.com> | 2012-08-21 15:31:51 +0200 |
commit | 7ffc4349f8f13c587e0d9de3842babe1fe1c2a78 (patch) | |
tree | 6958072e0ad21cf6ac3be81c5807abaaad324117 /src/plugins/vcsbase/vcsbaseclientsettings.cpp | |
parent | 2e98952068850d9b71385fb64180a836829cdb05 (diff) | |
download | qt-creator-7ffc4349f8f13c587e0d9de3842babe1fe1c2a78.tar.gz |
VCS: Allow use of base name for executable
Actual path is found on startup and when setting is changed
Change-Id: If2cb0735953b9fb64df7425230c98efb384d9287
Reviewed-by: Tobias Hunger <tobias.hunger@nokia.com>
Diffstat (limited to 'src/plugins/vcsbase/vcsbaseclientsettings.cpp')
-rw-r--r-- | src/plugins/vcsbase/vcsbaseclientsettings.cpp | 16 |
1 files changed, 14 insertions, 2 deletions
diff --git a/src/plugins/vcsbase/vcsbaseclientsettings.cpp b/src/plugins/vcsbase/vcsbaseclientsettings.cpp index c5a3bdbd59..e71b242e2a 100644 --- a/src/plugins/vcsbase/vcsbaseclientsettings.cpp +++ b/src/plugins/vcsbase/vcsbaseclientsettings.cpp @@ -30,6 +30,8 @@ #include "vcsbaseclientsettings.h" +#include <utils/environment.h> + #include <QSettings> namespace { @@ -165,13 +167,15 @@ public: QSharedData(other), m_valueHash(other.m_valueHash), m_defaultValueHash(other.m_defaultValueHash), - m_settingsGroup(other.m_settingsGroup) + m_settingsGroup(other.m_settingsGroup), + m_binaryFullPath(other.m_binaryFullPath) { } QHash<QString, SettingValue> m_valueHash; QVariantHash m_defaultValueHash; QString m_settingsGroup; + QString m_binaryFullPath; }; } // namespace Internal @@ -326,8 +330,11 @@ QVariant VcsBaseClientSettings::value(const QString &key) const void VcsBaseClientSettings::setValue(const QString &key, const QVariant &v) { - if (SettingValue::isUsableVariantType(valueType(key))) + if (SettingValue::isUsableVariantType(valueType(key))) { d->m_valueHash.insert(key, SettingValue(v)); + if (key == binaryPathKey) + d->m_binaryFullPath = Utils::Environment::systemEnvironment().searchInPath(v.toString()); + } } QVariant::Type VcsBaseClientSettings::valueType(const QString &key) const @@ -337,6 +344,11 @@ QVariant::Type VcsBaseClientSettings::valueType(const QString &key) const return QVariant::Invalid; } +QString VcsBaseClientSettings::binaryPath() const +{ + return d->m_binaryFullPath; +} + QString VcsBaseClientSettings::settingsGroup() const { return d->m_settingsGroup; |