diff --git a/src/plugins/cmakeprojectmanager/cmakeprojectmanager.cpp b/src/plugins/cmakeprojectmanager/cmakeprojectmanager.cpp
index 0bac1503d84af03f3f6432e85859d8a7578cc98c..49cff62d28efc739fb92cfb82512970d5b8d7fc6 100644
--- a/src/plugins/cmakeprojectmanager/cmakeprojectmanager.cpp
+++ b/src/plugins/cmakeprojectmanager/cmakeprojectmanager.cpp
@@ -53,11 +53,11 @@ CMakeManager::CMakeManager(CMakeSettingsPage *cmakeSettingsPage)
     : m_settingsPage(cmakeSettingsPage)
 {
     Core::UniqueIDManager *uidm = Core::UniqueIDManager::instance();
-    m_projectContext = uidm->uniqueIdentifier(CMakeProjectManager::Constants::PROJECTCONTEXT);
+    m_projectContext = Core::Context(CMakeProjectManager::Constants::PROJECTCONTEXT);
     m_projectLanguage = uidm->uniqueIdentifier(ProjectExplorer::Constants::LANG_CXX);
 }
 
-int CMakeManager::projectContext() const
+Core::Context CMakeManager::projectContext() const
 {
     return m_projectContext;
 }
diff --git a/src/plugins/cmakeprojectmanager/cmakeprojectmanager.h b/src/plugins/cmakeprojectmanager/cmakeprojectmanager.h
index 92f2ab01763b75c156750e6422b11d240247eb0a..d884b15407f093ea60fac921d959d6f1957ee44f 100644
--- a/src/plugins/cmakeprojectmanager/cmakeprojectmanager.h
+++ b/src/plugins/cmakeprojectmanager/cmakeprojectmanager.h
@@ -52,7 +52,7 @@ class CMakeManager : public ProjectExplorer::IProjectManager
 public:
     CMakeManager(CMakeSettingsPage *cmakeSettingsPage);
 
-    virtual int projectContext() const;
+    virtual Core::Context projectContext() const;
     virtual int projectLanguage() const;
 
     virtual ProjectExplorer::Project *openProject(const QString &fileName);
@@ -76,7 +76,7 @@ public:
 private:
     static QString qtVersionForQMake(const QString &qmakePath);
     static QPair<QString, QString> findQtDir(const ProjectExplorer::Environment &env);
-    int m_projectContext;
+    Core::Context m_projectContext;
     int m_projectLanguage;
     CMakeSettingsPage *m_settingsPage;
 };
diff --git a/src/plugins/genericprojectmanager/genericprojectmanager.cpp b/src/plugins/genericprojectmanager/genericprojectmanager.cpp
index 5f5737bf65e069ceb7354af657c0186590e12cf7..88583f0b8d7c67f2bb2d5d000cc8cec62085d10b 100644
--- a/src/plugins/genericprojectmanager/genericprojectmanager.cpp
+++ b/src/plugins/genericprojectmanager/genericprojectmanager.cpp
@@ -45,14 +45,14 @@ using namespace GenericProjectManager::Internal;
 Manager::Manager()
 {
     Core::UniqueIDManager *uidm = Core::UniqueIDManager::instance();
-    m_projectContext  = uidm->uniqueIdentifier(GenericProjectManager::Constants::PROJECTCONTEXT);
+    m_projectContext  = Core::Context(GenericProjectManager::Constants::PROJECTCONTEXT);
     m_projectLanguage = uidm->uniqueIdentifier(ProjectExplorer::Constants::LANG_CXX);
 }
 
 Manager::~Manager()
 { }
 
-int Manager::projectContext() const
+Core::Context Manager::projectContext() const
 { return m_projectContext; }
 
 int Manager::projectLanguage() const
diff --git a/src/plugins/genericprojectmanager/genericprojectmanager.h b/src/plugins/genericprojectmanager/genericprojectmanager.h
index 1b99f008d1770c20a4d3d4f38f6a4b6e9da7e92b..20666ac1ad53f6a8a0c5a422d9ebe005a05f2921 100644
--- a/src/plugins/genericprojectmanager/genericprojectmanager.h
+++ b/src/plugins/genericprojectmanager/genericprojectmanager.h
@@ -45,7 +45,7 @@ public:
     Manager();
     virtual ~Manager();
 
