Merge remote-tracking branch 'origin/2.6'

Conflicts:
	src/plugins/madde/maemodeployconfigurationwidget.cpp
	src/plugins/madde/maemoglobal.cpp
	src/plugins/madde/maemoinstalltosysrootstep.cpp
	src/plugins/madde/maemopublisherfremantlefree.cpp
	src/plugins/madde/qt4maemodeployconfiguration.cpp
	src/plugins/qt4projectmanager/librarydetailscontroller.cpp
	src/plugins/qt4projectmanager/qt-desktop/qt4runconfiguration.cpp
	src/plugins/qt4projectmanager/qt4buildconfiguration.cpp
	src/plugins/qt4projectmanager/qt4project.cpp
	src/plugins/qtsupport/baseqtversion.cpp
	src/plugins/remotelinux/abstractremotelinuxdeployservice.h
	src/plugins/remotelinux/deploymentinfo.cpp
	src/plugins/remotelinux/remotelinuxdeployconfigurationfactory.cpp
	src/plugins/remotelinux/remotelinuxrunconfiguration.cpp
	src/plugins/remotelinux/remotelinuxrunconfigurationfactory.cpp

Change-Id: I2560b528596f284e7b45a2260d8d3037891c5d17

1 files changed, 14 insertions, 14 deletions

diff --git a/src/plugins/remotelinux/abstractremotelinuxdeployservice.cpp b/src/plugins/remotelinux/abstractremotelinuxdeployservice.cpp
index 978ba516cd..4c93b4331c 100644
--- a/src/plugins/remotelinux/abstractremotelinuxdeployservice.cpp
+++ b/src/plugins/remotelinux/abstractremotelinuxdeployservice.cpp
@@ -33,7 +33,7 @@
 #include <projectexplorer/buildconfiguration.h>
 #include <projectexplorer/deployablefile.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>
@@ -83,11 +83,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;
@@ -113,9 +113,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
@@ -133,10 +133,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,
@@ -150,12 +150,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()
@@ -166,10 +166,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()