Introduce new "Madde" plugin.

The new plugin contains everything specific to Maemo and MeeGo as supported by the MADDE framework. This leaves the RemoteLinux plugin with abstract base classes and generic implementations. Change-Id: I6068caa758214cf26a27fe9893e0817b7834b580 Reviewed-on: http://codereview.qt-project.org/5230 Reviewed-by: Tobias Hunger <[email protected]>
author: Christian Kandeler <[email protected]> 2011-09-20 12:16:36 +0200
committer: Christian Kandeler <[email protected]> 2011-09-22 14:11:06 +0200
commit: 4e7d0d9c9ac3d1caa2b6f3ed0d9e0b2347507d70 (patch)
tree: 09e5954b11c0cb93331f3c6dcd294d5f582c9516 /src
parent: 43465cbe7a1fd5b055ce7930a46265972b77f9e1 (diff)
116 files changed, 626 insertions, 367 deletions
diff --git a/src/plugins/madde/Madde.pluginspec.in b/src/plugins/madde/Madde.pluginspec.in
new file mode 100644
index 00000000000..68d0fd2f786
--- /dev/null
+++ b/src/plugins/madde/Madde.pluginspec.in
@@ -0,0 +1,19 @@
+<plugin name=\"Madde\" version=\"$$QTCREATOR_VERSION\" compatVersion=\"$$QTCREATOR_VERSION\">
+    <vendor>Nokia Corporation</vendor>
+    <copyright>(C) 2011 Nokia Corporation</copyright>
+    <license>
+Commercial Usage
+
+Licensees holding valid Qt Commercial licenses may use this plugin in accordance with the Qt Commercial License Agreement provided with the Software or, alternatively, in accordance with the terms contained in a written agreement between you and Nokia.
+
+GNU Lesser General Public License Usage
+
+Alternatively, this plugin may be used under the terms of the GNU Lesser General Public License version 2.1 as published by the Free Software Foundation.  Please review the following information to ensure the GNU Lesser General Public License version 2.1 requirements will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+    </license>
+    <description>Support for MADDE-based platforms, including Fremantle and MeeGo 1.2 Harmattan.</description>
+    <category>Device Support</category>
+    <url>http://qt.nokia.com</url>
+    <dependencyList>
+        <dependency name=\"RemoteLinux\" version=\"$$QTCREATOR_VERSION\"/>
+    </dependencyList>
+</plugin>
diff --git a/src/plugins/remotelinux/images/qemu-run.png b/src/plugins/madde/images/qemu-run.png
index c65d15faf73..c65d15faf73 100644
--- a/src/plugins/remotelinux/images/qemu-run.png
+++ b/src/plugins/madde/images/qemu-run.png
diff --git a/src/plugins/remotelinux/images/qemu-stop.png b/src/plugins/madde/images/qemu-stop.png
index 97bc159599a..97bc159599a 100644
--- a/src/plugins/remotelinux/images/qemu-stop.png
+++ b/src/plugins/madde/images/qemu-stop.png
diff --git a/src/plugins/remotelinux/images/qemu.xcf b/src/plugins/madde/images/qemu.xcf
index 226dd2b30a6..226dd2b30a6 100644
--- a/src/plugins/remotelinux/images/qemu.xcf
+++ b/src/plugins/madde/images/qemu.xcf
diff --git a/src/plugins/madde/madde.pri b/src/plugins/madde/madde.pri
new file mode 100644
index 00000000000..90a62b71b85
--- /dev/null
+++ b/src/plugins/madde/madde.pri
@@ -0,0 +1,3 @@
+include(madde_dependencies.pri)
+
+LIBS *= -l$$qtLibraryName(Madde)
diff --git a/src/plugins/madde/madde.pro b/src/plugins/madde/madde.pro
new file mode 100644
index 00000000000..b69ed8350d5
--- /dev/null
+++ b/src/plugins/madde/madde.pro
@@ -0,0 +1,117 @@
+TEMPLATE = lib
+TARGET = Madde
+
+include(../../qtcreatorplugin.pri)
+include(madde_dependencies.pri)
+
+HEADERS += \
+    maddeplugin.h \
+    maemoconstants.h \
+    maemorunconfigurationwidget.h \
+    maemoruncontrol.h \
+    maemorunfactories.h \
+    maemosettingspages.h \
+    maemotoolchain.h \
+    maemopackagecreationstep.h \
+    maemopackagecreationfactory.h \
+    maemopackagecreationwidget.h \
+    maemoqemumanager.h \
+    maemodeploystepfactory.h \
+    maemoglobal.h \
+    maemosshrunner.h \
+    maemodebugsupport.h \
+    maemoremotemountsmodel.h \
+    maemomountspecification.h \
+    maemoremotemounter.h \
+    maemopublishingwizardfactories.h \
+    maemopublishingbuildsettingspagefremantlefree.h \
+    maemopublishingfileselectiondialog.h \
+    maemopublishedprojectmodel.h \
+    maemopublishinguploadsettingspagefremantlefree.h \
+    maemopublishingwizardfremantlefree.h \
+    maemopublishingresultpagefremantlefree.h \
+    maemopublisherfremantlefree.h \
+    maemoqemuruntime.h \
+    maemoqemuruntimeparser.h \
+    maemoqemusettingswidget.h \
+    maemoqemusettings.h \
+    qt4maemotargetfactory.h \
+    qt4maemotarget.h \
+    qt4maemodeployconfiguration.h \
+    maemodeviceconfigwizard.h \
+    maemodeployconfigurationwidget.h \
+    maemoinstalltosysrootstep.h \
+    maemodeploymentmounter.h \
+    maemopackageinstaller.h \
+    maemoremotecopyfacility.h \
+    maemoqtversionfactory.h \
+    maemoqtversion.h \
+    maemorunconfiguration.h \
+    maddeuploadandinstallpackagesteps.h \
+    maemodeploybymountsteps.h \
+    maddedevicetester.h \
+    maddedeviceconfigurationfactory.h \
+
+SOURCES += \
+    maddeplugin.cpp \
+    maemorunconfigurationwidget.cpp \
+    maemoruncontrol.cpp \
+    maemorunfactories.cpp \
+    maemosettingspages.cpp \
+    maemotoolchain.cpp \
+    maemopackagecreationstep.cpp \
+    maemopackagecreationfactory.cpp \
+    maemopackagecreationwidget.cpp \
+    maemoqemumanager.cpp \
+    maemodeploystepfactory.cpp \
+    maemoglobal.cpp \
+    maemosshrunner.cpp \
+    maemodebugsupport.cpp \
+    maemoremotemountsmodel.cpp \
+    maemomountspecification.cpp \
+    maemoremotemounter.cpp \
+    maemopublishingwizardfactories.cpp \
+    maemopublishingbuildsettingspagefremantlefree.cpp \
+    maemopublishingfileselectiondialog.cpp \
+    maemopublishedprojectmodel.cpp \
+    maemopublishinguploadsettingspagefremantlefree.cpp \
+    maemopublishingwizardfremantlefree.cpp \
+    maemopublishingresultpagefremantlefree.cpp \
+    maemopublisherfremantlefree.cpp \
+    maemoqemuruntimeparser.cpp \
+    maemoqemusettingswidget.cpp \
+    maemoqemusettings.cpp \
+    qt4maemotargetfactory.cpp \
+    qt4maemotarget.cpp \
+    qt4maemodeployconfiguration.cpp \
+    maemodeviceconfigwizard.cpp \
+    maemodeployconfigurationwidget.cpp \
+    maemoinstalltosysrootstep.cpp \
+    maemodeploymentmounter.cpp \
+    maemopackageinstaller.cpp \
+    maemoremotecopyfacility.cpp \
+    maemoqtversionfactory.cpp \
+    maemoqtversion.cpp \
+    maddedeviceconfigurationfactory.cpp \
+    maddeuploadandinstallpackagesteps.cpp \
+    maemodeploybymountsteps.cpp \
+    maddedevicetester.cpp \
+    maemorunconfiguration.cpp
+
+FORMS += \
+    maemopackagecreationwidget.ui \
+    maemopublishingbuildsettingspagefremantlefree.ui \
+    maemopublishingfileselectiondialog.ui \
+    maemopublishinguploadsettingspagefremantlefree.ui \
+    maemopublishingresultpagefremantlefree.ui \
+    maemoqemusettingswidget.ui \
+    maemodeviceconfigwizardstartpage.ui \
+    maemodeviceconfigwizardpreviouskeysetupcheckpage.ui \
+    maemodeviceconfigwizardreusekeyscheckpage.ui \
+    maemodeviceconfigwizardkeycreationpage.ui \
+    maemodeviceconfigwizardkeydeploymentpage.ui \
+    maemodeployconfigurationwidget.ui
+
+RESOURCES += qt-maemo.qrc
+DEFINES += QT_NO_CAST_TO_ASCII
+DEFINES += MADDE_LIBRARY
diff --git a/src/plugins/madde/madde_dependencies.pri b/src/plugins/madde/madde_dependencies.pri
new file mode 100644
index 00000000000..94d99fc73dc
--- /dev/null
+++ b/src/plugins/madde/madde_dependencies.pri
@@ -0,0 +1 @@
+include(../../plugins/remotelinux/remotelinux.pri)
diff --git a/src/plugins/madde/madde_exports.h b/src/plugins/madde/madde_exports.h
new file mode 100644
index 00000000000..8d928264e08
--- /dev/null
+++ b/src/plugins/madde/madde_exports.h
@@ -0,0 +1,44 @@
+/**************************************************************************
+**
+** This file is part of Qt Creator
+**
+** Copyright (c) 2011 Nokia Corporation and/or its subsidiary(-ies).
+**
+** Contact: Nokia Corporation ([email protected])
+**
+**
+** GNU Lesser General Public License Usage
+**
+** This file may be used under the terms of the GNU Lesser General Public
+** License version 2.1 as published by the Free Software Foundation and
+** appearing in the file LICENSE.LGPL included in the packaging of this file.
+** Please review the following information to ensure the GNU Lesser General
+** Public License version 2.1 requirements will be met:
+** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain additional
+** rights. These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+** Other Usage
+**
+** Alternatively, this file may be used in accordance with the terms and
+** conditions contained in a signed written agreement between you and Nokia.
+**
+** If you have questions regarding the use of this file, please contact
+** Nokia at [email protected].
+**
+**************************************************************************/
+
+#ifndef MADDEEXPORT_H
+#define MADDEEXPORT_H
+
+#include <QtCore/qglobal.h>
+
+#if defined(MADDE_LIBRARY)
+#  define MADDE_EXPORT Q_DECL_EXPORT
+#else
+#  define MADDE_EXPORT Q_DECL_IMPORT
+#endif
+
+#endif // MADDEEXPORT_H
diff --git a/src/plugins/remotelinux/maddedeviceconfigurationfactory.cpp b/src/plugins/madde/maddedeviceconfigurationfactory.cpp
index 8633de3d0eb..cad8cc7f148 100644
--- a/src/plugins/remotelinux/maddedeviceconfigurationfactory.cpp
+++ b/src/plugins/madde/maddedeviceconfigurationfactory.cpp
@@ -34,15 +34,17 @@
 #include "maddedevicetester.h"
 #include "maemoconstants.h"
 #include "maemodeviceconfigwizard.h"
-#include "publickeydeploymentdialog.h"
 
 #include <remotelinux/linuxdevicetestdialog.h>
+#include <remotelinux/publickeydeploymentdialog.h>
 #include <remotelinux/remotelinuxprocessesdialog.h>
 #include <remotelinux/remotelinuxprocesslist.h>
 #include <remotelinux/remotelinux_constants.h>
 #include <utils/qtcassert.h>
 
-namespace RemoteLinux {
+using namespace RemoteLinux;
+
+namespace Madde {
 namespace Internal {
 namespace {
 const char MaddeDeviceTestActionId[] = "Madde.DeviceTestAction";
@@ -115,4 +117,4 @@ QDialog *MaddeDeviceConfigurationFactory::createDeviceAction(const QString &acti
 }
 
 } // namespace Internal
-} // namespace RemoteLinux
+} // namespace Madde
diff --git a/src/plugins/remotelinux/maddedeviceconfigurationfactory.h b/src/plugins/madde/maddedeviceconfigurationfactory.h
index aa531f2c02b..dfbd1588184 100644
--- a/src/plugins/remotelinux/maddedeviceconfigurationfactory.h
+++ b/src/plugins/madde/maddedeviceconfigurationfactory.h
@@ -34,7 +34,7 @@
 
 #include <remotelinux/linuxdeviceconfiguration.h>
 
-namespace RemoteLinux {
+namespace Madde {
 namespace Internal {
 
 class MaddeDeviceConfigurationFactory : public RemoteLinux::ILinuxDeviceConfigurationFactory
@@ -44,16 +44,16 @@ public:
     MaddeDeviceConfigurationFactory(QObject *parent = 0);
 
     QString displayName() const;
-    ILinuxDeviceConfigurationWizard *createWizard(QWidget *parent) const;
+    RemoteLinux::ILinuxDeviceConfigurationWizard *createWizard(QWidget *parent) const;
     bool supportsOsType(const QString &osType) const;
     QString displayNameForOsType(const QString &osType) const;
     QStringList supportedDeviceActionIds() const;
     QString displayNameForActionId(const QString &actionId) const;
     QDialog *createDeviceAction(const QString &actionId,
-        const LinuxDeviceConfiguration::ConstPtr &deviceConfig, QWidget *parent) const;
+        const RemoteLinux::LinuxDeviceConfiguration::ConstPtr &deviceConfig, QWidget *parent) const;
 };
 
 } // namespace Internal
-} // namespace RemoteLinux
+} // namespace Madde
 
 #endif // MADDEDEVICECONFIGURATIONFACTORY_H
diff --git a/src/plugins/remotelinux/maddedevicetester.cpp b/src/plugins/madde/maddedevicetester.cpp
index adb5ff83271..120a465ba0c 100644
--- a/src/plugins/remotelinux/maddedevicetester.cpp
+++ b/src/plugins/madde/maddedevicetester.cpp
@@ -40,9 +40,10 @@
 
 #include <QtCore/QRegExp>
 
+using namespace RemoteLinux;
 using namespace Utils;
 
-namespace RemoteLinux {
+namespace Madde {
 namespace Internal {
 namespace {
 const char QmlToolingDirectory[] = "/usr/lib/qt4/plugins/qmltooling";
@@ -287,4 +288,4 @@ QString MaddeDeviceTester::processedQtLibsList()
 }
 
 } // namespace Internal
-} // namespace RemoteLinux
+} // namespace Madde
diff --git a/src/plugins/remotelinux/maddedevicetester.h b/src/plugins/madde/maddedevicetester.h
index 77aa2242d43..41856c21990 100644
--- a/src/plugins/remotelinux/maddedevicetester.h
+++ b/src/plugins/madde/maddedevicetester.h
@@ -40,7 +40,7 @@ namespace Utils {
 class SshRemoteProcessRunner;
 }
 
-namespace RemoteLinux {
+namespace Madde {
 namespace Internal {
 
 class MaddeDeviceTester : public RemoteLinux::AbstractLinuxDeviceTester
@@ -50,7 +50,7 @@ public:
     explicit MaddeDeviceTester(QObject *parent = 0);
     ~MaddeDeviceTester();
 
-    void testDevice(const QSharedPointer<const LinuxDeviceConfiguration> &deviceConfiguration);
+    void testDevice(const QSharedPointer<const RemoteLinux::LinuxDeviceConfiguration> &deviceConfiguration);
     void stopTest();
 
 private slots:
@@ -74,12 +74,12 @@ private:
     State m_state;
     TestResult m_result;
     QSharedPointer<Utils::SshRemoteProcessRunner> m_processRunner;
-    QSharedPointer<const LinuxDeviceConfiguration> m_deviceConfiguration;
+    QSharedPointer<const RemoteLinux::LinuxDeviceConfiguration> m_deviceConfiguration;
     QByteArray m_stdout;
     QByteArray m_stderr;
 };
 
 } // namespace Internal
-} // namespace RemoteLinux
+} // namespace Madde
 
 #endif // MADDEDEVICETESTER_H