-    virtual int projectContext() const;
+    virtual Core::Context projectContext() const;
     virtual int projectLanguage() const;
 
     virtual QString mimeType() const;
@@ -57,7 +57,7 @@ public:
     void unregisterProject(GenericProject *project);
 
 private:
-    int m_projectContext;
+    Core::Context m_projectContext;
     int m_projectLanguage;
     QList<GenericProject *> m_projects;
 };
diff --git a/src/plugins/projectexplorer/iprojectmanager.h b/src/plugins/projectexplorer/iprojectmanager.h
index 5fe61b6f69da6146a28e1c8296958ba265f62a80..315ecb203a4c0ee05afc093e089523f38001d65e 100644
--- a/src/plugins/projectexplorer/iprojectmanager.h
+++ b/src/plugins/projectexplorer/iprojectmanager.h
@@ -32,6 +32,7 @@
 
 #include "projectexplorer_export.h"
 
+#include <coreplugin/icontext.h>
 #include <QtCore/QObject>
 
 namespace ProjectExplorer {
@@ -46,7 +47,7 @@ class PROJECTEXPLORER_EXPORT IProjectManager
 public:
     IProjectManager() {}
 
-    virtual int projectContext() const = 0; //TODO move into project
+    virtual Core::Context projectContext() const = 0; //TODO move into project
     virtual int projectLanguage() const = 0; //TODO move into project
 
     virtual QString mimeType() const = 0;
diff --git a/src/plugins/qmlprojectmanager/qmlprojectmanager.cpp b/src/plugins/qmlprojectmanager/qmlprojectmanager.cpp
index cd8cc19f3ac59a2cd481db73aba5cfcc1e1fd849..6529e935457254cfba74bfd87cc42f3a1cdbb2e7 100644
--- a/src/plugins/qmlprojectmanager/qmlprojectmanager.cpp
+++ b/src/plugins/qmlprojectmanager/qmlprojectmanager.cpp
@@ -48,14 +48,14 @@ namespace Internal {
 Manager::Manager()
 {
     Core::UniqueIDManager *uidm = Core::UniqueIDManager::instance();
-    m_projectContext  = uidm->uniqueIdentifier(QmlProjectManager::Constants::PROJECTCONTEXT);
+    m_projectContext  = Core::Context(QmlProjectManager::Constants::PROJECTCONTEXT);
     m_projectLanguage = uidm->uniqueIdentifier(QmlProjectManager::Constants::LANG_QML);
 }
 
 Manager::~Manager()
 { }
 
-int Manager::projectContext() const
+Core::Context Manager::projectContext() const
 { return m_projectContext; }
 
 int Manager::projectLanguage() const
diff --git a/src/plugins/qmlprojectmanager/qmlprojectmanager.h b/src/plugins/qmlprojectmanager/qmlprojectmanager.h
index ba5866e971556eac37282c9d002f561b7cb10e60..b48ba6ff3ad3bad422fe77ba7daaeee4df955390 100644
--- a/src/plugins/qmlprojectmanager/qmlprojectmanager.h
+++ b/src/plugins/qmlprojectmanager/qmlprojectmanager.h
@@ -46,7 +46,7 @@ public:
     Manager();
     virtual ~Manager();
 
-    virtual int projectContext() const;
+    virtual Core::Context projectContext() const;
     virtual int projectLanguage() const;
 
     virtual QString mimeType() const;
@@ -58,7 +58,7 @@ public:
     void unregisterProject(QmlProject *project);
 
 private:
-    int m_projectContext;
+    Core::Context m_projectContext;
     int m_projectLanguage;
     QList<QmlProject *> m_projects;
 };
diff --git a/src/plugins/qt4projectmanager/qt4projectmanager.cpp b/src/plugins/qt4projectmanager/qt4projectmanager.cpp
index 443923c4c7be6a94ad63bfefac154703cbef0655..bcb8e550928e55a7aa99290cc387be5be9794d53 100644
--- a/src/plugins/qt4projectmanager/qt4projectmanager.cpp
+++ b/src/plugins/qt4projectmanager/qt4projectmanager.cpp
@@ -165,7 +165,7 @@ void Qt4Manager::uiEditorContentsChanged()
     m_dirty = true;
 }
 
