Merge remote-tracking branch 'origin/2.6'

share/qtcreator/qml/qmljsdebugger/editor/abstractliveedittool.cpp

@@ -34,7 +34,7 @@
 
 #include <QDeclarativeEngine>
 
-#include <QtDebug>
+#include <QDebug>
 #include <QGraphicsItem>
 #include <QDeclarativeItem>
 

share/qtcreator/qml/qmljsdebugger/editor/liveselectionrectangle.cpp

@@ -36,7 +36,7 @@
 #include <QGraphicsObject>
 #include <QGraphicsScene>
 
-#include <QtDebug>
+#include <QDebug>
 
 #include <cmath>
 

share/qtcreator/qml/qmljsdebugger/editor/livesingleselectionmanipulator.cpp

@@ -31,7 +31,7 @@
 #include "livesingleselectionmanipulator.h"
 #include "qdeclarativeviewinspector.h"
 #include "../qdeclarativeviewinspector_p.h"
-#include <QtDebug>
+#include <QDebug>
 
 namespace QmlJSDebugger {
 

share/qtcreator/qml/qmlobserver/texteditautoresizer_maemo5.h

@@ -31,7 +31,7 @@
 #include <qtextedit.h>
 #include <qabstractkineticscroller.h>
 #include <qscrollarea.h>
-#include <QtDebug>
+#include <QDebug>
 
 #ifndef TEXTEDITAUTORESIZER_H
 #define TEXTEDITAUTORESIZER_H

share/qtcreator/qml/qmlpuppet/commands/pixmapchangedcommand.cpp

@@ -30,7 +30,7 @@
 
 #include "pixmapchangedcommand.h"
 
-#include <QtDebug>
+#include <QDebug>
 
 #include <QVarLengthArray>
 

share/qtcreator/qml/qmlpuppet/instances/componentnodeinstance.cpp

@@ -33,7 +33,7 @@
 #include <QDeclarativeComponent>
 #include <QDeclarativeContext>
 
-#include <QtDebug>
+#include <QDebug>
 
 namespace QmlDesigner {
 namespace Internal {

share/qtcreator/qml/qmlpuppet/instances/nodeinstancemetaobject.cpp

@@ -34,7 +34,7 @@
 #include <QSharedPointer>
 #include <QMetaProperty>
 #include <qnumeric.h>
-#include <QtDebug>
+#include <QDebug>
 
 namespace QmlDesigner {
 namespace Internal {

share/qtcreator/qml/qmlpuppet/instances/nodeinstancesignalspy.cpp

@@ -33,7 +33,7 @@
 
 #include <QMetaProperty>
 #include <QMetaObject>
-#include <QtDebug>
+#include <QDebug>
 #include <QSharedPointer>
 #include <private/qdeclarativemetatype_p.h>
 

share/qtcreator/qml/qmlpuppet/instances/servernodeinstance.cpp

@@ -50,7 +50,7 @@
 
 #include <QHash>
 #include <QSet>
-#include <QtDebug>
+#include <QDebug>
 
 #if (QT_VERSION >= QT_VERSION_CHECK(5, 0, 0))
 #include <QSGItem>

share/qtcreator/qml/qmlpuppet/qml2puppet/instances/sgitemnodeinstance.cpp

@@ -38,7 +38,7 @@
 
 #include <QHash>
 
-#include <QtDebug>
+#include <QDebug>
 
 namespace QmlDesigner {
 namespace Internal {

share/qtcreator/qml/qmlpuppet/qml2puppet/main.cpp

@@ -28,7 +28,7 @@
 **
 **************************************************************************/
 
-#include <QtDebug>
+#include <QDebug>
 
 #include <QApplication>
 #include <QStringList>

share/qtcreator/qml/qmlpuppet/qmlpuppet/main.cpp

@@ -28,7 +28,7 @@
 **
 **************************************************************************/
 
-#include <QtDebug>
+#include <QDebug>
 
 #include <QApplication>
 #include <QStringList>

src/libs/cplusplus/CppDocument.cpp

@@ -53,7 +53,7 @@
 #include <QByteArray>
 #include <QBitArray>
 #include <QDir>
-#include <QtDebug>
+#include <QDebug>
 
 /*!
     \namespace CPlusPlus

src/libs/cplusplus/LookupContext.cpp

@@ -43,7 +43,7 @@
 #include <QStack>
 #include <QHash>
 #include <QVarLengthArray>
-#include <QtDebug>
+#include <QDebug>
 
 using namespace CPlusPlus;
 

src/libs/cplusplus/LookupItem.cpp

@@ -33,7 +33,7 @@
 #include <Symbol.h>
 #include <Control.h>
 
-#include <QtDebug>
+#include <QDebug>
 
 using namespace CPlusPlus;
 

src/libs/cplusplus/MatchingText.cpp

@@ -36,7 +36,7 @@
 #include <QTextCursor>
 
 #include <QChar>
-#include <QtDebug>
+#include <QDebug>
 
 using namespace CPlusPlus;
 

src/libs/cplusplus/OverviewModel.cpp

@@ -36,7 +36,7 @@
 #include <Symbols.h>
 
 #include <QFile>
-#include <QtDebug>
+#include <QDebug>
 
 using namespace CPlusPlus;
 

src/libs/cplusplus/ResolveExpression.cpp

@@ -47,7 +47,7 @@
 #include <Templates.h>
 
 #include <QList>
-#include <QtDebug>
+#include <QDebug>
 #include <QSet>
 
 using namespace CPlusPlus;

src/libs/cplusplus/SimpleLexer.cpp

@@ -34,7 +34,7 @@
 
 #include <Lexer.h>
 #include <Token.h>
-#include <QtDebug>
+#include <QDebug>
 
 using namespace CPlusPlus;
 

src/libs/cplusplus/TypePrettyPrinter.cpp

@@ -37,7 +37,7 @@
 #include <Symbols.h>
 #include <Scope.h>
 #include <QStringList>
-#include <QtDebug>
+#include <QDebug>
 
 using namespace CPlusPlus;
 

src/libs/cplusplus/pp-engine.cpp

@@ -56,7 +56,7 @@
 #include <Literals.h>
 #include <cctype>
 
-#include <QtDebug>
+#include <QDebug>
 #include <QList>
 #include <QDate>
 #include <QTime>

src/libs/extensionsystem/pluginmanager.cpp

@@ -44,7 +44,7 @@
 #include <QTextStream>
 #include <QTime>
 #include <QWriteLocker>
-#include <QtDebug>
+#include <QDebug>
 #include <QTimer>
 
 #ifdef WITH_TESTS

src/libs/extensionsystem/pluginspec.cpp

@@ -41,7 +41,7 @@
 #include <QXmlStreamReader>
 #include <QRegExp>
 #include <QCoreApplication>
-#include <QtDebug>
+#include <QDebug>
 
 #ifdef Q_OS_LINUX
 // Using the patched version breaks on Fedora 10, KDE4.2.2/Qt4.5.

src/libs/extensionsystem/pluginview.cpp

@@ -39,7 +39,7 @@
 #include <QTreeWidgetItem>
 #include <QPalette>
 
-#include <QtDebug>
+#include <QDebug>
 
 /*!
     \class ExtensionSystem::PluginView

src/libs/extensionsystem/test/manual/pluginview/plugindialog.cpp

@@ -39,7 +39,7 @@
 #include <QDialog>
 #include <QDialogButtonBox>
 #include <QApplication>
-#include <QtDebug>
+#include <QDebug>
 
 PluginDialog::PluginDialog(ExtensionSystem::PluginManager *manager)
     : m_view(new ExtensionSystem::PluginView(manager, this))

src/libs/qmljs/parser/parser.patch

@@ -102,7 +102,7 @@ index 069be3c..9cbdc23 100644
 +**************************************************************************/
 +
 
- #include <QtCore/QtDebug>
+ #include <QtCore/QDebug>
  #include <QtCore/QCoreApplication>
 @@ -136,46 +133,36 @@
 

src/libs/qmljs/parser/qmldirparser.cpp

@@ -33,7 +33,7 @@
 
 
 
-#include <QtCore/QtDebug>
+#include <QtCore/QDebug>
 
 QT_BEGIN_NAMESPACE
 

src/libs/qmljs/parser/qmljs.g

@@ -121,7 +121,7 @@
 **************************************************************************/
 
 
-#include <QtCore/QtDebug>
+#include <QtCore/QDebug>
 #include <QtCore/QCoreApplication>
 
 #include <string.h>

src/libs/qmljs/parser/qmljsparser.cpp

@@ -28,7 +28,7 @@
 **
 **************************************************************************/
 
-#include <QtCore/QtDebug>
+#include <QtCore/QDebug>
 #include <QtCore/QCoreApplication>
 
 #include <string.h>

src/libs/qmljs/qmljsindenter.cpp

@@ -69,7 +69,7 @@
 #include <qmljs/qmljsindenter.h>
 #include <qmljs/qmljsscanner.h>
 
-#include <QtDebug>
+#include <QDebug>
 #include <QTextBlock>
 
 using namespace QmlJS;

src/libs/qmljs/qmljslineinfo.cpp

@@ -69,7 +69,7 @@
 #include <qmljs/qmljslineinfo.h>
 #include <qmljs/qmljsscanner.h>
 
-#include <QtDebug>
+#include <QDebug>
 
 using namespace QmlJS;
 

src/libs/utils/multitask.h

@@ -41,7 +41,7 @@
 #include <QtConcurrentRun>
 #include <QThreadPool>
 
-#include <QtDebug>
+#include <QDebug>
 
 QT_BEGIN_NAMESPACE
 

src/plugins/android/androiddeployconfiguration.cpp

@@ -107,7 +107,7 @@ bool AndroidDeployConfigurationFactory::canClone(ProjectExplorer::Target *parent
 {
     if (!AndroidManager::supportsAndroid(parent))
         return false;
-    return source->id() == Core::Id(ANDROID_DEPLOYCONFIGURATION_ID);
+    return source->id() == ANDROID_DEPLOYCONFIGURATION_ID;
 }
 
 ProjectExplorer::DeployConfiguration *AndroidDeployConfigurationFactory::clone(ProjectExplorer::Target *parent, ProjectExplorer::DeployConfiguration *source)

src/plugins/android/androiddeploystepfactory.cpp

@@ -53,7 +53,7 @@ AndroidDeployStepFactory::AndroidDeployStepFactory(QObject *parent)
 
 QList<Core::Id> AndroidDeployStepFactory::availableCreationIds(BuildStepList *parent) const
 {
-    if (parent->id() != Core::Id(ProjectExplorer::Constants::BUILDSTEPS_DEPLOY))
+    if (parent->id() != ProjectExplorer::Constants::BUILDSTEPS_DEPLOY)
         return QList<Core::Id>();
     if (!AndroidManager::supportsAndroid(parent->target()))
         return QList<Core::Id>();

src/plugins/android/androiddevicefactory.cpp

@@ -44,7 +44,7 @@ AndroidDeviceFactory::AndroidDeviceFactory()
 
 QString AndroidDeviceFactory::displayNameForId(Core::Id type) const
 {
-    if (type == Core::Id(Constants::ANDROID_DEVICE_TYPE))
+    if (type == Constants::ANDROID_DEVICE_TYPE)
         return tr("Android Device");
     return QString();
 }
@@ -67,7 +67,7 @@ ProjectExplorer::IDevice::Ptr AndroidDeviceFactory::create(Core::Id id) const
 
 bool AndroidDeviceFactory::canRestore(const QVariantMap &map) const
 {
-    return ProjectExplorer::IDevice::typeFromMap(map) == Core::Id(Constants::ANDROID_DEVICE_TYPE);
+    return ProjectExplorer::IDevice::typeFromMap(map) == Constants::ANDROID_DEVICE_TYPE;
 }
 
 ProjectExplorer::IDevice::Ptr AndroidDeviceFactory::restore(const QVariantMap &map) const

src/plugins/android/androidpackagecreationfactory.cpp

@@ -55,7 +55,7 @@ AndroidPackageCreationFactory::AndroidPackageCreationFactory(QObject *parent)
 
 QList<Core::Id> AndroidPackageCreationFactory::availableCreationIds(ProjectExplorer::BuildStepList *parent) const
 {
-    if (parent->id() != Core::Id(ProjectExplorer::Constants::BUILDSTEPS_DEPLOY))
+    if (parent->id() != ProjectExplorer::Constants::BUILDSTEPS_DEPLOY)
         return QList<Core::Id>();
     if (!AndroidManager::supportsAndroid(parent->target()))
         return QList<Core::Id>();

src/plugins/android/androidpackageinstallationfactory.cpp

@@ -53,7 +53,7 @@ AndroidPackageInstallationFactory::AndroidPackageInstallationFactory(QObject *pa
 
 QList<Core::Id> AndroidPackageInstallationFactory::availableCreationIds(BuildStepList *parent) const
 {
-    if (parent->id() != Core::Id(ProjectExplorer::Constants::BUILDSTEPS_DEPLOY))
+    if (parent->id() != ProjectExplorer::Constants::BUILDSTEPS_DEPLOY)
         return QList<Core::Id>();
     if (!AndroidManager::supportsAndroid(parent->target()))
         return QList<Core::Id>();

src/plugins/autotoolsprojectmanager/autogenstep.cpp

@@ -74,7 +74,7 @@ QList<Core::Id> AutogenStepFactory::availableCreationIds(BuildStepList *parent)
 
 QString AutogenStepFactory::displayNameForId(const Core::Id id) const
 {
-    if (id == Core::Id(AUTOGEN_STEP_ID))
+    if (id == AUTOGEN_STEP_ID)
         return tr("Autogen", "Display name for AutotoolsProjectManager::AutogenStep id.");
     return QString();
 }
@@ -121,9 +121,9 @@ BuildStep *AutogenStepFactory::restore(BuildStepList *parent, const QVariantMap
 
 bool AutogenStepFactory::canHandle(BuildStepList *parent) const
 {
-    if (parent->target()->project()->id() != Core::Id(Constants::AUTOTOOLS_PROJECT_ID))
+    if (parent->target()->project()->id() == Constants::AUTOTOOLS_PROJECT_ID)
-        return false;
+        return parent->id() == ProjectExplorer::Constants::BUILDSTEPS_BUILD;
-    return parent->id() == Core::Id(ProjectExplorer::Constants::BUILDSTEPS_BUILD);
+    return false;
 }
 
 ////////////////////////

src/plugins/autotoolsprojectmanager/autoreconfstep.cpp

@@ -73,7 +73,7 @@ QList<Core::Id> AutoreconfStepFactory::availableCreationIds(BuildStepList *paren
 
 QString AutoreconfStepFactory::displayNameForId(const Core::Id id) const
 {
-    if (id == Core::Id(AUTORECONF_STEP_ID))
+    if (id == AUTORECONF_STEP_ID)
         return tr("Autoreconf", "Display name for AutotoolsProjectManager::AutoreconfStep id.");
     return QString();
 }
@@ -120,9 +120,9 @@ BuildStep *AutoreconfStepFactory::restore(BuildStepList *parent, const QVariantM
 
 bool AutoreconfStepFactory::canHandle(BuildStepList *parent) const
 {
-    if (parent->target()->project()->id() != Core::Id(Constants::AUTOTOOLS_PROJECT_ID))
+    if (parent->target()->project()->id() == Constants::AUTOTOOLS_PROJECT_ID)
-        return false;
+        return parent->id() == ProjectExplorer::Constants::BUILDSTEPS_BUILD;
-    return parent->id() == Core::Id(ProjectExplorer::Constants::BUILDSTEPS_BUILD);
+    return false;
 }
 
 /////////////////////////

src/plugins/autotoolsprojectmanager/autotoolsbuildconfiguration.cpp

@@ -140,7 +140,7 @@ QList<Core::Id> AutotoolsBuildConfigurationFactory::availableCreationIds(const T
 
 QString AutotoolsBuildConfigurationFactory::displayNameForId(const Core::Id id) const
 {
-    if (id == Core::Id(AUTOTOOLS_BC_ID))
+    if (id == AUTOTOOLS_BC_ID)
         return tr("Build");
     return QString();
 }
@@ -149,7 +149,7 @@ bool AutotoolsBuildConfigurationFactory::canCreate(const Target *parent, const C
 {
     if (!canHandle(parent))
         return false;
-    if (id == Core::Id(AUTOTOOLS_BC_ID))
+    if (id == AUTOTOOLS_BC_ID)
         return true;
     return false;
 }
@@ -216,7 +216,7 @@ bool AutotoolsBuildConfigurationFactory::canHandle(const Target *t) const
 {
     if (!t->project()->supportsProfile(t->profile()))
         return false;
-    return t->project()->id() == Core::Id(Constants::AUTOTOOLS_PROJECT_ID);
+    return t->project()->id() == Constants::AUTOTOOLS_PROJECT_ID;
 }
 
 bool AutotoolsBuildConfigurationFactory::canClone(const Target *parent, BuildConfiguration *source) const

src/plugins/autotoolsprojectmanager/configurestep.cpp

@@ -74,14 +74,14 @@ QList<Core::Id> ConfigureStepFactory::availableCreationIds(BuildStepList *parent
 
 QString ConfigureStepFactory::displayNameForId(const Core::Id id) const
 {
-    if (id == Core::Id(CONFIGURE_STEP_ID))
+    if (id == CONFIGURE_STEP_ID)
         return tr("Configure", "Display name for AutotoolsProjectManager::ConfigureStep id.");
     return QString();
 }
 
 bool ConfigureStepFactory::canCreate(BuildStepList *parent, const Core::Id id) const
 {
-    return canHandle(parent) && Core::Id(CONFIGURE_STEP_ID) == id;
+    return canHandle(parent) && id == CONFIGURE_STEP_ID;
 }
 
 BuildStep *ConfigureStepFactory::create(BuildStepList *parent, const Core::Id id)
@@ -121,9 +121,9 @@ BuildStep *ConfigureStepFactory::restore(BuildStepList *parent, const QVariantMa
 
 bool ConfigureStepFactory::canHandle(BuildStepList *parent) const
 {
-    if (parent->target()->project()->id() != Core::Id(Constants::AUTOTOOLS_PROJECT_ID))
+    if (parent->target()->project()->id() == Constants::AUTOTOOLS_PROJECT_ID)
-        return false;
+        return parent->id() == ProjectExplorer::Constants::BUILDSTEPS_BUILD;
-    return parent->id() == Core::Id(ProjectExplorer::Constants::BUILDSTEPS_BUILD);
+    return false;
 }
 
 ////////////////////////

src/plugins/autotoolsprojectmanager/makestep.cpp

@@ -70,24 +70,23 @@ MakeStepFactory::MakeStepFactory(QObject *parent) :
 
 QList<Core::Id> MakeStepFactory::availableCreationIds(BuildStepList *parent) const
 {
-    if (parent->target()->project()->id() == Core::Id(AUTOTOOLS_PROJECT_ID))
+    if (parent->target()->project()->id() == AUTOTOOLS_PROJECT_ID)
         return QList<Core::Id>() << Core::Id(MAKE_STEP_ID);
     return QList<Core::Id>();
 }
 
 QString MakeStepFactory::displayNameForId(const Core::Id id) const
 {
-    if (id == Core::Id(MAKE_STEP_ID))
+    if (id == MAKE_STEP_ID)
         return tr("Make", "Display name for AutotoolsProjectManager::MakeStep id.");
     return QString();
 }
 
 bool MakeStepFactory::canCreate(BuildStepList *parent, const Core::Id id) const
 {
-    if (parent->target()->project()->id() != Core::Id(AUTOTOOLS_PROJECT_ID))
+    if (parent->target()->project()->id() == AUTOTOOLS_PROJECT_ID)
-        return false;
+        return id == MAKE_STEP_ID;
-
+    return false;
-    return Core::Id(MAKE_STEP_ID) == id;
 }
 
 BuildStep *MakeStepFactory::create(BuildStepList *parent, const Core::Id id)

src/plugins/bazaar/bazaarclient.cpp

@@ -41,7 +41,7 @@
 #include <QDir>
 #include <QFileInfo>
 #include <QTextStream>
-#include <QtDebug>
+#include <QDebug>
 
 namespace Bazaar {
 namespace Internal {

src/plugins/bazaar/bazaarplugin.cpp

@@ -66,7 +66,7 @@
 #include <QAction>
 #include <QMenu>
 #include <QMainWindow>
-#include <QtDebug>
+#include <QDebug>
 #include <QtGlobal>
 #include <QDir>
 #include <QDialog>

src/plugins/bazaar/cloneoptionspanel.cpp

@@ -31,7 +31,7 @@
 #include "cloneoptionspanel.h"
 #include "ui_cloneoptionspanel.h"
 
-#include <QtDebug>
+#include <QDebug>
 
 namespace Bazaar {
 namespace Internal {

src/plugins/cmakeprojectmanager/cmakebuildconfiguration.cpp

@@ -152,7 +152,7 @@ QList<Core::Id> CMakeBuildConfigurationFactory::availableCreationIds(const Proje
 
 QString CMakeBuildConfigurationFactory::displayNameForId(const Core::Id id) const
 {
-    if (id == Core::Id(CMAKE_BC_ID))
+    if (id == CMAKE_BC_ID)
         return tr("Build");
     return QString();
 }
@@ -161,7 +161,7 @@ bool CMakeBuildConfigurationFactory::canCreate(const ProjectExplorer::Target *pa
 {
     if (!canHandle(parent))
         return false;
-    if (id == Core::Id(CMAKE_BC_ID))
+    if (id == CMAKE_BC_ID)
         return true;
     return false;
 }

src/plugins/cmakeprojectmanager/makestep.cpp

@@ -56,11 +56,10 @@ using namespace CMakeProjectManager::Internal;
 using namespace ProjectExplorer;
 
 namespace {
-const char * const MS_ID("CMakeProjectManager.MakeStep");
+const char MS_ID[] = "CMakeProjectManager.MakeStep";
-
+const char CLEAN_KEY[] = "CMakeProjectManager.MakeStep.Clean";
-const char * const CLEAN_KEY("CMakeProjectManager.MakeStep.Clean");
+const char BUILD_TARGETS_KEY[] = "CMakeProjectManager.MakeStep.BuildTargets";
-const char * const BUILD_TARGETS_KEY("CMakeProjectManager.MakeStep.BuildTargets");
+const char ADDITIONAL_ARGUMENTS_KEY[] = "CMakeProjectManager.MakeStep.AdditionalArguments";
-const char * const ADDITIONAL_ARGUMENTS_KEY("CMakeProjectManager.MakeStep.AdditionalArguments");
 }
 
 MakeStep::MakeStep(BuildStepList *bsl) :
@@ -347,9 +346,9 @@ MakeStepFactory::~MakeStepFactory()
 
 bool MakeStepFactory::canCreate(BuildStepList *parent, const Core::Id id) const
 {
-    if (parent->target()->project()->id() != Core::Id(Constants::CMAKEPROJECT_ID))
+    if (parent->target()->project()->id() == Constants::CMAKEPROJECT_ID)
-        return false;
+        return id == MS_ID;
-    return Core::Id(MS_ID) == id;
+    return false;
 }
 
 BuildStep *MakeStepFactory::create(BuildStepList *parent, const Core::Id id)
@@ -357,7 +356,7 @@ BuildStep *MakeStepFactory::create(BuildStepList *parent, const Core::Id id)
     if (!canCreate(parent, id))
         return 0;
     MakeStep *step = new MakeStep(parent);
-    if (parent->id() == Core::Id(ProjectExplorer::Constants::BUILDSTEPS_CLEAN)) {
+    if (parent->id() == ProjectExplorer::Constants::BUILDSTEPS_CLEAN) {
         step->setClean(true);
         step->setAdditionalArguments("clean");
     }
@@ -394,14 +393,14 @@ BuildStep *MakeStepFactory::restore(BuildStepList *parent, const QVariantMap &ma
 
 QList<Core::Id> MakeStepFactory::availableCreationIds(ProjectExplorer::BuildStepList *parent) const
 {
-    if (parent->target()->project()->id() == Core::Id(Constants::CMAKEPROJECT_ID))
+    if (parent->target()->project()->id() == Constants::CMAKEPROJECT_ID)
         return QList<Core::Id>() << Core::Id(MS_ID);
     return QList<Core::Id>();
 }
 
 QString MakeStepFactory::displayNameForId(const Core::Id id) const
 {
-    if (id == Core::Id(MS_ID))
+    if (id == MS_ID)
         return tr("Make", "Display name for CMakeProjectManager::MakeStep id.");
     return QString();
 }

src/plugins/coreplugin/actionmanager/commandmappings.cpp

@@ -45,7 +45,7 @@
 #include <QTreeWidgetItem>
 #include <QFileDialog>
 #include <QCoreApplication>
-#include <QtDebug>
+#include <QDebug>
 
 Q_DECLARE_METATYPE(Core::Internal::ShortcutItem*)
 

src/plugins/coreplugin/dialogs/saveitemsdialog.cpp

@@ -41,7 +41,7 @@
 #include <QTreeWidget>
 #include <QHeaderView>
 #include <QCheckBox>
-#include <QtDebug>
+#include <QDebug>
 
 Q_DECLARE_METATYPE(Core::IDocument*)
 

src/plugins/coreplugin/dialogs/shortcutsettings.cpp

@@ -49,7 +49,7 @@
 #include <QKeyEvent>
 #include <QTreeWidgetItem>
 #include <QCoreApplication>
-#include <QtDebug>
+#include <QDebug>
 
 Q_DECLARE_METATYPE(Core::Internal::ShortcutItem*)
 

src/plugins/coreplugin/externaltool.cpp

@@ -56,7 +56,7 @@
 #include <QMenu>
 #include <QAction>
 
-#include <QtDebug>
+#include <QDebug>
 
 using namespace Core;
 using namespace Core::Internal;

src/plugins/coreplugin/id.cpp

@@ -129,7 +129,12 @@ QByteArray Id::name() const
 
 QString Id::toString() const
 {
-    return QString::fromUtf8(stringFromId[m_id]);
+    return QString::fromUtf8(stringFromId.at(m_id));
+}
+
+bool Id::operator==(const char *name) const
+{
+    return strcmp(stringFromId.at(m_id).constData(), name) == 0;
 }
 
 // For debugging purposes

src/plugins/coreplugin/id.h

@@ -50,7 +50,9 @@ public:
     QString toString() const;
     bool isValid() const { return m_id; }
     bool operator==(Id id) const { return m_id == id.m_id; }
+    bool operator==(const char *name) const;
     bool operator!=(Id id) const { return m_id != id.m_id; }
+    bool operator!=(const char *name) const { return !operator==(name); }
     bool operator<(Id id) const { return m_id < id.m_id; }
     bool operator>(Id id) const { return m_id > id.m_id; }
     int uniqueIdentifier() const { return m_id; }

src/plugins/coreplugin/plugindialog.cpp

@@ -42,7 +42,7 @@
 #include <QDialogButtonBox>
 #include <QPushButton>
 #include <QLabel>
-#include <QtDebug>
+#include <QDebug>
 
 using namespace Core::Internal;
 

src/plugins/coreplugin/toolsettings.cpp

@@ -43,7 +43,7 @@
 #include <QTime>
 #include <QIcon>
 
-#include <QtDebug>
+#include <QDebug>
 
 using namespace Core;
 using namespace Core::Internal;

src/plugins/cpptools/cppcodegen_test.cpp

@@ -46,7 +46,7 @@
 #include <utils/fileutils.h>
 
 #include <QtTest>
-#include <QtDebug>
+#include <QDebug>
 #include <QTextDocument>
 #include <QDir>
 

src/plugins/cpptools/cppcompletion_test.cpp

@@ -53,7 +53,7 @@
 #include <utils/fileutils.h>
 
 #include <QtTest>
-#include <QtDebug>
+#include <QDebug>
 #include <QTextDocument>
 #include <QDir>
 

src/plugins/cpptools/cppcompletionassistprovider.cpp

@@ -42,7 +42,7 @@ using namespace CppTools;
 // ---------------------------
 bool CppCompletionAssistProvider::supportsEditor(const Core::Id &editorId) const
 {
-    return editorId == Core::Id(CppEditor::Constants::CPPEDITOR_ID);
+    return editorId == CppEditor::Constants::CPPEDITOR_ID;
 }
 
 int CppCompletionAssistProvider::activationCharSequenceLength() const

src/plugins/debugger/debuggerdialogs.cpp

@@ -1061,7 +1061,7 @@ static QString cdbRemoteHelp()
                 "(<code>%1</code> or <code>%2</code>, respectively).</p><p>Copy it onto the remote machine and set the "
                 "environment variable <code>%3</code> to point to its folder.</p><p>"
                 "Launch the remote CDB as <code>%4 &lt;executable&gt;</code> "
-                " to use TCP/IP as communication protocol.</p><p>Enter the connection parameters as:</p>"
+                "to use TCP/IP as communication protocol.</p><p>Enter the connection parameters as:</p>"
                 "<pre>%5</pre></body></html>").
             arg(ext32, ext64, QLatin1String("_NT_DEBUGGER_EXTENSION_PATH"),
                 QLatin1String("cdb.exe -server tcp:port=1234"),

src/plugins/debugger/debuggerplugin.cpp

@@ -778,7 +778,7 @@ public slots:
     void startRemoteServer();
     //bool queryRemoteParameters(DebuggerStartParameters &sp, bool useScript);
     void attachToRemoteServer();
-    void attachToRemoteProcess();
+    void attachToRunningApplication();
     void attachToQmlPort();
     void startRemoteEngine();
     void attachExternalApplication();
@@ -1117,7 +1117,7 @@ public:
     QAction *m_startLocalProcessAction;
     QAction *m_startRemoteProcessAction;
     QAction *m_startRemoteServerAction;
-    QAction *m_attachToRemoteProcessAction;
+    QAction *m_attachToRunningApplication;
     QAction *m_attachToQmlPortAction;
     QAction *m_attachToRemoteServerAction;
     QAction *m_startRemoteCdbAction;
@@ -1241,7 +1241,7 @@ DebuggerPluginPrivate::DebuggerPluginPrivate(DebuggerPlugin *plugin) :
     m_startLocalProcessAction = 0;
     m_startRemoteProcessAction = 0;
     m_attachToRemoteServerAction = 0;
-    m_attachToRemoteProcessAction = 0;
+    m_attachToRunningApplication = 0;
     m_attachToQmlPortAction = 0;
     m_startRemoteCdbAction = 0;
     m_startRemoteLldbAction = 0;
@@ -1671,7 +1671,7 @@ void DebuggerPluginPrivate::startRemoteServer()
     dlg.startGdbServer();
 }
 
-void DebuggerPluginPrivate::attachToRemoteProcess()
+void DebuggerPluginPrivate::attachToRunningApplication()
 {
     StartGdbServerDialog dlg(mainWindow());
     dlg.attachToRemoteProcess();
@@ -2142,7 +2142,7 @@ void DebuggerPluginPrivate::setInitialState()
     m_attachToCoreAction->setEnabled(true);
     m_startRemoteProcessAction->setEnabled(true);
     m_attachToRemoteServerAction->setEnabled(true);
-    m_attachToRemoteProcessAction->setEnabled(true);
+    m_attachToRunningApplication->setEnabled(true);
     m_detachAction->setEnabled(false);
 
     m_watchAction1->setEnabled(true);
@@ -2268,7 +2268,7 @@ void DebuggerPluginPrivate::updateState(DebuggerEngine *engine)
     m_attachToCoreAction->setEnabled(true);
     m_startRemoteProcessAction->setEnabled(true);
     m_attachToRemoteServerAction->setEnabled(true);
-    m_attachToRemoteProcessAction->setEnabled(true);
+    m_attachToRunningApplication->setEnabled(true);
 
     m_threadBox->setEnabled(state == InferiorStopOk);
 
@@ -2982,9 +2982,9 @@ void DebuggerPluginPrivate::extensionsInitialized()
     act->setText(tr("Start Remote Debug Server Attached to Process..."));
     connect(act, SIGNAL(triggered()), SLOT(startRemoteServer()));
 
-    act = m_attachToRemoteProcessAction = new QAction(this);
+    act = m_attachToRunningApplication = new QAction(this);
-    act->setText(tr("Attach to Running Remote Process..."));
+    act->setText(tr("Attach to Running Application..."));
-    connect(act, SIGNAL(triggered()), SLOT(attachToRemoteProcess()));
+    connect(act, SIGNAL(triggered()), SLOT(attachToRunningApplication()));
 
     act = m_attachToQmlPortAction = new QAction(this);
     act->setText(tr("Attach to QML Port..."));
@@ -3028,10 +3028,10 @@ void DebuggerPluginPrivate::extensionsInitialized()
     cmd->setAttribute(Command::CA_Hide);
     mstart->addAction(cmd, CC::G_DEFAULT_ONE);
 
-    cmd = ActionManager::registerAction(m_attachToLocalProcessAction,
+    cmd = ActionManager::registerAction(m_attachToRunningApplication,
-        "Debugger.AttachToLocalProcess", globalcontext);
+         "Debugger.AttachToRemoteProcess", globalcontext);
-    cmd->setAttribute(Command::CA_Hide);
+    cmd->setDescription(tr("Attach to Running Application"));
-    mstart->addAction(cmd, Constants::G_START_LOCAL);
+    mstart->addAction(cmd, Debugger::Constants::G_START_LOCAL);
 
     cmd = ActionManager::registerAction(m_startLocalProcessAction,
         "Debugger.StartLocalProcess", globalcontext);
@@ -3065,10 +3065,10 @@ void DebuggerPluginPrivate::extensionsInitialized()
     cmd->setDescription(tr("Start Gdbserver"));
     mstart->addAction(cmd, Constants::G_MANUAL_REMOTE);
 
-    cmd = ActionManager::registerAction(m_attachToRemoteProcessAction,
+    cmd = ActionManager::registerAction(m_attachToLocalProcessAction,
-         "Debugger.AttachToRemoteProcess", globalcontext);
+        "Debugger.AttachToLocalProcess", globalcontext);
-    cmd->setDescription(tr("Attach to Remote Process"));
+    cmd->setAttribute(Command::CA_Hide);
-    mstart->addAction(cmd, Debugger::Constants::G_AUTOMATIC_REMOTE);
+    mstart->addAction(cmd, Constants::G_MANUAL_REMOTE);
 
 #ifdef WITH_LLDB
     cmd = ActionManager::registerAction(m_startRemoteLldbAction,

src/plugins/debugger/gdb/startgdbserverdialog.cpp

@@ -66,8 +66,8 @@
 #include <QPushButton>
 #include <QSortFilterProxyModel>
 #include <QSpacerItem>
-#include <QTableView>
 #include <QTextBrowser>
+#include <QTreeView>
 #include <QVBoxLayout>
 
 using namespace Core;
@@ -94,13 +94,12 @@ public:
         return DeviceProfileInformation::device(profile);
     }
 
-    StartGdbServerDialog *q;
     bool startServerOnly;
     DeviceProcessList *processList;
     QSortFilterProxyModel proxyModel;
 
     QLineEdit *processFilterLineEdit;
-    QTableView *tableView;
+    QTreeView *processView;
     QPushButton *attachProcessButton;
     QTextBrowser *textBrowser;
     QPushButton *closeButton;
@@ -113,7 +112,7 @@ public:
 };
 
 StartGdbServerDialogPrivate::StartGdbServerDialogPrivate(StartGdbServerDialog *q)
-    : q(q), startServerOnly(true), processList(0)
+    : startServerOnly(true), processList(0)
 {
     QSettings *settings = ICore::settings();
 
@@ -128,13 +127,13 @@ StartGdbServerDialogPrivate::StartGdbServerDialogPrivate(StartGdbServerDialog *q
     processFilterLineEdit->setText(settings->value(LastProcessName).toString());
     processFilterLineEdit->selectAll();
 
-    tableView = new QTableView(q);
+    processView = new QTreeView(q);
-    tableView->setShowGrid(false);
+    processView->setSortingEnabled(true);
-    tableView->setSortingEnabled(true);
+    processView->header()->setDefaultSectionSize(100);
-    tableView->horizontalHeader()->setDefaultSectionSize(100);
+    processView->header()->setStretchLastSection(true);
-    tableView->horizontalHeader()->setStretchLastSection(true);
+    processView->setAlternatingRowColors(true);
-    tableView->verticalHeader()->setVisible(false);
+    processView->setSelectionMode(QAbstractItemView::SingleSelection);
-    tableView->setSelectionMode(QAbstractItemView::SingleSelection);
+    processView->setRootIsDecorated(false);
 
     attachProcessButton = new QPushButton(q);
     attachProcessButton->setText(StartGdbServerDialog::tr("&Attach to Selected Process"));
@@ -154,7 +153,7 @@ StartGdbServerDialogPrivate::StartGdbServerDialogPrivate(StartGdbServerDialog *q
     horizontalLayout2->addWidget(attachProcessButton);
     horizontalLayout2->addWidget(closeButton);
 
-    formLayout->addRow(tableView);
+    formLayout->addRow(processView);
     formLayout->addRow(textBrowser);
     formLayout->addRow(horizontalLayout2);
     q->setLayout(formLayout);
@@ -174,14 +173,14 @@ StartGdbServerDialog::StartGdbServerDialog(QWidget *parent) :
     connect(&d->gatherer, SIGNAL(error(QString)), SLOT(portGathererError(QString)));
     connect(&d->gatherer, SIGNAL(portListReady()), SLOT(portListReady()));
 
-    d->tableView->setSelectionBehavior(QAbstractItemView::SelectRows);
+    d->processView->setSelectionBehavior(QAbstractItemView::SelectRows);
     d->proxyModel.setDynamicSortFilter(true);
     d->proxyModel.setFilterKeyColumn(-1);
-    d->tableView->setModel(&d->proxyModel);
+    d->processView->setModel(&d->proxyModel);
     connect(d->processFilterLineEdit, SIGNAL(textChanged(QString)),
         &d->proxyModel, SLOT(setFilterRegExp(QString)));
 
-    connect(d->tableView->selectionModel(),
+    connect(d->processView->selectionModel(),
         SIGNAL(selectionChanged(QItemSelection,QItemSelection)),
         SLOT(updateButtons()));
     connect(d->profileChooser, SIGNAL(activated(int)),
@@ -229,7 +228,6 @@ void StartGdbServerDialog::handleRemoteError(const QString &errorMsg)
 
 void StartGdbServerDialog::handleProcessListUpdated()
 {
-    d->tableView->resizeRowsToContents();
     updateButtons();
 }
 
@@ -244,8 +242,8 @@ void StartGdbServerDialog::updateProcessList()
 
 void StartGdbServerDialog::attachToProcess()
 {
-    const QModelIndexList &indexes =
+    const QModelIndexList indexes =
-            d->tableView->selectionModel()->selectedIndexes();
+            d->processView->selectionModel()->selectedIndexes();
     if (indexes.empty())
         return;
     d->attachProcessButton->setEnabled(false);
@@ -290,7 +288,7 @@ void StartGdbServerDialog::handleProcessKilled()
 
 void StartGdbServerDialog::updateButtons()
 {
-    d->attachProcessButton->setEnabled(d->tableView->selectionModel()->hasSelection()
+    d->attachProcessButton->setEnabled(d->processView->selectionModel()->hasSelection()
         || d->proxyModel.rowCount() == 1);
 }
 

src/plugins/designer/formeditorw.cpp

@@ -749,7 +749,7 @@ void FormEditorW::currentEditorChanged(Core::IEditor *editor)
     if (Designer::Constants::Internal::debug)
         qDebug() << Q_FUNC_INFO << editor << " of " << m_fwm->formWindowCount();
 
-    if (editor && editor->id() == Core::Id(Constants::K_DESIGNER_XML_EDITOR_ID)) {
+    if (editor && editor->id() == Constants::K_DESIGNER_XML_EDITOR_ID) {
         FormWindowEditor *xmlEditor = qobject_cast<FormWindowEditor *>(editor);
         QTC_ASSERT(xmlEditor, return);
         ensureInitStage(FullyInitialized);

src/plugins/genericprojectmanager/genericbuildconfiguration.cpp

@@ -147,7 +147,7 @@ QList<Core::Id> GenericBuildConfigurationFactory::availableCreationIds(const Pro
 
 QString GenericBuildConfigurationFactory::displayNameForId(const Core::Id id) const
 {
-    if (id == Core::Id(GENERIC_BC_ID))
+    if (id == GENERIC_BC_ID)
         return tr("Build");
     return QString();
 }
@@ -156,7 +156,7 @@ bool GenericBuildConfigurationFactory::canCreate(const ProjectExplorer::Target *
 {
     if (!canHandle(parent))
         return false;
-    if (id == Core::Id(GENERIC_BC_ID))
+    if (id == GENERIC_BC_ID)
         return true;
     return false;
 }

src/plugins/genericprojectmanager/genericmakestep.cpp

@@ -323,9 +323,9 @@ GenericMakeStepFactory::~GenericMakeStepFactory()
 bool GenericMakeStepFactory::canCreate(ProjectExplorer::BuildStepList *parent,
                                        const Core::Id id) const
 {
-    if (parent->target()->project()->id() != Core::Id(Constants::GENERICPROJECT_ID))
+    if (parent->target()->project()->id() == Constants::GENERICPROJECT_ID)
-        return false;
+        return id == GENERIC_MS_ID;
-    return id == Core::Id(GENERIC_MS_ID);
+    return false;
 }
 
 ProjectExplorer::BuildStep *GenericMakeStepFactory::create(ProjectExplorer::BuildStepList *parent,
@@ -334,10 +334,10 @@ ProjectExplorer::BuildStep *GenericMakeStepFactory::create(ProjectExplorer::Buil
     if (!canCreate(parent, id))
         return 0;
     GenericMakeStep *step = new GenericMakeStep(parent);
-    if (parent->id() == Core::Id(ProjectExplorer::Constants::BUILDSTEPS_CLEAN)) {
+    if (parent->id() == ProjectExplorer::Constants::BUILDSTEPS_CLEAN) {
         step->setClean(true);
         step->setBuildTarget(QLatin1String("clean"), /* on = */ true);
-    } else if (parent->id() == Core::Id(ProjectExplorer::Constants::BUILDSTEPS_BUILD)) {
+    } else if (parent->id() == ProjectExplorer::Constants::BUILDSTEPS_BUILD) {
         step->setBuildTarget(QLatin1String("all"), /* on = */ true);
     }
     return step;
@@ -379,14 +379,14 @@ ProjectExplorer::BuildStep *GenericMakeStepFactory::restore(ProjectExplorer::Bui
 
 QList<Core::Id> GenericMakeStepFactory::availableCreationIds(ProjectExplorer::BuildStepList *parent) const
 {
-    if (parent->target()->project()->id() != Core::Id(Constants::GENERICPROJECT_ID))
+    if (parent->target()->project()->id() == Constants::GENERICPROJECT_ID)
-        return QList<Core::Id>();
+        return QList<Core::Id>() << Core::Id(GENERIC_MS_ID);
-    return QList<Core::Id>() << Core::Id(GENERIC_MS_ID);
+    return QList<Core::Id>();
 }
 
 QString GenericMakeStepFactory::displayNameForId(const Core::Id id) const
 {
-    if (id == Core::Id(GENERIC_MS_ID))
+    if (id == GENERIC_MS_ID)
         return QCoreApplication::translate("GenericProjectManager::Internal::GenericMakeStep",
                                            GENERIC_MS_DISPLAY_NAME);
     return QString();

src/plugins/genericprojectmanager/genericprojectmanager.cpp

@@ -37,7 +37,7 @@
 #include <projectexplorer/projectexplorerconstants.h>
 #include <projectexplorer/session.h>
 
-#include <QtDebug>
+#include <QDebug>
 
 using namespace GenericProjectManager::Internal;
 

src/plugins/genericprojectmanager/genericprojectwizard.cpp

@@ -47,7 +47,7 @@
 
 #include <QDir>
 #include <QFileInfo>
-#include <QtDebug>
+#include <QDebug>
 #include <QCoreApplication>
 
 using namespace GenericProjectManager::Internal;

src/plugins/genericprojectmanager/pkgconfigtool.cpp

@@ -32,7 +32,7 @@
 
 #include <QProcess>
 #include <QTextStream>
-#include <QtDebug>
+#include <QDebug>
 
 using namespace GenericProjectManager::Internal;
 

src/plugins/glsleditor/glslcompletionassist.cpp

@@ -122,7 +122,7 @@ bool checkStartOfIdentifier(const QString &word)
 // ----------------------------
 bool GLSLCompletionAssistProvider::supportsEditor(const Core::Id &editorId) const
 {
-    return editorId == Core::Id(Constants::C_GLSLEDITOR_ID);
+    return editorId == Constants::C_GLSLEDITOR_ID;
 }
 
 IAssistProcessor *GLSLCompletionAssistProvider::createProcessor() const

src/plugins/imageviewer/imageviewer.cpp

@@ -45,7 +45,7 @@
 #include <QFileInfo>
 #include <QDir>
 #include <QWidget>
-#include <QtDebug>
+#include <QDebug>
 
 namespace ImageViewer {
 namespace Internal {

src/plugins/imageviewer/imageviewerfactory.cpp

@@ -37,7 +37,7 @@
 #include <QCoreApplication>
 #include <QMap>
 #include <QImageReader>
-#include <QtDebug>
+#include <QDebug>
 
 namespace ImageViewer {
 namespace Internal {

src/plugins/imageviewer/imageviewerfile.cpp

@@ -39,7 +39,7 @@
 
 #include <QMap>
 #include <QFileInfo>
-#include <QtDebug>
+#include <QDebug>
 
 namespace ImageViewer {
 namespace Internal {

src/plugins/madde/debianmanager.cpp

@@ -99,7 +99,7 @@ QString shortDayOfWeekName(const QDateTime &dt)
 
 QByteArray packageManagerNameFieldName(Core::Id deviceType)
 {
-    if (deviceType == Core::Id(Madde::Internal::Maemo5OsType))
+    if (deviceType == Madde::Internal::Maemo5OsType)
         return QByteArray("XB-Maemo-Display-Name");
     return QByteArray("XSBC-Maemo-Display-Name");
 }
@@ -107,7 +107,7 @@ QByteArray packageManagerNameFieldName(Core::Id deviceType)
 QList<QPair<QByteArray, QByteArray> > additionalFields(Core::Id deviceType, const QString &projectName)
 {
     QList<QPair<QByteArray, QByteArray> > fields;
-    if (deviceType == Core::Id(Madde::Internal::HarmattanOsType))
+    if (deviceType == Madde::Internal::HarmattanOsType)
         fields << qMakePair(QByteArray("XB-Maemo-Flags"), QByteArray("visible"))
                << qMakePair(QByteArray("XB-MeeGo-Desktop-Entry-Filename"),
                             QString::fromLatin1("%1_harmattan").arg(projectName).toUtf8())
@@ -117,10 +117,11 @@ QList<QPair<QByteArray, QByteArray> > additionalFields(Core::Id deviceType, cons
     return fields;
 }
 
-QByteArray section(Core::Id deviceType) {
+QByteArray section(Core::Id deviceType)
-    if (deviceType == Core::Id(Madde::Internal::Maemo5OsType))
+{
+    if (deviceType == Madde::Internal::Maemo5OsType)
         return "user/hidden";
-    else if (deviceType == Core::Id(Madde::Internal::HarmattanOsType))
+    if (deviceType == Madde::Internal::HarmattanOsType)
         return "user/other";
     return QByteArray();
 }
@@ -671,9 +672,9 @@ Utils::FileName DebianManager::debianDirectory(ProjectExplorer::Target *target)
     Utils::FileName path = Utils::FileName::fromString(target->project()->projectDirectory());
     path.appendPath(PackagingDirName);
     Core::Id deviceType = ProjectExplorer::DeviceTypeProfileInformation::deviceTypeId(target->profile());
-    if (deviceType == Core::Id(HarmattanOsType))
+    if (deviceType == HarmattanOsType)
         path.appendPath(QLatin1String("debian_harmattan"));
-    else if (deviceType == Core::Id(Maemo5OsType))
+    else if (deviceType == Maemo5OsType)
         path.appendPath(QLatin1String("debian_fremantle"));
     else
         path.clear();

src/plugins/madde/maddedevice.cpp

@@ -89,9 +89,9 @@ QString MaddeDevice::displayNameForActionId(Core::Id actionId) const
 {
     QTC_ASSERT(actionIds().contains(actionId), return QString());
 
-    if (actionId == Core::Id(MaddeDeviceTestActionId))
+    if (actionId == MaddeDeviceTestActionId)
         return tr("Test");
-    if (actionId == Core::Id(Constants::GenericDeployKeyToDeviceActionId))
+    if (actionId == Constants::GenericDeployKeyToDeviceActionId)
         return tr("Deploy Public Key...");
     return QString(); // Can't happen.
 }
@@ -102,9 +102,9 @@ void MaddeDevice::executeAction(Core::Id actionId, QWidget *parent) const
 
     QDialog *d = 0;
     const IDevice::ConstPtr device = sharedFromThis();
-    if (actionId == Core::Id(MaddeDeviceTestActionId))
+    if (actionId == MaddeDeviceTestActionId)
         d = new LinuxDeviceTestDialog(device, new MaddeDeviceTester, parent);
-    else if (actionId == Core::Id(Constants::GenericDeployKeyToDeviceActionId))
+    else if (actionId == Constants::GenericDeployKeyToDeviceActionId)
         d = PublicKeyDeploymentDialog::createDialog(device, parent);
     if (d)
         d->exec();
@@ -113,9 +113,9 @@ void MaddeDevice::executeAction(Core::Id actionId, QWidget *parent) const
 
 QString MaddeDevice::maddeDisplayType(Core::Id type)
 {
-    if (type == Core::Id(Maemo5OsType))
+    if (type == Maemo5OsType)
         return tr("Maemo5/Fremantle");
-    if (type == Core::Id(HarmattanOsType))
+    if (type == HarmattanOsType)
         return tr("MeeGo 1.2 Harmattan");
     QTC_ASSERT(false, return QString());
     return QString(); // For crappy compilers.
@@ -123,24 +123,24 @@ QString MaddeDevice::maddeDisplayType(Core::Id type)
 
 bool MaddeDevice::allowsRemoteMounts(Core::Id type)
 {
-    return type == Core::Id(Maemo5OsType);
+    return type == Maemo5OsType;
 }
 
 bool MaddeDevice::allowsPackagingDisabling(Core::Id type)
 {
-    return type == Core::Id(Maemo5OsType);
+    return type == Maemo5OsType;
 }
 
 bool MaddeDevice::allowsQmlDebugging(Core::Id type)
 {
-    return type == Core::Id(HarmattanOsType);
+    return type == HarmattanOsType;
 }
 
 QSize MaddeDevice::packageManagerIconSize(Core::Id type)
 {
-    if (type == Core::Id(Maemo5OsType))
+    if (type == Maemo5OsType)
         return QSize(48, 48);
-    if (type == Core::Id(HarmattanOsType))
+    if (type == HarmattanOsType)
         return QSize(64, 64);
     return QSize();
 }

src/plugins/madde/maddedeviceconfigurationfactory.cpp

@@ -67,7 +67,7 @@ IDevice::Ptr MaddeDeviceConfigurationFactory::create(Core::Id id) const
 bool MaddeDeviceConfigurationFactory::canRestore(const QVariantMap &map) const
 {
     const Core::Id type = IDevice::typeFromMap(map);
-    return type == Core::Id(Maemo5OsType) || type == Core::Id(HarmattanOsType);
+    return type == Maemo5OsType || type == HarmattanOsType;
 }
 
 IDevice::Ptr MaddeDeviceConfigurationFactory::restore(const QVariantMap &map) const

src/plugins/madde/maddedevicetester.cpp

@@ -181,7 +181,7 @@ void MaddeDeviceTester::handleMadDeveloperTestFinished(int exitStatus)
     } else if (m_processRunner->processExitCode() != 0) {
         QString message = tr("Connectivity tool not installed on device. "
             "Deployment currently not possible.");
-        if (m_deviceConfiguration->type() == Core::Id(HarmattanOsType)) {
+        if (m_deviceConfiguration->type() == HarmattanOsType) {
             message += tr("Please switch the device to developer mode "
                 "via Settings -> Security.");
         }
@@ -191,7 +191,7 @@ void MaddeDeviceTester::handleMadDeveloperTestFinished(int exitStatus)
         emit progressMessage(tr("Connectivity tool present.\n"));
     }
 
-    if (m_deviceConfiguration->type() != Core::Id(HarmattanOsType)) {
+    if (m_deviceConfiguration->type() != HarmattanOsType) {
         setFinished();
         return;
     }

src/plugins/madde/maddeuploadandinstallpackagesteps.cpp

@@ -145,7 +145,7 @@ void MaemoUploadAndInstallPackageStep::ctor()
 {
     setDefaultDisplayName(displayName());
     Core::Id deviceType = ProjectExplorer::DeviceTypeProfileInformation::deviceTypeId(target()->profile());
-    if (deviceType == Core::Id(HarmattanOsType))
+    if (deviceType == HarmattanOsType)
         m_deployService = new HarmattanUploadAndInstallPackageAction(this);
     else
         m_deployService = new MaemoUploadAndInstallPackageAction(this);

src/plugins/madde/maemodeployconfigurationwidget.cpp

@@ -131,7 +131,7 @@ void MaemoDeployConfigurationWidget::addDesktopFile()
     d.remoteDir = QLatin1String("/usr/share/applications");
     Core::Id deviceType
             = ProjectExplorer::DeviceTypeProfileInformation::deviceTypeId(deployConfiguration()->target()->profile());
-    if (deviceType == Core::Id(Maemo5OsType))
+    if (deviceType == Maemo5OsType)
         d.remoteDir += QLatin1String("/hildon");
     d.localFilePath = desktopFilePath;
     if (!deployConfiguration()->deploymentSettingsAssistant()

src/plugins/madde/maemodeploystepfactory.cpp

@@ -53,9 +53,8 @@ using namespace RemoteLinux;
 
 namespace Madde {
 namespace Internal {
-namespace {
+
-const QString OldMaemoDeployStepId(QLatin1String("Qt4ProjectManager.MaemoDeployStep"));
+const char OldMaemoDeployStepId[] = "Qt4ProjectManager.MaemoDeployStep";
-} // anonymous namespace
 
 MaemoDeployStepFactory::MaemoDeployStepFactory(QObject *parent)
     : IBuildStepFactory(parent)
@@ -93,17 +92,17 @@ QString MaemoDeployStepFactory::displayNameForId(const Core::Id id) const
 {
     if (id == MaemoInstallPackageViaMountStep::stepId())
         return MaemoInstallPackageViaMountStep::displayName();
-    else if (id == MaemoCopyFilesViaMountStep::stepId())
+    if (id == MaemoCopyFilesViaMountStep::stepId())
         return MaemoCopyFilesViaMountStep::displayName();
-    else if (id == MaemoUploadAndInstallPackageStep::stepId())
+    if (id == MaemoUploadAndInstallPackageStep::stepId())
         return MaemoUploadAndInstallPackageStep::displayName();
-    else if (id == MaemoInstallDebianPackageToSysrootStep::Id)
+    if (id == MaemoInstallDebianPackageToSysrootStep::Id)
         return MaemoInstallDebianPackageToSysrootStep::displayName();
-    else if (id == MaemoCopyToSysrootStep::Id)
+    if (id == MaemoCopyToSysrootStep::Id)
         return MaemoCopyToSysrootStep::displayName();
-    else if (id == MaemoMakeInstallToSysrootStep::Id)
+    if (id == MaemoMakeInstallToSysrootStep::Id)
         return MaemoMakeInstallToSysrootStep::displayName();
-    else if (id == GenericDirectUploadStep::stepId())
+    if (id == GenericDirectUploadStep::stepId())
         return GenericDirectUploadStep::displayName();
     if (id == RemoteLinuxCheckForFreeDiskSpaceStep::stepId())
         return RemoteLinuxCheckForFreeDiskSpaceStep::stepDisplayName();
@@ -117,36 +116,33 @@ bool MaemoDeployStepFactory::canCreate(BuildStepList *parent, const Core::Id id)
 
 BuildStep *MaemoDeployStepFactory::create(BuildStepList *parent, const Core::Id id)
 {
-    Core::Id deviceType
+    Core::Id deviceType = DeviceTypeProfileInformation::deviceTypeId(parent->target()->profile());
-            = ProjectExplorer::DeviceTypeProfileInformation::deviceTypeId(parent->target()->profile());
 
-    if (id == MaemoInstallDebianPackageToSysrootStep::Id) {
+    if (id == MaemoInstallDebianPackageToSysrootStep::Id)
         return new MaemoInstallDebianPackageToSysrootStep(parent);
-    } else if (id == MaemoCopyToSysrootStep::Id) {
+    if (id == MaemoCopyToSysrootStep::Id)
         return new MaemoCopyToSysrootStep(parent);
-    } else if (id == MaemoMakeInstallToSysrootStep::Id) {
+    if (id == MaemoMakeInstallToSysrootStep::Id)
         return new MaemoMakeInstallToSysrootStep(parent);
-    } else if (id == MaemoInstallPackageViaMountStep::stepId()
+    if (id == MaemoInstallPackageViaMountStep::stepId()
-        || (id == Core::Id(OldMaemoDeployStepId) && deviceType == Core::Id(Maemo5OsType))) {
+        || (id == OldMaemoDeployStepId && deviceType == Maemo5OsType))
         return new MaemoInstallPackageViaMountStep(parent);
-    } else if (id == MaemoCopyFilesViaMountStep::stepId()) {
+    if (id == MaemoCopyFilesViaMountStep::stepId())
         return new MaemoCopyFilesViaMountStep(parent);
-    } else if (id == MaemoUploadAndInstallPackageStep::stepId()
+    if (id == MaemoUploadAndInstallPackageStep::stepId()
-        || (id == Core::Id(OldMaemoDeployStepId) && deviceType == Core::Id(HarmattanOsType))) {
+        || (id == OldMaemoDeployStepId && deviceType == HarmattanOsType))
         return new MaemoUploadAndInstallPackageStep(parent);
-    } else if (id == GenericDirectUploadStep::stepId()) {
+    if (id == GenericDirectUploadStep::stepId())
         return new GenericDirectUploadStep(parent, id);
-    } else if (id == RemoteLinuxCheckForFreeDiskSpaceStep::stepId()) {
+    if (id == RemoteLinuxCheckForFreeDiskSpaceStep::stepId())
         return new RemoteLinuxCheckForFreeDiskSpaceStep(parent);
-    }
 
     return 0;
 }
 
 bool MaemoDeployStepFactory::canRestore(BuildStepList *parent, const QVariantMap &map) const
 {
-    return canCreate(parent, idFromMap(map))
+    return canCreate(parent, idFromMap(map)) || idFromMap(map) == OldMaemoDeployStepId;
-        || idFromMap(map) == Core::Id(OldMaemoDeployStepId);
 }
 
 BuildStep *MaemoDeployStepFactory::restore(BuildStepList *parent, const QVariantMap &map)

src/plugins/madde/maemoglobal.cpp

@@ -65,13 +65,13 @@ bool MaemoGlobal::hasMaemoDevice(const Profile *p)
         return false;
 
     const Core::Id type = dev->type();
-    return type == Core::Id(Maemo5OsType) || type == Core::Id(HarmattanOsType);
+    return type == Maemo5OsType || type == HarmattanOsType;
 }
 
 bool MaemoGlobal::supportsMaemoDevice(const Profile *p)
 {
     const Core::Id type = DeviceTypeProfileInformation::deviceTypeId(p);
-    return type == Core::Id(Maemo5OsType) || type == Core::Id(HarmattanOsType);
+    return type == Maemo5OsType || type == HarmattanOsType;
 }
 
 bool MaemoGlobal::isValidMaemo5QtVersion(const QString &qmakePath)
@@ -122,14 +122,14 @@ QString MaemoGlobal::devrootshPath()
 int MaemoGlobal::applicationIconSize(const Target *target)
 {
     Core::Id deviceType = DeviceTypeProfileInformation::deviceTypeId(target->profile());
-    return deviceType == Core::Id(HarmattanOsType) ? 80 : 64;
+    return deviceType == HarmattanOsType ? 80 : 64;
 }
 
 QString MaemoGlobal::remoteSudo(Core::Id deviceType, const QString &uname)
 {
     if (uname == QLatin1String("root"))
         return QString();
-    if (deviceType == Core::Id(Maemo5OsType) || deviceType == Core::Id(HarmattanOsType))
+    if (deviceType == Maemo5OsType || deviceType == HarmattanOsType)
         return devrootshPath();
     return QString(); // Using sudo would open a can of worms.
 }
@@ -199,7 +199,7 @@ QString MaemoGlobal::madCommand(const QString &qmakePath)
 
 QString MaemoGlobal::madDeveloperUiName(Core::Id deviceType)
 {
-    return deviceType == Core::Id(HarmattanOsType)
+    return deviceType == HarmattanOsType
         ? tr("SDK Connectivity") : tr("Mad Developer");
 }
 

src/plugins/madde/maemoinstalltosysrootstep.cpp

@@ -236,7 +236,7 @@ QStringList MaemoInstallDebianPackageToSysrootStep::madArguments() const
     QStringList args;
     args << QLatin1String("xdpkg");
     Core::Id deviceType = ProjectExplorer::DeviceTypeProfileInformation::deviceTypeId(target()->profile());
-    if (deviceType == Core::Id(HarmattanOsType))
+    if (deviceType == HarmattanOsType)
         args << QLatin1String("--no-force-downgrade");
     args << QLatin1String("-i");
     return args;

src/plugins/madde/maemopackagecreationfactory.cpp

@@ -93,7 +93,7 @@ bool MaemoPackageCreationFactory::canRestore(ProjectExplorer::BuildStepList *par
                                              const QVariantMap &map) const
 {
     const Core::Id id = ProjectExplorer::idFromMap(map);
-    return canCreate(parent, id) || id == Core::Id(OldCreatePackageId);
+    return canCreate(parent, id) || id == OldCreatePackageId;
 }
 
 BuildStep *MaemoPackageCreationFactory::restore(ProjectExplorer::BuildStepList *parent,

src/plugins/madde/maemopackagecreationstep.cpp

@@ -238,7 +238,7 @@ QString AbstractMaemoPackageCreationStep::replaceDots(const QString &name) const
 {
     Core::Id deviceType = ProjectExplorer::DeviceTypeProfileInformation::deviceTypeId(target()->profile());
     // Idiotic OVI store requirement for N900 (but not allowed for N9 ...).
-    if (deviceType == Core::Id(Maemo5OsType)) {
+    if (deviceType == Maemo5OsType) {
         QString adaptedName = name;
         return adaptedName.replace(QLatin1Char('.'), QLatin1Char('_'));
     }

src/plugins/madde/maemopublisherfremantlefree.cpp

@@ -607,7 +607,7 @@ QStringList MaemoPublisherFremantleFree::findProblems() const
     ProjectExplorer::Target *target = m_buildConfig->target();
     Core::Id deviceType
             = ProjectExplorer::DeviceTypeProfileInformation::deviceTypeId(target->profile());
-    if (deviceType != Core::Id(Maemo5OsType))
+    if (deviceType != Maemo5OsType)
         return QStringList();
 
     const QString &description = DebianManager::shortDescription(DebianManager::debianDirectory(target));

src/plugins/madde/maemoqtversion.cpp

@@ -101,11 +101,11 @@ QList<ProjectExplorer::Abi> MaemoQtVersion::detectQtAbis() const
     QList<ProjectExplorer::Abi> result;
     if (!isValid())
         return result;
-    if (m_deviceType == Core::Id(Maemo5OsType)) {
+    if (m_deviceType == Maemo5OsType) {
         result.append(ProjectExplorer::Abi(ProjectExplorer::Abi::ArmArchitecture, ProjectExplorer::Abi::LinuxOS,
                                            ProjectExplorer::Abi::MaemoLinuxFlavor, ProjectExplorer::Abi::ElfFormat,
                                            32));
-    } else if (m_deviceType == Core::Id(HarmattanOsType)) {
+    } else if (m_deviceType == HarmattanOsType) {
         result.append(ProjectExplorer::Abi(ProjectExplorer::Abi::ArmArchitecture, ProjectExplorer::Abi::LinuxOS,
                                            ProjectExplorer::Abi::HarmattanLinuxFlavor,
                                            ProjectExplorer::Abi::ElfFormat,
@@ -116,9 +116,9 @@ QList<ProjectExplorer::Abi> MaemoQtVersion::detectQtAbis() const
 
 QString MaemoQtVersion::description() const
 {
-    if (m_deviceType == Core::Id(Maemo5OsType))
+    if (m_deviceType == Maemo5OsType)
         return QCoreApplication::translate("QtVersion", "Maemo", "Qt Version is meant for Maemo5");
-    else if (m_deviceType == Core::Id(HarmattanOsType))
+    if (m_deviceType == HarmattanOsType)
         return QCoreApplication::translate("QtVersion", "Harmattan ", "Qt Version is meant for Harmattan");
     return QString();
 }
@@ -143,7 +143,7 @@ Core::FeatureSet MaemoQtVersion::availableFeatures() const
         features |= Core::FeatureSet(QtSupport::Constants::FEATURE_QTQUICK_COMPONENTS_MEEGO);
     features |= Core::FeatureSet(QtSupport::Constants::FEATURE_MOBILE);
 
-    if (deviceType() != Core::Id(Maemo5OsType)) //Only Maemo5 has proper support for Widgets
+    if (deviceType() != Maemo5OsType) //Only Maemo5 has proper support for Widgets
         features.remove(Core::Feature(QtSupport::Constants::FEATURE_QWIDGETS));
 
     return features;

src/plugins/madde/maemorunconfiguration.cpp

@@ -77,7 +77,7 @@ void MaemoRunConfiguration::init()
         SLOT(handleRemoteMountsChanged()));
     connect(m_remoteMounts, SIGNAL(modelReset()), SLOT(handleRemoteMountsChanged()));
 
-    if (DeviceTypeProfileInformation::deviceTypeId(target()->profile()) != Core::Id(HarmattanOsType))
+    if (DeviceTypeProfileInformation::deviceTypeId(target()->profile()) != HarmattanOsType)
         debuggerAspect()->suppressQmlDebuggingOptions();
 }
 

src/plugins/madde/maemorunfactories.cpp

@@ -157,7 +157,7 @@ bool MaemoRunConfigurationFactory::canHandle(Target *t) const
     if (!qobject_cast<Qt4Project *>(t->project()))
         return false;
     Core::Id devType = DeviceTypeProfileInformation::deviceTypeId(t->profile());
-    return devType == Core::Id(Maemo5OsType) || devType == Core::Id(HarmattanOsType);
+    return devType == Maemo5OsType || devType == HarmattanOsType;
 }
 
 QList<RunConfiguration *> MaemoRunConfigurationFactory::runConfigurationsForNode(Target *t, Node *n)

src/plugins/madde/qt4maemodeployconfiguration.cpp

@@ -62,10 +62,8 @@ using namespace ProjectExplorer;
 using namespace Qt4ProjectManager;
 using namespace RemoteLinux;
 
-namespace {
+const char OldDeployConfigId[] = "2.2MaemoDeployConfig";
-const QString OldDeployConfigId = QLatin1String("2.2MaemoDeployConfig");
 const char DEPLOYMENT_ASSISTANT_SETTING[] = "RemoteLinux.DeploymentAssistant";
-} // namespace
 
 namespace Madde {
 namespace Internal {
@@ -124,9 +122,9 @@ QString Qt4MaemoDeployConfiguration::qmakeScope() const
 {
     Core::Id deviceType = ProjectExplorer::DeviceTypeProfileInformation::deviceTypeId(target()->profile());
 
-    if (deviceType == Core::Id(Maemo5OsType))
+    if (deviceType == Maemo5OsType)
         return QLatin1String("maemo5");
-    else if (deviceType == Core::Id(HarmattanOsType))
+    if (deviceType == HarmattanOsType)
         return QLatin1String("contains(MEEGO_EDITION,harmattan)");
     return QString("unix");
 }
@@ -135,9 +133,9 @@ QString Qt4MaemoDeployConfiguration::installPrefix() const
 {
     Core::Id deviceType = ProjectExplorer::DeviceTypeProfileInformation::deviceTypeId(target()->profile());
 
-    if (deviceType == Core::Id(Maemo5OsType))
+    if (deviceType == Maemo5OsType)
         return QLatin1String("/opt");
-    else if (deviceType == Core::Id(HarmattanOsType))
+    if (deviceType == HarmattanOsType)
         return QLatin1String("/opt");
     return QLatin1String("/usr/local");
 }
@@ -188,7 +186,7 @@ void Qt4MaemoDeployConfiguration::setupDebianPackaging()
     connect(dm, SIGNAL(debianDirectoryChanged(Utils::FileName)), this, SLOT(debianDirChanged(Utils::FileName)));
 
     // Set up aegis manifest on harmattan:
-    if (deviceType == Core::Id(HarmattanOsType)) {
+    if (deviceType == HarmattanOsType) {
         Utils::FileName manifest = debianDir;
         const QString manifestName = QLatin1String("manifest.aegis");
         manifest.appendPath(manifestName);
@@ -270,10 +268,10 @@ QList<Core::Id> Qt4MaemoDeployConfigurationFactory::availableCreationIds(Target
         return ids;
 
     Core::Id deviceType = ProjectExplorer::DeviceTypeProfileInformation::deviceTypeId(parent->profile());
-    if (deviceType == Core::Id(Maemo5OsType))
+    if (deviceType == Maemo5OsType)
         ids << Qt4MaemoDeployConfiguration::fremantleWithPackagingId()
             << Qt4MaemoDeployConfiguration::fremantleWithoutPackagingId();
-    else if (deviceType == Core::Id(HarmattanOsType))
+    else if (deviceType == HarmattanOsType)
         ids << Qt4MaemoDeployConfiguration::harmattanId();
     return ids;
 }
@@ -324,7 +322,7 @@ bool Qt4MaemoDeployConfigurationFactory::canRestore(Target *parent, const QVaria
 {
     Core::Id id = idFromMap(map);
     return canHandle(parent)
-            && (availableCreationIds(parent).contains(id) || id == Core::Id(OldDeployConfigId))
+            && (availableCreationIds(parent).contains(id) || id == OldDeployConfigId)
             && MaemoGlobal::supportsMaemoDevice(parent->profile());
 }
 
@@ -334,10 +332,10 @@ DeployConfiguration *Qt4MaemoDeployConfigurationFactory::restore(Target *parent,
         return 0;
     Core::Id id = idFromMap(map);
     Core::Id deviceType = ProjectExplorer::DeviceTypeProfileInformation::deviceTypeId(parent->profile());
-    if (id == Core::Id(OldDeployConfigId)) {
+    if (id == OldDeployConfigId) {
-        if (deviceType == Core::Id(Maemo5OsType))
+        if (deviceType == Maemo5OsType)
             id = Qt4MaemoDeployConfiguration::fremantleWithPackagingId();
-        else if (deviceType == Core::Id(HarmattanOsType))
+        else if (deviceType == HarmattanOsType)
             id = Qt4MaemoDeployConfiguration::harmattanId();
     }
     Qt4MaemoDeployConfiguration * const dc

src/plugins/mercurial/mercurialplugin.cpp

@@ -63,7 +63,7 @@
 #include <QtPlugin>
 #include <QAction>
 #include <QMenu>
-#include <QtDebug>
+#include <QDebug>
 #include <QtGlobal>
 #include <QDir>
 #include <QDialog>

src/plugins/projectexplorer/buildconfiguration.cpp

@@ -173,9 +173,9 @@ bool BuildConfiguration::fromMap(const QVariantMap &map)
             delete list;
             return false;
         }
-        if (list->id() == Core::Id(Constants::BUILDSTEPS_BUILD))
+        if (list->id() == Constants::BUILDSTEPS_BUILD)
             list->setDefaultDisplayName(tr("Build"));
-        else if (list->id() == Core::Id(Constants::BUILDSTEPS_CLEAN))
+        else if (list->id() == Constants::BUILDSTEPS_CLEAN)
             list->setDefaultDisplayName(tr("Clean"));
         m_stepLists.append(list);
     }

src/plugins/projectexplorer/buildprogress.cpp

@@ -37,7 +37,7 @@
 #include <QHBoxLayout>
 #include <QFont>
 #include <QPixmap>
-#include <QtDebug>
+#include <QDebug>
 
 using namespace ProjectExplorer;
 using namespace ProjectExplorer::Internal;

src/plugins/projectexplorer/buildstepspage.cpp

@@ -514,9 +514,9 @@ BuildStepsPage::~BuildStepsPage()
 
 QString BuildStepsPage::displayName() const
 {
-    if (m_id == Core::Id(Constants::BUILDSTEPS_BUILD))
+    if (m_id == Constants::BUILDSTEPS_BUILD)
         return tr("Build Steps");
-    if (m_id == Core::Id(Constants::BUILDSTEPS_CLEAN))
+    if (m_id == Constants::BUILDSTEPS_CLEAN)
         return tr("Clean Steps");
     return QString();
 }

src/plugins/projectexplorer/currentprojectfilter.cpp

@@ -32,7 +32,7 @@
 #include "projectexplorer.h"
 #include "project.h"
 
-#include <QtDebug>
+#include <QDebug>
 
 using namespace Core;
 using namespace Locator;

src/plugins/projectexplorer/deployconfiguration.cpp

@@ -130,7 +130,7 @@ bool DeployConfiguration::fromMap(const QVariantMap &map)
     }
 
     // We assume that we hold the deploy list
-    Q_ASSERT(m_stepList && m_stepList->id() == Core::Id(ProjectExplorer::Constants::BUILDSTEPS_DEPLOY));
+    Q_ASSERT(m_stepList && m_stepList->id() == ProjectExplorer::Constants::BUILDSTEPS_DEPLOY);
 
     return true;
 }
@@ -169,7 +169,7 @@ QList<Core::Id> DeployConfigurationFactory::availableCreationIds(Target *parent)
 
 QString DeployConfigurationFactory::displayNameForId(const Core::Id id) const
 {
-    if (id == Core::Id(Constants::DEFAULT_DEPLOYCONFIGURATION_ID))
+    if (id == Constants::DEFAULT_DEPLOYCONFIGURATION_ID)
         //: Display name of the default deploy configuration
         return tr("Deploy Configuration");
     return QString();
@@ -179,7 +179,7 @@ bool DeployConfigurationFactory::canCreate(Target *parent, const Core::Id id) co
 {
     if (!canHandle(parent))
         return false;
-    return id == Core::Id(Constants::DEFAULT_DEPLOYCONFIGURATION_ID);
+    return id == Constants::DEFAULT_DEPLOYCONFIGURATION_ID;
 }
 
 DeployConfiguration *DeployConfigurationFactory::create(Target *parent, const Core::Id id)
@@ -244,7 +244,7 @@ bool DeployConfigurationFactory::canHandle(Target *parent) const
 {
     if (!parent->project()->supportsProfile(parent->profile()))
         return false;
-    return DeviceTypeProfileInformation::deviceTypeId(parent->profile()) == Core::Id(Constants::DESKTOP_DEVICE_TYPE);
+    return DeviceTypeProfileInformation::deviceTypeId(parent->profile()) == Constants::DESKTOP_DEVICE_TYPE;
 }
 
 ///

src/plugins/projectexplorer/devicesupport/desktopdevice.cpp

@@ -31,6 +31,7 @@
 #include "desktopdevice.h"
 #include "projectexplorerconstants.h"
 #include "deviceprocesslist.h"
+#include "localprocesslist.h"
 
 #include <QCoreApplication>
 
@@ -80,6 +81,16 @@ void DesktopDevice::executeAction(Core::Id actionId, QWidget *parent) const
     Q_UNUSED(parent);
 }
 
+bool DesktopDevice::canCreateProcessModel() const
+{
+    return true;
+}
+
+DeviceProcessList *DesktopDevice::createProcessListModel(QObject *parent) const
+{
+    return new Internal::LocalProcessList(sharedFromThis(), parent);
+}
+
 IDevice::Ptr DesktopDevice::clone() const
 {
     return Ptr(new DesktopDevice(*this));

src/plugins/projectexplorer/devicesupport/desktopdevice.h

@@ -51,6 +51,8 @@ public:
     QList<Core::Id> actionIds() const;
     QString displayNameForActionId(Core::Id actionId) const;
     void executeAction(Core::Id actionId, QWidget *parent = 0) const;
+    bool canCreateProcessModel() const;
+    DeviceProcessList *createProcessListModel(QObject *parent) const;
 
     IDevice::Ptr clone() const;
 

src/plugins/projectexplorer/devicesupport/desktopdevicefactory.cpp

@@ -40,7 +40,7 @@ DesktopDeviceFactory::DesktopDeviceFactory(QObject *parent) : IDeviceFactory(par
 
 QString DesktopDeviceFactory::displayNameForId(Core::Id type) const
 {
-    if (type == Core::Id(Constants::DESKTOP_DEVICE_TYPE))
+    if (type == Constants::DESKTOP_DEVICE_TYPE)
         return tr("Desktop");
     return QString();
 }
@@ -63,7 +63,7 @@ IDevice::Ptr DesktopDeviceFactory::create(Core::Id id) const
 
 bool DesktopDeviceFactory::canRestore(const QVariantMap &map) const
 {
-    return IDevice::idFromMap(map) == Core::Id(Constants::DESKTOP_DEVICE_ID);
+    return IDevice::idFromMap(map) == Constants::DESKTOP_DEVICE_ID;
 }
 
 IDevice::Ptr DesktopDeviceFactory::restore(const QVariantMap &map) const

src/plugins/projectexplorer/devicesupport/deviceprocessesdialog.cpp

@@ -50,9 +50,6 @@ public:
     QSortFilterProxyModel proxyModel;
 };
 
-} // namespace Internal
-
-using namespace Internal;
 
 DeviceProcessesDialog::DeviceProcessesDialog(DeviceProcessList *processList, QWidget *parent)
     : QDialog(parent), d(new DeviceProcessesDialogPrivate(processList))
@@ -133,4 +130,5 @@ void DeviceProcessesDialog::handleSelectionChanged()
     d->ui.killProcessButton->setEnabled(d->ui.treeView->selectionModel()->hasSelection());
 }
 
+} // namespace Internal
 } // namespace RemoteLinux

src/plugins/projectexplorer/devicesupport/deviceprocessesdialog.h

@@ -38,7 +38,8 @@ namespace ProjectExplorer {
 
 class DeviceProcessList;
 
-namespace Internal { class DeviceProcessesDialogPrivate; }
+namespace Internal {
+class DeviceProcessesDialogPrivate;
 
 class DeviceProcessesDialog : public QDialog
 {
@@ -61,6 +62,7 @@ private:
     Internal::DeviceProcessesDialogPrivate * const d;
 };
 
+} // namespace Internal
 } // namespace RemoteLinux
 
 #endif // REMOTELINUXPROCESSESDIALOG_H

src/plugins/projectexplorer/devicesupport/deviceprocesslist.cpp

@@ -54,7 +54,7 @@ public:
 using namespace Internal;
 
 DeviceProcessList::DeviceProcessList(const IDevice::ConstPtr &device, QObject *parent)
-    : QAbstractTableModel(parent), d(new DeviceProcessListPrivate(device))
+    : QAbstractItemModel(parent), d(new DeviceProcessListPrivate(device))
 {
 }
 
@@ -63,6 +63,24 @@ DeviceProcessList::~DeviceProcessList()
     delete d;
 }
 
+QModelIndex DeviceProcessList::parent(const QModelIndex &) const
+{
+    return QModelIndex();
+}
+
+bool DeviceProcessList::hasChildren(const QModelIndex &parent) const
+{
+    if (!parent.isValid())
+        return rowCount(parent) > 0 && columnCount(parent) > 0;
+    return false;
+}
+
+QModelIndex DeviceProcessList::index(int row, int column, const QModelIndex &parent) const
+{
+    return hasIndex(row, column, parent) ? createIndex(row, column, 0) : QModelIndex();
+}
+
+
 void DeviceProcessList::update()
 {
     QTC_ASSERT(d->state == Inactive, return);

src/plugins/projectexplorer/devicesupport/deviceprocesslist.h

@@ -32,7 +32,7 @@
 
 #include "idevice.h"
 
-#include <QAbstractTableModel>
+#include <QAbstractItemModel>
 #include <QList>
 #include <QSharedPointer>
 
@@ -51,7 +51,7 @@ public:
     QString exe;
 };
 
-class PROJECTEXPLORER_EXPORT DeviceProcessList : public QAbstractTableModel
+class PROJECTEXPLORER_EXPORT DeviceProcessList : public QAbstractItemModel
 {
     Q_OBJECT
 
@@ -76,11 +76,14 @@ protected:
     IDevice::ConstPtr device() const;
 
 private:
+    QModelIndex index(int row, int column, const QModelIndex &parent) const;
     int rowCount(const QModelIndex &parent = QModelIndex()) const;
     int columnCount(const QModelIndex &parent = QModelIndex()) const;
     QVariant headerData(int section, Qt::Orientation orientation,
         int role = Qt::DisplayRole) const;
     QVariant data(const QModelIndex &index, int role = Qt::DisplayRole) const;
+    QModelIndex parent(const QModelIndex &) const;
+    bool hasChildren(const QModelIndex &parent) const;
 
     virtual void doUpdate() = 0;
     virtual void doKillProcess(const DeviceProcess &process) = 0;