diff --git a/src/plugins/madde/maddeplugin.cpp b/src/plugins/madde/maddeplugin.cpp
new file mode 100644
index 00000000000..c3165e87c6e
--- /dev/null
+++ b/src/plugins/madde/maddeplugin.cpp
@@ -0,0 +1,90 @@
+/**************************************************************************
+**
+** This file is part of Qt Creator
+**
+** Copyright (c) 2011 Nokia Corporation and/or its subsidiary(-ies).
+**
+** Contact: Nokia Corporation ([email protected])
+**
+**
+** GNU Lesser General Public License Usage
+**
+** This file may be used under the terms of the GNU Lesser General Public
+** License version 2.1 as published by the Free Software Foundation and
+** appearing in the file LICENSE.LGPL included in the packaging of this file.
+** Please review the following information to ensure the GNU Lesser General
+** Public License version 2.1 requirements will be met:
+** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain additional
+** rights. These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+** Other Usage
+**
+** Alternatively, this file may be used in accordance with the terms and
+** conditions contained in a signed written agreement between you and Nokia.
+**
+** If you have questions regarding the use of this file, please contact
+** Nokia at [email protected].
+**
+**************************************************************************/
+
+#include "maddeplugin.h"
+
+#include "maddedeviceconfigurationfactory.h"
+#include "maemoconstants.h"
+#include "maemodeploystepfactory.h"
+#include "maemopackagecreationfactory.h"
+#include "maemopublishingwizardfactories.h"
+#include "maemoqemumanager.h"
+#include "maemorunfactories.h"
+#include "maemosettingspages.h"
+#include "maemotoolchain.h"
+#include "qt4maemodeployconfiguration.h"
+#include "maemoqtversionfactory.h"
+#include "qt4maemotargetfactory.h"
+
+#include <QtCore/QtPlugin>
+
+namespace Madde {
+namespace Internal {
+
+MaddePlugin::MaddePlugin()
+{
+}
+
+MaddePlugin::~MaddePlugin()
+{
+}
+
+bool MaddePlugin::initialize(const QStringList &arguments, QString *error_message)
+{
+    Q_UNUSED(arguments)
+    Q_UNUSED(error_message)
+
+    MaemoQemuManager::instance(this);
+
+    addAutoReleasedObject(new MaemoRunControlFactory);
+    addAutoReleasedObject(new MaemoRunConfigurationFactory);
+    addAutoReleasedObject(new MaemoToolChainFactory);
+    addAutoReleasedObject(new Qt4MaemoDeployConfigurationFactory);
+    addAutoReleasedObject(new MaemoPackageCreationFactory);
+    addAutoReleasedObject(new MaemoDeployStepFactory);
+    addAutoReleasedObject(new MaemoQemuSettingsPage);
+    addAutoReleasedObject(new MaemoPublishingWizardFactoryFremantleFree);
+    addAutoReleasedObject(new Qt4MaemoTargetFactory);
+    addAutoReleasedObject(new MaemoQtVersionFactory);
+    addAutoReleasedObject(new MaddeDeviceConfigurationFactory);
+
+    return true;
+}
+
+void MaddePlugin::extensionsInitialized()
+{
+}
+
+} // namespace Internal
+} // namespace Madde
+
+Q_EXPORT_PLUGIN(Madde::Internal::MaddePlugin)
diff --git a/src/plugins/madde/maddeplugin.h b/src/plugins/madde/maddeplugin.h
new file mode 100644
index 00000000000..726a721cc02
--- /dev/null
+++ b/src/plugins/madde/maddeplugin.h
@@ -0,0 +1,55 @@
+/**************************************************************************
+**
+** This file is part of Qt Creator
+**
+** Copyright (c) 2011 Nokia Corporation and/or its subsidiary(-ies).
+**
+** Contact: Nokia Corporation ([email protected])
+**
+**
+** GNU Lesser General Public License Usage
+**
+** This file may be used under the terms of the GNU Lesser General Public
+** License version 2.1 as published by the Free Software Foundation and
+** appearing in the file LICENSE.LGPL included in the packaging of this file.
+** Please review the following information to ensure the GNU Lesser General
+** Public License version 2.1 requirements will be met:
+** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain additional
+** rights. These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+** Other Usage
+**
+** Alternatively, this file may be used in accordance with the terms and
+** conditions contained in a signed written agreement between you and Nokia.
+**
+** If you have questions regarding the use of this file, please contact
+** Nokia at [email protected].
+**
+**************************************************************************/
+
+#ifndef MADDEPLUGIN_H
+#define MADDEPLUGIN_H
+
+#include <extensionsystem/iplugin.h>
+
+namespace Madde {
+namespace Internal {
+
+class MaddePlugin : public ExtensionSystem::IPlugin
+{
+    Q_OBJECT
+public:
+    MaddePlugin();
+    ~MaddePlugin();
+
+    bool initialize(const QStringList &arguments, QString *error_message);
+    void extensionsInitialized();
+};
+
+} // namespace Internal
+} // namespace Madde
+
+#endif // MADDEPLUGIN_H
diff --git a/src/plugins/remotelinux/maddeuploadandinstallpackagesteps.cpp b/src/plugins/madde/maddeuploadandinstallpackagesteps.cpp
index 0c942c97fc7..f3f7d605898 100644
--- a/src/plugins/remotelinux/maddeuploadandinstallpackagesteps.cpp
+++ b/src/plugins/madde/maddeuploadandinstallpackagesteps.cpp
@@ -41,7 +41,9 @@
 #include <remotelinux/abstractuploadandinstallpackageservice.h>
 #include <remotelinux/linuxdeviceconfiguration.h>
 
-namespace RemoteLinux {
+using namespace RemoteLinux;
+
+namespace Madde {
 namespace Internal {
 namespace {
 class AbstractMaddeUploadAndInstallPackageAction : public AbstractUploadAndInstallPackageService
@@ -213,6 +215,6 @@ QString MeegoUploadAndInstallPackageStep::displayName()
 }
 
 } // namespace Internal
-} // namespace RemoteLinux
+} // namespace Madde
 
 #include "maddeuploadandinstallpackagesteps.moc"
diff --git a/src/plugins/remotelinux/maddeuploadandinstallpackagesteps.h b/src/plugins/madde/maddeuploadandinstallpackagesteps.h
index a3c7f4a7c8a..a4d7ce5a7f0 100644
--- a/src/plugins/remotelinux/maddeuploadandinstallpackagesteps.h
+++ b/src/plugins/madde/maddeuploadandinstallpackagesteps.h
@@ -36,7 +36,9 @@
 
 namespace RemoteLinux {
 class AbstractUploadAndInstallPackageService;
+}
 
+namespace Madde {
 namespace Internal {
 
 class MaemoUploadAndInstallPackageStep : public RemoteLinux::AbstractRemoteLinuxDeployStep
@@ -53,11 +55,11 @@ public:
     static QString displayName();
 
 private:
-    AbstractRemoteLinuxDeployService *deployService() const;
+    RemoteLinux::AbstractRemoteLinuxDeployService *deployService() const;
 
     void ctor();
 
-    AbstractUploadAndInstallPackageService *m_deployService;
+    RemoteLinux::AbstractUploadAndInstallPackageService *m_deployService;
 };
 
 
@@ -75,14 +77,14 @@ public:
     static QString displayName();
 
 private:
-    AbstractRemoteLinuxDeployService *deployService() const;
+    RemoteLinux::AbstractRemoteLinuxDeployService *deployService() const;
 
     void ctor();
 
-    AbstractUploadAndInstallPackageService *m_deployService;
+    RemoteLinux::AbstractUploadAndInstallPackageService *m_deployService;
 };
 
 } // namespace Internal
-} // namespace RemoteLinux
+} // namespace Madde
 
 #endif // MADDEUPLOADANDINSTALLPACKAGESTEPS_H
diff --git a/src/plugins/remotelinux/maemoconstants.h b/src/plugins/madde/maemoconstants.h
index d6a1fd80840..9b2d4425ccc 100644
--- a/src/plugins/remotelinux/maemoconstants.h
+++ b/src/plugins/madde/maemoconstants.h
@@ -34,7 +34,7 @@
 
 #include <QtCore/QLatin1String>
 
-namespace RemoteLinux {
+namespace Madde {
 namespace Internal {
 
 const char Maemo5OsType[] = "Maemo5OsType";
@@ -60,6 +60,6 @@ static const QLatin1String ExportedLocalDirsKey(PREFIX ".ExportedLocalDirs");
 static const QLatin1String RemoteMountPointsKey(PREFIX ".RemoteMountPoints");
 
 } // namespace Internal
-} // namespace RemoteLinux
+} // namespace Madde
 
 #endif  // MAEMOCONSTANTS_H
diff --git a/src/plugins/remotelinux/maemodebugsupport.cpp b/src/plugins/madde/maemodebugsupport.cpp
index ae67f50c3a6..ab70423b5ce 100644
--- a/src/plugins/remotelinux/maemodebugsupport.cpp
+++ b/src/plugins/madde/maemodebugsupport.cpp
@@ -35,7 +35,9 @@
 
 #include <remotelinux/linuxdeviceconfiguration.h>
 
-namespace RemoteLinux {
+using namespace RemoteLinux;
+
+namespace Madde {
 namespace Internal {
 
 MaemoDebugSupport::MaemoDebugSupport(MaemoRunConfiguration *runConfig, Debugger::DebuggerEngine *engine)
@@ -51,4 +53,4 @@ MaemoDebugSupport::~MaemoDebugSupport()
 AbstractRemoteLinuxApplicationRunner *MaemoDebugSupport::runner() const { return m_runner; }
 
 } // namespace Internal
-} // namespace RemoteLinux
+} // namespace Madde
diff --git a/src/plugins/remotelinux/maemodebugsupport.h b/src/plugins/madde/maemodebugsupport.h
index 94387e5e071..9b67a83a95e 100644
--- a/src/plugins/remotelinux/maemodebugsupport.h
+++ b/src/plugins/madde/maemodebugsupport.h
@@ -34,12 +34,12 @@
 
 #include <remotelinux/remotelinuxdebugsupport.h>
 
-namespace RemoteLinux {
+namespace Madde {
 namespace Internal {
 class MaemoRunConfiguration;
 class MaemoSshRunner;
 
-class MaemoDebugSupport : public AbstractRemoteLinuxDebugSupport
+class MaemoDebugSupport : public RemoteLinux::AbstractRemoteLinuxDebugSupport
 {
     Q_OBJECT
 public:
@@ -47,12 +47,12 @@ public:
     ~MaemoDebugSupport();
 
 private:
-    AbstractRemoteLinuxApplicationRunner *runner() const;
+    RemoteLinux::AbstractRemoteLinuxApplicationRunner *runner() const;
 
     MaemoSshRunner * const m_runner;
 };
 
 } // namespace Internal
-} // namespace RemoteLinux
+} // namespace Madde
 
 #endif // MAEMODEBUGSUPPORT_H
diff --git a/src/plugins/remotelinux/maemodeploybymountsteps.cpp b/src/plugins/madde/maemodeploybymountsteps.cpp
index fd1161a78e4..062176d6acc 100644
--- a/src/plugins/remotelinux/maemodeploybymountsteps.cpp
+++ b/src/plugins/madde/maemodeploybymountsteps.cpp
@@ -54,8 +54,9 @@
 #include <QtCore/QList>
 
 using namespace ProjectExplorer;
+using namespace RemoteLinux;
 
-namespace RemoteLinux {
+namespace Madde {
 namespace Internal {
 class AbstractMaemoDeployByMountService : public AbstractRemoteLinuxDeployService
 {
@@ -489,6 +490,6 @@ QString MaemoCopyFilesViaMountStep::displayName()
 }
 
 } // namespace Internal
-} // namespace RemoteLinux
+} // namespace Madde
 
 #include "maemodeploybymountsteps.moc"
diff --git a/src/plugins/remotelinux/maemodeploybymountsteps.h b/src/plugins/madde/maemodeploybymountsteps.h
index 584bfb54599..24870e36e92 100644
--- a/src/plugins/remotelinux/maemodeploybymountsteps.h
+++ b/src/plugins/madde/maemodeploybymountsteps.h
@@ -33,7 +33,7 @@
 
 #include <remotelinux/abstractremotelinuxdeploystep.h>
 
-namespace RemoteLinux {
+namespace Madde {
 namespace Internal {
 class MaemoMountAndInstallPackageService;
 class MaemoMountAndCopyFilesService;
@@ -53,7 +53,7 @@ public:
     static QString displayName();
 
 private:
-    AbstractRemoteLinuxDeployService *deployService() const;
+    RemoteLinux::AbstractRemoteLinuxDeployService *deployService() const;
 
     void ctor();
 
@@ -76,7 +76,7 @@ public:
     static QString displayName();
 
 private:
-    AbstractRemoteLinuxDeployService *deployService() const;
+    RemoteLinux::AbstractRemoteLinuxDeployService *deployService() const;
 
     void ctor();
 
@@ -84,6 +84,6 @@ private:
 };
 
 } // namespace Internal
-} // namespace RemoteLinux
+} // namespace Madde
 
 #endif // MAEMODEPLOYBYMOUNTSTEPS_H
diff --git a/src/plugins/remotelinux/maemodeployconfigurationwidget.cpp b/src/plugins/madde/maemodeployconfigurationwidget.cpp
index 9c5f79fd9a3..e1b3d4331e1 100644
--- a/src/plugins/remotelinux/maemodeployconfigurationwidget.cpp
+++ b/src/plugins/madde/maemodeployconfigurationwidget.cpp
@@ -32,7 +32,6 @@
 #include "maemodeployconfigurationwidget.h"
 #include "ui_maemodeployconfigurationwidget.h"
 
-#include "deploymentsettingsassistant.h"
 #include "maemoglobal.h"
 #include "qt4maemodeployconfiguration.h"
 #include "qt4maemotarget.h"
@@ -41,6 +40,7 @@
 #include <remotelinux/deployablefile.h>
 #include <remotelinux/deployablefilesperprofile.h>
 #include <remotelinux/deploymentinfo.h>
+#include <remotelinux/deploymentsettingsassistant.h>
 #include <remotelinux/remotelinuxdeployconfigurationwidget.h>
 #include <utils/fileutils.h>
 #include <utils/qtcassert.h>
@@ -53,8 +53,9 @@
 
 using namespace ProjectExplorer;
 using namespace Qt4ProjectManager;
+using namespace RemoteLinux;
 
-namespace RemoteLinux {
+namespace Madde {
 namespace Internal {
 
 MaemoDeployConfigurationWidget::MaemoDeployConfigurationWidget(QWidget *parent)
@@ -70,8 +71,9 @@ MaemoDeployConfigurationWidget::MaemoDeployConfigurationWidget(QWidget *parent)
     mainLayout->addWidget(subWidget);
     mainLayout->addStretch(1);
 
-    connect(m_remoteLinuxWidget, SIGNAL(currentModelChanged(const DeployableFilesPerProFile*)),
-        SLOT(handleCurrentModelChanged(const DeployableFilesPerProFile*)));
+    connect(m_remoteLinuxWidget,
+        SIGNAL(currentModelChanged(const RemoteLinux::DeployableFilesPerProFile *)),
+        SLOT(handleCurrentModelChanged(const RemoteLinux::DeployableFilesPerProFile *)));
     handleCurrentModelChanged(m_remoteLinuxWidget->currentModel());
 }
 
@@ -209,4 +211,4 @@ QString MaemoDeployConfigurationWidget::remoteIconDir() const
 }
 
 } // namespace Internal
-} // namespace RemoteLinux
+} // namespace Madde
diff --git a/src/plugins/remotelinux/maemodeployconfigurationwidget.h b/src/plugins/madde/maemodeployconfigurationwidget.h
index ea9b7b62084..5c24f666a3a 100644
--- a/src/plugins/remotelinux/maemodeployconfigurationwidget.h
+++ b/src/plugins/madde/maemodeployconfigurationwidget.h
@@ -44,7 +44,9 @@ QT_END_NAMESPACE
 namespace RemoteLinux {
 class DeployableFilesPerProFile;
 class RemoteLinuxDeployConfigurationWidget;
+}
 
+namespace Madde {
 namespace Internal {
 class Qt4MaemoDeployConfiguration;
 
@@ -64,19 +66,19 @@ private slots:
     void addDesktopFile();
     void addIcon();
     void handleDeploymentInfoToBeReset();
-    void handleCurrentModelChanged(const DeployableFilesPerProFile *proFileInfo);
+    void handleCurrentModelChanged(const RemoteLinux::DeployableFilesPerProFile *proFileInfo);
 
 private:
-    bool canAddDesktopFile(const DeployableFilesPerProFile *proFileInfo) const;
-    bool canAddIcon(const DeployableFilesPerProFile *proFileInfo) const;
-    QString remoteIconFilePath(const DeployableFilesPerProFile *proFileInfo) const;
+    bool canAddDesktopFile(const RemoteLinux::DeployableFilesPerProFile *proFileInfo) const;
+    bool canAddIcon(const RemoteLinux::DeployableFilesPerProFile *proFileInfo) const;
+    QString remoteIconFilePath(const RemoteLinux::DeployableFilesPerProFile *proFileInfo) const;
     QString remoteIconDir() const;
 
     Ui::MaemoDeployConfigurationWidget *ui;
-    RemoteLinuxDeployConfigurationWidget * const m_remoteLinuxWidget;
+    RemoteLinux::RemoteLinuxDeployConfigurationWidget * const m_remoteLinuxWidget;
 };
 
 } // namespace Internal
