RemoteLinux: More preparations for introducing an abstract device class.

- Introduce clone() method.
- Rename "osType" to "type" and "deviceType" to "machineType".
- Move machine type display out of generic settings widget.
- Put only immutable attributes into the device constructor and set the
others via setters. As part of this, also give the
SshConnectionParameters a default proxy type. The necessity to give one
to the constructor explicitly was for historical reasons.

Change-Id: I84757b1b2d6371544b9ab1f3290973e5498176ce
Reviewed-by: Kai Koehne <kai.koehne@nokia.com>

46 files changed, 264 insertions, 282 deletions

diff --git a/src/libs/utils/ssh/sshconnection.cpp b/src/libs/utils/ssh/sshconnection.cpp
index c5111c3d17..a69353801f 100644
--- a/src/libs/utils/ssh/sshconnection.cpp
+++ b/src/libs/utils/ssh/sshconnection.cpp
@@ -84,8 +84,8 @@ namespace {
 } // anonymous namespace
 
 
-SshConnectionParameters::SshConnectionParameters(ProxyType proxyType) :
-    timeout(0),  authenticationType(AuthenticationByKey), port(0), proxyType(proxyType)
+SshConnectionParameters::SshConnectionParameters() :
+    timeout(0),  authenticationType(AuthenticationByKey), port(0), proxyType(NoProxy)
 {
 }
 
diff --git a/src/libs/utils/ssh/sshconnection.h b/src/libs/utils/ssh/sshconnection.h
index 983c6c6890..211502f585 100644
--- a/src/libs/utils/ssh/sshconnection.h
+++ b/src/libs/utils/ssh/sshconnection.h
@@ -56,7 +56,7 @@ class QTCREATOR_UTILS_EXPORT SshConnectionParameters
 public:
     enum ProxyType { DefaultProxy, NoProxy };
     enum AuthenticationType { AuthenticationByPassword, AuthenticationByKey };
-    SshConnectionParameters(ProxyType proxyType);
+    SshConnectionParameters();
 
     QString host;
     QString userName;
