feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Make project context a Core::Context

Browse Source 
Also properly initialize m_projectContext in Qt4Manager, fixing the
disabled "Run QMake" action
This commit is contained in:
dt
2010-07-02 13:43:41 +02:00
parent 6ef602d121
commit 0801047287
11 changed files with 26 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/plugins/cmakeprojectmanager/cmakeprojectmanager.cpp
View File

@@ -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;
}

4
src/plugins/cmakeprojectmanager/cmakeprojectmanager.h
View File

@@ -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;
};