-} // namespace RemoteLinux
+} // namespace Madde
 
 #endif // MAEMODEPLOYCONFIGURATIONWIDGET_H
diff --git a/src/plugins/remotelinux/maemodeployconfigurationwidget.ui b/src/plugins/madde/maemodeployconfigurationwidget.ui
index 6cca3cac017..6cca3cac017 100644
--- a/src/plugins/remotelinux/maemodeployconfigurationwidget.ui
+++ b/src/plugins/madde/maemodeployconfigurationwidget.ui
diff --git a/src/plugins/remotelinux/maemodeploymentmounter.cpp b/src/plugins/madde/maemodeploymentmounter.cpp
index a0705416b94..677b3d0e9be 100644
--- a/src/plugins/remotelinux/maemodeploymentmounter.cpp
+++ b/src/plugins/madde/maemodeploymentmounter.cpp
@@ -42,9 +42,10 @@
 #include <utils/ssh/sshconnection.h>
 
 using namespace Qt4ProjectManager;
+using namespace RemoteLinux;
 using namespace Utils;
 
-namespace RemoteLinux {
+namespace Madde {
 namespace Internal {
 
 MaemoDeploymentMounter::MaemoDeploymentMounter(QObject *parent)
@@ -211,4 +212,4 @@ void MaemoDeploymentMounter::setState(State newState)
 }
 
 } // namespace Internal
-} // namespace RemoteLinux
+} // namespace Madde
diff --git a/src/plugins/remotelinux/maemodeploymentmounter.h b/src/plugins/madde/maemodeploymentmounter.h
index aac42add035..ec594be101e 100644
--- a/src/plugins/remotelinux/maemodeploymentmounter.h
+++ b/src/plugins/madde/maemodeploymentmounter.h
@@ -34,7 +34,8 @@
 #define MAEMODEPLOYMENTMOUNTER_H
 
 #include "maemomountspecification.h"
-#include "portlist.h"
+
+#include <remotelinux/portlist.h>
 
 #include <QtCore/QList>
 #include <QtCore/QObject>
@@ -46,7 +47,9 @@ namespace Qt4ProjectManager { class Qt4BuildConfiguration; }
 namespace RemoteLinux {
 class LinuxDeviceConfiguration;
 class RemoteLinuxUsedPortsGatherer;
+}
 
+namespace Madde {
 namespace Internal {
 class MaemoRemoteMounter;
 
@@ -59,7 +62,7 @@ public:
 
     // Connection must be in connected state.
     void setupMounts(const QSharedPointer<Utils::SshConnection> &connection,
-        const QSharedPointer<const LinuxDeviceConfiguration> &devConf,
+        const QSharedPointer<const RemoteLinux::LinuxDeviceConfiguration> &devConf,
         const QList<MaemoMountSpecification> &mountSpecs,
         const Qt4ProjectManager::Qt4BuildConfiguration *bc);
     void tearDownMounts();
@@ -91,15 +94,15 @@ private:
 
     State m_state;
     QSharedPointer<Utils::SshConnection> m_connection;
-    QSharedPointer<const LinuxDeviceConfiguration> m_devConf;
+    QSharedPointer<const RemoteLinux::LinuxDeviceConfiguration> m_devConf;
     MaemoRemoteMounter * const m_mounter;
-    RemoteLinuxUsedPortsGatherer * const m_portsGatherer;
-    PortList m_freePorts;
+    RemoteLinux::RemoteLinuxUsedPortsGatherer * const m_portsGatherer;
+    RemoteLinux::PortList m_freePorts;
     QList<MaemoMountSpecification> m_mountSpecs;
     const Qt4ProjectManager::Qt4BuildConfiguration *m_buildConfig;
 };
 
 } // namespace Internal
-} // namespace RemoteLinux
+} // namespace Madde
 
 #endif // MAEMODEPLOYMENTMOUNTER_H
diff --git a/src/plugins/remotelinux/maemodeploystepfactory.cpp b/src/plugins/madde/maemodeploystepfactory.cpp
index c6db2c03bb8..ad5b46fb502 100644
--- a/src/plugins/remotelinux/maemodeploystepfactory.cpp
+++ b/src/plugins/madde/maemodeploystepfactory.cpp
@@ -32,24 +32,25 @@
 
 #include "maemodeploystepfactory.h"
 
-#include "genericdirectuploadstep.h"
 #include "maddeuploadandinstallpackagesteps.h"
 #include "maemodeploybymountsteps.h"
 #include "maemoinstalltosysrootstep.h"
 #include "qt4maemotarget.h"
 #include "qt4maemodeployconfiguration.h"
-#include "uploadandinstalltarpackagestep.h"
 
 #include <projectexplorer/buildconfiguration.h>
 #include <projectexplorer/buildsteplist.h>
 #include <projectexplorer/projectexplorerconstants.h>
 #include <projectexplorer/target.h>
+#include <remotelinux/genericdirectuploadstep.h>
+#include <remotelinux/uploadandinstalltarpackagestep.h>
 
 #include <QtCore/QCoreApplication>
 
 using namespace ProjectExplorer;
+using namespace RemoteLinux;
 
-namespace RemoteLinux {
+namespace Madde {
 namespace Internal {
 namespace {
 const QString OldMaemoDeployStepId(QLatin1String("Qt4ProjectManager.MaemoDeployStep"));
@@ -200,4 +201,4 @@ BuildStep *MaemoDeployStepFactory::clone(BuildStepList *parent, BuildStep *produ
 }
 
 } // namespace Internal
-} // namespace RemoteLinux
+} // namespace Madde
diff --git a/src/plugins/remotelinux/maemodeploystepfactory.h b/src/plugins/madde/maemodeploystepfactory.h
index 8f0274ac5b1..96dd6073952 100644
--- a/src/plugins/remotelinux/maemodeploystepfactory.h
+++ b/src/plugins/madde/maemodeploystepfactory.h
@@ -35,7 +35,7 @@
 
 #include <projectexplorer/buildstep.h>
 
-namespace RemoteLinux {
+namespace Madde {
 namespace Internal {
 
 class MaemoDeployStepFactory : public ProjectExplorer::IBuildStepFactory
@@ -64,6 +64,6 @@ public:
 };
 
 } // namespace Internal
-} // namespace RemoteLinux
+} // namespace Madde
 
 #endif // MAEMODEPLOYSTEPFACTORY_H
diff --git a/src/plugins/remotelinux/maemodeviceconfigwizard.cpp b/src/plugins/madde/maemodeviceconfigwizard.cpp
index 73870f2f3db..e94f0d4bd9b 100644
--- a/src/plugins/remotelinux/maemodeviceconfigwizard.cpp
+++ b/src/plugins/madde/maemodeviceconfigwizard.cpp
@@ -54,9 +54,10 @@
 #include <QtGui/QMessageBox>
 #include <QtGui/QWizardPage>
 
+using namespace RemoteLinux;
 using namespace Utils;
 
-namespace RemoteLinux {
+namespace Madde {
 namespace Internal {
 namespace {
 
@@ -634,6 +635,6 @@ int MaemoDeviceConfigWizard::nextId() const
 }
 
 } // namespace Internal
-} // namespace RemoteLinux
+} // namespace Madde
 
 #include "maemodeviceconfigwizard.moc"
diff --git a/src/plugins/remotelinux/maemodeviceconfigwizard.h b/src/plugins/madde/maemodeviceconfigwizard.h
index c3b93a48c03..2b164382cb5 100644
--- a/src/plugins/remotelinux/maemodeviceconfigwizard.h
+++ b/src/plugins/madde/maemodeviceconfigwizard.h
@@ -34,7 +34,7 @@
 
 #include <remotelinux/linuxdeviceconfiguration.h>
 
-namespace RemoteLinux {
+namespace Madde {
 namespace Internal {
 
 struct MaemoDeviceConfigWizardPrivate;
@@ -47,7 +47,7 @@ public:
     explicit MaemoDeviceConfigWizard(QWidget *parent = 0);
     ~MaemoDeviceConfigWizard();
 
-    LinuxDeviceConfiguration::Ptr deviceConfiguration();
+    RemoteLinux::LinuxDeviceConfiguration::Ptr deviceConfiguration();
 
     virtual int nextId() const;
 
@@ -56,6 +56,6 @@ private:
 };
 
 } // namespace Internal
-} // namespace RemoteLinux
+} // namespace Madde
 
 #endif // MAEMODEVICECONFIGWIZARD_H
diff --git a/src/plugins/remotelinux/maemodeviceconfigwizardkeycreationpage.ui b/src/plugins/madde/maemodeviceconfigwizardkeycreationpage.ui
index 2d38c79d3f0..2d38c79d3f0 100644
--- a/src/plugins/remotelinux/maemodeviceconfigwizardkeycreationpage.ui
+++ b/src/plugins/madde/maemodeviceconfigwizardkeycreationpage.ui
diff --git a/src/plugins/remotelinux/maemodeviceconfigwizardkeydeploymentpage.ui b/src/plugins/madde/maemodeviceconfigwizardkeydeploymentpage.ui
index ec9069fff55..ec9069fff55 100644
--- a/src/plugins/remotelinux/maemodeviceconfigwizardkeydeploymentpage.ui
+++ b/src/plugins/madde/maemodeviceconfigwizardkeydeploymentpage.ui
diff --git a/src/plugins/remotelinux/maemodeviceconfigwizardpreviouskeysetupcheckpage.ui b/src/plugins/madde/maemodeviceconfigwizardpreviouskeysetupcheckpage.ui
index 46f20e9e1ad..46f20e9e1ad 100644
--- a/src/plugins/remotelinux/maemodeviceconfigwizardpreviouskeysetupcheckpage.ui
+++ b/src/plugins/madde/maemodeviceconfigwizardpreviouskeysetupcheckpage.ui
diff --git a/src/plugins/remotelinux/maemodeviceconfigwizardreusekeyscheckpage.ui b/src/plugins/madde/maemodeviceconfigwizardreusekeyscheckpage.ui
index 8332f17a757..8332f17a757 100644
--- a/src/plugins/remotelinux/maemodeviceconfigwizardreusekeyscheckpage.ui
+++ b/src/plugins/madde/maemodeviceconfigwizardreusekeyscheckpage.ui
diff --git a/src/plugins/remotelinux/maemodeviceconfigwizardstartpage.ui b/src/plugins/madde/maemodeviceconfigwizardstartpage.ui
index 4df4e3f8505..4df4e3f8505 100644
--- a/src/plugins/remotelinux/maemodeviceconfigwizardstartpage.ui
+++ b/src/plugins/madde/maemodeviceconfigwizardstartpage.ui
diff --git a/src/plugins/remotelinux/maemoglobal.cpp b/src/plugins/madde/maemoglobal.cpp
index 73975037262..1590034fc04 100644
--- a/src/plugins/remotelinux/maemoglobal.cpp
+++ b/src/plugins/madde/maemoglobal.cpp
@@ -48,8 +48,9 @@
 
 using namespace Qt4ProjectManager;
 using namespace Qt4ProjectManager::Constants;
+using namespace RemoteLinux;
 
-namespace RemoteLinux {
+namespace Madde {
 namespace Internal {
 namespace {
 static const QLatin1String binQmake("/bin/qmake" EXEC_SUFFIX);
@@ -208,7 +209,7 @@ QString MaemoGlobal::osType(const QString &qmakePath)
         return QLatin1String(HarmattanOsType);
     if (name.startsWith(QLatin1String("meego")))
         return QLatin1String(MeeGoOsType);
-    return QLatin1String(Constants::GenericLinuxOsType);
+    return QLatin1String(RemoteLinux::Constants::GenericLinuxOsType);
 }
 
 QString MaemoGlobal::architecture(const QString &qmakePath)
@@ -293,4 +294,4 @@ QStringList MaemoGlobal::targetArgs(const QString &qmakePath, bool useTarget)
 }
 
 } // namespace Internal
-} // namespace RemoteLinux
+} // namespace Madde
diff --git a/src/plugins/remotelinux/maemoglobal.h b/src/plugins/madde/maemoglobal.h
index ea07e9db252..a4d26f48346 100644
--- a/src/plugins/remotelinux/maemoglobal.h
+++ b/src/plugins/madde/maemoglobal.h
@@ -33,9 +33,8 @@
 #ifndef MAEMOGLOBAL_H
 #define MAEMOGLOBAL_H
 
-#include "portlist.h"
-
 #include <coreplugin/ifile.h>
+#include <remotelinux/portlist.h>
 #include <utils/environment.h>
 
 #include <QtCore/QCoreApplication>
@@ -52,7 +51,9 @@ class BaseQtVersion;
 
 namespace RemoteLinux {
 class LinuxDeviceConfiguration;
+}
 
+namespace Madde {
 namespace Internal {
 
 class WatchableFile : public Core::IFile
@@ -100,7 +101,7 @@ public:
     static int applicationIconSize(const QString &osType);
     static QString remoteSudo(const QString &osType, const QString &uname);
     static QString remoteSourceProfilesCommand();
-    static PortList freePorts(const QSharedPointer<const LinuxDeviceConfiguration> &devConf,
+    static RemoteLinux::PortList freePorts(const QSharedPointer<const RemoteLinux::LinuxDeviceConfiguration> &devConf,
         const QtSupport::BaseQtVersion *qtVersion);
 
     static void addMaddeEnvironment(Utils::Environment &env, const QString &qmakePath);
@@ -129,6 +130,6 @@ private:
 };
 
 } // namespace Internal
-} // namespace RemoteLinux
+} // namespace Madde
 
 #endif // MAEMOGLOBAL_H
diff --git a/src/plugins/remotelinux/maemoinstalltosysrootstep.cpp b/src/plugins/madde/maemoinstalltosysrootstep.cpp
index 64139c855ed..be2aacda076 100644
--- a/src/plugins/remotelinux/maemoinstalltosysrootstep.cpp
+++ b/src/plugins/madde/maemoinstalltosysrootstep.cpp
@@ -53,8 +53,9 @@
 
 using namespace ProjectExplorer;
 using namespace Qt4ProjectManager;
+using namespace RemoteLinux;
 
-namespace RemoteLinux {
+namespace Madde {
 namespace Internal {
 
 class AbstractMaemoInstallPackageToSysrootWidget : public BuildStepConfigWidget
@@ -416,6 +417,6 @@ QString MaemoMakeInstallToSysrootStep::displayName()
 }
 
 } // namespace Internal
-} // namespace RemoteLinux
+} // namespace Madde
 
 #include "maemoinstalltosysrootstep.moc"
diff --git a/src/plugins/remotelinux/maemoinstalltosysrootstep.h b/src/plugins/madde/maemoinstalltosysrootstep.h
index 7e9fd97bb66..90d5e626765 100644
--- a/src/plugins/remotelinux/maemoinstalltosysrootstep.h
+++ b/src/plugins/madde/maemoinstalltosysrootstep.h
@@ -42,7 +42,9 @@ QT_FORWARD_DECLARE_CLASS(QProcess)
 
 namespace RemoteLinux {
 class RemoteLinuxDeployConfiguration;
+}
 
+namespace Madde {
 namespace Internal {
 
 class AbstractMaemoInstallPackageToSysrootStep : public ProjectExplorer::BuildStep
@@ -52,7 +54,7 @@ public:
     virtual bool init() { return true; }
     virtual void run(QFutureInterface<bool> &fi);
 
-    RemoteLinuxDeployConfiguration *deployConfiguration() const;
+    RemoteLinux::RemoteLinuxDeployConfiguration *deployConfiguration() const;
 
 protected:
     AbstractMaemoInstallPackageToSysrootStep(ProjectExplorer::BuildStepList *bsl,
@@ -135,6 +137,6 @@ public:
 };
 
 } // namespace Internal
-} // namespace RemoteLinux
+} // namespace Madde
 
 #endif // MAEMOINSTALLTOSYSROOTSTEP_H
