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>

30 files changed, 142 insertions, 210 deletions

diff --git a/src/plugins/remotelinux/abstractremotelinuxdeployservice.cpp b/src/plugins/remotelinux/abstractremotelinuxdeployservice.cpp
index ccc988dbd6..ec96ebdcc4 100644
--- a/src/plugins/remotelinux/abstractremotelinuxdeployservice.cpp
+++ b/src/plugins/remotelinux/abstractremotelinuxdeployservice.cpp
@@ -32,8 +32,8 @@
 #include "deployablefile.h"
 #include "linuxdeviceconfiguration.h"
 
+#include <projectexplorer/buildconfiguration.h>
 #include <projectexplorer/target.h>
-#include <qt4projectmanager/qt4buildconfiguration.h>
 #include <qtsupport/qtprofileinformation.h>
 #include <utils/qtcassert.h>
 #include <ssh/sshconnection.h>
@@ -44,7 +44,7 @@
 #include <QPointer>
 #include <QString>
 
-using namespace Qt4ProjectManager;
+using namespace ProjectExplorer;
 using namespace QSsh;
 
 namespace RemoteLinux {
@@ -86,9 +86,9 @@ public:
     AbstractRemoteLinuxDeployServicePrivate()
         : profile(0), connection(0), state(Inactive), stopRequested(false) {}
 
-    LinuxDeviceConfiguration::ConstPtr deviceConfiguration;
-    QPointer<Qt4BuildConfiguration> buildConfiguration;
-    ProjectExplorer::Profile *profile;
+    IDevice::ConstPtr deviceConfiguration;
+    QPointer<BuildConfiguration> buildConfiguration;
+    Profile *profile;
     SshConnection *connection;
     State state;
     bool stopRequested;
@@ -109,17 +109,17 @@ AbstractRemoteLinuxDeployService::~AbstractRemoteLinuxDeployService()
     delete d;
 }
 
-const Qt4BuildConfiguration *AbstractRemoteLinuxDeployService::qt4BuildConfiguration() const
+const BuildConfiguration *AbstractRemoteLinuxDeployService::buildConfiguration() const
 {
     return d->buildConfiguration;
 }
 
-const ProjectExplorer::Profile *AbstractRemoteLinuxDeployService::profile() const
+const Profile *AbstractRemoteLinuxDeployService::profile() const
 {
     return d->profile;
 }
 
-LinuxDeviceConfiguration::ConstPtr AbstractRemoteLinuxDeployService::deviceConfiguration() const
+IDevice::ConstPtr AbstractRemoteLinuxDeployService::deviceConfiguration() const
 {
     return d->deviceConfiguration;
 }
@@ -136,8 +136,8 @@ void AbstractRemoteLinuxDeployService::saveDeploymentTimeStamp(const DeployableF
     const QtSupport::BaseQtVersion *const qtVersion
             = QtSupport::QtProfileInformation::qtVersion(d->profile);
     QString systemRoot;
-    if (ProjectExplorer::SysRootProfileInformation::hasSysRoot(d->profile))
-        systemRoot = ProjectExplorer::SysRootProfileInformation::sysRoot(d->profile).toString();
+    if (SysRootProfileInformation::hasSysRoot(d->profile))
+        systemRoot = SysRootProfileInformation::sysRoot(d->profile).toString();
     if (!qtVersion || !qtVersion->isValid())
         return;
     d->lastDeployed.insert(DeployParameters(deployableFile,
@@ -155,26 +155,22 @@ bool AbstractRemoteLinuxDeployService::hasChangedSinceLastDeployment(const Deplo
     if (!qtVersion || !qtVersion->isValid())
         return true;
     QString systemRoot;
-    if (ProjectExplorer::SysRootProfileInformation::hasSysRoot(d->profile))
-        systemRoot = ProjectExplorer::SysRootProfileInformation::sysRoot(d->profile).toString();
+    if (SysRootProfileInformation::hasSysRoot(d->profile))
+        systemRoot = SysRootProfileInformation::sysRoot(d->profile).toString();
     const QDateTime &lastDeployed = d->lastDeployed.value(DeployParameters(deployableFile,
         deviceConfiguration()->sshParameters().host, systemRoot));
     return !lastDeployed.isValid()
         || QFileInfo(deployableFile.localFilePath).lastModified() > lastDeployed;
 }
 
-void AbstractRemoteLinuxDeployService::setDeviceConfiguration(const LinuxDeviceConfiguration::ConstPtr &deviceConfiguration)
-{
-    d->deviceConfiguration = deviceConfiguration;
-}
-
-void AbstractRemoteLinuxDeployService::setBuildConfiguration(Qt4BuildConfiguration *bc)
+void AbstractRemoteLinuxDeployService::setBuildConfiguration(BuildConfiguration *bc)
 {
     d->buildConfiguration = bc;
     if (bc && bc->target())
         d->profile = bc->target()->profile();
     else
         d->profile = 0;
+    d->deviceConfiguration = DeviceProfileInformation::device(d->profile);
 }
 
 void AbstractRemoteLinuxDeployService::start()
@@ -282,7 +278,7 @@ void AbstractRemoteLinuxDeployService::handleDeviceSetupDone(bool success)
     }
 
     d->state = Connecting;
-    d->connection = SshConnectionManager::instance().acquireConnection(d->deviceConfiguration->sshParameters());
+    d->connection = SshConnectionManager::instance().acquireConnection(deviceConfiguration()->sshParameters());
     connect(d->connection, SIGNAL(error(QSsh::SshError)),
         SLOT(handleConnectionFailure()));
     if (d->connection->state() == SshConnection::Connected) {
@@ -324,7 +320,7 @@ void AbstractRemoteLinuxDeployService::handleConnectionFailure()
         break;
     case Connecting: {
         QString errorMsg = tr("Could not connect to host: %1").arg(d->connection->errorString());
-        if (deviceConfiguration()->machineType() == LinuxDeviceConfiguration::Emulator)
+        if (deviceConfiguration()->machineType() == IDevice::Emulator)
             errorMsg += tr("\nDid the emulator fail to start?");
         else
             errorMsg += tr("\nIs the device connected and set up for network access?");
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);
diff --git a/src/plugins/remotelinux/abstractremotelinuxdeploystep.cpp b/src/plugins/remotelinux/abstractremotelinuxdeploystep.cpp
index 9198f1f692..d9b3742ec4 100644
--- a/src/plugins/remotelinux/abstractremotelinuxdeploystep.cpp
+++ b/src/plugins/remotelinux/abstractremotelinuxdeploystep.cpp
@@ -27,17 +27,16 @@
 **
 **
 **************************************************************************/
+
 #include "abstractremotelinuxdeploystep.h"
 
 #include "abstractremotelinuxdeployservice.h"
-#include "linuxdeviceconfiguration.h"
 #include "remotelinuxdeployconfiguration.h"
 
 #include <projectexplorer/devicesupport/devicemanager.h>
 #include <projectexplorer/projectexplorerconstants.h>
 #include <projectexplorer/profileinformation.h>
 #include <projectexplorer/target.h>
-#include <qt4projectmanager/qt4buildconfiguration.h>
 
 using namespace ProjectExplorer;
 
@@ -85,9 +84,7 @@ QVariantMap AbstractRemoteLinuxDeployStep::toMap() const
 bool AbstractRemoteLinuxDeployStep::init()
 {
     QString error;
-    deployService()->setDeviceConfiguration(ProjectExplorer::DeviceProfileInformation::device(target()->profile())
-                                            .dynamicCast<const LinuxDeviceConfiguration>());
-    deployService()->setBuildConfiguration(qobject_cast<Qt4ProjectManager::Qt4BuildConfiguration *>(target()->activeBuildConfiguration()));
+    deployService()->setBuildConfiguration(target()->activeBuildConfiguration());
     const bool canDeploy = initInternal(&error);
     if (!canDeploy)
         emit addOutput(tr("Cannot deploy: %1").arg(error), ErrorMessageOutput);
@@ -138,7 +135,7 @@ void AbstractRemoteLinuxDeployStep::handleErrorMessage(const QString &message)
 {
     emit addOutput(message, ErrorMessageOutput);
     emit addTask(Task(Task::Error, message, Utils::FileName(), -1,
-                      Core::Id(ProjectExplorer::Constants::TASK_CATEGORY_BUILDSYSTEM)));
+                      Core::Id(Constants::TASK_CATEGORY_BUILDSYSTEM)));
     d->hasError = true;
 }
 
@@ -146,7 +143,7 @@ void AbstractRemoteLinuxDeployStep::handleWarningMessage(const QString &message)
 {
     emit addOutput(message, ErrorMessageOutput);
     emit addTask(Task(Task::Warning, message, Utils::FileName(), -1,
-                      Core::Id(ProjectExplorer::Constants::TASK_CATEGORY_BUILDSYSTEM)));
+                      Core::Id(Constants::TASK_CATEGORY_BUILDSYSTEM)));
 }
 
 void AbstractRemoteLinuxDeployStep::handleFinished()
