madde/qnx/remotelinux: adjust after profile changes

More Profile use, less dependency on QtSupport,
Derive qtVersionId from profile instead of qt build configuration.
Replace qt4BuildConfiguration with buildConfiguration.
Use IDevice base class in AbstractRemoteLinuxApplicationRunner
and in other places.  Simplify remote linux runconfiguration

Change-Id: I6414d3d8146d16c360b3a0465c57a052ea71f899
Reviewed-by: Christian Kandeler <christian.kandeler@nokia.com>

1 files changed, 10 insertions, 7 deletions

diff --git a/src/plugins/remotelinux/abstractremotelinuxdeployservice.h b/src/plugins/remotelinux/abstractremotelinuxdeployservice.h
index b54a34b2e6..0060db5df7 100644
--- a/src/plugins/remotelinux/abstractremotelinuxdeployservice.h
+++ b/src/plugins/remotelinux/abstractremotelinuxdeployservice.h
@@ -32,18 +32,22 @@
 
 #include "remotelinux_export.h"
 
+#include <projectexplorer/devicesupport/idevice.h>
+
 #include <QObject>
 #include <QSharedPointer>
 #include <QVariantMap>
 
 namespace QSsh { class SshConnection; }
-namespace Qt4ProjectManager { class Qt4BuildConfiguration; }
-namespace ProjectExplorer { class Profile; }
+
+namespace ProjectExplorer {
+class BuildConfiguration;
+class Profile;
+}
 
 namespace RemoteLinux {
 class DeployableFile;
 class DeploymentInfo;
-class LinuxDeviceConfiguration;
 
 namespace Internal {
 class AbstractRemoteLinuxDeployServicePrivate;
@@ -57,8 +61,7 @@ public:
     explicit AbstractRemoteLinuxDeployService(QObject *parent = 0);
     ~AbstractRemoteLinuxDeployService();
 
-    void setDeviceConfiguration(const QSharedPointer<const LinuxDeviceConfiguration> &deviceConfiguration);
-    void setBuildConfiguration(Qt4ProjectManager::Qt4BuildConfiguration *bc);
+    void setBuildConfiguration(ProjectExplorer::BuildConfiguration *bc);
     void start();
     void stop();
 
@@ -75,9 +78,9 @@ signals:
     void stdErrData(const QString &data);
 
 protected:
-    const Qt4ProjectManager::Qt4BuildConfiguration *qt4BuildConfiguration() const;
+    const ProjectExplorer::BuildConfiguration *buildConfiguration() const;
     const ProjectExplorer::Profile *profile() const;
-    QSharedPointer<const LinuxDeviceConfiguration> deviceConfiguration() const;
+    ProjectExplorer::IDevice::ConstPtr deviceConfiguration() const;
     QSsh::SshConnection *connection() const;
 
     void saveDeploymentTimeStamp(const DeployableFile &deployableFile);