diff --git a/src/plugins/remotelinux/maemomountspecification.cpp b/src/plugins/madde/maemomountspecification.cpp
index 7c74dea4e9a..4f344450ba5 100644
--- a/src/plugins/remotelinux/maemomountspecification.cpp
+++ b/src/plugins/madde/maemomountspecification.cpp
@@ -32,7 +32,7 @@
 
 #include "maemomountspecification.h"
 
-namespace RemoteLinux {
+namespace Madde {
 namespace Internal {
 
 const QLatin1String MaemoMountSpecification::InvalidMountPoint("/");
@@ -44,5 +44,5 @@ MaemoMountSpecification::MaemoMountSpecification(const QString &localDir,
 }
 
 } // namespace Internal
-} // namespace RemoteLinux
+} // namespace Madde
 
diff --git a/src/plugins/remotelinux/maemomountspecification.h b/src/plugins/madde/maemomountspecification.h
index 87300f33fc3..c326c107b06 100644
--- a/src/plugins/remotelinux/maemomountspecification.h
+++ b/src/plugins/madde/maemomountspecification.h
@@ -29,13 +29,12 @@
 ** Nokia at [email protected].
 **
 **************************************************************************/
-
 #ifndef MAEMOMOUNTSPECIFICATION_H
 #define MAEMOMOUNTSPECIFICATION_H
 
-#include <QtCore/QLatin1String>
+#include <QtCore/QString>
 
-namespace RemoteLinux {
+namespace Madde {
 namespace Internal {
 
 struct MaemoMountSpecification {
@@ -49,6 +48,6 @@ struct MaemoMountSpecification {
 };
 
 } // namespace Internal
-} // namespace RemoteLinux
+} // namespace Madde
 
 #endif // MAEMOMOUNTSPECIFICATION_H
diff --git a/src/plugins/remotelinux/maemopackagecreationfactory.cpp b/src/plugins/madde/maemopackagecreationfactory.cpp
index 64d9883fddc..dbf0da1c74d 100644
--- a/src/plugins/remotelinux/maemopackagecreationfactory.cpp
+++ b/src/plugins/madde/maemopackagecreationfactory.cpp
@@ -46,7 +46,7 @@
 using ProjectExplorer::BuildStepList;
 using ProjectExplorer::BuildStep;
 
-namespace RemoteLinux {
+namespace Madde {
 namespace Internal {
 namespace {
 const QString OldCreatePackageId("Qt4ProjectManager.MaemoPackageCreationStep");
@@ -152,4 +152,4 @@ BuildStep *MaemoPackageCreationFactory::clone(ProjectExplorer::BuildStepList *pa
 }
 
 } // namespace Internal
-} // namespace RemoteLinux
+} // namespace Madde
diff --git a/src/plugins/remotelinux/maemopackagecreationfactory.h b/src/plugins/madde/maemopackagecreationfactory.h
index 7f849dcde37..48fc9a2c7b1 100644
--- a/src/plugins/remotelinux/maemopackagecreationfactory.h
+++ b/src/plugins/madde/maemopackagecreationfactory.h
@@ -34,7 +34,7 @@
 
 #include <projectexplorer/buildstep.h>
 
-namespace RemoteLinux {
+namespace Madde {
 namespace Internal {
 
 class MaemoPackageCreationFactory : public ProjectExplorer::IBuildStepFactory
@@ -63,6 +63,6 @@ public:
 };
 
 } // namespace Internal
-} // namespace RemoteLinux
+} // namespace Madde
 
 #endif // MAEMOPACKAGECREATIONFACTORY_H
diff --git a/src/plugins/remotelinux/maemopackagecreationstep.cpp b/src/plugins/madde/maemopackagecreationstep.cpp
index ac7a4697581..ee2f8901498 100644
--- a/src/plugins/remotelinux/maemopackagecreationstep.cpp
+++ b/src/plugins/madde/maemopackagecreationstep.cpp
@@ -58,7 +58,7 @@ using ProjectExplorer::BuildStepConfigWidget;
 using ProjectExplorer::Task;
 using namespace Qt4ProjectManager;
 
-namespace RemoteLinux {
+namespace Madde {
 namespace Internal {
 
 const QLatin1String AbstractMaemoPackageCreationStep::DefaultVersionNumber("0.0.1");
@@ -508,4 +508,4 @@ const QString MaemoRpmPackageCreationStep::CreatePackageId
     = QLatin1String("MaemoRpmPackageCreationStep");
 
 } // namespace Internal
-} // namespace RemoteLinux
+} // namespace Madde
diff --git a/src/plugins/remotelinux/maemopackagecreationstep.h b/src/plugins/madde/maemopackagecreationstep.h
index 4e8b74db692..1c41a784808 100644
--- a/src/plugins/remotelinux/maemopackagecreationstep.h
+++ b/src/plugins/madde/maemopackagecreationstep.h
@@ -44,7 +44,9 @@ namespace Qt4ProjectManager { class Qt4BuildConfiguration; }
 
 namespace RemoteLinux {
 class RemoteLinuxDeployConfiguration;
+}
 
+namespace Madde {
 namespace Internal {
 class AbstractQt4MaemoTarget;
 class AbstractDebBasedQt4MaemoTarget;
@@ -147,6 +149,6 @@ private:
 };
 
 } // namespace Internal
-} // namespace RemoteLinux
+} // namespace Madde
 
 #endif // MAEMOPACKAGECREATIONSTEP_H
diff --git a/src/plugins/remotelinux/maemopackagecreationwidget.cpp b/src/plugins/madde/maemopackagecreationwidget.cpp
index 121a5514f9f..0874cd8170a 100644
--- a/src/plugins/remotelinux/maemopackagecreationwidget.cpp
+++ b/src/plugins/madde/maemopackagecreationwidget.cpp
@@ -49,7 +49,7 @@
 
 using namespace ProjectExplorer;
 
-namespace RemoteLinux {
+namespace Madde {
 namespace Internal {
 
 // TODO: Split up into dedicated widgets for Debian and RPM steps.
@@ -280,4 +280,4 @@ void MaemoPackageCreationWidget::editFile(const QString &filePath)
 }
 
 } // namespace Internal
-} // namespace RemoteLinux
+} // namespace Madde
diff --git a/src/plugins/remotelinux/maemopackagecreationwidget.h b/src/plugins/madde/maemopackagecreationwidget.h
index a119380f4fc..207b066013a 100644
--- a/src/plugins/remotelinux/maemopackagecreationwidget.h
+++ b/src/plugins/madde/maemopackagecreationwidget.h
@@ -38,7 +38,7 @@ QT_BEGIN_NAMESPACE
 namespace Ui { class MaemoPackageCreationWidget; }
 QT_END_NAMESPACE
 
-namespace RemoteLinux {
+namespace Madde {
 namespace Internal {
 class AbstractMaemoPackageCreationStep;
 
@@ -78,6 +78,6 @@ private:
 };
 
 } // namespace Internal
-} // namespace RemoteLinux
+} // namespace Madde
 
 #endif // MAEMOPACKAGECREATIONWIDGET_H
diff --git a/src/plugins/remotelinux/maemopackagecreationwidget.ui b/src/plugins/madde/maemopackagecreationwidget.ui
index b7017f27270..b7017f27270 100644
--- a/src/plugins/remotelinux/maemopackagecreationwidget.ui
+++ b/src/plugins/madde/maemopackagecreationwidget.ui
diff --git a/src/plugins/remotelinux/maemopackageinstaller.cpp b/src/plugins/madde/maemopackageinstaller.cpp
index 25964bf51e0..729beb643c9 100644
--- a/src/plugins/remotelinux/maemopackageinstaller.cpp
+++ b/src/plugins/madde/maemopackageinstaller.cpp
@@ -34,7 +34,7 @@
 
 #include "maemoglobal.h"
 
-namespace RemoteLinux {
+namespace Madde {
 namespace Internal {
 
 MaemoDebianPackageInstaller::MaemoDebianPackageInstaller(QObject *parent)
@@ -98,4 +98,4 @@ QString MaemoRpmPackageInstaller::cancelInstallationCommandLine() const
 }
 
 } // namespace Internal
-} // namespace RemoteLinux
+} // namespace Madde
diff --git a/src/plugins/remotelinux/maemopackageinstaller.h b/src/plugins/madde/maemopackageinstaller.h
index bd96b965ad2..3acc171a3b4 100644
--- a/src/plugins/remotelinux/maemopackageinstaller.h
+++ b/src/plugins/madde/maemopackageinstaller.h
@@ -35,7 +35,7 @@
 
 #include <remotelinux/remotelinuxpackageinstaller.h>
 
-namespace RemoteLinux {
+namespace Madde {
 namespace Internal {
 
 class MaemoDebianPackageInstaller: public RemoteLinux::AbstractRemoteLinuxPackageInstaller
@@ -69,6 +69,6 @@ private:
 };
 
 } // namespace Internal
-} // namespace RemoteLinux
+} // namespace Madde
 
 #endif // ABSTRACTMAEMOPACKAGEINSTALLER_H
diff --git a/src/plugins/remotelinux/maemopublishedprojectmodel.cpp b/src/plugins/madde/maemopublishedprojectmodel.cpp
index e9af35dce1f..bf0f889ab65 100644
--- a/src/plugins/remotelinux/maemopublishedprojectmodel.cpp
+++ b/src/plugins/madde/maemopublishedprojectmodel.cpp
@@ -33,7 +33,7 @@
 
 #include <QtCore/QFileInfo>
 
-namespace RemoteLinux {
+namespace Madde {
 namespace Internal {
 namespace {
 const int IncludeColumn = 2;
@@ -132,4 +132,4 @@ bool MaemoPublishedProjectModel::setData(const QModelIndex &index,
 
 
 } // namespace Internal
-} // namespace RemoteLinux
+} // namespace Madde
diff --git a/src/plugins/remotelinux/maemopublishedprojectmodel.h b/src/plugins/madde/maemopublishedprojectmodel.h
index 45e25a5353e..4309f5f9dfa 100644
--- a/src/plugins/remotelinux/maemopublishedprojectmodel.h
+++ b/src/plugins/madde/maemopublishedprojectmodel.h
@@ -36,7 +36,7 @@
 #include <QtCore/QStringList>
 #include <QtGui/QFileSystemModel>
 
-namespace RemoteLinux {
+namespace Madde {
 namespace Internal {
 
 class MaemoPublishedProjectModel : public QFileSystemModel
@@ -63,6 +63,6 @@ private:
 };
 
 } // namespace Internal
-} // namespace RemoteLinux
+} // namespace Madde
 
 #endif // MAEMOPUBLISHEDPROJECTMODEL_H
diff --git a/src/plugins/remotelinux/maemopublisherfremantlefree.cpp b/src/plugins/madde/maemopublisherfremantlefree.cpp
index 9fd91d1ef37..a0dbe99bc43 100644
--- a/src/plugins/remotelinux/maemopublisherfremantlefree.cpp
+++ b/src/plugins/madde/maemopublisherfremantlefree.cpp
@@ -56,9 +56,10 @@
 
 using namespace Core;
 using namespace Qt4ProjectManager;
+using namespace RemoteLinux;
 using namespace Utils;
 
-namespace RemoteLinux {
+namespace Madde {
 namespace Internal {
 
 MaemoPublisherFremantleFree::MaemoPublisherFremantleFree(const ProjectExplorer::Project *project,
@@ -641,4 +642,4 @@ void MaemoPublisherFremantleFree::setState(State newState)
 }
 
 } // namespace Internal
-} // namespace RemoteLinux
+} // namespace Madde
diff --git a/src/plugins/remotelinux/maemopublisherfremantlefree.h b/src/plugins/madde/maemopublisherfremantlefree.h
index 65d03f6a232..b300fc3126a 100644
--- a/src/plugins/remotelinux/maemopublisherfremantlefree.h
+++ b/src/plugins/madde/maemopublisherfremantlefree.h
@@ -45,7 +45,7 @@ namespace Qt4ProjectManager {
 class Qt4BuildConfiguration;
 }
 
-namespace RemoteLinux {
+namespace Madde {
 namespace Internal {
 
 class MaemoPublisherFremantleFree : public QObject
@@ -123,6 +123,6 @@ private:
 };
 
 } // namespace Internal
-} // namespace RemoteLinux
+} // namespace Madde
 
 #endif // MAEMOPUBLISHERFREMANTLEFREE_H
diff --git a/src/plugins/remotelinux/maemopublishingbuildsettingspagefremantlefree.cpp b/src/plugins/madde/maemopublishingbuildsettingspagefremantlefree.cpp
index 436ce7dc795..dd63c835b6a 100644
--- a/src/plugins/remotelinux/maemopublishingbuildsettingspagefremantlefree.cpp
+++ b/src/plugins/madde/maemopublishingbuildsettingspagefremantlefree.cpp
@@ -46,7 +46,7 @@
 using namespace ProjectExplorer;
 using namespace Qt4ProjectManager;
 
-namespace RemoteLinux {
+namespace Madde {
 namespace Internal {
 
 MaemoPublishingBuildSettingsPageFremantleFree::MaemoPublishingBuildSettingsPageFremantleFree(const Project *project,
@@ -116,4 +116,4 @@ bool MaemoPublishingBuildSettingsPageFremantleFree::skipUpload() const
 }
 
 } // namespace Internal
-} // namespace RemoteLinux
+} // namespace Madde
diff --git a/src/plugins/remotelinux/maemopublishingbuildsettingspagefremantlefree.h b/src/plugins/madde/maemopublishingbuildsettingspagefremantlefree.h
index 83dd6b7a2b9..cd14336ac8b 100644
--- a/src/plugins/remotelinux/maemopublishingbuildsettingspagefremantlefree.h
+++ b/src/plugins/madde/maemopublishingbuildsettingspagefremantlefree.h
@@ -44,7 +44,7 @@ QT_END_NAMESPACE
 namespace ProjectExplorer { class Project; }
 namespace Qt4ProjectManager { class Qt4BuildConfiguration; }
 
-namespace RemoteLinux {
+namespace Madde {
 namespace Internal {
 class MaemoPublisherFremantleFree;
 
@@ -70,6 +70,6 @@ private:
 };
 
 } // namespace Internal
-} // namespace RemoteLinux
+} // namespace Madde
 
 #endif // MAEMOPUBLISHINGBUILDSETTINGSPAGEFREMANTLEFREE_H
diff --git a/src/plugins/remotelinux/maemopublishingbuildsettingspagefremantlefree.ui b/src/plugins/madde/maemopublishingbuildsettingspagefremantlefree.ui
index 6e536f6cc81..6e536f6cc81 100644
--- a/src/plugins/remotelinux/maemopublishingbuildsettingspagefremantlefree.ui
+++ b/src/plugins/madde/maemopublishingbuildsettingspagefremantlefree.ui
diff --git a/src/plugins/remotelinux/maemopublishingfileselectiondialog.cpp b/src/plugins/madde/maemopublishingfileselectiondialog.cpp
index 8feba7a678b..7e862599e65 100644
--- a/src/plugins/remotelinux/maemopublishingfileselectiondialog.cpp
+++ b/src/plugins/madde/maemopublishingfileselectiondialog.cpp
@@ -34,7 +34,7 @@
 
 #include "maemopublishedprojectmodel.h"
 
-namespace RemoteLinux {
+namespace Madde {
 namespace Internal {
 
 MaemoPublishingFileSelectionDialog::MaemoPublishingFileSelectionDialog(const QString &projectPath,
@@ -62,4 +62,4 @@ QStringList MaemoPublishingFileSelectionDialog::filesToExclude() const
 }
 
 } // namespace Internal
-} // namespace RemoteLinux
+} // namespace Madde
diff --git a/src/plugins/remotelinux/maemopublishingfileselectiondialog.h b/src/plugins/madde/maemopublishingfileselectiondialog.h
index b6dfe843667..e3e901b23d3 100644
--- a/src/plugins/remotelinux/maemopublishingfileselectiondialog.h
+++ b/src/plugins/madde/maemopublishingfileselectiondialog.h
@@ -41,7 +41,7 @@ namespace Ui {
 }
 QT_END_NAMESPACE
 
-namespace RemoteLinux {
+namespace Madde {
 namespace Internal {
 
 class MaemoPublishingFileSelectionDialog : public QDialog
@@ -60,6 +60,6 @@ private:
 };
 
 } // namespace Internal
-} // namespace RemoteLinux
+} // namespace Madde
 
 #endif // MAEMOPUBLISHINGFILESELECTIONDIALOG_H