diff --git a/src/plugins/analyzerbase/analyzerstartparameters.h b/src/plugins/analyzerbase/analyzerstartparameters.h
index 651e05d7ce..d84bd95771 100644
--- a/src/plugins/analyzerbase/analyzerstartparameters.h
+++ b/src/plugins/analyzerbase/analyzerstartparameters.h
@@ -51,7 +51,6 @@ class ANALYZER_EXPORT AnalyzerStartParameters
 {
 public:
     AnalyzerStartParameters()
-        : connParams(Utils::SshConnectionParameters::NoProxy)
     {}
 
     StartMode startMode;
diff --git a/src/plugins/analyzerbase/startremotedialog.cpp b/src/plugins/analyzerbase/startremotedialog.cpp
index 4e071aa47d..25b784f607 100644
--- a/src/plugins/analyzerbase/startremotedialog.cpp
+++ b/src/plugins/analyzerbase/startremotedialog.cpp
@@ -115,7 +115,7 @@ void StartRemoteDialog::validate()
 
 Utils::SshConnectionParameters StartRemoteDialog::sshParams() const
 {
-    Utils::SshConnectionParameters params(Utils::SshConnectionParameters::NoProxy);
+    Utils::SshConnectionParameters params;
     params.host = m_ui->host->text();
     params.userName = m_ui->user->text();
     if (m_ui->keyFile->isValid()) {
diff --git a/src/plugins/debugger/debuggerstartparameters.h b/src/plugins/debugger/debuggerstartparameters.h
index 6c556d222e..b5eef3f226 100644
--- a/src/plugins/debugger/debuggerstartparameters.h
+++ b/src/plugins/debugger/debuggerstartparameters.h
@@ -65,7 +65,6 @@ public:
         qmlServerAddress(QLatin1String("127.0.0.1")),
         qmlServerPort(ProjectExplorer::Constants::QML_DEFAULT_DEBUG_SERVER_PORT),
         useServerStartScript(false),
-        connParams(Utils::SshConnectionParameters::NoProxy),
         requestRemoteSetup(false),
         startMode(NoStartMode),
         executableUid(0),
diff --git a/src/plugins/madde/maddedeviceconfigurationfactory.cpp b/src/plugins/madde/maddedeviceconfigurationfactory.cpp
index e7e3cdfafc..18177a7e81 100644
--- a/src/plugins/madde/maddedeviceconfigurationfactory.cpp
+++ b/src/plugins/madde/maddedeviceconfigurationfactory.cpp
@@ -74,18 +74,18 @@ ILinuxDeviceConfigurationWidget *MaddeDeviceConfigurationFactory::createWidget(
     return new GenericLinuxDeviceConfigurationWidget(deviceConfig, parent);
 }
 
-bool MaddeDeviceConfigurationFactory::supportsOsType(const QString &osType) const
+bool MaddeDeviceConfigurationFactory::supportsDeviceType(const QString &type) const
 {
-    return osType == QLatin1String(Maemo5OsType) || osType == QLatin1String(HarmattanOsType)
-        || osType == QLatin1String(MeeGoOsType);
+    return type == QLatin1String(Maemo5OsType) || type == QLatin1String(HarmattanOsType)
+        || type == QLatin1String(MeeGoOsType);
 }
 
-QString MaddeDeviceConfigurationFactory::displayNameForOsType(const QString &osType) const
+QString MaddeDeviceConfigurationFactory::displayType(const QString &deviceType) const
 {
-    QTC_ASSERT(supportsOsType(osType), return QString());
-    if (osType == QLatin1String(Maemo5OsType))
+    QTC_ASSERT(supportsDeviceType(deviceType), return QString());
+    if (deviceType == QLatin1String(Maemo5OsType))
         return tr("Maemo5/Fremantle");
-    if (osType == QLatin1String(HarmattanOsType))
+    if (deviceType == QLatin1String(HarmattanOsType))
         return tr("MeeGo 1.2 Harmattan");
     return tr("Other MeeGo OS");
 }
diff --git a/src/plugins/madde/maddedeviceconfigurationfactory.h b/src/plugins/madde/maddedeviceconfigurationfactory.h
index b07bbd74ea..d81dcdf260 100644
--- a/src/plugins/madde/maddedeviceconfigurationfactory.h
+++ b/src/plugins/madde/maddedeviceconfigurationfactory.h
@@ -48,8 +48,8 @@ public:
     RemoteLinux::ILinuxDeviceConfigurationWidget *createWidget(
             const RemoteLinux::LinuxDeviceConfiguration::Ptr &deviceConfig,
             QWidget *parent = 0) const;
-    bool supportsOsType(const QString &osType) const;
-    QString displayNameForOsType(const QString &osType) const;
+    bool supportsDeviceType(const QString &type) const;
+    QString displayType(const QString &deviceType) const;
     QStringList supportedDeviceActionIds() const;
     QString displayNameForActionId(const QString &actionId) const;
     QDialog *createDeviceAction(const QString &actionId,
diff --git a/src/plugins/madde/maddedevicetester.cpp b/src/plugins/madde/maddedevicetester.cpp
index 77ce8a59fc..c3e6498b11 100644
--- a/src/plugins/madde/maddedevicetester.cpp
+++ b/src/plugins/madde/maddedevicetester.cpp
@@ -117,7 +117,7 @@ void MaddeDeviceTester::handleGenericTestFinished(TestResult result)
     connect(m_processRunner, SIGNAL(processClosed(int)), SLOT(handleProcessFinished(int)));
 
     QString qtInfoCmd;
-    if (m_deviceConfiguration->osType() == QLatin1String(MeeGoOsType)) {
+    if (m_deviceConfiguration->type() == QLatin1String(MeeGoOsType)) {
         qtInfoCmd = QLatin1String("rpm -qa 'libqt*' --queryformat '%{NAME} %{VERSION}\\n'");
     } else {
         qtInfoCmd = QLatin1String("dpkg-query -W -f "
@@ -212,7 +212,7 @@ void MaddeDeviceTester::handleMadDeveloperTestFinished(int exitStatus)
     } else if (m_processRunner->processExitCode() != 0) {
         QString message = tr("Connectivity tool not installed on device. "
             "Deployment currently not possible.");
-        if (m_deviceConfiguration->osType() == QLatin1String(HarmattanOsType)) {
+        if (m_deviceConfiguration->type() == QLatin1String(HarmattanOsType)) {
             message += tr("Please switch the device to developer mode "
                 "via Settings -> Security.");
         }
@@ -222,7 +222,7 @@ void MaddeDeviceTester::handleMadDeveloperTestFinished(int exitStatus)
         emit progressMessage(tr("Connectivity tool present.\n"));
     }
 
-    if (m_deviceConfiguration->osType() != QLatin1String(HarmattanOsType)) {
+    if (m_deviceConfiguration->type() != QLatin1String(HarmattanOsType)) {
         setFinished();
         return;
     }
@@ -263,7 +263,7 @@ QString MaddeDeviceTester::processedQtLibsList()
     QString unfilteredLibs = QString::fromUtf8(m_stdout);
     QString filteredLibs;
     QString patternString;
-    if (m_deviceConfiguration->osType() == QLatin1String(MeeGoOsType))
+    if (m_deviceConfiguration->type() == QLatin1String(MeeGoOsType))
         patternString = QLatin1String("(libqt\\S+) ((\\d+)\\.(\\d+)\\.(\\d+))");
     else
         patternString = QLatin1String("(\\S+) (\\S*(\\d+)\\.(\\d+)\\.(\\d+)\\S*) \\S+ \\S+ \\S+");
diff --git a/src/plugins/madde/maddeuploadandinstallpackagesteps.cpp b/src/plugins/madde/maddeuploadandinstallpackagesteps.cpp
index c689be8abd..2071dfb7af 100644
--- a/src/plugins/madde/maddeuploadandinstallpackagesteps.cpp
+++ b/src/plugins/madde/maddeuploadandinstallpackagesteps.cpp
@@ -61,7 +61,7 @@ protected:
 
     void doDeviceSetup()
     {
-        if (deviceConfiguration()->deviceType() == LinuxDeviceConfiguration::Hardware) {
+        if (deviceConfiguration()->machineType() == LinuxDeviceConfiguration::Hardware) {
             handleDeviceSetupDone(true);
             return;
         }
diff --git a/src/plugins/madde/maemodeploybymountsteps.cpp b/src/plugins/madde/maemodeploybymountsteps.cpp
index bbf2bfdb44..e907323eea 100644
--- a/src/plugins/madde/maemodeploybymountsteps.cpp
+++ b/src/plugins/madde/maemodeploybymountsteps.cpp
@@ -157,7 +157,7 @@ void AbstractMaemoDeployByMountService::doDeviceSetup()
 {
     QTC_ASSERT(m_state == Inactive, return);
 
-    if (deviceConfiguration()->deviceType() == LinuxDeviceConfiguration::Hardware) {
+    if (deviceConfiguration()->machineType() == LinuxDeviceConfiguration::Hardware) {
         handleDeviceSetupDone(true);
         return;
     }
diff --git a/src/plugins/madde/maemodeployconfigurationwidget.cpp b/src/plugins/madde/maemodeployconfigurationwidget.cpp
index e4d8ae5cbe..d1cdf6ba1b 100644
--- a/src/plugins/madde/maemodeployconfigurationwidget.cpp
+++ b/src/plugins/madde/maemodeployconfigurationwidget.cpp
@@ -147,7 +147,7 @@ void MaemoDeployConfigurationWidget::addIcon()
 {
     DeployableFilesPerProFile * const proFileInfo = m_remoteLinuxWidget->currentModel();
     const int iconDim
-        = MaemoGlobal::applicationIconSize(deployConfiguration()->target()->supportedOsType());
+        = MaemoGlobal::applicationIconSize(deployConfiguration()->target()->supportedDeviceType());
     const QString origFilePath = QFileDialog::getOpenFileName(this,
         tr("Choose Icon (will be scaled to %1x%1 pixels, if necessary)").arg(iconDim),
         proFileInfo->projectDir(), QLatin1String("(*.png)"));
@@ -212,7 +212,7 @@ QString MaemoDeployConfigurationWidget::remoteIconFilePath(const DeployableFiles
 QString MaemoDeployConfigurationWidget::remoteIconDir() const
 {
     return QString::fromLatin1("/usr/share/icons/hicolor/%1x%1/apps")
-        .arg(MaemoGlobal::applicationIconSize(deployConfiguration()->target()->supportedOsType()));
+        .arg(MaemoGlobal::applicationIconSize(deployConfiguration()->target()->supportedDeviceType()));
 }
 
 } // namespace Internal
diff --git a/src/plugins/madde/maemodeviceconfigwizard.cpp b/src/plugins/madde/maemodeviceconfigwizard.cpp
index 6b77357e8b..81a8ee2f84 100644
--- a/src/plugins/madde/maemodeviceconfigwizard.cpp
+++ b/src/plugins/madde/maemodeviceconfigwizard.cpp
@@ -61,14 +61,14 @@ namespace Madde {
 namespace Internal {
 namespace {
 
-QString defaultUser(const QString &osType)
+QString defaultUser(const QString &deviceType)
 {
-    if (osType == QLatin1String(MeeGoOsType))
+    if (deviceType == QLatin1String(MeeGoOsType))
         return QLatin1String("meego");
     return QLatin1String("developer");
 }
 
-QString defaultHost(LinuxDeviceConfiguration::DeviceType type)
+QString defaultHost(LinuxDeviceConfiguration::MachineType type)
 {
     return QLatin1String(type == LinuxDeviceConfiguration::Hardware ? "192.168.2.15" : "localhost");
 }
@@ -77,9 +77,9 @@ struct WizardData
 {
     QString configName;
     QString hostName;
-    QString osType;
+    QString deviceType;
     SshConnectionParameters::AuthenticationType authType;
-    LinuxDeviceConfiguration::DeviceType deviceType;
+    LinuxDeviceConfiguration::MachineType machineType;
     QString privateKeyFilePath;
     QString publicKeyFilePath;
     QString userName;
@@ -104,25 +104,24 @@ public:
         setTitle(tr("General Information"));
         setSubTitle(QLatin1String(" ")); // For Qt bug (background color)
 
-        m_ui->osTypeComboBox->addItem(RemoteLinuxUtils::osTypeToString(QLatin1String(Maemo5OsType)),
+        m_ui->osTypeComboBox->addItem(RemoteLinuxUtils::displayType(QLatin1String(Maemo5OsType)),
             QLatin1String(Maemo5OsType));
-        m_ui->osTypeComboBox->addItem(RemoteLinuxUtils::osTypeToString(QLatin1String(HarmattanOsType)),
+        m_ui->osTypeComboBox->addItem(RemoteLinuxUtils::displayType(QLatin1String(HarmattanOsType)),
             QLatin1String(HarmattanOsType));
-        m_ui->osTypeComboBox->addItem(RemoteLinuxUtils::osTypeToString(QLatin1String(MeeGoOsType)),
+        m_ui->osTypeComboBox->addItem(RemoteLinuxUtils::displayType(QLatin1String(MeeGoOsType)),
             QLatin1String(MeeGoOsType));
 
         QButtonGroup *buttonGroup = new QButtonGroup(this);
         buttonGroup->setExclusive(true);
         buttonGroup->addButton(m_ui->hwButton);
         buttonGroup->addButton(m_ui->emulatorButton);
-        connect(buttonGroup, SIGNAL(buttonClicked(int)),
-           SLOT(handleDeviceTypeChanged()));
+        connect(buttonGroup, SIGNAL(buttonClicked(int)), SLOT(handleMachineTypeChanged()));
 
         m_ui->nameLineEdit->setText(tr("MeeGo Device"));
         m_ui->osTypeComboBox->setCurrentIndex(m_ui->osTypeComboBox->findData(QLatin1String(HarmattanOsType)));
         m_ui->hwButton->setChecked(true);
-        handleDeviceTypeChanged();
-        m_ui->hostNameLineEdit->setText(defaultHost(deviceType()));
+        handleMachineTypeChanged();
+        m_ui->hostNameLineEdit->setText(defaultHost(machineType()));
         m_ui->sshPortSpinBox->setMinimum(1);
         m_ui->sshPortSpinBox->setMaximum(65535);
         m_ui->sshPortSpinBox->setValue(22);
@@ -141,17 +140,17 @@ public:
 
     QString hostName() const
     {
-        return deviceType() == LinuxDeviceConfiguration::Emulator
+        return machineType() == LinuxDeviceConfiguration::Emulator
             ? defaultHost(LinuxDeviceConfiguration::Emulator)
             : m_ui->hostNameLineEdit->text().trimmed();
     }
 
-    QString osType() const
+    QString deviceType() const
     {
         return m_ui->osTypeComboBox->itemData(m_ui->osTypeComboBox->currentIndex()).toString();
     }
 
-    LinuxDeviceConfiguration::DeviceType deviceType() const
+    LinuxDeviceConfiguration::MachineType machineType() const
     {
         return m_ui->hwButton->isChecked()
             ? LinuxDeviceConfiguration::Hardware : LinuxDeviceConfiguration::Emulator;
@@ -159,14 +158,14 @@ public:
 
     int sshPort() const
     {
-        return deviceType() == LinuxDeviceConfiguration::Emulator
+        return machineType() == LinuxDeviceConfiguration::Emulator
             ? 6666 : m_ui->sshPortSpinBox->value();
     }
 
 private slots:
-    void handleDeviceTypeChanged()
+    void handleMachineTypeChanged()
     {
-        const bool enable = deviceType() == LinuxDeviceConfiguration::Hardware;
+        const bool enable = machineType() == LinuxDeviceConfiguration::Hardware;
         m_ui->hostNameLabel->setEnabled(enable);
         m_ui->hostNameLineEdit->setEnabled(enable);
         m_ui->sshPortLabel->setEnabled(enable);
@@ -422,7 +421,7 @@ public:
         m_ui->deviceAddressLineEdit->setText(m_wizardData.hostName);
         m_ui->instructionLabel->setText(QString(m_instructionTextTemplate)
             .replace(QLatin1String("%%%maddev%%%"),
-                MaemoGlobal::madDeveloperUiName(m_wizardData.osType)));
+                MaemoGlobal::madDeveloperUiName(m_wizardData.deviceType)));
         m_ui->passwordLineEdit->clear();
         enableInput();
     }
@@ -446,13 +445,13 @@ private:
         m_ui->deviceAddressLineEdit->setEnabled(false);
         m_ui->passwordLineEdit->setEnabled(false);
         m_ui->deployButton->setEnabled(false);
-        SshConnectionParameters sshParams(SshConnectionParameters::NoProxy);
+        SshConnectionParameters sshParams;
         sshParams.authenticationType = SshConnectionParameters::AuthenticationByPassword;
         sshParams.host = hostAddress();
         sshParams.port = m_wizardData.sshPort;
         sshParams.password = password();
         sshParams.timeout = 10;
-        sshParams.userName = defaultUser(m_wizardData.osType);
+        sshParams.userName = defaultUser(m_wizardData.deviceType);
         m_ui->statusLabel->setText(tr("Deploying... "));
         m_keyDeployer->deployPublicKey(sshParams, m_wizardData.publicKeyFilePath);
     }
@@ -468,7 +467,7 @@ private:
         QMessageBox::information(this, tr("Key Deployment Success"),
             tr("The key was successfully deployed. You may now close "
                "the \"%1\" application and continue.")
-               .arg(MaemoGlobal::madDeveloperUiName(m_wizardData.osType)));
+               .arg(MaemoGlobal::madDeveloperUiName(m_wizardData.deviceType)));
         m_ui->statusLabel->setText(m_ui->statusLabel->text() + tr("Done."));
         m_isComplete = true;
         emit completeChanged();
@@ -506,7 +505,7 @@ public:
 private:
     QString infoText() const
     {
-        if (m_wizardData.deviceType == LinuxDeviceConfiguration::Emulator)
+        if (m_wizardData.machineType == LinuxDeviceConfiguration::Emulator)
             return tr("The new device configuration will now be created.");
         return GenericLinuxDeviceConfigurationWizardFinalPage::infoText();
     }
@@ -560,13 +559,13 @@ LinuxDeviceConfiguration::Ptr MaemoDeviceConfigWizard::deviceConfiguration()
 {
     bool doTest;
     QString freePortsSpec;
-    Utils::SshConnectionParameters sshParams(Utils::SshConnectionParameters::NoProxy);
-    sshParams.userName = defaultUser(d->wizardData.osType);
+    Utils::SshConnectionParameters sshParams;
+    sshParams.userName = defaultUser(d->wizardData.deviceType);
     sshParams.host = d->wizardData.hostName;
     sshParams.port = d->wizardData.sshPort;
-    if (d->wizardData.deviceType == LinuxDeviceConfiguration::Emulator) {
+    if (d->wizardData.machineType == LinuxDeviceConfiguration::Emulator) {
         sshParams.authenticationType = Utils::SshConnectionParameters::AuthenticationByPassword;
-        sshParams.password = d->wizardData.osType == QLatin1String(MeeGoOsType)
+        sshParams.password = d->wizardData.deviceType == QLatin1String(MeeGoOsType)
             ? QLatin1String("meego") : QString();
         sshParams.timeout = 30;
         freePortsSpec = QLatin1String("13219,14168");
@@ -579,8 +578,9 @@ LinuxDeviceConfiguration::Ptr MaemoDeviceConfigWizard::deviceConfiguration()
         doTest = true;
     }
     const LinuxDeviceConfiguration::Ptr devConf = LinuxDeviceConfiguration::create(d->wizardData.configName,
-        d->wizardData.osType, d->wizardData.deviceType, PortList::fromString(freePortsSpec),
-        sshParams);
+        d->wizardData.deviceType, d->wizardData.machineType);
+    devConf->setFreePorts(PortList::fromString(freePortsSpec));
+    devConf->setSshParameters(sshParams);
     if (doTest) {
         LinuxDeviceTestDialog dlg(devConf, new MaddeDeviceTester(this), this);
         dlg.exec();
@@ -593,11 +593,11 @@ int MaemoDeviceConfigWizard::nextId() const
     switch (currentId()) {
     case StartPageId:
         d->wizardData.configName = d->startPage.configName();
-        d->wizardData.osType = d->startPage.osType();
         d->wizardData.deviceType = d->startPage.deviceType();
+        d->wizardData.machineType = d->startPage.machineType();
         d->wizardData.hostName = d->startPage.hostName();
         d->wizardData.sshPort = d->startPage.sshPort();
-        if (d->wizardData.deviceType == LinuxDeviceConfiguration::Emulator)
+        if (d->wizardData.machineType == LinuxDeviceConfiguration::Emulator)
             return FinalPageId;
         return PreviousKeySetupCheckPageId;
     case PreviousKeySetupCheckPageId:
diff --git a/src/plugins/madde/maemoglobal.cpp b/src/plugins/madde/maemoglobal.cpp
index cdc24cf8ea..4d307a5197 100644
--- a/src/plugins/madde/maemoglobal.cpp
+++ b/src/plugins/madde/maemoglobal.cpp
@@ -92,9 +92,9 @@ bool MaemoGlobal::isValidMeegoQtVersion(const QString &qmakePath)
     return isValidMaemoQtVersion(qmakePath, QLatin1String(MeeGoOsType));
 }
 
-bool MaemoGlobal::isValidMaemoQtVersion(const QString &qmakePath, const QString &osType)
+bool MaemoGlobal::isValidMaemoQtVersion(const QString &qmakePath, const QString &deviceType)
 {
-    if (MaemoGlobal::osType(qmakePath) != osType)
+    if (MaemoGlobal::deviceType(qmakePath) != deviceType)
         return false;
     QProcess madAdminProc;
     const QStringList arguments(QLatin1String("list"));
@@ -127,17 +127,17 @@ QString MaemoGlobal::devrootshPath()
     return QLatin1String("/usr/lib/mad-developer/devrootsh");
 }
 
-int MaemoGlobal::applicationIconSize(const QString &osType)
+int MaemoGlobal::applicationIconSize(const QString &deviceType)
 {
-    return osType == QLatin1String(HarmattanOsType) ? 80 : 64;
+    return deviceType == QLatin1String(HarmattanOsType) ? 80 : 64;
 }
 
-QString MaemoGlobal::remoteSudo(const QString &osType, const QString &uname)
+QString MaemoGlobal::remoteSudo(const QString &deviceType, const QString &uname)
 {
     if (uname == QLatin1String("root"))
         return QString();
-    if (osType == QLatin1String(Maemo5OsType) || osType == QLatin1String(HarmattanOsType)
-            || osType == QLatin1String(MeeGoOsType)) {
+    if (deviceType == QLatin1String(Maemo5OsType) || deviceType == QLatin1String(HarmattanOsType)
+            || deviceType == QLatin1String(MeeGoOsType)) {
         return devrootshPath();
     }
     return QString(); // Using sudo would open a can of worms.
@@ -158,7 +158,7 @@ Utils::PortList MaemoGlobal::freePorts(const LinuxDeviceConfiguration::ConstPtr
 {
     if (!devConf || !qtVersion)
         return Utils::PortList();
-    if (devConf->deviceType() == LinuxDeviceConfiguration::Emulator) {
+    if (devConf->machineType() == LinuxDeviceConfiguration::Emulator) {
         MaemoQemuRuntime rt;
         const int id = qtVersion->uniqueId();
         if (MaemoQemuManager::instance().runtimeForQtVersion(id, &rt))
@@ -199,13 +199,13 @@ QString MaemoGlobal::madCommand(const QString &qmakePath)
     return maddeRoot(qmakePath) + QLatin1String("/bin/mad");
 }
 
-QString MaemoGlobal::madDeveloperUiName(const QString &osType)
+QString MaemoGlobal::madDeveloperUiName(const QString &deviceType)
 {
-    return osType == QLatin1String(HarmattanOsType)
+    return deviceType == QLatin1String(HarmattanOsType)
         ? tr("SDK Connectivity") : tr("Mad Developer");
 }
 
-QString MaemoGlobal::osType(const QString &qmakePath)
+QString MaemoGlobal::deviceType(const QString &qmakePath)
 {
     const QString &name = targetName(qmakePath);
     if (name.startsWith(QLatin1String("fremantle")))
diff --git a/src/plugins/madde/maemoglobal.h b/src/plugins/madde/maemoglobal.h
index 14aab85f38..e2c2c62d16 100644
--- a/src/plugins/madde/maemoglobal.h
+++ b/src/plugins/madde/maemoglobal.h
@@ -97,8 +97,8 @@ public:
 
     static QString homeDirOnDevice(const QString &uname);
     static QString devrootshPath();
-    static int applicationIconSize(const QString &osType);
-    static QString remoteSudo(const QString &osType, const QString &uname);
+    static int applicationIconSize(const QString &deviceType);
+    static QString remoteSudo(const QString &deviceType, const QString &uname);
     static QString remoteSourceProfilesCommand();
     static Utils::PortList freePorts(const QSharedPointer<const RemoteLinux::LinuxDeviceConfiguration> &devConf,
         const QtSupport::BaseQtVersion *qtVersion);
@@ -109,8 +109,8 @@ public:
     static QString targetRoot(const QString &qmakePath);
     static QString targetName(const QString &qmakePath);
     static QString madCommand(const QString &qmakePath);
-    static QString madDeveloperUiName(const QString &osType);
-    static QString osType(const QString &qmakePath);
+    static QString madDeveloperUiName(const QString &deviceType);
+    static QString deviceType(const QString &qmakePath);
 
     // TODO: IS this still needed with Qt Version having an Abi?
     static QString architecture(const QString &qmakePath);
@@ -120,7 +120,7 @@ public:
     static bool callMadAdmin(QProcess &proc, const QStringList &args,
         const QString &qmakePath, bool useTarget);
 
-    static bool isValidMaemoQtVersion(const QString &qmakePath, const QString &osType);
+    static bool isValidMaemoQtVersion(const QString &qmakePath, const QString &deviceType);
 private:
     static QString madAdminCommand(const QString &qmakePath);
     static bool callMaddeShellScript(QProcess &proc, const QString &qmakePath,
diff --git a/src/plugins/madde/maemopublisherfremantlefree.cpp b/src/plugins/madde/maemopublisherfremantlefree.cpp
index 8a3e055151..7df0fa3bbd 100644
--- a/src/plugins/madde/maemopublisherfremantlefree.cpp
+++ b/src/plugins/madde/maemopublisherfremantlefree.cpp
@@ -69,7 +69,6 @@ MaemoPublisherFremantleFree::MaemoPublisherFremantleFree(const ProjectExplorer::
     QObject(parent),
     m_project(project),
     m_state(Inactive),
-    m_sshParams(SshConnectionParameters::DefaultProxy),
     m_uploader(0)
 {
     m_sshParams.authenticationType = SshConnectionParameters::AuthenticationByKey;
diff --git a/src/plugins/madde/maemopublishingbuildsettingspagefremantlefree.cpp b/src/plugins/madde/maemopublishingbuildsettingspagefremantlefree.cpp
index 53da32fe71..396d1246e3 100644
--- a/src/plugins/madde/maemopublishingbuildsettingspagefremantlefree.cpp
+++ b/src/plugins/madde/maemopublishingbuildsettingspagefremantlefree.cpp
@@ -86,7 +86,7 @@ void MaemoPublishingBuildSettingsPageFremantleFree::collectBuildConfigurations(c
             QtSupport::BaseQtVersion *lqt = qt4Bc->qtVersion();
             if (!lqt)
                 continue;
-            if (MaemoGlobal::osType(lqt->qmakeCommand().toString()) == QLatin1String(Maemo5OsType))
+            if (MaemoGlobal::deviceType(lqt->qmakeCommand().toString()) == QLatin1String(Maemo5OsType))
                 m_buildConfigs << qt4Bc;
         }
         break;
diff --git a/src/plugins/madde/maemopublishingwizardfactories.cpp b/src/plugins/madde/maemopublishingwizardfactories.cpp
index eb90bde72b..6524527856 100644
--- a/src/plugins/madde/maemopublishingwizardfactories.cpp
+++ b/src/plugins/madde/maemopublishingwizardfactories.cpp
@@ -84,7 +84,7 @@ bool MaemoPublishingWizardFactoryFremantleFree::canCreateWizard(const Project *p
             QtSupport::BaseQtVersion *qt = qt4Bc->qtVersion();
             if (!qt)
                 continue;
-            if (MaemoGlobal::osType(qt->qmakeCommand().toString()) == QLatin1String(Maemo5OsType))
+            if (MaemoGlobal::deviceType(qt->qmakeCommand().toString()) == QLatin1String(Maemo5OsType))
                 return true;
         }
         break;
diff --git a/src/plugins/madde/maemoqemumanager.cpp b/src/plugins/madde/maemoqemumanager.cpp
index 78b18409f1..d9c79c1a24 100644
--- a/src/plugins/madde/maemoqemumanager.cpp
+++ b/src/plugins/madde/maemoqemumanager.cpp
@@ -591,7 +591,7 @@ bool MaemoQemuManager::targetUsesMatchingRuntimeConfig(Target *target,
     if (qtVersion)
         *qtVersion = version;
     const LinuxDeviceConfiguration::ConstPtr &config = mrc->deviceConfig();
-    return config && config->deviceType() == LinuxDeviceConfiguration::Emulator;
+    return config && config->machineType() == LinuxDeviceConfiguration::Emulator;
 }
 
 void MaemoQemuManager::notify(const QList<int> uniqueIds)
diff --git a/src/plugins/madde/maemoqtversion.cpp b/src/plugins/madde/maemoqtversion.cpp
index 6c5a692a81..1ca3e9f8bc 100644
--- a/src/plugins/madde/maemoqtversion.cpp
+++ b/src/plugins/madde/maemoqtversion.cpp
@@ -57,7 +57,7 @@ MaemoQtVersion::MaemoQtVersion()
 
 MaemoQtVersion::MaemoQtVersion(const Utils::FileName &path, bool isAutodetected, const QString &autodetectionSource)
     : QtSupport::BaseQtVersion(path, isAutodetected, autodetectionSource),
-      m_osType(MaemoGlobal::osType(path.toString())),
+      m_deviceType(MaemoGlobal::deviceType(path.toString())),
       m_isvalidVersion(false),
       m_initialized(false)
 {
@@ -73,7 +73,7 @@ void MaemoQtVersion::fromMap(const QVariantMap &map)
 {
     QtSupport::BaseQtVersion::fromMap(map);
     QString path = qmakeCommand().toString();
-    m_osType = MaemoGlobal::osType(path);
+    m_deviceType = MaemoGlobal::deviceType(path);
 }
 
 QString MaemoQtVersion::type() const
@@ -86,7 +86,7 @@ bool MaemoQtVersion::isValid() const
     if (!BaseQtVersion::isValid())
         return false;
     if (!m_initialized) {
-        m_isvalidVersion = MaemoGlobal::isValidMaemoQtVersion(qmakeCommand().toString(), m_osType);
+        m_isvalidVersion = MaemoGlobal::isValidMaemoQtVersion(qmakeCommand().toString(), m_deviceType);
         m_initialized = true;
     }
     return m_isvalidVersion;
@@ -124,16 +124,16 @@ QList<ProjectExplorer::Abi> MaemoQtVersion::detectQtAbis() const
     QList<ProjectExplorer::Abi> result;
     if (!isValid())
         return result;
-    if (m_osType == QLatin1String(Maemo5OsType)) {
+    if (m_deviceType == QLatin1String(Maemo5OsType)) {
         result.append(ProjectExplorer::Abi(ProjectExplorer::Abi::ArmArchitecture, ProjectExplorer::Abi::LinuxOS,
                                            ProjectExplorer::Abi::MaemoLinuxFlavor, ProjectExplorer::Abi::ElfFormat,
                                            32));
-    } else if (m_osType == QLatin1String(HarmattanOsType)) {
+    } else if (m_deviceType == QLatin1String(HarmattanOsType)) {
         result.append(ProjectExplorer::Abi(ProjectExplorer::Abi::ArmArchitecture, ProjectExplorer::Abi::LinuxOS,
                                            ProjectExplorer::Abi::HarmattanLinuxFlavor,
                                            ProjectExplorer::Abi::ElfFormat,
                                            32));
-    } else if (m_osType == QLatin1String(MeeGoOsType)) {
+    } else if (m_deviceType == QLatin1String(MeeGoOsType)) {
         result.append(ProjectExplorer::Abi(ProjectExplorer::Abi::ArmArchitecture, ProjectExplorer::Abi::LinuxOS,
                                            ProjectExplorer::Abi::MeegoLinuxFlavor,
                                            ProjectExplorer::Abi::ElfFormat, 32));
@@ -151,11 +151,11 @@ QSet<QString> MaemoQtVersion::supportedTargetIds() const
     QSet<QString> result;
     if (!isValid())
         return result;
-    if (m_osType == QLatin1String(Maemo5OsType)) {
+    if (m_deviceType == QLatin1String(Maemo5OsType)) {
         result.insert(QLatin1String(Constants::MAEMO5_DEVICE_TARGET_ID));
-    } else if (m_osType == QLatin1String(HarmattanOsType)) {
+    } else if (m_deviceType == QLatin1String(HarmattanOsType)) {
         result.insert(QLatin1String(Constants::HARMATTAN_DEVICE_TARGET_ID));
-    } else if (m_osType == QLatin1String(MeeGoOsType)) {
+    } else if (m_deviceType == QLatin1String(MeeGoOsType)) {
         result.insert(QLatin1String(Constants::MEEGO_DEVICE_TARGET_ID));
     }
     return result;
@@ -163,11 +163,11 @@ QSet<QString> MaemoQtVersion::supportedTargetIds() const
 
 QString MaemoQtVersion::description() const
 {
-    if (m_osType == QLatin1String(Maemo5OsType))
+    if (m_deviceType == QLatin1String(Maemo5OsType))
         return QCoreApplication::translate("QtVersion", "Maemo", "Qt Version is meant for Maemo5");
-    else if (m_osType == QLatin1String(HarmattanOsType))
+    else if (m_deviceType == QLatin1String(HarmattanOsType))
         return QCoreApplication::translate("QtVersion", "Harmattan ", "Qt Version is meant for Harmattan");
-    else if (m_osType == QLatin1String(MeeGoOsType))
+    else if (m_deviceType == QLatin1String(MeeGoOsType))
         return QCoreApplication::translate("QtVersion", "MeeGo", "Qt Version is meant for MeeGo");
     return QString();
 }
@@ -180,9 +180,9 @@ bool MaemoQtVersion::supportsShadowBuilds() const
     return true;
 }
 
-QString MaemoQtVersion::osType() const
+QString MaemoQtVersion::deviceType() const
 {
-    return m_osType;
+    return m_deviceType;
 }
 
 Core::FeatureSet MaemoQtVersion::availableFeatures() const
@@ -192,7 +192,7 @@ Core::FeatureSet MaemoQtVersion::availableFeatures() const
         features |= Core::FeatureSet(QtSupport::Constants::FEATURE_QTQUICK_COMPONENTS_MEEGO);
     features |= Core::FeatureSet(QtSupport::Constants::FEATURE_MOBILE);
 
-    if (osType() != QLatin1String(Maemo5OsType)) //Only Maemo5 has proper support for Widgets
+    if (deviceType() != QLatin1String(Maemo5OsType)) //Only Maemo5 has proper support for Widgets
         features.remove(Core::Feature(QtSupport::Constants::FEATURE_QWIDGETS));
 
     return features;
diff --git a/src/plugins/madde/maemoqtversion.h b/src/plugins/madde/maemoqtversion.h
index 2b55c2cee8..ec65f43fcc 100644
--- a/src/plugins/madde/maemoqtversion.h
+++ b/src/plugins/madde/maemoqtversion.h
@@ -59,14 +59,14 @@ public:
     QString description() const;
 
     bool supportsShadowBuilds() const;
-    QString osType() const;
+    QString deviceType() const;
     Core::FeatureSet availableFeatures() const;
     QString platformName() const;
     QString platformDisplayName() const;
 
 private:
     mutable QString m_systemRoot;
-    mutable QString m_osType;
+    mutable QString m_deviceType;
     mutable bool m_isvalidVersion;
     mutable bool m_initialized;
 };
diff --git a/src/plugins/madde/maemoremotecopyfacility.cpp b/src/plugins/madde/maemoremotecopyfacility.cpp
index 849c497514..574a2efcba 100644
--- a/src/plugins/madde/maemoremotecopyfacility.cpp
+++ b/src/plugins/madde/maemoremotecopyfacility.cpp
@@ -138,7 +138,7 @@ void MaemoRemoteCopyFacility::copyNextFile()
 #endif
 
     QString command = QString::fromLatin1("%1 mkdir -p %3 && %1 cp -a %2 %3")
-        .arg(MaemoGlobal::remoteSudo(m_devConf->osType(), m_devConf->sshParameters().userName),
+        .arg(MaemoGlobal::remoteSudo(m_devConf->type(), m_devConf->sshParameters().userName),
             sourceFilePath, d.remoteDir);
     emit progress(tr("Copying file '%1' to directory '%2' on the device...")
         .arg(d.localFilePath, d.remoteDir));
diff --git a/src/plugins/madde/maemoremotemounter.cpp b/src/plugins/madde/maemoremotemounter.cpp
index fd39e54855..c8de89c90a 100644
--- a/src/plugins/madde/maemoremotemounter.cpp
+++ b/src/plugins/madde/maemoremotemounter.cpp
@@ -129,7 +129,7 @@ void MaemoRemoteMounter::unmount()
     }
 
     QString remoteCall;
-    const QString remoteSudo = MaemoGlobal::remoteSudo(m_devConf->osType(),
+    const QString remoteSudo = MaemoGlobal::remoteSudo(m_devConf->type(),
         m_connection->connectionParameters().userName);
     for (int i = 0; i < m_mountSpecs.count(); ++i) {
         remoteCall += QString::fromLatin1("%1 umount %2 && %1 rmdir %2;")
@@ -188,7 +188,7 @@ void MaemoRemoteMounter::stop()
 void MaemoRemoteMounter::startUtfsClients()
 {
     const QString userName = m_connection->connectionParameters().userName;
-    const QString chmodFuse = MaemoGlobal::remoteSudo(m_devConf->osType(),
+    const QString chmodFuse = MaemoGlobal::remoteSudo(m_devConf->type(),
         userName) + QLatin1String(" chmod a+r+w /dev/fuse");
     const QString chmodUtfsClient
         = QLatin1String("chmod a+x ") + utfsClientOnDevice();
@@ -205,7 +205,7 @@ void MaemoRemoteMounter::startUtfsClients()
         }
 
         const QString remoteSudo
-            = MaemoGlobal::remoteSudo(m_devConf->osType(), userName);
+            = MaemoGlobal::remoteSudo(m_devConf->type(), userName);
         const MaemoMountSpecification &mountSpec = mountInfo.mountSpec;
         const QString mkdir = QString::fromLatin1("%1 mkdir -p %2")
             .arg(remoteSudo, mountSpec.remoteMountPoint);
@@ -216,7 +216,7 @@ void MaemoRemoteMounter::startUtfsClients()
                   .arg(utfsClientOnDevice()).arg(mountInfo.remotePort)
                   .arg(mountSpec.remoteMountPoint);
         if (mountInfo.mountAsRoot) {
-            utfsClient.prepend(MaemoGlobal::remoteSudo(m_devConf->osType(),
+            utfsClient.prepend(MaemoGlobal::remoteSudo(m_devConf->type(),
                 userName) + QLatin1Char(' '));
         }
         QLatin1String seqOp("; ");
diff --git a/src/plugins/madde/maemorunconfiguration.cpp b/src/plugins/madde/maemorunconfiguration.cpp
index 026ab3065e..9db4413023 100644
--- a/src/plugins/madde/maemorunconfiguration.cpp
+++ b/src/plugins/madde/maemorunconfiguration.cpp
@@ -125,7 +125,7 @@ QString MaemoRunConfiguration::commandPrefix() const
         return QString();
 
     QString prefix = environmentPreparationCommand() + QLatin1Char(';');
-    if (deviceConfig()->osType() == QLatin1String(MeeGoOsType))
+    if (deviceConfig()->type() == QLatin1String(MeeGoOsType))
         prefix += QLatin1String("DISPLAY=:0.0 ");
 
     return QString::fromLatin1("%1 %2").arg(prefix, userEnvironmentChangesAsString());
diff --git a/src/plugins/madde/maemosshrunner.cpp b/src/plugins/madde/maemosshrunner.cpp
index 846ef068e8..219b93515a 100644
--- a/src/plugins/madde/maemosshrunner.cpp
+++ b/src/plugins/madde/maemosshrunner.cpp
@@ -73,7 +73,7 @@ bool MaemoSshRunner::canRun(QString &whyNot) const
     if (!AbstractRemoteLinuxApplicationRunner::canRun(whyNot))
         return false;
 
-    if (devConfig()->deviceType() == LinuxDeviceConfiguration::Emulator
+    if (devConfig()->machineType() == LinuxDeviceConfiguration::Emulator
             && !MaemoQemuManager::instance().qemuIsRunning()) {
         MaemoQemuRuntime rt;
         if (MaemoQemuManager::instance().runtimeForQtVersion(m_qtId, &rt)) {
diff --git a/src/plugins/madde/qt4maemotarget.cpp b/src/plugins/madde/qt4maemotarget.cpp
index b273b2d80c..964673fe4b 100644
--- a/src/plugins/madde/qt4maemotarget.cpp
+++ b/src/plugins/madde/qt4maemotarget.cpp
@@ -122,8 +122,8 @@ bool adaptTagValue(QByteArray &document, const QByteArray &fieldName,
 
 
 AbstractQt4MaemoTarget::AbstractQt4MaemoTarget(Qt4Project *parent, const QString &id,
-        const QString &supportedOsType, const QString &qmakeScope) :
-    AbstractEmbeddedLinuxTarget(parent, id, supportedOsType),
+        const QString &supportedDeviceType, const QString &qmakeScope) :
+    AbstractEmbeddedLinuxTarget(parent, id, supportedDeviceType),
     m_filesWatcher(new Utils::FileSystemWatcher(this)),
     m_deploymentSettingsAssistant(new DeploymentSettingsAssistant(qmakeScope,
         QLatin1String("/opt"), deploymentInfo())),
@@ -375,8 +375,8 @@ void AbstractQt4MaemoTarget::raiseError(const QString &reason)
 }
 
 AbstractDebBasedQt4MaemoTarget::AbstractDebBasedQt4MaemoTarget(Qt4Project *parent,
-        const QString &id, const QString &supportedOsType, const QString &qmakeScope)
-    : AbstractQt4MaemoTarget(parent, id, supportedOsType, qmakeScope)
+        const QString &id, const QString &supportedDeviceType, const QString &qmakeScope)
+    : AbstractQt4MaemoTarget(parent, id, supportedDeviceType, qmakeScope)
 {
 }
 
@@ -958,8 +958,8 @@ QString AbstractDebBasedQt4MaemoTarget::shortDayOfWeekName(const QDateTime &dt)
 
 
 AbstractRpmBasedQt4MaemoTarget::AbstractRpmBasedQt4MaemoTarget(Qt4Project *parent,
-        const QString &id, const QString &supportedOsType, const QString &qmakeScope)
-    : AbstractQt4MaemoTarget(parent, id, supportedOsType, qmakeScope)
+        const QString &id, const QString &supportedDeviceType, const QString &qmakeScope)
+    : AbstractQt4MaemoTarget(parent, id, supportedDeviceType, qmakeScope)
 {
 }
 
diff --git a/src/plugins/madde/qt4maemotarget.h b/src/plugins/madde/qt4maemotarget.h
index 4489521981..ef35b9569a 100644
--- a/src/plugins/madde/qt4maemotarget.h
+++ b/src/plugins/madde/qt4maemotarget.h
@@ -57,7 +57,7 @@ class AbstractQt4MaemoTarget : public RemoteLinux::AbstractEmbeddedLinuxTarget
     Q_OBJECT
 public:
     explicit AbstractQt4MaemoTarget(Qt4ProjectManager::Qt4Project *parent, const QString &id,
-        const QString &supportedOsType, const QString &qmakeScope);
+        const QString &supportedDeviceType, const QString &qmakeScope);
     virtual ~AbstractQt4MaemoTarget();
 
     void createApplicationProFiles(bool reparse);
@@ -120,7 +120,7 @@ class AbstractDebBasedQt4MaemoTarget : public AbstractQt4MaemoTarget
     Q_OBJECT
 public:
     AbstractDebBasedQt4MaemoTarget(Qt4ProjectManager::Qt4Project *parent, const QString &id,
-        const QString &supportedOsType, const QString &qmakeScope);
+        const QString &supportedDeviceType, const QString &qmakeScope);
     ~AbstractDebBasedQt4MaemoTarget();
 
     QString debianDirPath() const;
@@ -193,7 +193,7 @@ class AbstractRpmBasedQt4MaemoTarget : public AbstractQt4MaemoTarget
     Q_OBJECT
 public:
     AbstractRpmBasedQt4MaemoTarget(Qt4ProjectManager::Qt4Project *parent, const QString &id,
-        const QString &supportedOsType, const QString &qmakeScope);
+        const QString &supportedDeviceType, const QString &qmakeScope);
     ~AbstractRpmBasedQt4MaemoTarget();
 
     virtual bool allowsRemoteMounts() const { return false; }
diff --git a/src/plugins/remotelinux/abstractembeddedlinuxtarget.cpp b/src/plugins/remotelinux/abstractembeddedlinuxtarget.cpp
index 16985e39a7..0ecc012378 100644
--- a/src/plugins/remotelinux/abstractembeddedlinuxtarget.cpp
+++ b/src/plugins/remotelinux/abstractembeddedlinuxtarget.cpp
@@ -42,12 +42,13 @@ using namespace Qt4ProjectManager;
 namespace RemoteLinux {
 
 AbstractEmbeddedLinuxTarget::AbstractEmbeddedLinuxTarget(Qt4Project *parent, const QString &id,
-        const QString &supportedOsType) :
+        const QString &supportedDeviceType) :
     Qt4BaseTarget(parent, id),
     m_buildConfigurationFactory(new Qt4BuildConfigurationFactory(this)),
-    m_supportedOsType(supportedOsType),
+    m_supportedDeviceType(supportedDeviceType),
     m_deploymentInfo(new DeploymentInfo(this)),
-    m_deviceConfigModel(new Internal::TypeSpecificDeviceConfigurationListModel(supportedOsType, this))
+    m_deviceConfigModel(new Internal::TypeSpecificDeviceConfigurationListModel(supportedDeviceType,
+        this))
 {
 }
 
diff --git a/src/plugins/remotelinux/abstractembeddedlinuxtarget.h b/src/plugins/remotelinux/abstractembeddedlinuxtarget.h
index da0e26efea..6b1869cb09 100644
--- a/src/plugins/remotelinux/abstractembeddedlinuxtarget.h
+++ b/src/plugins/remotelinux/abstractembeddedlinuxtarget.h
@@ -50,11 +50,11 @@ class REMOTELINUX_EXPORT AbstractEmbeddedLinuxTarget : public Qt4ProjectManager:
     Q_OBJECT
 public:
     AbstractEmbeddedLinuxTarget(Qt4ProjectManager::Qt4Project *parent, const QString &id,
-        const QString &supportedOsType);
+        const QString &supportedDeviceType);
 
     ProjectExplorer::IBuildConfigurationFactory *buildConfigurationFactory() const;
 
-    QString supportedOsType() const { return m_supportedOsType; }
+    QString supportedDeviceType() const { return m_supportedDeviceType; }
     DeploymentInfo *deploymentInfo() const { return m_deploymentInfo; }
     Internal::TypeSpecificDeviceConfigurationListModel *deviceConfigModel() const {
         return m_deviceConfigModel;
@@ -62,7 +62,7 @@ public:
 
 private:
     Qt4ProjectManager::Qt4BuildConfigurationFactory * const m_buildConfigurationFactory;
-    const QString m_supportedOsType;
+    const QString m_supportedDeviceType;
     DeploymentInfo * const m_deploymentInfo;
     Internal::TypeSpecificDeviceConfigurationListModel * const m_deviceConfigModel;
 };
diff --git a/src/plugins/remotelinux/abstractremotelinuxdeployservice.cpp b/src/plugins/remotelinux/abstractremotelinuxdeployservice.cpp
index 80be33ea36..33433d61f8 100644
--- a/src/plugins/remotelinux/abstractremotelinuxdeployservice.cpp
+++ b/src/plugins/remotelinux/abstractremotelinuxdeployservice.cpp
@@ -304,7 +304,7 @@ void AbstractRemoteLinuxDeployService::handleConnectionFailure()
         break;
     case Connecting: {
         QString errorMsg = tr("Could not connect to host: %1").arg(d->connection->errorString());
-        if (deviceConfiguration()->deviceType() == LinuxDeviceConfiguration::Emulator)
+        if (deviceConfiguration()->machineType() == LinuxDeviceConfiguration::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/devicemanagermodel.cpp b/src/plugins/remotelinux/devicemanagermodel.cpp
index 0d447c120b..46daa0938b 100644
--- a/src/plugins/remotelinux/devicemanagermodel.cpp
+++ b/src/plugins/remotelinux/devicemanagermodel.cpp
@@ -106,9 +106,9 @@ QVariant DeviceManagerModel::data(const QModelIndex &index, int role) const
         return QVariant();
     const LinuxDeviceConfiguration::ConstPtr devConf = d->devices.at(index.row());
     QString name = devConf->displayName();
-    if (d->deviceManager->defaultDeviceConfig(devConf->osType()) == devConf) {
+    if (d->deviceManager->defaultDeviceConfig(devConf->type()) == devConf) {
         name += QLatin1Char(' ') + tr("(default for %1)")
-            .arg(RemoteLinuxUtils::osTypeToString(devConf->osType()));
+            .arg(RemoteLinuxUtils::displayType(devConf->type()));
     }
     return name;
 }
diff --git a/src/plugins/remotelinux/genericlinuxdeviceconfigurationfactory.cpp b/src/plugins/remotelinux/genericlinuxdeviceconfigurationfactory.cpp
index 0c7865199c..74429e8d03 100644
--- a/src/plugins/remotelinux/genericlinuxdeviceconfigurationfactory.cpp
+++ b/src/plugins/remotelinux/genericlinuxdeviceconfigurationfactory.cpp
@@ -65,14 +65,14 @@ ILinuxDeviceConfigurationWidget *GenericLinuxDeviceConfigurationFactory::createW
     return new GenericLinuxDeviceConfigurationWidget(deviceConfig, parent);
 }
 
-bool GenericLinuxDeviceConfigurationFactory::supportsOsType(const QString &osType) const
+bool GenericLinuxDeviceConfigurationFactory::supportsDeviceType(const QString &deviceType) const
 {
-    return osType == QLatin1String(Constants::GenericLinuxOsType);
+    return deviceType == QLatin1String(Constants::GenericLinuxOsType);
 }
 
-QString GenericLinuxDeviceConfigurationFactory::displayNameForOsType(const QString &osType) const
+QString GenericLinuxDeviceConfigurationFactory::displayType(const QString &deviceType) const
 {
-    QTC_ASSERT(supportsOsType(osType), return QString());
+    QTC_ASSERT(supportsDeviceType(deviceType), return QString());
     return tr("Generic Linux");
 }
 
diff --git a/src/plugins/remotelinux/genericlinuxdeviceconfigurationfactory.h b/src/plugins/remotelinux/genericlinuxdeviceconfigurationfactory.h
index 24b4400b2f..b8fbde579f 100644
--- a/src/plugins/remotelinux/genericlinuxdeviceconfigurationfactory.h
+++ b/src/plugins/remotelinux/genericlinuxdeviceconfigurationfactory.h
@@ -50,8 +50,8 @@ public:
     ILinuxDeviceConfigurationWidget *createWidget(
             const LinuxDeviceConfiguration::Ptr &deviceConfig,
             QWidget *parent = 0) const;
-    bool supportsOsType(const QString &osType) const;
-    QString displayNameForOsType(const QString &osType) const;
+    bool supportsDeviceType(const QString &deviceType) const;
+    QString displayType(const QString &deviceType) const;
     QStringList supportedDeviceActionIds() const;
     QString displayNameForActionId(const QString &actionId) const;
     QDialog *createDeviceAction(const QString &actionId,
diff --git a/src/plugins/remotelinux/genericlinuxdeviceconfigurationwidget.cpp b/src/plugins/remotelinux/genericlinuxdeviceconfigurationwidget.cpp
index 1f1b8da513..e50256d512 100644
--- a/src/plugins/remotelinux/genericlinuxdeviceconfigurationwidget.cpp
+++ b/src/plugins/remotelinux/genericlinuxdeviceconfigurationwidget.cpp
@@ -159,6 +159,10 @@ void GenericLinuxDeviceConfigurationWidget::updatePortsWarningLabel()
 
 void GenericLinuxDeviceConfigurationWidget::initGui()
 {
+    if (deviceConfiguration()->machineType() == LinuxDeviceConfiguration::Hardware)
+        m_ui->machineTypeValueLabel->setText(tr("Physical Device"));
+    else
+        m_ui->machineTypeValueLabel->setText(tr("Emulator"));
     m_ui->portsWarningLabel->setPixmap(QPixmap(":/projectexplorer/images/compile_error.png"));
     m_ui->portsWarningLabel->setToolTip(QLatin1String("<font color=\"red\">")
         + tr("You will need at least one port.") + QLatin1String("</font>"));
diff --git a/src/plugins/remotelinux/genericlinuxdeviceconfigurationwidget.ui b/src/plugins/remotelinux/genericlinuxdeviceconfigurationwidget.ui
index 6a72bec054..6969c38e65 100644
--- a/src/plugins/remotelinux/genericlinuxdeviceconfigurationwidget.ui
+++ b/src/plugins/remotelinux/genericlinuxdeviceconfigurationwidget.ui
@@ -7,7 +7,7 @@
     <x>0</x>
     <y>0</y>
     <width>393</width>
-    <height>170</height>
+    <height>185</height>
    </rect>
   </property>
   <property name="windowTitle">
@@ -20,14 +20,14 @@
    <property name="margin">
     <number>0</number>
    </property>
-   <item row="0" column="0">
+   <item row="1" column="0">
     <widget class="QLabel" name="authTypeLabel">
      <property name="text">
       <string>Authentication type:</string>
      </property>
     </widget>
    </item>
-   <item row="0" column="1">
+   <item row="1" column="1">
     <widget class="QWidget" name="authTypeButtonsWidget" native="true">
      <layout class="QHBoxLayout" name="horizontalLayout_3">
       <property name="margin">
@@ -63,7 +63,7 @@
      </layout>
     </widget>
    </item>
-   <item row="1" column="0">
+   <item row="2" column="0">
     <widget class="QLabel" name="hostNameLabel">
      <property name="text">
       <string>&amp;Host name:</string>
@@ -73,7 +73,7 @@
      </property>
     </widget>
    </item>
-   <item row="1" column="1">
+   <item row="2" column="1">
     <layout class="QHBoxLayout" name="horizontalLayout_4">
      <item>
       <widget class="QLineEdit" name="hostLineEdit">
@@ -107,7 +107,7 @@
      </item>
     </layout>
    </item>
-   <item row="2" column="0">
+   <item row="3" column="0">
     <widget class="QLabel" name="freePortsLabel">
      <property name="text">
       <string>Free ports:</string>
@@ -117,7 +117,7 @@
      </property>
     </widget>
    </item>
-   <item row="2" column="1">
+   <item row="3" column="1">
     <layout class="QHBoxLayout" name="horizontalLayout_7">
      <item>
       <widget class="QLineEdit" name="portsLineEdit">
@@ -161,7 +161,7 @@
      </item>
     </layout>
    </item>
-   <item row="3" column="0">
+   <item row="4" column="0">
     <widget class="QLabel" name="userNameLabel">
      <property name="text">
       <string>&amp;Username:</string>
@@ -171,10 +171,10 @@
      </property>
     </widget>
    </item>
-   <item row="3" column="1">
+   <item row="4" column="1">
     <widget class="QLineEdit" name="userLineEdit"/>
    </item>
-   <item row="4" column="0">
+   <item row="5" column="0">
     <widget class="QLabel" name="passwordLabel">
      <property name="text">
       <string>&amp;Password:</string>
@@ -184,7 +184,7 @@
      </property>
     </widget>
    </item>
-   <item row="4" column="1">
+   <item row="5" column="1">
     <layout class="QHBoxLayout" name="horizontalLayout_6">
      <item>
       <widget class="QLineEdit" name="pwdLineEdit">
@@ -202,14 +202,14 @@
      </item>
     </layout>
    </item>
-   <item row="5" column="0">
+   <item row="6" column="0">
     <widget class="QLabel" name="keyLabel">
      <property name="text">
       <string>Private key file:</string>
      </property>
     </widget>
    </item>
-   <item row="5" column="1">
+   <item row="6" column="1">
     <layout class="QHBoxLayout" name="horizontalLayout_8">
      <item>
       <widget class="Utils::PathChooser" name="keyFileLineEdit" native="true"/>
@@ -223,6 +223,16 @@
      </item>
     </layout>
    </item>
+   <item row="0" column="0">
+    <widget class="QLabel" name="machineTypeLabel">
+     <property name="text">
+      <string>Machine type:</string>
+     </property>
+    </widget>
+   </item>
+   <item row="0" column="1">
+    <widget class="QLabel" name="machineTypeValueLabel"/>
+   </item>
   </layout>
   <zorder>passwordLabel</zorder>
   <zorder>authTypeButtonsWidget</zorder>
@@ -232,6 +242,8 @@
   <zorder>userLineEdit</zorder>
   <zorder>authTypeLabel</zorder>
   <zorder>keyLabel</zorder>
+  <zorder>machineTypeLabel</zorder>
+  <zorder>machineTypeValueLabel</zorder>
  </widget>
  <customwidgets>
   <customwidget>
diff --git a/src/plugins/remotelinux/genericlinuxdeviceconfigurationwizard.cpp b/src/plugins/remotelinux/genericlinuxdeviceconfigurationwizard.cpp
index ef7a61f830..f0901ad98f 100644
--- a/src/plugins/remotelinux/genericlinuxdeviceconfigurationwizard.cpp
+++ b/src/plugins/remotelinux/genericlinuxdeviceconfigurationwizard.cpp
@@ -74,7 +74,7 @@ GenericLinuxDeviceConfigurationWizard::~GenericLinuxDeviceConfigurationWizard()
 
 LinuxDeviceConfiguration::Ptr GenericLinuxDeviceConfigurationWizard::deviceConfiguration()
 {
-    Utils::SshConnectionParameters sshParams(SshConnectionParameters::NoProxy);
+    Utils::SshConnectionParameters sshParams;
     sshParams.host = d->setupPage.hostName();
     sshParams.userName = d->setupPage.userName();
     sshParams.port = 22;
@@ -85,8 +85,9 @@ LinuxDeviceConfiguration::Ptr GenericLinuxDeviceConfigurationWizard::deviceConfi
     else
         sshParams.privateKeyFile = d->setupPage.privateKeyFilePath();
     LinuxDeviceConfiguration::Ptr devConf = LinuxDeviceConfiguration::create(d->setupPage.configurationName(),
-        QLatin1String(Constants::GenericLinuxOsType), LinuxDeviceConfiguration::Hardware,
-        Utils::PortList::fromString(QLatin1String("10000-10100")), sshParams);
+        QLatin1String(Constants::GenericLinuxOsType), LinuxDeviceConfiguration::Hardware);
+    devConf->setFreePorts(Utils::PortList::fromString(QLatin1String("10000-10100")));
+    devConf->setSshParameters(sshParams);
     LinuxDeviceTestDialog dlg(devConf, new GenericLinuxDeviceTester(this), this);
     dlg.exec();
     return devConf;
diff --git a/src/plugins/remotelinux/linuxdeviceconfiguration.cpp b/src/plugins/remotelinux/linuxdeviceconfiguration.cpp
index fe95fcd143..5d9eb3ef28 100644
--- a/src/plugins/remotelinux/linuxdeviceconfiguration.cpp
+++ b/src/plugins/remotelinux/linuxdeviceconfiguration.cpp
@@ -49,8 +49,8 @@ namespace Internal {
 namespace {
 const QLatin1String NameKey("Name");
 const QLatin1String OldOsVersionKey("OsVersion"); // Outdated, only use for upgrading.
-const QLatin1String OsTypeKey("OsType");
-const QLatin1String TypeKey("Type");
+const QLatin1String TypeKey("OsType");
+const QLatin1String MachineTypeKey("Type");
 const QLatin1String HostKey("Host");
 const QLatin1String SshPortKey("SshPort");
 const QLatin1String PortsSpecKey("FreePortsSpec");
@@ -64,21 +64,16 @@ const QLatin1String AttributesKey("Attributes");
 
 const AuthType DefaultAuthType(SshConnectionParameters::AuthenticationByKey);
 const int DefaultTimeout(10);
-const LinuxDeviceConfiguration::DeviceType DefaultDeviceType(LinuxDeviceConfiguration::Hardware);
+const LinuxDeviceConfiguration::MachineType DefaultMachineType(LinuxDeviceConfiguration::Hardware);
 } // anonymous namespace
 
 class LinuxDeviceConfigurationPrivate
 {
 public:
-    LinuxDeviceConfigurationPrivate(const SshConnectionParameters &sshParameters)
-        : sshParameters(sshParameters)
-    {
-    }
-
     SshConnectionParameters sshParameters;
     QString displayName;
-    QString osType;
-    LinuxDeviceConfiguration::DeviceType deviceType;
+    QString type;
+    LinuxDeviceConfiguration::MachineType machineType;
     PortList freePorts;
     LinuxDeviceConfiguration::Origin origin;
     LinuxDeviceConfiguration::Id internalId;
@@ -100,56 +95,45 @@ LinuxDeviceConfiguration::Ptr LinuxDeviceConfiguration::create(const QSettings &
     return Ptr(new LinuxDeviceConfiguration(settings));
 }
 
-LinuxDeviceConfiguration::Ptr LinuxDeviceConfiguration::create(const ConstPtr &other)
-{
-    return Ptr(new LinuxDeviceConfiguration(other));
-}
-
 LinuxDeviceConfiguration::Ptr LinuxDeviceConfiguration::create(const QString &name,
-    const QString &osType, DeviceType deviceType, const PortList &freePorts,
-    const SshConnectionParameters &sshParams, const QVariantHash &attributes, Origin origin)
+    const QString &type, MachineType machineType, Origin origin)
 {
-    return Ptr(new LinuxDeviceConfiguration(name, osType, deviceType, freePorts, sshParams,
-                                            attributes, origin));
+    return Ptr(new LinuxDeviceConfiguration(name, type, machineType, origin));
 }
 
-LinuxDeviceConfiguration::LinuxDeviceConfiguration()
-    : d(new LinuxDeviceConfigurationPrivate(SshConnectionParameters(SshConnectionParameters::NoProxy)))
+LinuxDeviceConfiguration::LinuxDeviceConfiguration() : d(new LinuxDeviceConfigurationPrivate)
 {
 }
 
-LinuxDeviceConfiguration::LinuxDeviceConfiguration(const QString &name, const QString &osType,
-        DeviceType deviceType, const PortList &freePorts, const SshConnectionParameters &sshParams,
-        const QVariantHash &attributes, Origin origin)
-    : d(new LinuxDeviceConfigurationPrivate(sshParams))
+LinuxDeviceConfiguration::LinuxDeviceConfiguration(const QString &name, const QString &type,
+        MachineType machineType, Origin origin)
+    : d(new LinuxDeviceConfigurationPrivate)
 {
     d->displayName = name;
-    d->osType = osType;
-    d->deviceType = deviceType;
-    d->freePorts = freePorts;
+    d->type = type;
+    d->machineType = machineType;
     d->origin = origin;
-    d->attributes = attributes;
 }
 
 // TODO: For pre-2.6 versions. Remove in 2.8.
 LinuxDeviceConfiguration::LinuxDeviceConfiguration(const QSettings &settings)
-    : d(new LinuxDeviceConfigurationPrivate(SshConnectionParameters::NoProxy))
+    : d(new LinuxDeviceConfigurationPrivate)
 {
     d->origin = ManuallyAdded;
     d->displayName = settings.value(NameKey).toString();
-    d->osType = settings.value(OsTypeKey).toString();
-    d->deviceType = static_cast<DeviceType>(settings.value(TypeKey, DefaultDeviceType).toInt());
+    d->type = settings.value(TypeKey).toString();
+    d->machineType = static_cast<MachineType>(settings.value(MachineTypeKey, DefaultMachineType).toInt());
     d->internalId = settings.value(InternalIdKey, InvalidId).toULongLong();
     d->attributes = settings.value(AttributesKey).toHash();
 
     // Convert from version < 2.3.
-    if (d->osType.isEmpty()) {
+    if (d->type.isEmpty()) {
         const int oldOsType = settings.value(OldOsVersionKey, -1).toInt();
         switch (oldOsType) {
-        case 0: d->osType = QLatin1String("Maemo5OsType"); break;
-        case 1: d->osType = QLatin1String("HarmattanOsType"); break;
-        case 2: d->osType = QLatin1String("MeeGoOsType"); break;
-        default: d->osType = QLatin1String(Constants::GenericLinuxOsType);
+        case 0: d->type = QLatin1String("Maemo5OsType"); break;
+        case 1: d->type = QLatin1String("HarmattanOsType"); break;
+        case 2: d->type = QLatin1String("MeeGoOsType"); break;
+        default: d->type = QLatin1String(Constants::GenericLinuxOsType);
         }
     }
 
@@ -165,16 +149,17 @@ LinuxDeviceConfiguration::LinuxDeviceConfiguration(const QSettings &settings)
     d->sshParameters.timeout = settings.value(TimeoutKey, DefaultTimeout).toInt();
 }
 
-LinuxDeviceConfiguration::LinuxDeviceConfiguration(const LinuxDeviceConfiguration::ConstPtr &other)
-    : d(new LinuxDeviceConfigurationPrivate(other->d->sshParameters))
+LinuxDeviceConfiguration::LinuxDeviceConfiguration(const LinuxDeviceConfiguration &other)
+    : d(new LinuxDeviceConfigurationPrivate)
 {
-    d->displayName = other->d->displayName;
-    d->osType = other->d->osType;
-    d->deviceType = other->deviceType();
-    d->freePorts = other->freePorts();
-    d->origin = other->d->origin;
-    d->internalId = other->d->internalId;
-    d->attributes = other->d->attributes;
+    d->displayName = other.d->displayName;
+    d->type = other.d->type;
+    d->machineType = other.machineType();
+    d->freePorts = other.freePorts();
+    d->origin = other.d->origin;
+    d->internalId = other.d->internalId;
+    d->attributes = other.d->attributes;
+    d->sshParameters = other.d->sshParameters;
 }
 
 QString LinuxDeviceConfiguration::defaultPrivateKeyFilePath()
@@ -197,8 +182,8 @@ void LinuxDeviceConfiguration::fromMap(const QVariantMap &map)
 {
     d->origin = ManuallyAdded;
     d->displayName = map.value(NameKey).toString();
-    d->osType = map.value(OsTypeKey).toString();
-    d->deviceType = static_cast<DeviceType>(map.value(TypeKey, DefaultDeviceType).toInt());
+    d->type = map.value(TypeKey).toString();
+    d->machineType = static_cast<MachineType>(map.value(MachineTypeKey, DefaultMachineType).toInt());
     d->internalId = map.value(InternalIdKey, InvalidId).toULongLong();
     const QVariantMap attrMap = map.value(AttributesKey).toMap();
     for (QVariantMap::ConstIterator it = attrMap.constBegin(); it != attrMap.constEnd(); ++it)
@@ -220,8 +205,8 @@ QVariantMap LinuxDeviceConfiguration::toMap() const
 {
     QVariantMap map;
     map.insert(NameKey, d->displayName);
-    map.insert(OsTypeKey, d->osType);
-    map.insert(TypeKey, d->deviceType);
+    map.insert(TypeKey, d->type);
+    map.insert(MachineTypeKey, d->machineType);
     map.insert(HostKey, d->sshParameters.host);
     map.insert(SshPortKey, d->sshParameters.port);
     map.insert(PortsSpecKey, d->freePorts.toString());
@@ -240,15 +225,20 @@ QVariantMap LinuxDeviceConfiguration::toMap() const
     return map;
 }
 
+LinuxDeviceConfiguration::Ptr LinuxDeviceConfiguration::clone() const
+{
+    return Ptr(new LinuxDeviceConfiguration(*this));
+}
+
 SshConnectionParameters LinuxDeviceConfiguration::sshParameters() const
 {
     return d->sshParameters;
 }
 
-LinuxDeviceConfiguration::DeviceType LinuxDeviceConfiguration::deviceType() const
+LinuxDeviceConfiguration::MachineType LinuxDeviceConfiguration::machineType() const
 
 {
-    return d->deviceType;
+    return d->machineType;
 }
 
 LinuxDeviceConfiguration::Id LinuxDeviceConfiguration::internalId() const
@@ -288,7 +278,7 @@ QVariant LinuxDeviceConfiguration::attribute(const QString &name) const
 
 PortList LinuxDeviceConfiguration::freePorts() const { return d->freePorts; }
 QString LinuxDeviceConfiguration::displayName() const { return d->displayName; }
-QString LinuxDeviceConfiguration::osType() const { return d->osType; }
+QString LinuxDeviceConfiguration::type() const { return d->type; }
 
 void LinuxDeviceConfiguration::setDisplayName(const QString &name) { d->displayName = name; }
 void LinuxDeviceConfiguration::setInternalId(Id id) { d->internalId = id; }
diff --git a/src/plugins/remotelinux/linuxdeviceconfiguration.h b/src/plugins/remotelinux/linuxdeviceconfiguration.h
index 70227cdf4d..77ee781c4d 100644
--- a/src/plugins/remotelinux/linuxdeviceconfiguration.h
+++ b/src/plugins/remotelinux/linuxdeviceconfiguration.h
@@ -67,7 +67,7 @@ public:
 
     typedef quint64 Id;
 
-    enum DeviceType { Hardware, Emulator };
+    enum MachineType { Hardware, Emulator };
     enum Origin { ManuallyAdded, AutoDetected };
 
     ~LinuxDeviceConfiguration();
@@ -75,8 +75,8 @@ public:
     Utils::PortList freePorts() const;
     Utils::SshConnectionParameters sshParameters() const;
     QString displayName() const;
-    QString osType() const;
-    DeviceType deviceType() const;
+    QString type() const;
+    MachineType machineType() const;
     Id internalId() const;
     bool isAutoDetected() const;
     QVariantHash attributes() const;
@@ -92,22 +92,18 @@ public:
     static const Id InvalidId;
 
     static Ptr create();
-    static Ptr create(const QString &name, const QString &osType, DeviceType deviceType,
-        const Utils::PortList &freePorts, const Utils::SshConnectionParameters &sshParams,
-        const QVariantHash &attributes = QVariantHash(), Origin origin = ManuallyAdded);
+    static Ptr create(const QString &name, const QString &type, MachineType machineType,
+        Origin origin = ManuallyAdded);
 private:
     LinuxDeviceConfiguration();
-    LinuxDeviceConfiguration(const QString &name, const QString &osType, DeviceType deviceType,
-        const Utils::PortList &freePorts, const Utils::SshConnectionParameters &sshParams,
-        const QVariantHash &attributes, Origin origin);
+    LinuxDeviceConfiguration(const QString &name, const QString &type, MachineType machineType,
+        Origin origin);
     LinuxDeviceConfiguration(const QSettings &settings);
-    LinuxDeviceConfiguration(const ConstPtr &other);
 
-    LinuxDeviceConfiguration(const LinuxDeviceConfiguration &);
+    LinuxDeviceConfiguration(const LinuxDeviceConfiguration &other);
     LinuxDeviceConfiguration &operator=(const LinuxDeviceConfiguration &);
 
     static Ptr create(const QSettings &settings);
-    static Ptr create(const ConstPtr &other);
 
     void setDisplayName(const QString &name);
     void setInternalId(Id id);
@@ -116,6 +112,8 @@ private:
     void fromMap(const QVariantMap &map);
     QVariantMap toMap() const;
 
+    Ptr clone() const;
+
     Internal::LinuxDeviceConfigurationPrivate *d;
 };
 
@@ -205,12 +203,12 @@ public:
     /*!
       Returns true iff this factory supports the given device type.
     */
-    virtual bool supportsOsType(const QString &osType) const = 0;
+    virtual bool supportsDeviceType(const QString &type) const = 0;
 
     /*!
       Returns a human-readable string for the given OS type, if this factory supports that type.
     */
-    virtual QString displayNameForOsType(const QString &osType) const = 0;
+    virtual QString displayType(const QString &type) const = 0;
 
     /*!
       Returns a list of ids representing actions that can be run on device configurations
diff --git a/src/plugins/remotelinux/linuxdeviceconfigurations.cpp b/src/plugins/remotelinux/linuxdeviceconfigurations.cpp
index 76bd32af8d..767e3210a0 100644
--- a/src/plugins/remotelinux/linuxdeviceconfigurations.cpp
+++ b/src/plugins/remotelinux/linuxdeviceconfigurations.cpp
@@ -139,7 +139,7 @@ void LinuxDeviceConfigurations::copy(const LinuxDeviceConfigurations *source,
 {
     if (deep) {
         foreach (const LinuxDeviceConfiguration::ConstPtr &devConf, source->d->devConfigs)
-            target->d->devConfigs << LinuxDeviceConfiguration::create(devConf);
+            target->d->devConfigs << devConf->clone();
     } else {
         target->d->devConfigs = source->d->devConfigs;
     }
@@ -167,7 +167,7 @@ void LinuxDeviceConfigurations::load()
     } else {
         loadPre2_6();
     }
-    ensureOneDefaultConfigurationPerOsType();
+    ensureOneDefaultConfigurationPerDeviceType();
 }
 
 void LinuxDeviceConfigurations::loadPre2_6()
@@ -252,12 +252,12 @@ void LinuxDeviceConfigurations::addConfiguration(const LinuxDeviceConfiguration:
     }
     devConfig->setDisplayName(name);
     devConfig->setInternalId(unusedId());
-    if (!defaultDeviceConfig(devConfig->osType()))
-        d->defaultConfigs.insert(devConfig->osType(), devConfig->internalId());
+    if (!defaultDeviceConfig(devConfig->type()))
+        d->defaultConfigs.insert(devConfig->type(), devConfig->internalId());
     d->devConfigs << devConfig;
     if (this == d->instance && d->clonedInstance) {
         d->clonedInstance->addConfiguration(
-            LinuxDeviceConfiguration::Ptr(new LinuxDeviceConfiguration(devConfig)));
+            LinuxDeviceConfiguration::Ptr(new LinuxDeviceConfiguration(*devConfig)));
     }
     emit deviceAdded(devConfig);
     emit updated();
@@ -271,16 +271,16 @@ void LinuxDeviceConfigurations::removeConfiguration(int idx)
         || deviceConfig->isAutoDetected(), return);
 
     const bool wasDefault
-        = d->defaultConfigs.value(deviceConfig->osType()) == deviceConfig->internalId();
-    const QString osType = deviceConfig->osType();
+        = d->defaultConfigs.value(deviceConfig->type()) == deviceConfig->internalId();
+    const QString deviceType = deviceConfig->type();
     d->devConfigs.removeAt(idx);
 
     emit deviceRemoved(idx);
 
     if (wasDefault) {
         for (int i = 0; i < d->devConfigs.count(); ++i) {
-            if (deviceAt(i)->osType() == osType) {
-                d->defaultConfigs.insert(deviceAt(i)->osType(), deviceAt(i)->internalId());
+            if (deviceAt(i)->type() == deviceType) {
+                d->defaultConfigs.insert(deviceAt(i)->type(), deviceAt(i)->internalId());
                 emit defaultStatusChanged(i);
                 break;
             }
@@ -322,10 +322,10 @@ void LinuxDeviceConfigurations::setDefaultDevice(int idx)
 
     const LinuxDeviceConfiguration::ConstPtr &devConf = d->devConfigs.at(idx);
     const LinuxDeviceConfiguration::ConstPtr &oldDefaultDevConf
-        = defaultDeviceConfig(devConf->osType());
+        = defaultDeviceConfig(devConf->type());
     if (devConf == oldDefaultDevConf)
         return;
-    d->defaultConfigs.insert(devConf->osType(), devConf->internalId());
+    d->defaultConfigs.insert(devConf->type(), devConf->internalId());
     emit defaultStatusChanged(idx);
     for (int i = 0; i < d->devConfigs.count(); ++i) {
         if (d->devConfigs.at(i) == oldDefaultDevConf) {
@@ -373,9 +373,9 @@ LinuxDeviceConfiguration::ConstPtr LinuxDeviceConfigurations::find(LinuxDeviceCo
     return index == -1 ? LinuxDeviceConfiguration::ConstPtr() : deviceAt(index);
 }
 
-LinuxDeviceConfiguration::ConstPtr LinuxDeviceConfigurations::defaultDeviceConfig(const QString &osType) const
+LinuxDeviceConfiguration::ConstPtr LinuxDeviceConfigurations::defaultDeviceConfig(const QString &deviceType) const
 {
-    const LinuxDeviceConfiguration::Id id = d->defaultConfigs.value(osType,
+    const LinuxDeviceConfiguration::Id id = d->defaultConfigs.value(deviceType,
         LinuxDeviceConfiguration::InvalidId);
     if (id == LinuxDeviceConfiguration::InvalidId)
         return LinuxDeviceConfiguration::ConstPtr();
@@ -396,11 +396,11 @@ LinuxDeviceConfiguration::Id LinuxDeviceConfigurations::internalId(LinuxDeviceCo
     return devConf ? devConf->internalId() : LinuxDeviceConfiguration::InvalidId;
 }
 
-void LinuxDeviceConfigurations::ensureOneDefaultConfigurationPerOsType()
+void LinuxDeviceConfigurations::ensureOneDefaultConfigurationPerDeviceType()
 {
     foreach (const LinuxDeviceConfiguration::Ptr &devConf, d->devConfigs) {
-        if (!defaultDeviceConfig(devConf->osType()))
-            d->defaultConfigs.insert(devConf->osType(), devConf->internalId());
+        if (!defaultDeviceConfig(devConf->type()))
+            d->defaultConfigs.insert(devConf->type(), devConf->internalId());
     }
 }
 
diff --git a/src/plugins/remotelinux/linuxdeviceconfigurations.h b/src/plugins/remotelinux/linuxdeviceconfigurations.h
index 1c6dcd22d7..c020b54963 100644
--- a/src/plugins/remotelinux/linuxdeviceconfigurations.h
+++ b/src/plugins/remotelinux/linuxdeviceconfigurations.h
@@ -57,7 +57,7 @@ public:
     int deviceCount() const;
     LinuxDeviceConfiguration::ConstPtr deviceAt(int index) const;
     LinuxDeviceConfiguration::ConstPtr find(LinuxDeviceConfiguration::Id id) const;
-    LinuxDeviceConfiguration::ConstPtr defaultDeviceConfig(const QString &osType) const;
+    LinuxDeviceConfiguration::ConstPtr defaultDeviceConfig(const QString &deviceType) const;
     bool hasConfig(const QString &name) const;
     int indexForInternalId(LinuxDeviceConfiguration::Id internalId) const;
     LinuxDeviceConfiguration::Id internalId(LinuxDeviceConfiguration::ConstPtr devConf) const;
@@ -97,7 +97,7 @@ private:
     static void removeClonedInstance();
     static void copy(const LinuxDeviceConfigurations *source,
         LinuxDeviceConfigurations *target, bool deep);
-    void ensureOneDefaultConfigurationPerOsType();
+    void ensureOneDefaultConfigurationPerDeviceType();
     LinuxDeviceConfiguration::Id unusedId() const;
 
     Internal::LinuxDeviceConfigurationsPrivate * const d;
diff --git a/src/plugins/remotelinux/linuxdeviceconfigurationssettingswidget.cpp b/src/plugins/remotelinux/linuxdeviceconfigurationssettingswidget.cpp
index c0480cd213..9fb5779df7 100644
--- a/src/plugins/remotelinux/linuxdeviceconfigurationssettingswidget.cpp
+++ b/src/plugins/remotelinux/linuxdeviceconfigurationssettingswidget.cpp
@@ -126,8 +126,6 @@ QString LinuxDeviceConfigurationsSettingsWidget::searchKeywords() const
 {
     QString rc;
     QTextStream(&rc) << m_ui->configurationLabel->text()
-        << ' ' << m_ui->deviceTypeLabel->text()
-        << ' ' << m_ui->deviceTypeValueLabel->text()
         << ' ' << m_ui->deviceNameLabel->text()
         << ' ' << m_ui->nameLineEdit->text();
     if (m_configWidget)
@@ -187,13 +185,9 @@ void LinuxDeviceConfigurationsSettingsWidget::displayCurrent()
 {
     const LinuxDeviceConfiguration::ConstPtr &current = currentConfig();
     m_ui->defaultDeviceButton->setEnabled(
-        m_devConfigs->defaultDeviceConfig(current->osType()) != current);
-    m_ui->osTypeValueLabel->setText(RemoteLinuxUtils::osTypeToString(current->osType()));
+        m_devConfigs->defaultDeviceConfig(current->type()) != current);
+    m_ui->osTypeValueLabel->setText(RemoteLinuxUtils::displayType(current->type()));
 
-    if (current->deviceType() == LinuxDeviceConfiguration::Hardware)
-        m_ui->deviceTypeValueLabel->setText(tr("Physical Device"));
-    else
-        m_ui->deviceTypeValueLabel->setText(tr("Emulator"));
     m_nameValidator->setDisplayName(current->displayName());
     m_ui->removeConfigButton->setEnabled(!current->isAutoDetected());
     fillInValues();
@@ -292,7 +286,6 @@ void LinuxDeviceConfigurationsSettingsWidget::clearDetails()
 {
     m_ui->nameLineEdit->clear();
     m_ui->osTypeValueLabel->clear();
-    m_ui->deviceTypeValueLabel->clear();
 }
 
 const ILinuxDeviceConfigurationFactory *LinuxDeviceConfigurationsSettingsWidget::factoryForCurrentConfig() const
@@ -301,7 +294,7 @@ const ILinuxDeviceConfigurationFactory *LinuxDeviceConfigurationsSettingsWidget:
     const QList<ILinuxDeviceConfigurationFactory *> &factories
         = ExtensionSystem::PluginManager::instance()->getObjects<ILinuxDeviceConfigurationFactory>();
     foreach (const ILinuxDeviceConfigurationFactory * const factory, factories) {
-        if (factory->supportsOsType(currentConfig()->osType()))
+        if (factory->supportsDeviceType(currentConfig()->type()))
             return factory;
     }
     return 0;
diff --git a/src/plugins/remotelinux/linuxdeviceconfigurationssettingswidget.ui b/src/plugins/remotelinux/linuxdeviceconfigurationssettingswidget.ui
index ba27d4e0da..3f330e7d1f 100644
--- a/src/plugins/remotelinux/linuxdeviceconfigurationssettingswidget.ui
+++ b/src/plugins/remotelinux/linuxdeviceconfigurationssettingswidget.ui
@@ -6,8 +6,8 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>726</width>
-    <height>473</height>
+    <width>829</width>
+    <height>516</height>
    </rect>
   </property>
   <property name="windowTitle">
@@ -52,13 +52,6 @@
         <string>General</string>
        </property>
        <layout class="QGridLayout" name="gridLayout">
-        <item row="1" column="0">
-         <widget class="QLabel" name="oSTypeLabel">
-          <property name="text">
-           <string>OS type:</string>
-          </property>
-         </widget>
-        </item>
         <item row="1" column="1">
          <widget class="QLabel" name="osTypeValueLabel">
           <property name="text">
@@ -66,30 +59,13 @@
           </property>
          </widget>
         </item>
-        <item row="0" column="0">
-         <widget class="QLabel" name="deviceNameLabel">
-          <property name="text">
-           <string>&amp;Name:</string>
-          </property>
-          <property name="buddy">
-           <cstring>nameLineEdit</cstring>
-          </property>
-         </widget>
-        </item>
         <item row="0" column="1">
          <widget class="QLineEdit" name="nameLineEdit"/>
         </item>
-        <item row="2" column="0">
-         <widget class="QLabel" name="deviceTypeLabel">
-          <property name="text">
-           <string>Device type:</string>
-          </property>
-         </widget>
-        </item>
-        <item row="2" column="1">
-         <widget class="QLabel" name="deviceTypeValueLabel">
+        <item row="1" column="0">
+         <widget class="QLabel" name="oSTypeLabel">
           <property name="text">
-           <string/>
+           <string>Type:</string>
           </property>
          </widget>
         </item>
@@ -106,13 +82,23 @@
           </property>
          </spacer>
         </item>
+        <item row="0" column="0">
+         <widget class="QLabel" name="deviceNameLabel">
+          <property name="text">
+           <string>&amp;Name:</string>
+          </property>
+          <property name="buddy">
+           <cstring>nameLineEdit</cstring>
+          </property>
+         </widget>
+        </item>
        </layout>
       </widget>
      </item>
      <item>
       <widget class="QGroupBox" name="osSpecificGroupBox">
        <property name="title">
-        <string>OS Type Specific</string>
+        <string>Type Specific</string>
        </property>
       </widget>
      </item>
diff --git a/src/plugins/remotelinux/remotelinuxutils.cpp b/src/plugins/remotelinux/remotelinuxutils.cpp
index f711a7fc9a..7a1e57f5b4 100644
--- a/src/plugins/remotelinux/remotelinuxutils.cpp
+++ b/src/plugins/remotelinux/remotelinuxutils.cpp
@@ -43,13 +43,13 @@ using namespace ExtensionSystem;
 
 namespace RemoteLinux {
 
-QString RemoteLinuxUtils::osTypeToString(const QString &osType)
+QString RemoteLinuxUtils::displayType(const QString &deviceType)
 {
     const QList<ILinuxDeviceConfigurationFactory *> &factories
         = PluginManager::instance()->getObjects<ILinuxDeviceConfigurationFactory>();
     foreach (const ILinuxDeviceConfigurationFactory * const factory, factories) {
-        if (factory->supportsOsType(osType))
-            return factory->displayNameForOsType(osType);
+        if (factory->supportsDeviceType(deviceType))
+            return factory->displayType(deviceType);
     }
     return QCoreApplication::translate("RemoteLinux", "Unknown OS");
 }
diff --git a/src/plugins/remotelinux/remotelinuxutils.h b/src/plugins/remotelinux/remotelinuxutils.h
index af0517cdf9..d67d630600 100644
--- a/src/plugins/remotelinux/remotelinuxutils.h
+++ b/src/plugins/remotelinux/remotelinuxutils.h
@@ -42,7 +42,7 @@ class LinuxDeviceConfiguration;
 class REMOTELINUX_EXPORT RemoteLinuxUtils
 {
 public:
-    static QString osTypeToString(const QString &osType);
+    static QString displayType(const QString &deviceType);
     static QString deviceConfigurationName(const QSharedPointer<const LinuxDeviceConfiguration> &devConf);
 };
 
diff --git a/src/plugins/remotelinux/typespecificdeviceconfigurationlistmodel.cpp b/src/plugins/remotelinux/typespecificdeviceconfigurationlistmodel.cpp
index a576a9b169..cfc5253197 100644
--- a/src/plugins/remotelinux/typespecificdeviceconfigurationlistmodel.cpp
+++ b/src/plugins/remotelinux/typespecificdeviceconfigurationlistmodel.cpp
@@ -37,8 +37,8 @@
 namespace RemoteLinux {
 namespace Internal {
 
-TypeSpecificDeviceConfigurationListModel::TypeSpecificDeviceConfigurationListModel(const QString &osType,
-    QObject *parent) : QAbstractListModel(parent), m_targetOsType(osType)
+TypeSpecificDeviceConfigurationListModel::TypeSpecificDeviceConfigurationListModel(const QString &deviceType,
+    QObject *parent) : QAbstractListModel(parent), m_targetDeviceType(deviceType)
 {
     const LinuxDeviceConfigurations * const devConfs
         = LinuxDeviceConfigurations::instance();
@@ -57,10 +57,10 @@ int TypeSpecificDeviceConfigurationListModel::rowCount(const QModelIndex &parent
     const LinuxDeviceConfigurations * const devConfs
         = LinuxDeviceConfigurations::instance();
     const int devConfsCount = devConfs->deviceCount();
-    if (m_targetOsType == QLatin1String(Constants::GenericLinuxOsType))
+    if (m_targetDeviceType == QLatin1String(Constants::GenericLinuxOsType))
         return devConfsCount;
     for (int i = 0; i < devConfsCount; ++i) {
-        if (devConfs->deviceAt(i)->osType() == m_targetOsType)
+        if (devConfs->deviceAt(i)->type() == m_targetDeviceType)
             ++count;
     }
     return count;
@@ -74,8 +74,8 @@ QVariant TypeSpecificDeviceConfigurationListModel::data(const QModelIndex &index
     const LinuxDeviceConfiguration::ConstPtr &devConf = deviceAt(index.row());
     Q_ASSERT(devConf);
     QString displayedName = devConf->displayName();
-    if (devConf->osType() == m_targetOsType && LinuxDeviceConfigurations::instance()
-            ->defaultDeviceConfig(devConf->osType()) == devConf) {
+    if (devConf->type() == m_targetDeviceType && LinuxDeviceConfigurations::instance()
+            ->defaultDeviceConfig(devConf->type()) == devConf) {
         displayedName = tr("%1 (default)").arg(displayedName);
     }
     return displayedName;
@@ -86,11 +86,11 @@ LinuxDeviceConfiguration::ConstPtr TypeSpecificDeviceConfigurationListModel::dev
     int currentRow = -1;
     const LinuxDeviceConfigurations * const devConfs
         = LinuxDeviceConfigurations::instance();
-    if (m_targetOsType == QLatin1String(Constants::GenericLinuxOsType))
+    if (m_targetDeviceType == QLatin1String(Constants::GenericLinuxOsType))
         return devConfs->deviceAt(idx);
     const int devConfsCount = devConfs->deviceCount();
     for (int i = 0; i < devConfsCount; ++i) {
-        if (devConfs->deviceAt(i)->osType() == m_targetOsType) {
+        if (devConfs->deviceAt(i)->type() == m_targetDeviceType) {
             if (++currentRow == idx)
                 return devConfs->deviceAt(i);
         }
@@ -101,15 +101,15 @@ LinuxDeviceConfiguration::ConstPtr TypeSpecificDeviceConfigurationListModel::dev
 
 LinuxDeviceConfiguration::ConstPtr TypeSpecificDeviceConfigurationListModel::defaultDeviceConfig() const
 {
-    return LinuxDeviceConfigurations::instance()->defaultDeviceConfig(m_targetOsType);
+    return LinuxDeviceConfigurations::instance()->defaultDeviceConfig(m_targetDeviceType);
 }
 
 LinuxDeviceConfiguration::ConstPtr TypeSpecificDeviceConfigurationListModel::find(LinuxDeviceConfiguration::Id id) const
 {
     const LinuxDeviceConfiguration::ConstPtr &devConf
         = LinuxDeviceConfigurations::instance()->find(id);
-    return devConf && (devConf->osType() == m_targetOsType
-            || m_targetOsType == QLatin1String(Constants::GenericLinuxOsType))
+    return devConf && (devConf->type() == m_targetDeviceType
+            || m_targetDeviceType == QLatin1String(Constants::GenericLinuxOsType))
         ? devConf : defaultDeviceConfig();
 }
 
diff --git a/src/plugins/remotelinux/typespecificdeviceconfigurationlistmodel.h b/src/plugins/remotelinux/typespecificdeviceconfigurationlistmodel.h
index 6de2cc6611..b686b5a1a1 100644
--- a/src/plugins/remotelinux/typespecificdeviceconfigurationlistmodel.h
+++ b/src/plugins/remotelinux/typespecificdeviceconfigurationlistmodel.h
@@ -44,7 +44,8 @@ class TypeSpecificDeviceConfigurationListModel : public QAbstractListModel
 {
     Q_OBJECT
 public:
-    explicit TypeSpecificDeviceConfigurationListModel(const QString &osType, QObject *parent = 0);
+    explicit TypeSpecificDeviceConfigurationListModel(const QString &deviceType,
+        QObject *parent = 0);
     ~TypeSpecificDeviceConfigurationListModel();
 
     virtual int rowCount(const QModelIndex &parent = QModelIndex()) const;
@@ -60,7 +61,7 @@ signals:
     void updated();
 
 private:
-    const QString m_targetOsType;
+    const QString m_targetDeviceType;
 };
 
 } // namespace Internal
diff --git a/src/plugins/valgrind/valgrindrunner.cpp b/src/plugins/valgrind/valgrindrunner.cpp
index 2c7e8e1c82..26f4f219d9 100644
--- a/src/plugins/valgrind/valgrindrunner.cpp
+++ b/src/plugins/valgrind/valgrindrunner.cpp
@@ -53,8 +53,7 @@ public:
           process(0),
           channelMode(QProcess::SeparateChannels),
           finished(false),
-          startMode(Analyzer::StartLocal),
-          connParams(Utils::SshConnectionParameters::DefaultProxy)
+          startMode(Analyzer::StartLocal)
     {
     }