diff --git a/src/plugins/remotelinux/deploymentinfo.cpp b/src/plugins/remotelinux/deploymentinfo.cpp
index 50dcfbc2ae..7c69ef89fa 100644
--- a/src/plugins/remotelinux/deploymentinfo.cpp
+++ b/src/plugins/remotelinux/deploymentinfo.cpp
@@ -35,7 +35,6 @@
 
 #include <projectexplorer/buildstep.h>
 #include <projectexplorer/target.h>
-#include <qt4projectmanager/qt4buildconfiguration.h>
 #include <qt4projectmanager/qt4project.h>
 #include <qtsupport/qtprofileinformation.h>
 
diff --git a/src/plugins/remotelinux/genericlinuxdeviceconfigurationfactory.cpp b/src/plugins/remotelinux/genericlinuxdeviceconfigurationfactory.cpp
index 958bd4cb3c..5f040de857 100644
--- a/src/plugins/remotelinux/genericlinuxdeviceconfigurationfactory.cpp
+++ b/src/plugins/remotelinux/genericlinuxdeviceconfigurationfactory.cpp
@@ -71,8 +71,8 @@ bool GenericLinuxDeviceConfigurationFactory::canRestore(const QVariantMap &map)
 
 IDevice::Ptr GenericLinuxDeviceConfigurationFactory::restore(const QVariantMap &map) const
 {
-    QTC_ASSERT(canRestore(map), return LinuxDeviceConfiguration::Ptr());
-    const LinuxDeviceConfiguration::Ptr device = LinuxDeviceConfiguration::create();
+    QTC_ASSERT(canRestore(map), return IDevice::Ptr());
+    const IDevice::Ptr device = LinuxDeviceConfiguration::create();
     device->fromMap(map);
     return device;
 }
diff --git a/src/plugins/remotelinux/genericlinuxdeviceconfigurationwidget.cpp b/src/plugins/remotelinux/genericlinuxdeviceconfigurationwidget.cpp
index d64d5c9dc9..b2d87407c2 100644
--- a/src/plugins/remotelinux/genericlinuxdeviceconfigurationwidget.cpp
+++ b/src/plugins/remotelinux/genericlinuxdeviceconfigurationwidget.cpp
@@ -36,14 +36,14 @@
 
 #include <QTextStream>
 