diff --git a/src/plugins/remotelinux/maemopublishingfileselectiondialog.ui b/src/plugins/madde/maemopublishingfileselectiondialog.ui
index a66247f9eef..a66247f9eef 100644
--- a/src/plugins/remotelinux/maemopublishingfileselectiondialog.ui
+++ b/src/plugins/madde/maemopublishingfileselectiondialog.ui
diff --git a/src/plugins/remotelinux/maemopublishingresultpagefremantlefree.cpp b/src/plugins/madde/maemopublishingresultpagefremantlefree.cpp
index be8a5c096c6..48eee34f434 100644
--- a/src/plugins/remotelinux/maemopublishingresultpagefremantlefree.cpp
+++ b/src/plugins/madde/maemopublishingresultpagefremantlefree.cpp
@@ -34,7 +34,7 @@
 
 #include <QtGui/QAbstractButton>
 
-namespace RemoteLinux {
+namespace Madde {
 namespace Internal {
 typedef MaemoPublisherFremantleFree MPFF;
 
@@ -105,4 +105,4 @@ QAbstractButton *MaemoPublishingResultPageFremantleFree::cancelButton() const
 }
 
 } // namespace Internal
-} // namespace RemoteLinux
+} // namespace Madde
diff --git a/src/plugins/remotelinux/maemopublishingresultpagefremantlefree.h b/src/plugins/madde/maemopublishingresultpagefremantlefree.h
index 6fc2ce5c5a8..d5a6de6e627 100644
--- a/src/plugins/remotelinux/maemopublishingresultpagefremantlefree.h
+++ b/src/plugins/madde/maemopublishingresultpagefremantlefree.h
@@ -41,7 +41,7 @@ namespace Ui {
 }
 QT_END_NAMESPACE
 
-namespace RemoteLinux {
+namespace Madde {
 namespace Internal {
 
 class MaemoPublishingResultPageFremantleFree : public QWizardPage
@@ -72,6 +72,6 @@ private:
 };
 
 } // namespace Internal
-} // namespace RemoteLinux
+} // namespace Madde
 
 #endif // MAEMOPUBLISHINGRESULTPAGEFREMANTLEFREE_H
diff --git a/src/plugins/remotelinux/maemopublishingresultpagefremantlefree.ui b/src/plugins/madde/maemopublishingresultpagefremantlefree.ui
index f7f429ccf8d..f7f429ccf8d 100644
--- a/src/plugins/remotelinux/maemopublishingresultpagefremantlefree.ui
+++ b/src/plugins/madde/maemopublishingresultpagefremantlefree.ui
diff --git a/src/plugins/remotelinux/maemopublishinguploadsettingspagefremantlefree.cpp b/src/plugins/madde/maemopublishinguploadsettingspagefremantlefree.cpp
index 98feae6536c..0a0969c4602 100644
--- a/src/plugins/remotelinux/maemopublishinguploadsettingspagefremantlefree.cpp
+++ b/src/plugins/madde/maemopublishinguploadsettingspagefremantlefree.cpp
@@ -38,7 +38,7 @@
 
 #include <QtCore/QDir>
 
-namespace RemoteLinux {
+namespace Madde {
 namespace Internal {
 
 MaemoPublishingUploadSettingsPageFremantleFree::MaemoPublishingUploadSettingsPageFremantleFree(MaemoPublisherFremantleFree *publisher,
@@ -113,4 +113,4 @@ bool MaemoPublishingUploadSettingsPageFremantleFree::validatePage()
 }
 
 } // namespace Internal
-} // namespace RemoteLinux
+} // namespace Madde
diff --git a/src/plugins/remotelinux/maemopublishinguploadsettingspagefremantlefree.h b/src/plugins/madde/maemopublishinguploadsettingspagefremantlefree.h
index 5ffee819b59..a93b8c7643d 100644
--- a/src/plugins/remotelinux/maemopublishinguploadsettingspagefremantlefree.h
+++ b/src/plugins/madde/maemopublishinguploadsettingspagefremantlefree.h
@@ -40,7 +40,7 @@ namespace Ui {
 }
 QT_END_NAMESPACE
 
-namespace RemoteLinux {
+namespace Madde {
 namespace Internal {
 class MaemoPublisherFremantleFree;
 
@@ -68,6 +68,6 @@ private:
 };
 
 } // namespace Internal
-} // namespace RemoteLinux
+} // namespace Madde
 
 #endif // MAEMOPUBLISHINGUPLOADSETTINGSWIZARDPAGE_H
diff --git a/src/plugins/remotelinux/maemopublishinguploadsettingspagefremantlefree.ui b/src/plugins/madde/maemopublishinguploadsettingspagefremantlefree.ui
index 48064654d37..48064654d37 100644
--- a/src/plugins/remotelinux/maemopublishinguploadsettingspagefremantlefree.ui
+++ b/src/plugins/madde/maemopublishinguploadsettingspagefremantlefree.ui
diff --git a/src/plugins/remotelinux/maemopublishingwizardfactories.cpp b/src/plugins/madde/maemopublishingwizardfactories.cpp
index 991a3c6e89a..47e40ce1644 100644
--- a/src/plugins/remotelinux/maemopublishingwizardfactories.cpp
+++ b/src/plugins/madde/maemopublishingwizardfactories.cpp
@@ -45,7 +45,7 @@
 using namespace ProjectExplorer;
 using namespace Qt4ProjectManager;
 
-namespace RemoteLinux {
+namespace Madde {
 namespace Internal {
 
 MaemoPublishingWizardFactoryFremantleFree::MaemoPublishingWizardFactoryFremantleFree(QObject *parent)
@@ -99,4 +99,4 @@ QWizard *MaemoPublishingWizardFactoryFremantleFree::createWizard(const Project *
 }
 
 } // namespace Internal
-} // namespace RemoteLinux
+} // namespace Madde
diff --git a/src/plugins/remotelinux/maemopublishingwizardfactories.h b/src/plugins/madde/maemopublishingwizardfactories.h
index 1b56bf2cf2d..f19c833812a 100644
--- a/src/plugins/remotelinux/maemopublishingwizardfactories.h
+++ b/src/plugins/madde/maemopublishingwizardfactories.h
@@ -38,7 +38,7 @@ namespace Core {
 class SshRemoteProcessRunner;
 }
 
-namespace RemoteLinux {
+namespace Madde {
 namespace Internal {
 
 class MaemoPublishingWizardFactoryFremantleFree
@@ -55,6 +55,6 @@ private:
 };
 
 } // namespace Internal
-} // namespace RemoteLinux
+} // namespace Madde
 
 #endif // MAEMOPUBLISHINGSERVICE_H
diff --git a/src/plugins/remotelinux/maemopublishingwizardfremantlefree.cpp b/src/plugins/madde/maemopublishingwizardfremantlefree.cpp
index 7330ae06e48..cc5664782c2 100644
--- a/src/plugins/remotelinux/maemopublishingwizardfremantlefree.cpp
+++ b/src/plugins/madde/maemopublishingwizardfremantlefree.cpp
@@ -38,7 +38,7 @@
 
 using namespace ProjectExplorer;
 
-namespace RemoteLinux {
+namespace Madde {
 namespace Internal {
 namespace {
 enum PageId { BuildSettingsPageId, UploadSettingsPageId, ResultPageId };
@@ -78,4 +78,4 @@ int MaemoPublishingWizardFremantleFree::nextId() const
 
 
 } // namespace Internal
-} // namespace RemoteLinux
+} // namespace Madde
diff --git a/src/plugins/remotelinux/maemopublishingwizardfremantlefree.h b/src/plugins/madde/maemopublishingwizardfremantlefree.h
index 03f6f33a454..ca08311ec9c 100644
--- a/src/plugins/remotelinux/maemopublishingwizardfremantlefree.h
+++ b/src/plugins/madde/maemopublishingwizardfremantlefree.h
@@ -38,7 +38,7 @@ namespace ProjectExplorer {
 class Project;
 }
 
-namespace RemoteLinux {
+namespace Madde {
 namespace Internal {
 class MaemoPublishingResultPageFremantleFree;
 class MaemoPublisherFremantleFree;
@@ -63,6 +63,6 @@ private:
 };
 
 } // namespace Internal
-} // namespace RemoteLinux
+} // namespace Madde
 
 #endif // MAEMOPUBLISHINGWIZARDFREMANTLEFREE_H
diff --git a/src/plugins/remotelinux/maemoqemumanager.cpp b/src/plugins/madde/maemoqemumanager.cpp
index 18791c22026..af7632420e8 100644
--- a/src/plugins/remotelinux/maemoqemumanager.cpp
+++ b/src/plugins/madde/maemoqemumanager.cpp
@@ -35,7 +35,6 @@
 #include "maemoglobal.h"
 #include "maemoqemuruntimeparser.h"
 #include "maemosettingspages.h"
-#include "remotelinuxrunconfiguration.h"
 #include "qt4maemotarget.h"
 #include "maemoqtversion.h"
 
@@ -54,6 +53,7 @@
 #include <qtsupport/qtversionmanager.h>
 #include <qt4projectmanager/qt4buildconfiguration.h>
 #include <remotelinux/linuxdeviceconfiguration.h>
+#include <remotelinux/remotelinuxrunconfiguration.h>
 #include <utils/filesystemwatcher.h>
 
 #include <QtCore/QDebug>
@@ -71,7 +71,9 @@
 using namespace ProjectExplorer;
 using namespace Qt4ProjectManager;
 using namespace RemoteLinux;
-using namespace RemoteLinux::Internal;
+
+namespace Madde {
+namespace Internal {
 
 MaemoQemuManager *MaemoQemuManager::m_instance = 0;
 
@@ -621,3 +623,6 @@ void MaemoQemuManager::showOrHideQemuButton()
         terminateRuntime();
     m_qemuAction->setVisible(showButton);
 }
+
+}   // namespace Internal
+}   // namespace Madde
diff --git a/src/plugins/remotelinux/maemoqemumanager.h b/src/plugins/madde/maemoqemumanager.h
index 91c6c5cb5c7..2ce954247fd 100644
--- a/src/plugins/remotelinux/maemoqemumanager.h
+++ b/src/plugins/madde/maemoqemumanager.h
@@ -50,10 +50,10 @@ class FileSystemWatcher;
 }
 
 namespace ProjectExplorer {
-    class BuildConfiguration;
-    class Project;
-    class RunConfiguration;
-    class Target;
+class BuildConfiguration;
+class Project;
+class RunConfiguration;
+class Target;
 }
 
 namespace QtSupport {
@@ -62,7 +62,9 @@ class BaseQtVersion;
 
 namespace RemoteLinux {
 class RemoteLinuxRunConfiguration;
+}
 
+namespace Madde {
 namespace Internal {
 
 class MaemoQemuManager : public QObject
@@ -123,7 +125,7 @@ private:
         QtSupport::BaseQtVersion **qtVersion = 0);
 
     void notify(const QList<int> uniqueIds);
-    void toggleDeviceConnections(RemoteLinuxRunConfiguration *mrc, bool connect);
+    void toggleDeviceConnections(RemoteLinux::RemoteLinuxRunConfiguration *mrc, bool connect);
     void showOrHideQemuButton();
 
 private:
@@ -142,6 +144,6 @@ private:
 };
 
 }   // namespace Internal
-}   // namespace RemoteLinux
+}   // namespace Madde
 
 #endif  // QEMURUNTIMEMANAGER_H
diff --git a/src/plugins/remotelinux/maemoqemuruntime.h b/src/plugins/madde/maemoqemuruntime.h
index ce9088af03d..572ee4e7a9c 100644
--- a/src/plugins/remotelinux/maemoqemuruntime.h
+++ b/src/plugins/madde/maemoqemuruntime.h
@@ -42,7 +42,7 @@
 #include <QtCore/QProcessEnvironment>
 #include <QtCore/QString>
 
-namespace RemoteLinux {
+namespace Madde {
 namespace Internal {
 
 enum QemuStatus {
@@ -79,13 +79,13 @@ struct MaemoQemuRuntime
     QString m_args;
     QString m_sshPort;
     QString m_watchPath;
-    PortList m_freePorts;
+    RemoteLinux::PortList m_freePorts;
     QList<Variable> m_normalVars;
     QString m_openGlBackendVarName;
     QHash<MaemoQemuSettings::OpenGlMode, QString> m_openGlBackendVarValues;
 };
 
 }   // namespace Internal
-}   // namespace RemoteLinux
+}   // namespace Madde
 
 #endif // MAEMOQEMURUNTIME_H
diff --git a/src/plugins/remotelinux/maemoqemuruntimeparser.cpp b/src/plugins/madde/maemoqemuruntimeparser.cpp
index ff9c7c8c8d9..59e274144ab 100644
--- a/src/plugins/remotelinux/maemoqemuruntimeparser.cpp
+++ b/src/plugins/madde/maemoqemuruntimeparser.cpp
@@ -42,7 +42,9 @@
 #include <QtCore/QStringList>
 #include <QtCore/QTextStream>
 
-namespace RemoteLinux {
+using namespace RemoteLinux;
+
+namespace Madde {
 namespace Internal {
 
 class MaemoQemuRuntimeParserV1 : public MaemoQemuRuntimeParser
@@ -428,4 +430,4 @@ MaemoQemuSettings::OpenGlMode MaemoQemuRuntimeParserV2::openGlTagToEnum(const QS
 }
 
 }   // namespace Internal
-}   // namespace RemoteLinux
+}   // namespace Madde
diff --git a/src/plugins/remotelinux/maemoqemuruntimeparser.h b/src/plugins/madde/maemoqemuruntimeparser.h
index 77a052baf6e..6dd472eea8f 100644
--- a/src/plugins/remotelinux/maemoqemuruntimeparser.h
+++ b/src/plugins/madde/maemoqemuruntimeparser.h
@@ -41,7 +41,7 @@ namespace QtSupport {
 class BaseQtVersion;
 }
 
-namespace RemoteLinux {
+namespace Madde {
 namespace Internal {
 
 class MaemoQemuRuntimeParser
@@ -59,6 +59,6 @@ protected:
 };
 
 }   // namespace Internal
-}   // namespace RemoteLinux
+}   // namespace Madde
 
 #endif // MAEMOQEMURUNTIMEPARSER_H
diff --git a/src/plugins/remotelinux/maemoqemusettings.cpp b/src/plugins/madde/maemoqemusettings.cpp
index 3e86f8b9306..e164773bb81 100644
--- a/src/plugins/remotelinux/maemoqemusettings.cpp
+++ b/src/plugins/madde/maemoqemusettings.cpp
@@ -35,7 +35,7 @@
 
 #include <QtCore/QSettings>
 
-namespace RemoteLinux {
+namespace Madde {
 namespace Internal {
 namespace {
 const QString SettingsGroup = QLatin1String("Maemo Qemu Settings");
@@ -68,4 +68,4 @@ bool MaemoQemuSettings::m_initialized = false;
 MaemoQemuSettings::OpenGlMode MaemoQemuSettings::m_openGlMode;
 
 } // namespace Internal
-} // namespace RemoteLinux
+} // namespace Madde
diff --git a/src/plugins/remotelinux/maemoqemusettings.h b/src/plugins/madde/maemoqemusettings.h
index f1c11697c7a..35291bb2b59 100644
--- a/src/plugins/remotelinux/maemoqemusettings.h
+++ b/src/plugins/madde/maemoqemusettings.h
@@ -32,7 +32,7 @@
 #ifndef MAEMOQEMUSETTINGS_H
 #define MAEMOQEMUSETTINGS_H
 
-namespace RemoteLinux {
+namespace Madde {
 namespace Internal {
 
 class MaemoQemuSettings
@@ -51,6 +51,6 @@ private:
 };
 
 } // namespace Internal
-} // namespace RemoteLinux
+} // namespace Madde
 
 #endif // MAEMOQEMUSETTINGS_H
diff --git a/src/plugins/remotelinux/maemoqemusettingswidget.cpp b/src/plugins/madde/maemoqemusettingswidget.cpp
index 8b1d0bec991..9acb4e7398d 100644
--- a/src/plugins/remotelinux/maemoqemusettingswidget.cpp
+++ b/src/plugins/madde/maemoqemusettingswidget.cpp
@@ -34,7 +34,7 @@
 
 #include "maemoqemusettings.h"
 