-int Qt4Manager::projectContext() const
+Core::Context Qt4Manager::projectContext() const
 {
      return m_plugin->projectContext();
 }
diff --git a/src/plugins/qt4projectmanager/qt4projectmanager.h b/src/plugins/qt4projectmanager/qt4projectmanager.h
index 822383751a74334ee699cde621b7a5ed84ba9366..f8df511cc561bfe8ea3916cf188dce541e273476 100644
--- a/src/plugins/qt4projectmanager/qt4projectmanager.h
+++ b/src/plugins/qt4projectmanager/qt4projectmanager.h
@@ -75,7 +75,7 @@ public:
     ProjectExplorer::ProjectExplorerPlugin *projectExplorer() const;
 
     // ProjectExplorer::IProjectManager
-    int projectContext() const;
+    Core::Context projectContext() const;
     int projectLanguage() const;
 
     virtual QString mimeType() const;
diff --git a/src/plugins/qt4projectmanager/qt4projectmanagerplugin.cpp b/src/plugins/qt4projectmanager/qt4projectmanagerplugin.cpp
index f678486b53f59263dc4d2649112f6fa59463b5aa..1015ea4989d9767f52ff73cff2af842ec0f3d385 100644
--- a/src/plugins/qt4projectmanager/qt4projectmanagerplugin.cpp
+++ b/src/plugins/qt4projectmanager/qt4projectmanagerplugin.cpp
@@ -52,6 +52,7 @@
 #include "qt-maemo/maemomanager.h"
 #include "qt-s60/s60manager.h"
 
+#include <coreplugin/uniqueidmanager.h>
 #include <coreplugin/icore.h>
 #include <extensionsystem/pluginmanager.h>
 #include <projectexplorer/buildmanager.h>