+using namespace ProjectExplorer;
 using namespace RemoteLinux;
 using namespace QSsh;
 using namespace Utils;
 
 GenericLinuxDeviceConfigurationWidget::GenericLinuxDeviceConfigurationWidget(
-        const LinuxDeviceConfiguration::Ptr &deviceConfig,
-        QWidget *parent) :
-    ProjectExplorer::IDeviceWidget(deviceConfig, parent),
+        const IDevice::Ptr &deviceConfig, QWidget *parent) :
+    IDeviceWidget(deviceConfig, parent),
     m_ui(new Ui::GenericLinuxDeviceConfigurationWidget)
 {
     m_ui->setupUi(this);
@@ -72,12 +72,12 @@ GenericLinuxDeviceConfigurationWidget::~GenericLinuxDeviceConfigurationWidget()
 
 void GenericLinuxDeviceConfigurationWidget::authenticationTypeChanged()
 {
-    SshConnectionParameters sshParams = deviceConfiguration()->sshParameters();
+    SshConnectionParameters sshParams = device()->sshParameters();
     const bool usePassword = m_ui->passwordButton->isChecked();
     sshParams.authenticationType = usePassword
         ? SshConnectionParameters::AuthenticationByPassword
         : SshConnectionParameters::AuthenticationByKey;
-    deviceConfiguration()->setSshParameters(sshParams);
+    device()->setSshParameters(sshParams);
     m_ui->pwdLineEdit->setEnabled(usePassword);
     m_ui->passwordLabel->setEnabled(usePassword);
     m_ui->keyFileLineEdit->setEnabled(!usePassword);
@@ -86,49 +86,49 @@ void GenericLinuxDeviceConfigurationWidget::authenticationTypeChanged()
 
 void GenericLinuxDeviceConfigurationWidget::hostNameEditingFinished()
 {
-    SshConnectionParameters sshParams = deviceConfiguration()->sshParameters();
+    SshConnectionParameters sshParams = device()->sshParameters();
     sshParams.host = m_ui->hostLineEdit->text().trimmed();
-    deviceConfiguration()->setSshParameters(sshParams);
+    device()->setSshParameters(sshParams);
 }
 
 void GenericLinuxDeviceConfigurationWidget::sshPortEditingFinished()
 {
-    SshConnectionParameters sshParams = deviceConfiguration()->sshParameters();
+    SshConnectionParameters sshParams = device()->sshParameters();
     sshParams.port = m_ui->sshPortSpinBox->value();
-    deviceConfiguration()->setSshParameters(sshParams);
+    device()->setSshParameters(sshParams);
 }
 
 void GenericLinuxDeviceConfigurationWidget::timeoutEditingFinished()
 {
-    SshConnectionParameters sshParams = deviceConfiguration()->sshParameters();
+    SshConnectionParameters sshParams = device()->sshParameters();
     sshParams.timeout = m_ui->timeoutSpinBox->value();
-    deviceConfiguration()->setSshParameters(sshParams);
+    device()->setSshParameters(sshParams);
 }
 
 void GenericLinuxDeviceConfigurationWidget::userNameEditingFinished()
 {
-    SshConnectionParameters sshParams = deviceConfiguration()->sshParameters();
+    SshConnectionParameters sshParams = device()->sshParameters();
     sshParams.userName = m_ui->userLineEdit->text();
-    deviceConfiguration()->setSshParameters(sshParams);
+    device()->setSshParameters(sshParams);
 }
 
 void GenericLinuxDeviceConfigurationWidget::passwordEditingFinished()
 {
-    SshConnectionParameters sshParams = deviceConfiguration()->sshParameters();
+    SshConnectionParameters sshParams = device()->sshParameters();
     sshParams.password = m_ui->pwdLineEdit->text();
-    deviceConfiguration()->setSshParameters(sshParams);
+    device()->setSshParameters(sshParams);
 }
 
 void GenericLinuxDeviceConfigurationWidget::keyFileEditingFinished()
 {
-    SshConnectionParameters sshParams = deviceConfiguration()->sshParameters();
+    SshConnectionParameters sshParams = device()->sshParameters();
     sshParams.privateKeyFile = m_ui->keyFileLineEdit->path();
-    deviceConfiguration()->setSshParameters(sshParams);
+    device()->setSshParameters(sshParams);
 }
 
 void GenericLinuxDeviceConfigurationWidget::handleFreePortsChanged()
 {
-    deviceConfiguration()->setFreePorts(PortList::fromString(m_ui->portsLineEdit->text()));
+    device()->setFreePorts(PortList::fromString(m_ui->portsLineEdit->text()));
     updatePortsWarningLabel();
 }
 
@@ -153,12 +153,12 @@ void GenericLinuxDeviceConfigurationWidget::createNewKey()
 
 void GenericLinuxDeviceConfigurationWidget::updatePortsWarningLabel()
 {
-    m_ui->portsWarningLabel->setVisible(!deviceConfiguration()->freePorts().hasMore());
+    m_ui->portsWarningLabel->setVisible(!device()->freePorts().hasMore());
 }
 
 void GenericLinuxDeviceConfigurationWidget::initGui()
 {
-    if (deviceConfiguration()->machineType() == LinuxDeviceConfiguration::Hardware)
+    if (device()->machineType() == IDevice::Hardware)
         m_ui->machineTypeValueLabel->setText(tr("Physical Device"));
     else
         m_ui->machineTypeValueLabel->setText(tr("Emulator"));
@@ -171,19 +171,19 @@ void GenericLinuxDeviceConfigurationWidget::initGui()
         = new QRegExpValidator(QRegExp(PortList::regularExpression()), this);
     m_ui->portsLineEdit->setValidator(portsValidator);
 
-    const SshConnectionParameters &sshParams = deviceConfiguration()->sshParameters();
+    const SshConnectionParameters &sshParams = device()->sshParameters();
 
     if (sshParams.authenticationType == SshConnectionParameters::AuthenticationByPassword)
         m_ui->passwordButton->setChecked(true);
     else
         m_ui->keyButton->setChecked(true);
     m_ui->timeoutSpinBox->setValue(sshParams.timeout);
-    m_ui->hostLineEdit->setEnabled(!deviceConfiguration()->isAutoDetected());
-    m_ui->sshPortSpinBox->setEnabled(!deviceConfiguration()->isAutoDetected());
+    m_ui->hostLineEdit->setEnabled(!device()->isAutoDetected());
+    m_ui->sshPortSpinBox->setEnabled(!device()->isAutoDetected());
 
     m_ui->hostLineEdit->setText(sshParams.host);
     m_ui->sshPortSpinBox->setValue(sshParams.port);
-    m_ui->portsLineEdit->setText(deviceConfiguration()->freePorts().toString());
+    m_ui->portsLineEdit->setText(device()->freePorts().toString());
     m_ui->timeoutSpinBox->setValue(sshParams.timeout);
     m_ui->userLineEdit->setText(sshParams.userName);
     m_ui->pwdLineEdit->setText(sshParams.password);
@@ -191,8 +191,3 @@ void GenericLinuxDeviceConfigurationWidget::initGui()
     m_ui->showPasswordCheckBox->setChecked(false);
     updatePortsWarningLabel();
 }
-
-LinuxDeviceConfiguration::Ptr GenericLinuxDeviceConfigurationWidget::deviceConfiguration() const
-{
-    return device().staticCast<LinuxDeviceConfiguration>();
-}
diff --git a/src/plugins/remotelinux/genericlinuxdeviceconfigurationwidget.h b/src/plugins/remotelinux/genericlinuxdeviceconfigurationwidget.h
index c9395eeaa7..0b996fb1e9 100644
--- a/src/plugins/remotelinux/genericlinuxdeviceconfigurationwidget.h
+++ b/src/plugins/remotelinux/genericlinuxdeviceconfigurationwidget.h
@@ -32,7 +32,6 @@
 
 #include <projectexplorer/devicesupport/idevicewidget.h>
 
-#include "linuxdeviceconfiguration.h"
 #include "remotelinux_export.h"
 
 namespace RemoteLinux {
@@ -48,7 +47,7 @@ class REMOTELINUX_EXPORT GenericLinuxDeviceConfigurationWidget
 
 public:
     explicit GenericLinuxDeviceConfigurationWidget(
-        const LinuxDeviceConfiguration::Ptr &deviceConfig, QWidget *parent = 0);
+        const ProjectExplorer::IDevice::Ptr &deviceConfig, QWidget *parent = 0);
     ~GenericLinuxDeviceConfigurationWidget();
 
 private slots:
@@ -67,7 +66,6 @@ private slots:
 private:
     void updatePortsWarningLabel();
     void initGui();
-    LinuxDeviceConfiguration::Ptr deviceConfiguration() const;
 
     Ui::GenericLinuxDeviceConfigurationWidget *m_ui;
 };
diff --git a/src/plugins/remotelinux/genericlinuxdeviceconfigurationwizard.cpp b/src/plugins/remotelinux/genericlinuxdeviceconfigurationwizard.cpp
index fe7e15c35e..f47a548ab9 100644
--- a/src/plugins/remotelinux/genericlinuxdeviceconfigurationwizard.cpp
+++ b/src/plugins/remotelinux/genericlinuxdeviceconfigurationwizard.cpp
@@ -84,8 +84,8 @@ IDevice::Ptr GenericLinuxDeviceConfigurationWizard::device()
         sshParams.password = d->setupPage.password();
     else
         sshParams.privateKeyFile = d->setupPage.privateKeyFilePath();
-    LinuxDeviceConfiguration::Ptr devConf = LinuxDeviceConfiguration::create(d->setupPage.configurationName(),
-        Core::Id(Constants::GenericLinuxOsType), LinuxDeviceConfiguration::Hardware);
+    IDevice::Ptr devConf = LinuxDeviceConfiguration::create(d->setupPage.configurationName(),
+        Core::Id(Constants::GenericLinuxOsType), IDevice::Hardware);
     devConf->setFreePorts(Utils::PortList::fromString(QLatin1String("10000-10100")));
     devConf->setSshParameters(sshParams);
     LinuxDeviceTestDialog dlg(devConf, new GenericLinuxDeviceTester(this), this);
diff --git a/src/plugins/remotelinux/genericlinuxdeviceconfigurationwizardpages.cpp b/src/plugins/remotelinux/genericlinuxdeviceconfigurationwizardpages.cpp
index acf7e4296f..d48d0a2b3e 100644
--- a/src/plugins/remotelinux/genericlinuxdeviceconfigurationwizardpages.cpp
+++ b/src/plugins/remotelinux/genericlinuxdeviceconfigurationwizardpages.cpp
@@ -77,7 +77,7 @@ void GenericLinuxDeviceConfigurationWizardSetupPage::initializePage()
     d->ui.userNameLineEdit->setText(defaultUserName());
     d->ui.passwordButton->setChecked(true);
     d->ui.passwordLineEdit->setText(defaultPassWord());
-    d->ui.privateKeyPathChooser->setPath(LinuxDeviceConfiguration::defaultPrivateKeyFilePath());
+    d->ui.privateKeyPathChooser->setPath(ProjectExplorer::IDevice::defaultPrivateKeyFilePath());
     handleAuthTypeChanged();
 }
 
diff --git a/src/plugins/remotelinux/linuxdevicetestdialog.cpp b/src/plugins/remotelinux/linuxdevicetestdialog.cpp
index bc3e981d74..88097da821 100644
--- a/src/plugins/remotelinux/linuxdevicetestdialog.cpp
+++ b/src/plugins/remotelinux/linuxdevicetestdialog.cpp
@@ -54,7 +54,7 @@ public:
 
 using namespace Internal;
 