-namespace RemoteLinux {
+namespace Madde {
 namespace Internal {
 
 MaemoQemuSettingsWidget::MaemoQemuSettingsWidget(QWidget *parent) :
@@ -83,4 +83,4 @@ void MaemoQemuSettingsWidget::saveSettings()
 }
 
 } // namespace Internal
-} // namespace RemoteLinux
+} // namespace Madde
diff --git a/src/plugins/remotelinux/maemoqemusettingswidget.h b/src/plugins/madde/maemoqemusettingswidget.h
index 4b2d4c6fad1..6c434479306 100644
--- a/src/plugins/remotelinux/maemoqemusettingswidget.h
+++ b/src/plugins/madde/maemoqemusettingswidget.h
@@ -40,7 +40,7 @@ namespace Ui {
 }
 QT_END_NAMESPACE
 
-namespace RemoteLinux {
+namespace Madde {
 namespace Internal {
 
 class MaemoQemuSettingsWidget : public QWidget
@@ -58,6 +58,6 @@ private:
 };
 
 } // namespace Internal
-} // namespace RemoteLinux
+} // namespace Madde
 
 #endif // MAEMOQEMUSETTINGSWIDGET_H
diff --git a/src/plugins/remotelinux/maemoqemusettingswidget.ui b/src/plugins/madde/maemoqemusettingswidget.ui
index f500f946808..f500f946808 100644
--- a/src/plugins/remotelinux/maemoqemusettingswidget.ui
+++ b/src/plugins/madde/maemoqemusettingswidget.ui
diff --git a/src/plugins/remotelinux/maemoqtversion.cpp b/src/plugins/madde/maemoqtversion.cpp
index 8f61abd941f..f7b7a341162 100644
--- a/src/plugins/remotelinux/maemoqtversion.cpp
+++ b/src/plugins/madde/maemoqtversion.cpp
@@ -44,7 +44,7 @@
 
 using namespace Qt4ProjectManager;
 
-namespace RemoteLinux {
+namespace Madde {
 namespace Internal {
 
 MaemoQtVersion::MaemoQtVersion() : QtSupport::BaseQtVersion()
@@ -195,4 +195,4 @@ void MaemoQtVersion::addToEnvironment(Utils::Environment &env) const
 }
 
 } // namespace Internal
-} // namespace RemoteLinux
+} // namespace Madde
diff --git a/src/plugins/remotelinux/maemoqtversion.h b/src/plugins/madde/maemoqtversion.h
index 6fcbccf0b9d..9d933f9ee04 100644
--- a/src/plugins/remotelinux/maemoqtversion.h
+++ b/src/plugins/madde/maemoqtversion.h
@@ -34,7 +34,7 @@
 
 #include <qtsupport/baseqtversion.h>
 
-namespace RemoteLinux {
+namespace Madde {
 namespace Internal {
 
 class MaemoQtVersion : public QtSupport::BaseQtVersion
@@ -67,6 +67,6 @@ private:
 };
 
 } // namespace Internal
-} // namespace RemoteLinux
+} // namespace Madde
 
 #endif // MAEMOQTVERSION_H
diff --git a/src/plugins/remotelinux/maemoqtversionfactory.cpp b/src/plugins/madde/maemoqtversionfactory.cpp
index 86bcc41d655..d385c0b4d7a 100644
--- a/src/plugins/remotelinux/maemoqtversionfactory.cpp
+++ b/src/plugins/madde/maemoqtversionfactory.cpp
@@ -39,7 +39,7 @@
 
 #include <QtCore/QFileInfo>
 
-namespace RemoteLinux {
+namespace Madde {
 namespace Internal {
 
 MaemoQtVersionFactory::MaemoQtVersionFactory(QObject *parent)
@@ -87,5 +87,5 @@ QtSupport::BaseQtVersion *MaemoQtVersionFactory::create(const QString &qmakePath
     return 0;
 }
 
-} // Internal
-} // Qt4ProjectManager
+} // namespace Internal
+} // namespace Madde
diff --git a/src/plugins/remotelinux/maemoqtversionfactory.h b/src/plugins/madde/maemoqtversionfactory.h
index 41234cd6142..b4ea034d4db 100644
--- a/src/plugins/remotelinux/maemoqtversionfactory.h
+++ b/src/plugins/madde/maemoqtversionfactory.h
@@ -35,7 +35,7 @@
 
 #include <qtsupport/qtversionfactory.h>
 
-namespace RemoteLinux {
+namespace Madde {
 namespace Internal {
 
 class MaemoQtVersionFactory : public QtSupport::QtVersionFactory
@@ -51,7 +51,7 @@ public:
     virtual QtSupport::BaseQtVersion *create(const QString &qmakePath, ProFileEvaluator *evaluator, bool isAutoDetected = false, const QString &autoDetectionSource = QString());
 };
 
-} // Internal
-} // Qt4ProjectManager
+} // namespace Internal
+} // namespace Madde
 
 #endif // MAEMOQTVERSIONFACTORY_H
diff --git a/src/plugins/remotelinux/maemoremotecopyfacility.cpp b/src/plugins/madde/maemoremotecopyfacility.cpp
index 796efbfe621..1776fa8ccd4 100644
--- a/src/plugins/remotelinux/maemoremotecopyfacility.cpp
+++ b/src/plugins/madde/maemoremotecopyfacility.cpp
@@ -39,9 +39,10 @@
 
 #include <QtCore/QDir>
 
+using namespace RemoteLinux;
 using namespace Utils;
 
-namespace RemoteLinux {
+namespace Madde {
 namespace Internal {
 
 MaemoRemoteCopyFacility::MaemoRemoteCopyFacility(QObject *parent) :
@@ -157,4 +158,4 @@ void MaemoRemoteCopyFacility::setFinished()
 }
 
 } // namespace Internal
-} // namespace RemoteLinux
+} // namespace Madde
diff --git a/src/plugins/remotelinux/maemoremotecopyfacility.h b/src/plugins/madde/maemoremotecopyfacility.h
index 58e484a6f69..c2ee128dc79 100644
--- a/src/plugins/remotelinux/maemoremotecopyfacility.h
+++ b/src/plugins/madde/maemoremotecopyfacility.h
@@ -33,7 +33,7 @@
 #ifndef MAEMOREMOTECOPYFACILITY_H
 #define MAEMOREMOTECOPYFACILITY_H
 
-#include "deployablefile.h"
+#include <remotelinux/deployablefile.h>
 
 #include <QtCore/QList>
 #include <QtCore/QObject>
@@ -47,7 +47,9 @@ class SshRemoteProcessRunner;
 
 namespace RemoteLinux {
 class LinuxDeviceConfiguration;
+}
 
+namespace Madde {
 namespace Internal {
 
 class MaemoRemoteCopyFacility : public QObject
@@ -58,8 +60,8 @@ public:
     ~MaemoRemoteCopyFacility();
 
     void copyFiles(const QSharedPointer<Utils::SshConnection> &connection,
-        const QSharedPointer<const LinuxDeviceConfiguration> &devConf,
-        const QList<DeployableFile> &deployables, const QString &mountPoint);
+        const QSharedPointer<const RemoteLinux::LinuxDeviceConfiguration> &devConf,
+        const QList<RemoteLinux::DeployableFile> &deployables, const QString &mountPoint);
     void cancel();
 
 signals:
@@ -80,13 +82,13 @@ private:
     void setFinished();
 
     QSharedPointer<Utils::SshRemoteProcessRunner> m_copyRunner;
-    QSharedPointer<const LinuxDeviceConfiguration> m_devConf;
-    QList<DeployableFile> m_deployables;
+    QSharedPointer<const RemoteLinux::LinuxDeviceConfiguration> m_devConf;
+    QList<RemoteLinux::DeployableFile> m_deployables;
     QString m_mountPoint;
     bool m_isCopying;
 };
 
 } // namespace Internal
-} // namespace RemoteLinux
+} // namespace Madde
 
 #endif // MAEMOREMOTECOPYFACILITY_H
diff --git a/src/plugins/remotelinux/maemoremotemounter.cpp b/src/plugins/madde/maemoremotemounter.cpp
index d84be8abb83..8e72cada1e3 100644
--- a/src/plugins/remotelinux/maemoremotemounter.cpp
+++ b/src/plugins/madde/maemoremotemounter.cpp
@@ -46,9 +46,10 @@
 #include <QtCore/QTimer>
 
 using namespace Qt4ProjectManager;
+using namespace RemoteLinux;
 using namespace Utils;
 
-namespace RemoteLinux {
+namespace Madde {
 namespace Internal {
 
 MaemoRemoteMounter::MaemoRemoteMounter(QObject *parent)
@@ -409,4 +410,4 @@ void MaemoRemoteMounter::setState(State newState)
 }
 
 } // namespace Internal
-} // namespace RemoteLinux
+} // namespace Madde
diff --git a/src/plugins/remotelinux/maemoremotemounter.h b/src/plugins/madde/maemoremotemounter.h
index 324ba281a59..8e08b5e2577 100644
--- a/src/plugins/remotelinux/maemoremotemounter.h
+++ b/src/plugins/madde/maemoremotemounter.h
@@ -55,7 +55,9 @@ namespace RemoteLinux {
 class LinuxDeviceConfiguration;
 class PortList;
 class RemoteLinuxUsedPortsGatherer;
+}
 
+namespace Madde {
 namespace Internal {
 
 class MaemoRemoteMounter : public QObject
@@ -67,15 +69,15 @@ public:
 
     // Must already be connected.
     void setConnection(const QSharedPointer<Utils::SshConnection> &connection,
-        const QSharedPointer<const LinuxDeviceConfiguration> &devConf);
+        const QSharedPointer<const RemoteLinux::LinuxDeviceConfiguration> &devConf);
 
     void setBuildConfiguration(const Qt4ProjectManager::Qt4BuildConfiguration *bc);
     void addMountSpecification(const MaemoMountSpecification &mountSpec,
         bool mountAsRoot);
     bool hasValidMountSpecifications() const;
     void resetMountSpecifications() { m_mountSpecs.clear(); }
-    void mount(PortList *freePorts,
-        const RemoteLinuxUsedPortsGatherer *portsGatherer);
+    void mount(RemoteLinux::PortList *freePorts,
+        const RemoteLinux::RemoteLinuxUsedPortsGatherer *portsGatherer);
     void unmount();
     void stop();
 
@@ -124,7 +126,7 @@ private:
     };
 
     QSharedPointer<Utils::SshConnection> m_connection;
-    QSharedPointer<const LinuxDeviceConfiguration> m_devConf;
+    QSharedPointer<const RemoteLinux::LinuxDeviceConfiguration> m_devConf;
     QList<MountInfo> m_mountSpecs;
     QSharedPointer<Utils::SshRemoteProcess> m_mountProcess;
     QSharedPointer<Utils::SshRemoteProcess> m_unmountProcess;
@@ -134,8 +136,8 @@ private:
 
     QByteArray m_utfsClientStderr;
     QByteArray m_umountStderr;
-    PortList *m_freePorts;
-    const RemoteLinuxUsedPortsGatherer *m_portsGatherer;
+    RemoteLinux::PortList *m_freePorts;
+    const RemoteLinux::RemoteLinuxUsedPortsGatherer *m_portsGatherer;
     bool m_remoteMountsAllowed;
     QString m_maddeRoot;
 
@@ -143,6 +145,6 @@ private:
 };
 
 } // namespace Internal
-} // namespace RemoteLinux
+} // namespace Madde
 
 #endif // MAEMOREMOTEMOUNTER_H
diff --git a/src/plugins/remotelinux/maemoremotemountsmodel.cpp b/src/plugins/madde/maemoremotemountsmodel.cpp
index 99a77d4e20b..fb4d233bb0f 100644
--- a/src/plugins/remotelinux/maemoremotemountsmodel.cpp
+++ b/src/plugins/madde/maemoremotemountsmodel.cpp
@@ -34,7 +34,7 @@
 
 #include "maemoconstants.h"
 
-namespace RemoteLinux {
+namespace Madde {
 namespace Internal {
 
 MaemoRemoteMountsModel::MaemoRemoteMountsModel(QObject *parent) :
@@ -187,4 +187,4 @@ bool MaemoRemoteMountsModel::setData(const QModelIndex &index,
 }
 
 } // namespace Internal
-} // namespace RemoteLinux
+} // namespace Madde
diff --git a/src/plugins/remotelinux/maemoremotemountsmodel.h b/src/plugins/madde/maemoremotemountsmodel.h
index e7d5b7bb5c4..2df096cc14a 100644
--- a/src/plugins/remotelinux/maemoremotemountsmodel.h
+++ b/src/plugins/madde/maemoremotemountsmodel.h
@@ -40,7 +40,7 @@
 #include <QtCore/QString>
 #include <QtCore/QVariantMap>
 
-namespace RemoteLinux {
+namespace Madde {
 namespace Internal {
 
 class MaemoRemoteMountsModel : public QAbstractTableModel
@@ -94,6 +94,6 @@ inline QModelIndex MaemoRemoteMountsModel::parent(const QModelIndex &) const
 }
 
 } // namespace Internal
-} // namespace RemoteLinux
+} // namespace Madde
 
 #endif // MAEMOREMOTEMOUNTSMODEL_H
diff --git a/src/plugins/remotelinux/maemorunconfiguration.cpp b/src/plugins/madde/maemorunconfiguration.cpp
index ecc0e5914e6..017302e13fa 100644
--- a/src/plugins/remotelinux/maemorunconfiguration.cpp
+++ b/src/plugins/madde/maemorunconfiguration.cpp
@@ -49,8 +49,9 @@
 
 using namespace ProjectExplorer;
 using namespace Qt4ProjectManager;
+using namespace RemoteLinux;
 
-namespace RemoteLinux {
+namespace Madde {
 namespace Internal {
 
 MaemoRunConfiguration::MaemoRunConfiguration(AbstractQt4MaemoTarget *parent,
@@ -198,4 +199,4 @@ const AbstractQt4MaemoTarget *MaemoRunConfiguration::maemoTarget() const
 const QString MaemoRunConfiguration::Id = QLatin1String(MAEMO_RC_ID);
 
 } // namespace Internal
-} // namespace RemoteLinux
+} // namespace Madde
diff --git a/src/plugins/remotelinux/maemorunconfiguration.h b/src/plugins/madde/maemorunconfiguration.h
index 7146f9cadf5..8fcbb8a3791 100644
--- a/src/plugins/remotelinux/maemorunconfiguration.h
+++ b/src/plugins/madde/maemorunconfiguration.h
@@ -31,14 +31,14 @@
 #ifndef MAEMORUNCONFIGURATION_H
 #define MAEMORUNCONFIGURATION_H
 
-#include "remotelinuxrunconfiguration.h"
+#include <remotelinux/remotelinuxrunconfiguration.h>
 
-namespace RemoteLinux {
+namespace Madde {
 namespace Internal {
 class AbstractQt4MaemoTarget;
 class MaemoRemoteMountsModel;
 
-class MaemoRunConfiguration : public RemoteLinuxRunConfiguration
+class MaemoRunConfiguration : public RemoteLinux::RemoteLinuxRunConfiguration
 {
     Q_OBJECT
 
@@ -52,7 +52,7 @@ public:
     QWidget *createConfigurationWidget();
     QString environmentPreparationCommand() const;
     QString commandPrefix() const;
-    PortList freePorts() const;
+    RemoteLinux::PortList freePorts() const;
     DebuggingType debuggingType() const;
 
     Internal::MaemoRemoteMountsModel *remoteMounts() const { return m_remoteMounts; }
@@ -76,6 +76,6 @@ private:
 };
 
 } // namespace Internal
-} // namespace RemoteLinux
+} // namespace Madde
 
 #endif // MAEMORUNCONFIGURATION_H
diff --git a/src/plugins/remotelinux/maemorunconfigurationwidget.cpp b/src/plugins/madde/maemorunconfigurationwidget.cpp
index b7a64cbd3da..857cc8de598 100644
--- a/src/plugins/remotelinux/maemorunconfigurationwidget.cpp
+++ b/src/plugins/madde/maemorunconfigurationwidget.cpp
@@ -61,8 +61,9 @@
 #include <QtGui/QToolButton>
 
 using namespace Qt4ProjectManager;
+using namespace RemoteLinux;
 
-namespace RemoteLinux {
+namespace Madde {
 namespace Internal {
 
 MaemoRunConfigurationWidget::MaemoRunConfigurationWidget(
@@ -245,4 +246,4 @@ void MaemoRunConfigurationWidget::updateMountWarning()
 }
 
 } // namespace Internal
-} // namespace RemoteLinux
+} // namespace Madde
diff --git a/src/plugins/remotelinux/maemorunconfigurationwidget.h b/src/plugins/madde/maemorunconfigurationwidget.h
index c3349e94b75..ff4e01a0265 100644
--- a/src/plugins/remotelinux/maemorunconfigurationwidget.h
+++ b/src/plugins/madde/maemorunconfigurationwidget.h
@@ -46,7 +46,9 @@ namespace Utils { class DetailsWidget; }
 
 namespace RemoteLinux {
 class RemoteLinuxRunConfigurationWidget;
+}
 
+namespace Madde {
 namespace Internal {
 class MaemoRunConfiguration;
 
@@ -74,11 +76,11 @@ private:
     QTableView *m_mountView;
     QToolButton *m_removeMountButton;
     Utils::DetailsWidget *m_mountDetailsContainer;
-    RemoteLinuxRunConfigurationWidget *m_remoteLinuxRunConfigWidget;
+    RemoteLinux::RemoteLinuxRunConfigurationWidget *m_remoteLinuxRunConfigWidget;
     MaemoRunConfiguration *m_runConfiguration;
 };
 
 } // namespace Internal
-} // namespace RemoteLinux
+} // namespace Madde
 
 #endif // MAEMORUNCONFIGURATIONWIDGET_H
