diff options
author | Tobias Hunger <tobias.hunger@nokia.com> | 2012-09-03 18:31:44 +0200 |
---|---|---|
committer | Eike Ziller <eike.ziller@nokia.com> | 2012-09-04 15:24:25 +0200 |
commit | 8ba422d07c4371a47b575bdef3051554cd4063e0 (patch) | |
tree | afe879082b3b5d35eacc1db3142ece2076cdb3bd /src/plugins/remotelinux/abstractremotelinuxdeployservice.cpp | |
parent | 328d205b624a94cf2f515ae8934b86b934c43f48 (diff) | |
download | qt-creator-8ba422d07c4371a47b575bdef3051554cd4063e0.tar.gz |
s/profile/kit/
* Rename profiles to kits.
* Update some strings:
* projects mode has a Kits tab, not a Targets tab.
* " Settings" was dropped from the sub-tabs of the Kits tab
* menu entry "Build/Open Build/Run Target Selector" was renamed
to "Build/Open Build and Run Kits Selector".
* Use "Kit" instead of "Target" in miniprojecttargetselector.
(The class was not renamed as it does indeed select targets,
not kits)
Change-Id: I0727e086e2dfa0e8aaaf89fdc6f2e3596c7a4314
Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
Diffstat (limited to 'src/plugins/remotelinux/abstractremotelinuxdeployservice.cpp')
-rw-r--r-- | src/plugins/remotelinux/abstractremotelinuxdeployservice.cpp | 28 |
1 files changed, 14 insertions, 14 deletions
diff --git a/src/plugins/remotelinux/abstractremotelinuxdeployservice.cpp b/src/plugins/remotelinux/abstractremotelinuxdeployservice.cpp index e0b3640f89..3cdbac6115 100644 --- a/src/plugins/remotelinux/abstractremotelinuxdeployservice.cpp +++ b/src/plugins/remotelinux/abstractremotelinuxdeployservice.cpp @@ -34,7 +34,7 @@ #include <projectexplorer/buildconfiguration.h> #include <projectexplorer/target.h> -#include <qtsupport/qtprofileinformation.h> +#include <qtsupport/qtkitinformation.h> #include <utils/qtcassert.h> #include <ssh/sshconnection.h> #include <ssh/sshconnectionmanager.h> @@ -84,11 +84,11 @@ class AbstractRemoteLinuxDeployServicePrivate { public: AbstractRemoteLinuxDeployServicePrivate() - : profile(0), connection(0), state(Inactive), stopRequested(false) {} + : kit(0), connection(0), state(Inactive), stopRequested(false) {} IDevice::ConstPtr deviceConfiguration; QPointer<BuildConfiguration> buildConfiguration; - Profile *profile; + Kit *kit; SshConnection *connection; State state; bool stopRequested; @@ -114,9 +114,9 @@ const BuildConfiguration *AbstractRemoteLinuxDeployService::buildConfiguration() return d->buildConfiguration; } -const Profile *AbstractRemoteLinuxDeployService::profile() const +const Kit *AbstractRemoteLinuxDeployService::profile() const { - return d->profile; + return d->kit; } IDevice::ConstPtr AbstractRemoteLinuxDeployService::deviceConfiguration() const @@ -134,10 +134,10 @@ void AbstractRemoteLinuxDeployService::saveDeploymentTimeStamp(const DeployableF if (!d->buildConfiguration) return; const QtSupport::BaseQtVersion *const qtVersion - = QtSupport::QtProfileInformation::qtVersion(d->profile); + = QtSupport::QtKitInformation::qtVersion(d->kit); QString systemRoot; - if (SysRootProfileInformation::hasSysRoot(d->profile)) - systemRoot = SysRootProfileInformation::sysRoot(d->profile).toString(); + if (SysRootKitInformation::hasSysRoot(d->kit)) + systemRoot = SysRootKitInformation::sysRoot(d->kit).toString(); if (!qtVersion || !qtVersion->isValid()) return; d->lastDeployed.insert(DeployParameters(deployableFile, @@ -151,12 +151,12 @@ bool AbstractRemoteLinuxDeployService::hasChangedSinceLastDeployment(const Deplo if (!d->buildConfiguration) return true; const QtSupport::BaseQtVersion *const qtVersion - = QtSupport::QtProfileInformation::qtVersion(d->profile); + = QtSupport::QtKitInformation::qtVersion(d->kit); if (!qtVersion || !qtVersion->isValid()) return true; QString systemRoot; - if (SysRootProfileInformation::hasSysRoot(d->profile)) - systemRoot = SysRootProfileInformation::sysRoot(d->profile).toString(); + if (SysRootKitInformation::hasSysRoot(d->kit)) + systemRoot = SysRootKitInformation::sysRoot(d->kit).toString(); const QDateTime &lastDeployed = d->lastDeployed.value(DeployParameters(deployableFile, deviceConfiguration()->sshParameters().host, systemRoot)); return !lastDeployed.isValid() @@ -167,10 +167,10 @@ void AbstractRemoteLinuxDeployService::setBuildConfiguration(BuildConfiguration { d->buildConfiguration = bc; if (bc && bc->target()) - d->profile = bc->target()->profile(); + d->kit = bc->target()->kit(); else - d->profile = 0; - d->deviceConfiguration = DeviceProfileInformation::device(d->profile); + d->kit = 0; + d->deviceConfiguration = DeviceKitInformation::device(d->kit); } void AbstractRemoteLinuxDeployService::start() |