@@ -93,6 +94,7 @@ Qt4ProjectManagerPlugin::~Qt4ProjectManagerPlugin()
 bool Qt4ProjectManagerPlugin::initialize(const QStringList &arguments, QString *errorMessage)
 {
     Q_UNUSED(arguments)
+    m_projectContext = Core::Context(Qt4ProjectManager::Constants::PROJECT_ID);
 
     ProFileParser::initialize();
     ProFileEvaluator::initialize();
@@ -172,18 +174,17 @@ bool Qt4ProjectManagerPlugin::initialize(const QStringList &arguments, QString *
             am->actionContainer(ProjectExplorer::Constants::M_SUBPROJECTCONTEXT);
 
     //register actions
-    Core::Context context(Qt4ProjectManager::Constants::PROJECT_ID);
     Core::Command *command;
 
     QIcon qmakeIcon(QLatin1String(":/qt4projectmanager/images/run_qmake.png"));
     qmakeIcon.addFile(QLatin1String(":/qt4projectmanager/images/run_qmake_small.png"));
     m_runQMakeAction = new QAction(qmakeIcon, tr("Run qmake"), this);
-    command = am->registerAction(m_runQMakeAction, Constants::RUNQMAKE, context);
+    command = am->registerAction(m_runQMakeAction, Constants::RUNQMAKE, m_projectContext);
     mbuild->addAction(command, ProjectExplorer::Constants::G_BUILD_PROJECT);
     connect(m_runQMakeAction, SIGNAL(triggered()), m_qt4ProjectManager, SLOT(runQMake()));
 
     m_runQMakeActionContextMenu = new QAction(qmakeIcon, tr("Run qmake"), this);
-    command = am->registerAction(m_runQMakeActionContextMenu, Constants::RUNQMAKECONTEXTMENU, context);
+    command = am->registerAction(m_runQMakeActionContextMenu, Constants::RUNQMAKECONTEXTMENU, m_projectContext);
     command->setAttribute(Core::Command::CA_Hide);
     mproject->addAction(command, ProjectExplorer::Constants::G_PROJECT_BUILD);
     msubproject->addAction(command, ProjectExplorer::Constants::G_PROJECT_BUILD);
@@ -192,7 +193,7 @@ bool Qt4ProjectManagerPlugin::initialize(const QStringList &arguments, QString *
     QIcon buildIcon(ProjectExplorer::Constants::ICON_BUILD);
     buildIcon.addFile(ProjectExplorer::Constants::ICON_BUILD_SMALL);
     m_buildSubProjectContextMenu = new QAction(buildIcon, tr("Build"), this);
-    command = am->registerAction(m_buildSubProjectContextMenu, Constants::BUILDSUBDIR, context);
+    command = am->registerAction(m_buildSubProjectContextMenu, Constants::BUILDSUBDIR, m_projectContext);
     command->setAttribute(Core::Command::CA_Hide);
     msubproject->addAction(command, ProjectExplorer::Constants::G_PROJECT_BUILD);
     connect(m_buildSubProjectContextMenu, SIGNAL(triggered()), m_qt4ProjectManager, SLOT(buildSubDirContextMenu()));
@@ -200,7 +201,7 @@ bool Qt4ProjectManagerPlugin::initialize(const QStringList &arguments, QString *
     QIcon rebuildIcon(ProjectExplorer::Constants::ICON_REBUILD);
     rebuildIcon.addFile(ProjectExplorer::Constants::ICON_REBUILD_SMALL);
     m_rebuildSubProjectContextMenu = new QAction(rebuildIcon, tr("Rebuild"), this);
-    command = am->registerAction(m_rebuildSubProjectContextMenu, Constants::REBUILDSUBDIR, context);
+    command = am->registerAction(m_rebuildSubProjectContextMenu, Constants::REBUILDSUBDIR, m_projectContext);
     command->setAttribute(Core::Command::CA_Hide);
     msubproject->addAction(command, ProjectExplorer::Constants::G_PROJECT_BUILD);
     connect(m_rebuildSubProjectContextMenu, SIGNAL(triggered()), m_qt4ProjectManager, SLOT(rebuildSubDirContextMenu()));
@@ -208,7 +209,7 @@ bool Qt4ProjectManagerPlugin::initialize(const QStringList &arguments, QString *
     QIcon cleanIcon(ProjectExplorer::Constants::ICON_CLEAN);
     cleanIcon.addFile(ProjectExplorer::Constants::ICON_CLEAN_SMALL);
     m_cleanSubProjectContextMenu = new QAction(cleanIcon, tr("Clean"), this);
-    command = am->registerAction(m_cleanSubProjectContextMenu, Constants::CLEANSUBDIR, context);
+    command = am->registerAction(m_cleanSubProjectContextMenu, Constants::CLEANSUBDIR, m_projectContext);
     command->setAttribute(Core::Command::CA_Hide);
     msubproject->addAction(command, ProjectExplorer::Constants::G_PROJECT_BUILD);
     connect(m_cleanSubProjectContextMenu, SIGNAL(triggered()), m_qt4ProjectManager, SLOT(cleanSubDirContextMenu()));
diff --git a/src/plugins/qt4projectmanager/qt4projectmanagerplugin.h b/src/plugins/qt4projectmanager/qt4projectmanagerplugin.h
index fd1f96b856e81968f2bdba7f734567738af09cdd..ca95e37c939d3dd88674bc868a6bd7c47e757e1a 100644
--- a/src/plugins/qt4projectmanager/qt4projectmanagerplugin.h
+++ b/src/plugins/qt4projectmanager/qt4projectmanagerplugin.h
@@ -31,6 +31,7 @@
 #define QT4PROJECTMANAGERPLUGIN_H
 
 #include <extensionsystem/iplugin.h>
+#include <coreplugin/icontext.h>
 
 QT_BEGIN_NAMESPACE
 class QAction;
@@ -66,7 +67,7 @@ public:
     bool initialize(const QStringList &arguments, QString *error_message);
     void extensionsInitialized();
 
-    int projectContext() const { return m_projectContext; }
+    Core::Context projectContext() const { return m_projectContext; }
 
 private slots:
     void updateContextMenu(ProjectExplorer::Project *project,
@@ -92,7 +93,7 @@ private:
     QAction *m_rebuildSubProjectContextMenu;
     QAction *m_cleanSubProjectContextMenu;
     GettingStartedWelcomePage *m_welcomePage;
-    int m_projectContext;
+    Core::Context m_projectContext;
 };
 
 } // namespace Internal