diff --git a/src/plugins/remotelinux/maemoruncontrol.cpp b/src/plugins/madde/maemoruncontrol.cpp
index c32a66ccce4..5b31dac7fbb 100644
--- a/src/plugins/remotelinux/maemoruncontrol.cpp
+++ b/src/plugins/madde/maemoruncontrol.cpp
@@ -35,9 +35,10 @@
 #include "maemorunconfiguration.h"
 #include "maemosshrunner.h"
 
-namespace RemoteLinux {
+namespace Madde {
 namespace Internal {
 
+using namespace RemoteLinux;
 using ProjectExplorer::RunConfiguration;
 
 MaemoRunControl::MaemoRunControl(RunConfiguration *rc)
@@ -64,4 +65,4 @@ void MaemoRunControl::handleMountDebugOutput(const QString &output)
 AbstractRemoteLinuxApplicationRunner *MaemoRunControl::runner() const { return m_runner; }
 
 } // namespace Internal
-} // namespace RemoteLinux
+} // namespace Madde
diff --git a/src/plugins/remotelinux/maemoruncontrol.h b/src/plugins/madde/maemoruncontrol.h
index 19e45b00a69..7dc202f2a95 100644
--- a/src/plugins/remotelinux/maemoruncontrol.h
+++ b/src/plugins/madde/maemoruncontrol.h
@@ -36,11 +36,13 @@
 
 namespace RemoteLinux {
 class RemoteLinuxRunConfiguration;
+}
 
+namespace Madde {
 namespace Internal {
 class MaemoSshRunner;
 
-class MaemoRunControl : public AbstractRemoteLinuxRunControl
+class MaemoRunControl : public RemoteLinux::AbstractRemoteLinuxRunControl
 {
     Q_OBJECT
 public:
@@ -53,12 +55,12 @@ private slots:
     void handleMountDebugOutput(const QString &output);
 
 private:
-    virtual AbstractRemoteLinuxApplicationRunner *runner() const;
+    virtual RemoteLinux::AbstractRemoteLinuxApplicationRunner *runner() const;
 
     MaemoSshRunner * const m_runner;
 };
 
 } // namespace Internal
-} // namespace RemoteLinux
+} // namespace Madde
 
 #endif // MAEMORUNCONTROL_H
diff --git a/src/plugins/remotelinux/maemorunfactories.cpp b/src/plugins/madde/maemorunfactories.cpp
index 1a4c98d5841..7e3e4ea9b46 100644
--- a/src/plugins/remotelinux/maemorunfactories.cpp
+++ b/src/plugins/madde/maemorunfactories.cpp
@@ -48,8 +48,9 @@
 using namespace Debugger;
 using namespace ProjectExplorer;
 using namespace Qt4ProjectManager;
+using namespace RemoteLinux;
 
-namespace RemoteLinux {
+namespace Madde {
 namespace Internal {
 
 namespace {
@@ -196,4 +197,4 @@ RunConfigWidget *MaemoRunControlFactory::createConfigurationWidget(RunConfigurat
 }
 
     } // namespace Internal
-} // namespace RemoteLinux
+} // namespace Madde
diff --git a/src/plugins/remotelinux/maemorunfactories.h b/src/plugins/madde/maemorunfactories.h
index 954093aed09..933c7d7237c 100644
--- a/src/plugins/remotelinux/maemorunfactories.h
+++ b/src/plugins/madde/maemorunfactories.h
@@ -46,7 +46,7 @@ using ProjectExplorer::RunConfigWidget;
 using ProjectExplorer::RunControl;
 using ProjectExplorer::Target;
 
-namespace RemoteLinux {
+namespace Madde {
 namespace Internal {
 
 class MaemoRunConfigurationFactory : public IRunConfigurationFactory
@@ -85,6 +85,6 @@ public:
 };
 
     } // namespace Internal
-} // namespace RemoteLinux
+} // namespace Madde
 
 #endif  // MAEMORUNFACTORIES_H
diff --git a/src/plugins/remotelinux/maemosettingspages.cpp b/src/plugins/madde/maemosettingspages.cpp
index c5c232ce8ec..74d4d1dbae5 100644
--- a/src/plugins/remotelinux/maemosettingspages.cpp
+++ b/src/plugins/madde/maemosettingspages.cpp
@@ -45,7 +45,7 @@
 #include <QtGui/QIcon>
 #include <QtGui/QMainWindow>
 
-namespace RemoteLinux {
+namespace Madde {
 namespace Internal {
 namespace {
 
@@ -169,10 +169,10 @@ QString MaemoQemuSettingsPage::pageId()
 
 QString MaemoQemuSettingsPage::pageCategory()
 {
-    return QLatin1String(Constants::RemoteLinuxSettingsCategory);
+    return QLatin1String(RemoteLinux::Constants::RemoteLinuxSettingsCategory);
 }
 
 } // namespace Internal
-} // namespace RemoteLinux
+} // namespace Madde
 
 #include "maemosettingspages.moc"
diff --git a/src/plugins/remotelinux/maemosettingspages.h b/src/plugins/madde/maemosettingspages.h
index 6048369fe65..77e278768ac 100644
--- a/src/plugins/remotelinux/maemosettingspages.h
+++ b/src/plugins/madde/maemosettingspages.h
@@ -34,7 +34,7 @@
 
 #include <coreplugin/dialogs/ioptionspage.h>
 
-namespace RemoteLinux{
+namespace Madde{
 namespace Internal {
 class MaemoQemuSettingsWidget;
 
@@ -65,6 +65,6 @@ private:
 };
 
 } // namespace Internal
-} // namespace RemoteLinux
+} // namespace Madde
 
 #endif // MAEMOSETTINGSPAGES_H
diff --git a/src/plugins/remotelinux/maemosshrunner.cpp b/src/plugins/madde/maemosshrunner.cpp
index 86d33826d80..c698d8b635f 100644
--- a/src/plugins/remotelinux/maemosshrunner.cpp
+++ b/src/plugins/madde/maemosshrunner.cpp
@@ -41,9 +41,10 @@
 #include <utils/ssh/sshconnection.h>
 
 using namespace Qt4ProjectManager;
+using namespace RemoteLinux;
 using namespace Utils;
 
-namespace RemoteLinux {
+namespace Madde {
 namespace Internal {
 
 MaemoSshRunner::MaemoSshRunner(QObject *parent, MaemoRunConfiguration *runConfig)
@@ -230,5 +231,5 @@ QString MaemoSshRunner::killApplicationCommandLine() const
 }
 
 } // namespace Internal
-} // namespace RemoteLinux
+} // namespace Madde
 
diff --git a/src/plugins/remotelinux/maemosshrunner.h b/src/plugins/madde/maemosshrunner.h
index f283f79a494..e91c78f678e 100644
--- a/src/plugins/remotelinux/maemosshrunner.h
+++ b/src/plugins/madde/maemosshrunner.h
@@ -32,15 +32,16 @@
 #ifndef MAEMOSSHRUNNER_H
 #define MAEMOSSHRUNNER_H
 
-#include "remotelinuxapplicationrunner.h"
 #include "maemomountspecification.h"
 
-namespace RemoteLinux {
+#include <remotelinux/remotelinuxapplicationrunner.h>
+
+namespace Madde {
 namespace Internal {
 class MaemoRemoteMounter;
 class MaemoRunConfiguration;
 
-class MaemoSshRunner : public AbstractRemoteLinuxApplicationRunner
+class MaemoSshRunner : public RemoteLinux::AbstractRemoteLinuxApplicationRunner
 {
     Q_OBJECT
 public:
@@ -76,6 +77,6 @@ private:
 };
 
 } // namespace Internal
-} // namespace RemoteLinux
+} // namespace Madde
 
 #endif // MAEMOSSHRUNNER_H
diff --git a/src/plugins/remotelinux/maemotoolchain.cpp b/src/plugins/madde/maemotoolchain.cpp
index d008cbdc565..d174f473398 100644
--- a/src/plugins/remotelinux/maemotoolchain.cpp
+++ b/src/plugins/madde/maemotoolchain.cpp
@@ -49,7 +49,7 @@
 
 using namespace Qt4ProjectManager;
 
-namespace RemoteLinux {
+namespace Madde {
 namespace Internal {
 
 static const char *const MAEMO_QT_VERSION_KEY = "Qt4ProjectManager.Maemo.QtVersion";
@@ -293,4 +293,4 @@ QList<ProjectExplorer::ToolChain *> MaemoToolChainFactory::createToolChainList(c
 }
 
 } // namespace Internal
-} // namespace RemoteLinux
+} // namespace Madde
diff --git a/src/plugins/remotelinux/maemotoolchain.h b/src/plugins/madde/maemotoolchain.h
index 9e3128014b6..56b66976792 100644
--- a/src/plugins/remotelinux/maemotoolchain.h
+++ b/src/plugins/madde/maemotoolchain.h
@@ -36,8 +36,7 @@
 #include <projectexplorer/gcctoolchain.h>
 #include <projectexplorer/toolchainconfigwidget.h>
 
-namespace RemoteLinux {
-
+namespace Madde {
 namespace Internal {
 
 // --------------------------------------------------------------------------
@@ -119,6 +118,6 @@ private slots:
 };
 
 } // namespace Internal
-} // namespace RemoteLinux
+} // namespace Madde
 
 #endif // MAEMOTOOLCHAIN_H
diff --git a/src/plugins/remotelinux/qt-maemo.qrc b/src/plugins/madde/qt-maemo.qrc
index 354fe64d1be..354fe64d1be 100644
--- a/src/plugins/remotelinux/qt-maemo.qrc
+++ b/src/plugins/madde/qt-maemo.qrc
diff --git a/src/plugins/remotelinux/qt4maemodeployconfiguration.cpp b/src/plugins/madde/qt4maemodeployconfiguration.cpp
index 9f9498ab269..9428cfd25f5 100644
--- a/src/plugins/remotelinux/qt4maemodeployconfiguration.cpp
+++ b/src/plugins/madde/qt4maemodeployconfiguration.cpp
@@ -52,8 +52,9 @@
 
 using namespace ProjectExplorer;
 using namespace Qt4ProjectManager;
+using namespace RemoteLinux;
 
-namespace RemoteLinux {
+namespace Madde {
 namespace Internal {
 namespace {
 const QString OldDeployConfigId = QLatin1String("2.2MaemoDeployConfig");
@@ -250,4 +251,4 @@ DeployConfiguration *Qt4MaemoDeployConfigurationFactory::clone(Target *parent,
 }
 
 } // namespace Internal
-} // namespace RemoteLinux
+} // namespace Madde
diff --git a/src/plugins/remotelinux/qt4maemodeployconfiguration.h b/src/plugins/madde/qt4maemodeployconfiguration.h
index be7226bdf8a..c954cdec46d 100644
--- a/src/plugins/remotelinux/qt4maemodeployconfiguration.h
+++ b/src/plugins/madde/qt4maemodeployconfiguration.h
@@ -38,7 +38,9 @@
 namespace RemoteLinux {
 class DeployableFilesPerProFile;
 class DeploymentSettingsAssistant;
+}
 
+namespace Madde {
 namespace Internal {
 
 class Qt4MaemoDeployConfigurationFactory : public ProjectExplorer::DeployConfigurationFactory
@@ -69,8 +71,8 @@ public:
 
     ProjectExplorer::DeployConfigurationWidget *configurationWidget() const;
 
-    QSharedPointer<DeploymentSettingsAssistant> deploymentSettingsAssistant() const;
-    QString localDesktopFilePath(const DeployableFilesPerProFile *proFileInfo) const;
+    QSharedPointer<RemoteLinux::DeploymentSettingsAssistant> deploymentSettingsAssistant() const;
+    QString localDesktopFilePath(const RemoteLinux::DeployableFilesPerProFile *proFileInfo) const;
 
     static QString fremantleWithPackagingId();
     static QString fremantleWithoutPackagingId();
@@ -85,10 +87,10 @@ private:
     Qt4MaemoDeployConfiguration(ProjectExplorer::Target *target,
         Qt4MaemoDeployConfiguration *source);
 
-    QSharedPointer<DeploymentSettingsAssistant> m_deploymentSettingsAssistant;
+    QSharedPointer<RemoteLinux::DeploymentSettingsAssistant> m_deploymentSettingsAssistant;
 };
 
 } // namespace Internal
-} // namespace RemoteLinux
+} // namespace Madde
 
 #endif // QT4PROJECTMANAGER_QT4DEPLOYCONFIGURATION_H
diff --git a/src/plugins/remotelinux/qt4maemotarget.cpp b/src/plugins/madde/qt4maemotarget.cpp
index 1a46836ac62..3814236159c 100644
--- a/src/plugins/remotelinux/qt4maemotarget.cpp
+++ b/src/plugins/madde/qt4maemotarget.cpp
@@ -72,7 +72,7 @@
 
 using namespace Qt4ProjectManager;
 
-namespace RemoteLinux {
+namespace Madde {
 namespace Internal {
 
 namespace {
@@ -1194,4 +1194,4 @@ QString Qt4MeegoTarget::specFileName() const
 }
 
 } // namespace Internal
-} // namespace RemoteLinux
+} // namespace Madde
diff --git a/src/plugins/remotelinux/qt4maemotarget.h b/src/plugins/madde/qt4maemotarget.h
index 1aac85fbf7b..822678f140f 100644
--- a/src/plugins/remotelinux/qt4maemotarget.h
+++ b/src/plugins/madde/qt4maemotarget.h
@@ -47,7 +47,7 @@ class Qt4BuildConfigurationFactory;
 }
 namespace Utils { class FileSystemWatcher; }
 
-namespace RemoteLinux {
+namespace Madde {
 namespace Internal {
 class Qt4MaemoDeployConfigurationFactory;
 class WatchableFile;
@@ -291,6 +291,6 @@ private:
 };
 
 } // namespace Internal
-} // namespace RemoteLinux
+} // namespace Madde
 
 #endif // QT4MAEMOTARGET_H
diff --git a/src/plugins/remotelinux/qt4maemotargetfactory.cpp b/src/plugins/madde/qt4maemotargetfactory.cpp
index afacc185cf4..c043c90c03e 100644
--- a/src/plugins/remotelinux/qt4maemotargetfactory.cpp
+++ b/src/plugins/madde/qt4maemotargetfactory.cpp
@@ -33,7 +33,6 @@
 #include "qt4maemotargetfactory.h"
 #include "maemoglobal.h"
 #include "maemopackagecreationstep.h"
-#include "remotelinuxrunconfiguration.h"
 #include "qt4maemodeployconfiguration.h"
 #include "qt4maemotarget.h"
 
@@ -50,7 +49,7 @@ using namespace Qt4ProjectManager;
 using namespace Qt4ProjectManager::Constants;
 using ProjectExplorer::idFromMap;
 
-namespace RemoteLinux {
+namespace Madde {
 namespace Internal {
 
 // -------------------------------------------------------------------------
@@ -226,4 +225,4 @@ ProjectExplorer::Target *Qt4MaemoTargetFactory::create(ProjectExplorer::Project
 }
 
 } // namespace Internal
-} // namespace RemoteLinux
+} // namespace Madde
diff --git a/src/plugins/remotelinux/qt4maemotargetfactory.h b/src/plugins/madde/qt4maemotargetfactory.h
index 592131d5039..b34a9c70ecf 100644
--- a/src/plugins/remotelinux/qt4maemotargetfactory.h
+++ b/src/plugins/madde/qt4maemotargetfactory.h
@@ -35,7 +35,7 @@
 
 #include <qt4projectmanager/qt4basetargetfactory.h>
 