-LinuxDeviceTestDialog::LinuxDeviceTestDialog(const QSharedPointer<const LinuxDeviceConfiguration> &deviceConfiguration,
+LinuxDeviceTestDialog::LinuxDeviceTestDialog(const ProjectExplorer::IDevice::ConstPtr &deviceConfiguration,
         AbstractLinuxDeviceTester *deviceTester, QWidget *parent)
     : QDialog(parent), d(new LinuxDeviceTestDialogPrivate(deviceTester))
 {
diff --git a/src/plugins/remotelinux/linuxdevicetestdialog.h b/src/plugins/remotelinux/linuxdevicetestdialog.h
index 73a947c656..aefa0fc2d3 100644
--- a/src/plugins/remotelinux/linuxdevicetestdialog.h
+++ b/src/plugins/remotelinux/linuxdevicetestdialog.h
@@ -43,10 +43,10 @@ class LinuxDeviceTestDialogPrivate;
 class REMOTELINUX_EXPORT LinuxDeviceTestDialog : public QDialog
 {
     Q_OBJECT
-public:
 
+public:
     // Note: The dialog takes ownership of deviceTester
-    explicit LinuxDeviceTestDialog(const QSharedPointer<const LinuxDeviceConfiguration> &deviceConfiguration,
+    LinuxDeviceTestDialog(const ProjectExplorer::IDevice::ConstPtr &deviceConfiguration,
         AbstractLinuxDeviceTester * deviceTester, QWidget *parent = 0);
     ~LinuxDeviceTestDialog();
 
diff --git a/src/plugins/remotelinux/linuxdevicetester.cpp b/src/plugins/remotelinux/linuxdevicetester.cpp
index 43ca2e0a3d..8dea034a65 100644
--- a/src/plugins/remotelinux/linuxdevicetester.cpp
+++ b/src/plugins/remotelinux/linuxdevicetester.cpp
@@ -29,13 +29,13 @@
 **************************************************************************/
 #include "linuxdevicetester.h"
 
-#include "linuxdeviceconfiguration.h"
 #include "remotelinuxusedportsgatherer.h"
 
 #include <utils/qtcassert.h>
 #include <ssh/sshremoteprocess.h>
 #include <ssh/sshconnection.h>
 
+using namespace ProjectExplorer;
 using namespace QSsh;
 
 namespace RemoteLinux {
@@ -51,7 +51,7 @@ class GenericLinuxDeviceTesterPrivate
 public:
     GenericLinuxDeviceTesterPrivate() : connection(0), state(Inactive) {}
 
-    LinuxDeviceConfiguration::ConstPtr deviceConfiguration;
+    IDevice::ConstPtr deviceConfiguration;
     SshConnection *connection;
     SshRemoteProcess::Ptr process;
     RemoteLinuxUsedPortsGatherer portsGatherer;
@@ -77,7 +77,7 @@ GenericLinuxDeviceTester::~GenericLinuxDeviceTester()
     delete d;
 }
 
-void GenericLinuxDeviceTester::testDevice(const LinuxDeviceConfiguration::ConstPtr &deviceConfiguration)
+void GenericLinuxDeviceTester::testDevice(const IDevice::ConstPtr &deviceConfiguration)
 {
     QTC_ASSERT(d->state == Inactive, return);
 
diff --git a/src/plugins/remotelinux/linuxdevicetester.h b/src/plugins/remotelinux/linuxdevicetester.h
index be686539bf..b7a9b1fc2c 100644
--- a/src/plugins/remotelinux/linuxdevicetester.h
+++ b/src/plugins/remotelinux/linuxdevicetester.h
@@ -27,36 +27,33 @@
 **
 **
 **************************************************************************/
+
 #ifndef LINUXDEVICETESTER_H
 #define LINUXDEVICETESTER_H
 
 #include "remotelinux_export.h"
 
-#include <QObject>
-#include <QSharedPointer>
-
-QT_FORWARD_DECLARE_CLASS(QString)
+#include <projectexplorer/devicesupport/idevice.h>
 
 namespace QSsh {
 class SshConnection;
 }
 
 namespace RemoteLinux {
-class LinuxDeviceConfiguration;
 class RemoteLinuxUsedPortsGatherer;
 
 namespace Internal {
 class GenericLinuxDeviceTesterPrivate;
-} // namespace Internal
+}
 
 class REMOTELINUX_EXPORT AbstractLinuxDeviceTester : public QObject
 {
     Q_OBJECT
-    Q_DISABLE_COPY(AbstractLinuxDeviceTester)
+
 public:
     enum TestResult { TestSuccess, TestFailure };
 
-    virtual void testDevice(const QSharedPointer<const LinuxDeviceConfiguration> &deviceConfiguration) = 0;
+    virtual void testDevice(const ProjectExplorer::IDevice::ConstPtr &deviceConfiguration) = 0;
     virtual void stopTest() = 0;
 
 signals:
@@ -72,11 +69,12 @@ protected:
 class REMOTELINUX_EXPORT GenericLinuxDeviceTester : public AbstractLinuxDeviceTester
 {
     Q_OBJECT
+
 public:
     explicit GenericLinuxDeviceTester(QObject *parent = 0);
     ~GenericLinuxDeviceTester();
 
-    void testDevice(const QSharedPointer<const LinuxDeviceConfiguration> &deviceConfiguration);
+    void testDevice(const ProjectExplorer::IDevice::ConstPtr &deviceConfiguration);
     void stopTest();
 
     RemoteLinuxUsedPortsGatherer *usedPortsGatherer() const;
diff --git a/src/plugins/remotelinux/publickeydeploymentdialog.cpp b/src/plugins/remotelinux/publickeydeploymentdialog.cpp
index 26ab6af0ec..cf7bf919c8 100644
--- a/src/plugins/remotelinux/publickeydeploymentdialog.cpp
+++ b/src/plugins/remotelinux/publickeydeploymentdialog.cpp
@@ -28,7 +28,6 @@
 **************************************************************************/
 #include "publickeydeploymentdialog.h"
 
-#include "linuxdeviceconfiguration.h"
 #include "sshkeydeployer.h"
 
 #include <coreplugin/icore.h>
@@ -37,6 +36,8 @@
 #include <QTimer>
 #include <QFileDialog>
 
+using namespace ProjectExplorer;
+
 namespace RemoteLinux {
 namespace Internal {
 class PublicKeyDeploymentDialogPrivate
@@ -49,7 +50,7 @@ public:
 
 using namespace Internal;
 
-PublicKeyDeploymentDialog *PublicKeyDeploymentDialog::createDialog(const LinuxDeviceConfiguration::ConstPtr &deviceConfig,
+PublicKeyDeploymentDialog *PublicKeyDeploymentDialog::createDialog(const IDevice::ConstPtr &deviceConfig,
     QWidget *parent)
 {
     const QString &dir = QFileInfo(deviceConfig->sshParameters().privateKeyFile).path();
@@ -62,7 +63,7 @@ PublicKeyDeploymentDialog *PublicKeyDeploymentDialog::createDialog(const LinuxDe
     return new PublicKeyDeploymentDialog(deviceConfig, publicKeyFileName, parent);
 }
 
-PublicKeyDeploymentDialog::PublicKeyDeploymentDialog(const LinuxDeviceConfiguration::ConstPtr &deviceConfig,
+PublicKeyDeploymentDialog::PublicKeyDeploymentDialog(const IDevice::ConstPtr &deviceConfig,
         const QString &publicKeyFileName, QWidget *parent)
     : QProgressDialog(parent), d(new PublicKeyDeploymentDialogPrivate)
 {
diff --git a/src/plugins/remotelinux/publickeydeploymentdialog.h b/src/plugins/remotelinux/publickeydeploymentdialog.h
index c632c8c486..db03cded9b 100644
--- a/src/plugins/remotelinux/publickeydeploymentdialog.h
+++ b/src/plugins/remotelinux/publickeydeploymentdialog.h
@@ -31,16 +31,11 @@
 
 #include "remotelinux_export.h"
 
-#include <QSharedPointer>
-#include <QProgressDialog>
+#include <projectexplorer/devicesupport/idevice.h>
 
-QT_BEGIN_NAMESPACE
-class QString;
-QT_END_NAMESPACE
+#include <QProgressDialog>
 
 namespace RemoteLinux {
-class LinuxDeviceConfiguration;
-
 namespace Internal {
 class PublicKeyDeploymentDialogPrivate;
 } // namespace Internal
@@ -50,7 +45,7 @@ class REMOTELINUX_EXPORT PublicKeyDeploymentDialog : public QProgressDialog
     Q_OBJECT
 public:
     // Asks for public key and returns null if the file dialog is canceled.
-    static PublicKeyDeploymentDialog *createDialog(const QSharedPointer<const LinuxDeviceConfiguration> &deviceConfig,
+    static PublicKeyDeploymentDialog *createDialog(const ProjectExplorer::IDevice::ConstPtr &deviceConfig,
         QWidget *parent = 0);
 
     ~PublicKeyDeploymentDialog();
@@ -61,7 +56,7 @@ private slots:
     void handleCanceled();
 
 private:
-    explicit PublicKeyDeploymentDialog(const QSharedPointer<const LinuxDeviceConfiguration> &deviceConfig,
+    explicit PublicKeyDeploymentDialog(const ProjectExplorer::IDevice::ConstPtr &deviceConfig,
         const QString &publicKeyFileName, QWidget *parent = 0);
     void handleDeploymentFinished(const QString &errorMsg);
 
diff --git a/src/plugins/remotelinux/remotelinuxapplicationrunner.cpp b/src/plugins/remotelinux/remotelinuxapplicationrunner.cpp
index 12d3b3984b..b05f9bf8d8 100644
--- a/src/plugins/remotelinux/remotelinuxapplicationrunner.cpp
+++ b/src/plugins/remotelinux/remotelinuxapplicationrunner.cpp
@@ -44,7 +44,7 @@
 
 #include <limits>
 
-using namespace Qt4ProjectManager;
+using namespace ProjectExplorer;
 using namespace QSsh;
 using namespace Utils;
 
@@ -64,8 +64,7 @@ class AbstractRemoteLinuxApplicationRunnerPrivate
 {
 public:
     AbstractRemoteLinuxApplicationRunnerPrivate(const RemoteLinuxRunConfiguration *runConfig)
-        : devConfig(ProjectExplorer::DeviceProfileInformation::device(runConfig->target()->profile())
-                    .dynamicCast<const LinuxDeviceConfiguration>()),
+        : devConfig(DeviceProfileInformation::device(runConfig->target()->profile())),
           remoteExecutable(runConfig->remoteExecutableFilePath()),
           appArguments(runConfig->arguments()),
           commandPrefix(runConfig->commandPrefix()),
@@ -76,7 +75,7 @@ public:
     { }
 
     RemoteLinuxUsedPortsGatherer portsGatherer;
-    LinuxDeviceConfiguration::ConstPtr devConfig;
+    IDevice::ConstPtr devConfig;
     const QString remoteExecutable;
     const QString appArguments;
     const QString commandPrefix;
@@ -115,7 +114,7 @@ SshConnection *AbstractRemoteLinuxApplicationRunner::connection() const
     return d->connection;
 }
 
-LinuxDeviceConfiguration::ConstPtr AbstractRemoteLinuxApplicationRunner::devConfig() const
+IDevice::ConstPtr AbstractRemoteLinuxApplicationRunner::devConfig() const
 {
     return d->devConfig;
 }
@@ -383,11 +382,6 @@ bool AbstractRemoteLinuxApplicationRunner::canRun(QString &whyNot) const
     return true;
 }
 
-void AbstractRemoteLinuxApplicationRunner::setDeviceConfiguration(const LinuxDeviceConfiguration::ConstPtr &deviceConfig)
-{
-    d->devConfig = deviceConfig;
-}
-
 void AbstractRemoteLinuxApplicationRunner::handleDeviceSetupDone(bool success)
 {
     QTC_ASSERT(d->state == SettingUpDevice, return);
diff --git a/src/plugins/remotelinux/remotelinuxapplicationrunner.h b/src/plugins/remotelinux/remotelinuxapplicationrunner.h
index de17fff9ce..a9e8e6c951 100644
--- a/src/plugins/remotelinux/remotelinuxapplicationrunner.h
+++ b/src/plugins/remotelinux/remotelinuxapplicationrunner.h
@@ -31,6 +31,8 @@
 
 #include "remotelinux_export.h"
 
+#include <projectexplorer/devicesupport/idevice.h>
+
 #include <QObject>
 #include <QSharedPointer>
 
@@ -38,7 +40,6 @@ namespace QSsh { class SshConnection; }
 namespace Utils { class PortList; }
 
 namespace RemoteLinux {
-class LinuxDeviceConfiguration;
 class RemoteLinuxRunConfiguration;
 class RemoteLinuxUsedPortsGatherer;
 
@@ -60,7 +61,7 @@ public:
 
     void startExecution(const QByteArray &remoteCall);
 
-    QSharedPointer<const LinuxDeviceConfiguration> devConfig() const;
+    ProjectExplorer::IDevice::ConstPtr devConfig() const;
     QSsh::SshConnection *connection() const;
     RemoteLinuxUsedPortsGatherer *usedPortsGatherer() const;
     Utils::PortList *freePorts();
@@ -83,8 +84,6 @@ protected:
     // Override to to additional checks.
     virtual bool canRun(QString &whyNot) const;
 
-    void setDeviceConfiguration(const QSharedPointer<const LinuxDeviceConfiguration> &deviceConfig);
-
     void handleDeviceSetupDone(bool success);
     void handleInitialCleanupDone(bool success);
     void handleInitializationsDone(bool success);
diff --git a/src/plugins/remotelinux/remotelinuxdebugsupport.cpp b/src/plugins/remotelinux/remotelinuxdebugsupport.cpp
index ead5c41193..9920a413b6 100644
--- a/src/plugins/remotelinux/remotelinuxdebugsupport.cpp
+++ b/src/plugins/remotelinux/remotelinuxdebugsupport.cpp
@@ -26,9 +26,9 @@
 **
 **
 **************************************************************************/
+
 #include "remotelinuxdebugsupport.h"
 
-#include "linuxdeviceconfiguration.h"
 #include "remotelinuxapplicationrunner.h"
 #include "remotelinuxrunconfiguration.h"
 #include "remotelinuxusedportsgatherer.h"
@@ -37,12 +37,11 @@
 #include <debugger/debuggerstartparameters.h>
 #include <debugger/debuggerprofileinformation.h>
 #include <projectexplorer/abi.h>
+#include <projectexplorer/buildconfiguration.h>
 #include <projectexplorer/profile.h>
 #include <projectexplorer/project.h>
 #include <projectexplorer/target.h>
 #include <projectexplorer/toolchain.h>
-#include <qt4projectmanager/qt4buildconfiguration.h>
-#include <qtsupport/qtprofileinformation.h>
 #include <utils/qtcassert.h>
 
 #include <QPointer>
@@ -97,9 +96,7 @@ DebuggerStartParameters AbstractRemoteLinuxDebugSupport::startParameters(const R
     DebuggerStartParameters params;
     Target *target = runConfig->target();
     Profile *profile = target->profile();
-    const LinuxDeviceConfiguration::ConstPtr devConf
-            = DeviceProfileInformation::device(profile)
-              .dynamicCast<const RemoteLinux::LinuxDeviceConfiguration>();
+    const IDevice::ConstPtr devConf = DeviceProfileInformation::device(profile);
 
     params.sysRoot = SysRootProfileInformation::sysRoot(profile).toString();
     params.debuggerCommand = DebuggerProfileInformation::debuggerCommand(profile).toString();
diff --git a/src/plugins/remotelinux/remotelinuxdeployconfiguration.cpp b/src/plugins/remotelinux/remotelinuxdeployconfiguration.cpp
index 1d60c1cd74..7de56a9c2a 100644
--- a/src/plugins/remotelinux/remotelinuxdeployconfiguration.cpp
+++ b/src/plugins/remotelinux/remotelinuxdeployconfiguration.cpp
@@ -33,8 +33,8 @@
 #include "remotelinuxdeployconfigurationwidget.h"
 #include "typespecificdeviceconfigurationlistmodel.h"
 
-#include <coreplugin/id.h>
 #include <projectexplorer/devicesupport/devicemanager.h>
+#include <projectexplorer/project.h>
 #include <projectexplorer/target.h>
 #include <qt4projectmanager/qt4project.h>
 
diff --git a/src/plugins/remotelinux/remotelinuxdeployconfiguration.h b/src/plugins/remotelinux/remotelinuxdeployconfiguration.h
index b95519fce1..4ba7e42be9 100644
--- a/src/plugins/remotelinux/remotelinuxdeployconfiguration.h
+++ b/src/plugins/remotelinux/remotelinuxdeployconfiguration.h
@@ -31,23 +31,18 @@
 #ifndef REMOTELINUXDEPLOYCONFIGURATION_H
 #define REMOTELINUXDEPLOYCONFIGURATION_H
 
-#include "linuxdeviceconfiguration.h"
-
 #include "remotelinux_export.h"
 
-#include <coreplugin/id.h>
 #include <projectexplorer/buildstep.h>
 #include <projectexplorer/buildsteplist.h>
 #include <projectexplorer/deployconfiguration.h>
+#include <projectexplorer/devicesupport/idevice.h>
 
 namespace RemoteLinux {
 class AbstractEmbeddedLinuxTarget;
 class DeploymentInfo;
 
-namespace Internal {
-class RemoteLinuxDeployConfigurationFactory;
-class TypeSpecificDeviceConfigurationListModel;
-} // namespace Internal
+namespace Internal { class RemoteLinuxDeployConfigurationFactory; }
 
 class REMOTELINUX_EXPORT RemoteLinuxDeployConfiguration
     : public ProjectExplorer::DeployConfiguration
diff --git a/src/plugins/remotelinux/remotelinuxenvironmentreader.cpp b/src/plugins/remotelinux/remotelinuxenvironmentreader.cpp
index 2138bee937..63810a50e9 100644
--- a/src/plugins/remotelinux/remotelinuxenvironmentreader.cpp
+++ b/src/plugins/remotelinux/remotelinuxenvironmentreader.cpp
@@ -29,34 +29,32 @@
 #include "remotelinuxenvironmentreader.h"
 
 #include "linuxdeviceconfiguration.h"
-#include "remotelinuxrunconfiguration.h"
 
 #include <ssh/sshremoteprocessrunner.h>
+#include <projectexplorer/devicesupport/idevice.h>
 #include <projectexplorer/profileinformation.h>
+#include <projectexplorer/runconfiguration.h>
 #include <projectexplorer/target.h>
 
+using namespace ProjectExplorer;
+
 namespace RemoteLinux {
 namespace Internal {
 
-RemoteLinuxEnvironmentReader::RemoteLinuxEnvironmentReader(RemoteLinuxRunConfiguration *config,
-        QObject *parent)
+RemoteLinuxEnvironmentReader::RemoteLinuxEnvironmentReader(RunConfiguration *config, QObject *parent)
     : QObject(parent)
     , m_stop(false)
-    , m_devConfig(ProjectExplorer::DeviceProfileInformation::device(config->target()->profile()))
-    , m_runConfig(config)
+    , m_profile(config->target()->profile())
     , m_remoteProcessRunner(0)
 {
     connect(config->target(), SIGNAL(profileChanged()),
         this, SLOT(handleCurrentDeviceConfigChanged()));
 }
 
-RemoteLinuxEnvironmentReader::~RemoteLinuxEnvironmentReader()
-{
-}
-
 void RemoteLinuxEnvironmentReader::start(const QString &environmentSetupCommand)
 {
-    if (!m_devConfig)
+    IDevice::ConstPtr devConfig = DeviceProfileInformation::device(m_profile);
+    if (!devConfig)
         return;
     m_stop = false;
     if (!m_remoteProcessRunner)
@@ -65,7 +63,7 @@ void RemoteLinuxEnvironmentReader::start(const QString &environmentSetupCommand)
     connect(m_remoteProcessRunner, SIGNAL(processClosed(int)), SLOT(remoteProcessFinished(int)));
     const QByteArray remoteCall
         = QString(environmentSetupCommand + QLatin1String("; env")).toUtf8();
-    m_remoteProcessRunner->run(remoteCall, m_devConfig->sshParameters());
+    m_remoteProcessRunner->run(remoteCall, devConfig->sshParameters());
 }
 
 void RemoteLinuxEnvironmentReader::stop()
@@ -87,8 +85,6 @@ void RemoteLinuxEnvironmentReader::handleConnectionFailure()
 
 void RemoteLinuxEnvironmentReader::handleCurrentDeviceConfigChanged()
 {
-    m_devConfig = ProjectExplorer::DeviceProfileInformation::device(m_runConfig->target()->profile());
-
     if (m_remoteProcessRunner)
         disconnect(m_remoteProcessRunner, 0, this, 0);
     m_env.clear();
diff --git a/src/plugins/remotelinux/remotelinuxenvironmentreader.h b/src/plugins/remotelinux/remotelinuxenvironmentreader.h
index c35a3321ec..e8f6c0f717 100644
--- a/src/plugins/remotelinux/remotelinuxenvironmentreader.h
+++ b/src/plugins/remotelinux/remotelinuxenvironmentreader.h
@@ -33,25 +33,22 @@
 #include <projectexplorer/devicesupport/idevice.h>
 #include <utils/environment.h>
 
-#include <QObject>
-
-
-namespace QSsh {
-class SshRemoteProcessRunner;
+namespace ProjectExplorer {
+class RunConfiguration;
+class Profile;
 }
 
-namespace RemoteLinux {
-class LinuxDeviceConfiguration;
-class RemoteLinuxRunConfiguration;
+namespace QSsh { class SshRemoteProcessRunner; }
 
+namespace RemoteLinux {
 namespace Internal {
 
 class RemoteLinuxEnvironmentReader : public QObject
 {
     Q_OBJECT
+
 public:
-    RemoteLinuxEnvironmentReader(RemoteLinuxRunConfiguration *config, QObject *parent = 0);
-    ~RemoteLinuxEnvironmentReader();
+    RemoteLinuxEnvironmentReader(ProjectExplorer::RunConfiguration *config, QObject *parent = 0);
 
     void start(const QString &environmentSetupCommand);
     void stop();
@@ -73,8 +70,7 @@ private:
 
     bool m_stop;
     Utils::Environment m_env;
-    ProjectExplorer::IDevice::ConstPtr m_devConfig;
-    RemoteLinuxRunConfiguration *m_runConfig;
+    ProjectExplorer::Profile *m_profile;
     QSsh::SshRemoteProcessRunner *m_remoteProcessRunner;
 };
 
diff --git a/src/plugins/remotelinux/remotelinuxpackageinstaller.cpp b/src/plugins/remotelinux/remotelinuxpackageinstaller.cpp
index 27b2dedae7..615d3f3f06 100644
--- a/src/plugins/remotelinux/remotelinuxpackageinstaller.cpp
+++ b/src/plugins/remotelinux/remotelinuxpackageinstaller.cpp
@@ -29,13 +29,10 @@
 **************************************************************************/
 #include "remotelinuxpackageinstaller.h"
 
-#include "linuxdeviceconfiguration.h"
-
 #include <utils/qtcassert.h>
 #include <ssh/sshremoteprocessrunner.h>
 
-#include <QByteArray>
-
+using namespace ProjectExplorer;
 using namespace QSsh;
 
 namespace RemoteLinux {
@@ -47,7 +44,7 @@ public:
     AbstractRemoteLinuxPackageInstallerPrivate() : isRunning(false), installer(0), killProcess(0) {}
 
     bool isRunning;
-    LinuxDeviceConfiguration::ConstPtr deviceConfig;
+    IDevice::ConstPtr deviceConfig;
     QSsh::SshRemoteProcessRunner *installer;
     QSsh::SshRemoteProcessRunner *killProcess;
 };
@@ -64,7 +61,7 @@ AbstractRemoteLinuxPackageInstaller::~AbstractRemoteLinuxPackageInstaller()
     delete d;
 }
 
-void AbstractRemoteLinuxPackageInstaller::installPackage(const LinuxDeviceConfiguration::ConstPtr &deviceConfig,
+void AbstractRemoteLinuxPackageInstaller::installPackage(const IDevice::ConstPtr &deviceConfig,
     const QString &packageFilePath, bool removePackageFile)
 {
     QTC_ASSERT(!d->isRunning, return);
diff --git a/src/plugins/remotelinux/remotelinuxpackageinstaller.h b/src/plugins/remotelinux/remotelinuxpackageinstaller.h
index 05b79d077c..0d66733d9a 100644
--- a/src/plugins/remotelinux/remotelinuxpackageinstaller.h
+++ b/src/plugins/remotelinux/remotelinuxpackageinstaller.h
@@ -27,17 +27,17 @@
 **
 **
 **************************************************************************/
+
 #ifndef REMOTELINUXPACKAGEINSTALLER_H
 #define REMOTELINUXPACKAGEINSTALLER_H
 
 #include "remotelinux_export.h"
 
-#include <QObject>
+#include <projectexplorer/devicesupport/idevice.h>
+
 #include <QSharedPointer>
-#include <QString>
 
 namespace RemoteLinux {
-class LinuxDeviceConfiguration;
 
 namespace Internal {
 class AbstractRemoteLinuxPackageInstallerPrivate;
@@ -50,7 +50,7 @@ class REMOTELINUX_EXPORT AbstractRemoteLinuxPackageInstaller : public QObject
 public:
     ~AbstractRemoteLinuxPackageInstaller();
 
-    void installPackage(const QSharedPointer<const LinuxDeviceConfiguration> &deviceConfig,
+    void installPackage(const ProjectExplorer::IDevice::ConstPtr &deviceConfig,
         const QString &packageFilePath, bool removePackageFile);
     void cancelInstallation();
 
diff --git a/src/plugins/remotelinux/remotelinuxrunconfiguration.cpp b/src/plugins/remotelinux/remotelinuxrunconfiguration.cpp
index 33f9325186..3b73ebaf1e 100644
--- a/src/plugins/remotelinux/remotelinuxrunconfiguration.cpp
+++ b/src/plugins/remotelinux/remotelinuxrunconfiguration.cpp
@@ -40,7 +40,6 @@
 #include <projectexplorer/target.h>
 #include <projectexplorer/toolchain.h>
 #include <qtsupport/qtoutputformatter.h>
-#include <qt4projectmanager/qt4buildconfiguration.h>
 #include <qt4projectmanager/qt4nodes.h>
 #include <qt4projectmanager/qt4project.h>
 
@@ -141,18 +140,13 @@ void RemoteLinuxRunConfiguration::init()
         this, SLOT(handleDeployConfigChanged()));
     handleDeployConfigChanged();
 
-    Qt4Project *pro = static_cast<Qt4Project *>(target()->project());
+    Project *pro = target()->project();
     connect(pro, SIGNAL(proFileUpdated(Qt4ProjectManager::Qt4ProFileNode*,bool,bool)),
             this, SLOT(proFileUpdate(Qt4ProjectManager::Qt4ProFileNode*,bool,bool)));
     connect(target(), SIGNAL(profileChanged()),
             this, SLOT(handleDeployablesUpdated())); // Handles device changes, etc.
 }
 
-Qt4BuildConfiguration *RemoteLinuxRunConfiguration::activeQt4BuildConfiguration() const
-{
-    return static_cast<Qt4BuildConfiguration *>(activeBuildConfiguration());
-}
-
 bool RemoteLinuxRunConfiguration::isEnabled() const
 {
     if (d->parseInProgress) {
@@ -165,7 +159,7 @@ bool RemoteLinuxRunConfiguration::isEnabled() const
         d->disabledReason = project->disabledReasonForRunConfiguration(d->proFilePath);
         return false;
     }
-    if (!activeQt4BuildConfiguration()) {
+    if (!activeBuildConfiguration()) {
         d->disabledReason = tr("No active build configuration.");
         return false;
     }
diff --git a/src/plugins/remotelinux/remotelinuxrunconfiguration.h b/src/plugins/remotelinux/remotelinuxrunconfiguration.h
index 43cc07ecde..ee869a62de 100644
--- a/src/plugins/remotelinux/remotelinuxrunconfiguration.h
+++ b/src/plugins/remotelinux/remotelinuxrunconfiguration.h
@@ -33,13 +33,10 @@
 
 #include "remotelinux_export.h"
 
-#include "linuxdeviceconfiguration.h"
-
 #include <projectexplorer/runconfiguration.h>
 #include <utils/environment.h>
 
 namespace Qt4ProjectManager {
-class Qt4BuildConfiguration;
 class Qt4ProFileNode;
 } // namespace Qt4ProjectManager
 
@@ -77,10 +74,8 @@ public:
     QString disabledReason() const;
     QWidget *createConfigurationWidget();
     Utils::OutputFormatter *createOutputFormatter() const;
-    Qt4ProjectManager::Qt4BuildConfiguration *activeQt4BuildConfiguration() const;
 
     RemoteLinuxDeployConfiguration *deployConfig() const;
-    LinuxDeviceConfiguration::ConstPtr device() const;
 
     virtual QString environmentPreparationCommand() const;
     virtual QString commandPrefix() const;
diff --git a/src/plugins/remotelinux/remotelinuxrunconfigurationwidget.cpp b/src/plugins/remotelinux/remotelinuxrunconfigurationwidget.cpp
index 32da2c8b2c..c31910d3ad 100644
--- a/src/plugins/remotelinux/remotelinuxrunconfigurationwidget.cpp
+++ b/src/plugins/remotelinux/remotelinuxrunconfigurationwidget.cpp
@@ -29,7 +29,6 @@
 **************************************************************************/
 #include "remotelinuxrunconfigurationwidget.h"
 
-#include "linuxdeviceconfiguration.h"
 #include "remotelinuxrunconfiguration.h"
 #include "remotelinuxenvironmentreader.h"
 #include "remotelinuxutils.h"
@@ -38,7 +37,6 @@
 #include <coreplugin/icore.h>
 #include <projectexplorer/environmentwidget.h>
 #include <projectexplorer/projectexplorerconstants.h>
-#include <qt4projectmanager/qt4buildconfiguration.h>
 #include <utils/detailswidget.h>
 
 #include <QCoreApplication>
@@ -53,8 +51,6 @@
 #include <QMessageBox>
 #include <QPushButton>
 
-using namespace Qt4ProjectManager;
-
 namespace RemoteLinux {
 namespace Internal {
 namespace {
diff --git a/src/plugins/remotelinux/remotelinuxruncontrolfactory.cpp b/src/plugins/remotelinux/remotelinuxruncontrolfactory.cpp
index 918cdd7429..36e2820b36 100644
--- a/src/plugins/remotelinux/remotelinuxruncontrolfactory.cpp
+++ b/src/plugins/remotelinux/remotelinuxruncontrolfactory.cpp
@@ -72,9 +72,7 @@ bool RemoteLinuxRunControlFactory::canRun(RunConfiguration *runConfiguration, Ru
     const RemoteLinuxRunConfiguration * const remoteRunConfig
             = qobject_cast<RemoteLinuxRunConfiguration *>(runConfiguration);
     if (mode == DebugRunMode) {
-        LinuxDeviceConfiguration::ConstPtr dev =
-                ProjectExplorer::DeviceProfileInformation::device(runConfiguration->target()->profile())
-                .dynamicCast<const LinuxDeviceConfiguration>();
+        IDevice::ConstPtr dev = DeviceProfileInformation::device(runConfiguration->target()->profile());
         if (dev.isNull())
             return false;
         return remoteRunConfig->portsUsedByDebuggers() <= dev->freePorts().count();
diff --git a/src/plugins/remotelinux/typespecificdeviceconfigurationlistmodel.cpp b/src/plugins/remotelinux/typespecificdeviceconfigurationlistmodel.cpp
index 464d21e457..a09e78a9b3 100644
--- a/src/plugins/remotelinux/typespecificdeviceconfigurationlistmodel.cpp
+++ b/src/plugins/remotelinux/typespecificdeviceconfigurationlistmodel.cpp
@@ -39,7 +39,7 @@ using namespace ProjectExplorer;
 namespace RemoteLinux {
 namespace Internal {
 
-TypeSpecificDeviceConfigurationListModel::TypeSpecificDeviceConfigurationListModel(ProjectExplorer::Target *target)
+TypeSpecificDeviceConfigurationListModel::TypeSpecificDeviceConfigurationListModel(Target *target)
     : QAbstractListModel(target)
 {
     const DeviceManager * const devConfs = DeviceManager::instance();
@@ -47,10 +47,6 @@ TypeSpecificDeviceConfigurationListModel::TypeSpecificDeviceConfigurationListMod
     connect(target, SIGNAL(profileChanged()), this, SIGNAL(modelReset()));
 }
 
-TypeSpecificDeviceConfigurationListModel::~TypeSpecificDeviceConfigurationListModel()
-{
-}
-
 int TypeSpecificDeviceConfigurationListModel::rowCount(const QModelIndex &parent) const
 {
     if (parent.isValid())
@@ -70,7 +66,7 @@ QVariant TypeSpecificDeviceConfigurationListModel::data(const QModelIndex &index
 {
     if (!index.isValid() || index.row() >= rowCount() || role != Qt::DisplayRole)
         return QVariant();
-    const LinuxDeviceConfiguration::ConstPtr &devConf = deviceAt(index.row());
+    const IDevice::ConstPtr &devConf = deviceAt(index.row());
     Q_ASSERT(devConf);
     QString displayedName = devConf->displayName();
     if (deviceMatches(devConf)
@@ -80,7 +76,7 @@ QVariant TypeSpecificDeviceConfigurationListModel::data(const QModelIndex &index
     return displayedName;
 }
 
-LinuxDeviceConfiguration::ConstPtr TypeSpecificDeviceConfigurationListModel::deviceAt(int idx) const
+IDevice::ConstPtr TypeSpecificDeviceConfigurationListModel::deviceAt(int idx) const
 {
     int currentRow = -1;
     const DeviceManager * const devConfs = DeviceManager::instance();
@@ -88,13 +84,13 @@ LinuxDeviceConfiguration::ConstPtr TypeSpecificDeviceConfigurationListModel::dev
     for (int i = 0; i < devConfsCount; ++i) {
         const IDevice::ConstPtr device = devConfs->deviceAt(i);
         if (deviceMatches(device) && ++currentRow == idx)
-            return device.staticCast<const LinuxDeviceConfiguration>();
+            return device;
     }
     QTC_CHECK(false);
-    return LinuxDeviceConfiguration::ConstPtr();
+    return IDevice::ConstPtr();
 }
 
-LinuxDeviceConfiguration::ConstPtr TypeSpecificDeviceConfigurationListModel::defaultDeviceConfig() const
+IDevice::ConstPtr TypeSpecificDeviceConfigurationListModel::defaultDeviceConfig() const
 {
     const DeviceManager * const deviceManager = DeviceManager::instance();
     const int deviceCount = deviceManager->deviceCount();
@@ -102,17 +98,17 @@ LinuxDeviceConfiguration::ConstPtr TypeSpecificDeviceConfigurationListModel::def
         const IDevice::ConstPtr device = deviceManager->deviceAt(i);
         if (deviceMatches(device)
                 && deviceManager->defaultDevice(device->type()) == device) {
-            return device.staticCast<const LinuxDeviceConfiguration>();
+            return device;
         }
     }
-    return LinuxDeviceConfiguration::ConstPtr();
+    return IDevice::ConstPtr();
 }
 
-LinuxDeviceConfiguration::ConstPtr TypeSpecificDeviceConfigurationListModel::find(Core::Id id) const
+IDevice::ConstPtr TypeSpecificDeviceConfigurationListModel::find(Core::Id id) const
 {
     const IDevice::ConstPtr &devConf = DeviceManager::instance()->find(id);
     if (deviceMatches(devConf))
-        return devConf.staticCast<const LinuxDeviceConfiguration>();
+        return devConf;
     return defaultDeviceConfig();
 }
 
@@ -126,12 +122,12 @@ int TypeSpecificDeviceConfigurationListModel::indexForId(Core::Id id) const
     return -1;
 }
 
-ProjectExplorer::Target *TypeSpecificDeviceConfigurationListModel::target() const
+Target *TypeSpecificDeviceConfigurationListModel::target() const
 {
-    return qobject_cast<ProjectExplorer::Target *>(QObject::parent());
+    return qobject_cast<Target *>(QObject::parent());
 }
 
-bool TypeSpecificDeviceConfigurationListModel::deviceMatches(ProjectExplorer::IDevice::ConstPtr dev) const
+bool TypeSpecificDeviceConfigurationListModel::deviceMatches(IDevice::ConstPtr dev) const
 {
     if (dev.isNull())
         return false;
diff --git a/src/plugins/remotelinux/typespecificdeviceconfigurationlistmodel.h b/src/plugins/remotelinux/typespecificdeviceconfigurationlistmodel.h
index 054c6a9efe..563d38002d 100644
--- a/src/plugins/remotelinux/typespecificdeviceconfigurationlistmodel.h
+++ b/src/plugins/remotelinux/typespecificdeviceconfigurationlistmodel.h
@@ -30,10 +30,9 @@
 #ifndef TYPESPECIFICDEVICECONFIGURATIONLISTMODEL_H
 #define TYPESPECIFICDEVICECONFIGURATIONLISTMODEL_H
 
-#include "linuxdeviceconfiguration.h"
+#include <projectexplorer/devicesupport/idevice.h>
 
 #include <QAbstractListModel>
-#include <QSharedPointer>
 
 namespace ProjectExplorer { class Target; }
 
@@ -43,20 +42,18 @@ namespace Internal {
 class TypeSpecificDeviceConfigurationListModel : public QAbstractListModel
 {
     Q_OBJECT
+
 public:
     explicit TypeSpecificDeviceConfigurationListModel(ProjectExplorer::Target *target);
-    ~TypeSpecificDeviceConfigurationListModel();
-
-    virtual int rowCount(const QModelIndex &parent = QModelIndex()) const;
-    virtual QVariant data(const QModelIndex &index,
-        int role = Qt::DisplayRole) const;
 
-    QSharedPointer<const LinuxDeviceConfiguration> deviceAt(int idx) const;
-    QSharedPointer<const LinuxDeviceConfiguration> defaultDeviceConfig() const;
-    QSharedPointer<const LinuxDeviceConfiguration> find(Core::Id id) const;
-    int indexForId(Core::Id id) const;
+    int rowCount(const QModelIndex &parent = QModelIndex()) const;
+    QVariant data(const QModelIndex &index, int role = Qt::DisplayRole) const;
 
 private:
+    int indexForId(Core::Id id) const;
+    ProjectExplorer::IDevice::ConstPtr deviceAt(int idx) const;
+    ProjectExplorer::IDevice::ConstPtr defaultDeviceConfig() const;
+    ProjectExplorer::IDevice::ConstPtr find(Core::Id id) const;
     ProjectExplorer::Target *target() const;
     bool deviceMatches(ProjectExplorer::IDevice::ConstPtr dev) const;
 };