-namespace RemoteLinux {
+namespace Madde {
 namespace Internal {
 
 class Qt4MaemoTargetFactory : public Qt4ProjectManager::Qt4BaseTargetFactory
@@ -66,6 +66,6 @@ public:
 };
 
 } // namespace Internal
-} // namespace RemoteLinux
+} // namespace Madde
 
 #endif // QT4MAEMOTARGETFACTORY_H
diff --git a/src/plugins/plugins.pro b/src/plugins/plugins.pro
index bc5ac35c158..9f7e3bf423f 100644
--- a/src/plugins/plugins.pro
+++ b/src/plugins/plugins.pro
@@ -44,6 +44,7 @@ SUBDIRS   = plugin_coreplugin \
             debugger/dumper.pro \
             plugin_qmlprofiler \
             plugin_remotelinux \
+            plugin_madde \
             plugin_qttest \
             plugin_valgrind \
             plugin_updateinfo
@@ -160,6 +161,9 @@ plugin_remotelinux.depends += plugin_debugger
 plugin_remotelinux.depends += plugin_projectexplorer
 plugin_remotelinux.depends += plugin_qt4projectmanager
 
+plugin_madde.subdir = madde
+plugin_madde.depends += plugin_remotelinux
+
 plugin_locator.subdir = locator
 plugin_locator.depends = plugin_coreplugin
 
diff --git a/src/plugins/qttest/testconfigurations.cpp b/src/plugins/qttest/testconfigurations.cpp
index 26c2d492fb4..0fa1105ac97 100644
--- a/src/plugins/qttest/testconfigurations.cpp
+++ b/src/plugins/qttest/testconfigurations.cpp
@@ -43,8 +43,8 @@
 #include <projectexplorer/runconfiguration.h>
 #include <projectexplorer/customexecutablerunconfiguration.h>
 #include <projectexplorer/target.h>
-#include <remotelinux/maemorunconfiguration.h>
 #include <remotelinux/linuxdeviceconfigurations.h>
+#include <remotelinux/remotelinuxrunconfiguration.h>
 #include <qt4projectmanager/qt-desktop/qt4runconfiguration.h>
 #include <qt4projectmanager/qt4buildconfiguration.h>
 
@@ -547,14 +547,14 @@ bool TestConfig::isRemoteTarget(QString &deviceName, QString &testDeviceType,
     if (m_activeProject && m_activeProject->activeTarget()) {
         ProjectExplorer::RunConfiguration *r = m_activeProject->activeTarget()->activeRunConfiguration();
         if (r) {
-            if (r->id() == QLatin1String("Qt4ProjectManager.MaemoRunConfiguration")) {
-                RemoteLinux::Internal::MaemoRunConfiguration *mr = static_cast<RemoteLinux::Internal::MaemoRunConfiguration*>(r);
+            if (r->id() == QLatin1String("RemoteLinuxRunConfiguration")) {
+                RemoteLinux::RemoteLinuxRunConfiguration *mr = static_cast<RemoteLinux::RemoteLinuxRunConfiguration *>(r);
                 if (mr) {
                     QSharedPointer<const RemoteLinux::LinuxDeviceConfiguration> mc = mr->deviceConfig();
                     if (mc){
                         deviceName = mc->name();
                         sshParameters = mc->sshParameters();
-                        testDeviceType = QLatin1String("Maemo");//Qt4Test::TestController::Maemo;
+                        testDeviceType = QLatin1String("RemoteLinux");//Qt4Test::TestController::Maemo;
                         return true;
                     }else{
                         qWarning() << "Invalid remote" << deviceName;
@@ -989,9 +989,9 @@ QStringList *TestConfig::runEnvironment()
             } else if (rc->id() == QLatin1String("ProjectExplorer.CustomExecutableRunConfiguration")) {
                 m_runEnvironment =
                     static_cast<ProjectExplorer::CustomExecutableRunConfiguration*>(rc)->environment().toStringList();
-            } else if (rc->id() == QLatin1String("Qt4ProjectManager.MaemoRunConfiguration")) {
+            } else if (rc->id() == QLatin1String("RemoteLinuxRunConfiguration")) {
                 m_runEnvironment =
-                    static_cast<RemoteLinux::Internal::MaemoRunConfiguration*>(rc)->environment().toStringList();
+                    static_cast<RemoteLinux::RemoteLinuxRunConfiguration *>(rc)->environment().toStringList();
             }
         }
     }
diff --git a/src/plugins/remotelinux/remotelinux.pro b/src/plugins/remotelinux/remotelinux.pro
index 351be477cc0..a616927a1e3 100644
--- a/src/plugins/remotelinux/remotelinux.pro
+++ b/src/plugins/remotelinux/remotelinux.pro
@@ -7,46 +7,6 @@ include(remotelinux_dependencies.pri)
 HEADERS += \
     remotelinuxplugin.h \
     remotelinux_export.h \
-    maemoconstants.h \
-    maemorunconfigurationwidget.h \
-    maemoruncontrol.h \
-    maemorunfactories.h \
-    maemosettingspages.h \
-    maemotoolchain.h \
-    maemopackagecreationstep.h \
-    maemopackagecreationfactory.h \
-    maemopackagecreationwidget.h \
-    maemoqemumanager.h \
-    maemodeploystepfactory.h \
-    maemoglobal.h \
-    maemosshrunner.h \
-    maemodebugsupport.h \
-    maemoremotemountsmodel.h \
-    maemomountspecification.h \
-    maemoremotemounter.h \
-    maemopublishingwizardfactories.h \
-    maemopublishingbuildsettingspagefremantlefree.h \
-    maemopublishingfileselectiondialog.h \
-    maemopublishedprojectmodel.h \
-    maemopublishinguploadsettingspagefremantlefree.h \
-    maemopublishingwizardfremantlefree.h \
-    maemopublishingresultpagefremantlefree.h \
-    maemopublisherfremantlefree.h \
-    maemoqemuruntime.h \
-    maemoqemuruntimeparser.h \
-    maemoqemusettingswidget.h \
-    maemoqemusettings.h \
-    qt4maemotargetfactory.h \
-    qt4maemotarget.h \
-    qt4maemodeployconfiguration.h \
-    maemodeviceconfigwizard.h \
-    maemodeployconfigurationwidget.h \
-    maemoinstalltosysrootstep.h \
-    maemodeploymentmounter.h \
-    maemopackageinstaller.h \
-    maemoremotecopyfacility.h \
-    maemoqtversionfactory.h \
-    maemoqtversion.h \
     linuxdeviceconfiguration.h \
     linuxdeviceconfigurations.h \
     remotelinuxrunconfiguration.h \
@@ -54,8 +14,6 @@ HEADERS += \
     publickeydeploymentdialog.h \
     genericlinuxdeviceconfigurationwizard.h \
     genericlinuxdeviceconfigurationfactory.h \
-    maddedeviceconfigurationfactory.h \
-    maemorunconfiguration.h \
     remotelinuxrunconfigurationwidget.h \
     remotelinuxrunconfigurationfactory.h \
     remotelinuxapplicationrunner.h \
@@ -69,9 +27,7 @@ HEADERS += \
     deploymentinfo.h \
     abstractremotelinuxdeploystep.h \
     genericdirectuploadstep.h \
-    maddeuploadandinstallpackagesteps.h \
     uploadandinstalltarpackagestep.h \
-    maemodeploybymountsteps.h \
     abstractremotelinuxdeployservice.h \
     abstractuploadandinstallpackageservice.h \
     genericdirectuploadservice.h \
@@ -83,7 +39,6 @@ HEADERS += \
     remotelinuxpackageinstaller.h \
     packageuploader.h \
     linuxdevicetester.h \
-    maddedevicetester.h \
     remotelinux_constants.h \
     linuxdevicetestdialog.h \
     remotelinuxprocesslist.h \
@@ -103,44 +58,6 @@ HEADERS += \
 
 SOURCES += \
     remotelinuxplugin.cpp \
-    maemorunconfigurationwidget.cpp \
-    maemoruncontrol.cpp \
-    maemorunfactories.cpp \
-    maemosettingspages.cpp \
-    maemotoolchain.cpp \
-    maemopackagecreationstep.cpp \
-    maemopackagecreationfactory.cpp \
-    maemopackagecreationwidget.cpp \
-    maemoqemumanager.cpp \
-    maemodeploystepfactory.cpp \
-    maemoglobal.cpp \
-    maemosshrunner.cpp \
-    maemodebugsupport.cpp \
-    maemoremotemountsmodel.cpp \
-    maemomountspecification.cpp \
-    maemoremotemounter.cpp \
-    maemopublishingwizardfactories.cpp \
-    maemopublishingbuildsettingspagefremantlefree.cpp \
-    maemopublishingfileselectiondialog.cpp \
-    maemopublishedprojectmodel.cpp \
-    maemopublishinguploadsettingspagefremantlefree.cpp \
-    maemopublishingwizardfremantlefree.cpp \
-    maemopublishingresultpagefremantlefree.cpp \
-    maemopublisherfremantlefree.cpp \
-    maemoqemuruntimeparser.cpp \
-    maemoqemusettingswidget.cpp \
-    maemoqemusettings.cpp \
-    qt4maemotargetfactory.cpp \
-    qt4maemotarget.cpp \
-    qt4maemodeployconfiguration.cpp \
-    maemodeviceconfigwizard.cpp \
-    maemodeployconfigurationwidget.cpp \
-    maemoinstalltosysrootstep.cpp \
-    maemodeploymentmounter.cpp \
-    maemopackageinstaller.cpp \
-    maemoremotecopyfacility.cpp \
-    maemoqtversionfactory.cpp \
-    maemoqtversion.cpp \
     linuxdeviceconfiguration.cpp \
     linuxdeviceconfigurations.cpp \
     remotelinuxrunconfiguration.cpp \
@@ -148,8 +65,6 @@ SOURCES += \
     publickeydeploymentdialog.cpp \
     genericlinuxdeviceconfigurationwizard.cpp \
     genericlinuxdeviceconfigurationfactory.cpp \
-    maddedeviceconfigurationfactory.cpp \
-    maemorunconfiguration.cpp \
     remotelinuxrunconfigurationwidget.cpp \
     remotelinuxrunconfigurationfactory.cpp \
     remotelinuxapplicationrunner.cpp \
@@ -162,9 +77,7 @@ SOURCES += \
     deploymentinfo.cpp \
     abstractremotelinuxdeploystep.cpp \
     genericdirectuploadstep.cpp \
-    maddeuploadandinstallpackagesteps.cpp \
     uploadandinstalltarpackagestep.cpp \
-    maemodeploybymountsteps.cpp \
     abstractremotelinuxdeployservice.cpp \
     abstractuploadandinstallpackageservice.cpp \
     genericdirectuploadservice.cpp \
@@ -176,7 +89,6 @@ SOURCES += \
     remotelinuxpackageinstaller.cpp \
     packageuploader.cpp \
     linuxdevicetester.cpp \
-    maddedevicetester.cpp \
     linuxdevicetestdialog.cpp \
     remotelinuxprocesslist.cpp \
     remotelinuxprocessesdialog.cpp \
@@ -194,18 +106,6 @@ SOURCES += \
     profilesupdatedialog.cpp
 
 FORMS += \
-    maemopackagecreationwidget.ui \
-    maemopublishingbuildsettingspagefremantlefree.ui \
-    maemopublishingfileselectiondialog.ui \
-    maemopublishinguploadsettingspagefremantlefree.ui \
-    maemopublishingresultpagefremantlefree.ui \
-    maemoqemusettingswidget.ui \
-    maemodeviceconfigwizardstartpage.ui \
-    maemodeviceconfigwizardpreviouskeysetupcheckpage.ui \
-    maemodeviceconfigwizardreusekeyscheckpage.ui \
-    maemodeviceconfigwizardkeycreationpage.ui \
-    maemodeviceconfigwizardkeydeploymentpage.ui \
-    maemodeployconfigurationwidget.ui \
     linuxdevicefactoryselectiondialog.ui \
     genericlinuxdeviceconfigurationwizardsetuppage.ui \
     linuxdevicetestdialog.ui \
@@ -215,8 +115,5 @@ FORMS += \
     remotelinuxdeployconfigurationwidget.ui \
     profilesupdatedialog.ui
 
-RESOURCES += qt-maemo.qrc
 DEFINES += QT_NO_CAST_TO_ASCII
 DEFINES += REMOTELINUX_LIBRARY
-
-
diff --git a/src/plugins/remotelinux/remotelinuxdeployconfigurationwidget.h b/src/plugins/remotelinux/remotelinuxdeployconfigurationwidget.h
index 67924fe34aa..45af354ef72 100644
--- a/src/plugins/remotelinux/remotelinuxdeployconfigurationwidget.h
+++ b/src/plugins/remotelinux/remotelinuxdeployconfigurationwidget.h
@@ -58,7 +58,7 @@ public:
     DeployableFilesPerProFile *currentModel() const;
 
 signals:
-    void currentModelChanged(const DeployableFilesPerProFile *proFileInfo);
+    void currentModelChanged(const RemoteLinux::DeployableFilesPerProFile *proFileInfo);
 
 private slots:
     void handleModelListToBeReset();
diff --git a/src/plugins/remotelinux/remotelinuxplugin.cpp b/src/plugins/remotelinux/remotelinuxplugin.cpp
index a2e31498f3e..f821834fa2e 100644
--- a/src/plugins/remotelinux/remotelinuxplugin.cpp
+++ b/src/plugins/remotelinux/remotelinuxplugin.cpp
@@ -35,19 +35,7 @@
 #include "deployablefile.h"
 #include "genericlinuxdeviceconfigurationfactory.h"
 #include "genericremotelinuxdeploystepfactory.h"
-#include "maddedeviceconfigurationfactory.h"
-#include "maemoconstants.h"
-#include "maemodeploystepfactory.h"
 #include "linuxdeviceconfigurations.h"
-#include "maemopackagecreationfactory.h"
-#include "maemopublishingwizardfactories.h"
-#include "maemoqemumanager.h"
-#include "maemorunfactories.h"
-#include "maemosettingspages.h"
-#include "maemotoolchain.h"
-#include "qt4maemodeployconfiguration.h"
-#include "maemoqtversionfactory.h"
-#include "qt4maemotargetfactory.h"
 #include "qt4projectmanager/qt4projectmanagerconstants.h"
 #include "remotelinuxdeployconfigurationfactory.h"
 #include "remotelinuxrunconfigurationfactory.h"
@@ -73,22 +61,10 @@ bool RemoteLinuxPlugin::initialize(const QStringList &arguments,
     Q_UNUSED(arguments)
     Q_UNUSED(errorMessage)
 
-    MaemoQemuManager::instance(this);
     LinuxDeviceConfigurations::instance(this);
 
-    addAutoReleasedObject(new MaemoRunControlFactory);
-    addAutoReleasedObject(new MaemoRunConfigurationFactory);
-    addAutoReleasedObject(new MaemoToolChainFactory);
-    addAutoReleasedObject(new Qt4MaemoDeployConfigurationFactory);
-    addAutoReleasedObject(new MaemoPackageCreationFactory);
-    addAutoReleasedObject(new MaemoDeployStepFactory);
     addAutoReleasedObject(new LinuxDeviceConfigurationsSettingsPage);
-    addAutoReleasedObject(new MaemoQemuSettingsPage);
-    addAutoReleasedObject(new MaemoPublishingWizardFactoryFremantleFree);
-    addAutoReleasedObject(new Qt4MaemoTargetFactory);
-    addAutoReleasedObject(new MaemoQtVersionFactory);
     addAutoReleasedObject(new GenericLinuxDeviceConfigurationFactory);
-    addAutoReleasedObject(new MaddeDeviceConfigurationFactory);
     addAutoReleasedObject(new RemoteLinuxRunConfigurationFactory);
     addAutoReleasedObject(new RemoteLinuxRunControlFactory);
     addAutoReleasedObject(new RemoteLinuxDeployConfigurationFactory);
author	Christian Kandeler <[email protected]>	2011-09-20 12:16:36 +0200
committer	Christian Kandeler <[email protected]>	2011-09-22 14:11:06 +0200
commit	4e7d0d9c9ac3d1caa2b6f3ed0d9e0b2347507d70 (patch)
tree	09e5954b11c0cb93331f3c6dcd294d5f582c9516 /src
parent	43465cbe7a1fd5b055ce7930a46265972b77f9e1 (diff)