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

QmlJsTools: Use the startup project for context in the code model

Browse Source 
ProjectTree::currentProject is not the right project to track.

Change-Id: Ia9da32a24e73565c4b9a3739c4000c13b803375f
Reviewed-by: Fawzi Mohamed <fawzi.mohamed@theqtcompany.com>
This commit is contained in:
Tobias Hunger
2015-01-12 14:04:27 +01:00
parent 31032ffbbe
commit 87faa62fa0
3 changed files with 8 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/plugins/projectexplorer/currentprojectfilter.cpp
View File

@@ -51,6 +51,8 @@ CurrentProjectFilter::CurrentProjectFilter()
connect(ProjectTree::instance(), &ProjectTree::currentProjectChanged, connect(ProjectTree::instance(), &ProjectTree::currentProjectChanged,
this, &CurrentProjectFilter::currentProjectChanged); this, &CurrentProjectFilter::currentProjectChanged);
connect(SessionManager::instance(), &SessionManager::startupProjectChanged,
this, &CurrentProjectFilter::currentProjectChanged);
} }
void CurrentProjectFilter::markFilesAsOutOfDate() void CurrentProjectFilter::markFilesAsOutOfDate()

2
src/plugins/projectexplorer/currentprojectfind.cpp
View File

@@ -48,6 +48,8 @@ CurrentProjectFind::CurrentProjectFind()
{ {
connect(ProjectTree::instance(), &ProjectTree::currentProjectChanged, connect(ProjectTree::instance(), &ProjectTree::currentProjectChanged,
this, &CurrentProjectFind::handleProjectChanged); this, &CurrentProjectFind::handleProjectChanged);
connect(SessionManager::instance(), &SessionManager::startupProjectChanged,
this, &CurrentProjectFind::handleProjectChanged);
connect(SessionManager::instance(), SIGNAL(projectRemoved(ProjectExplorer::Project*)), connect(SessionManager::instance(), SIGNAL(projectRemoved(ProjectExplorer::Project*)),
this, SLOT(handleProjectChanged())); this, SLOT(handleProjectChanged()));
connect(SessionManager::instance(), SIGNAL(projectAdded(ProjectExplorer::Project*)), connect(SessionManager::instance(), SIGNAL(projectAdded(ProjectExplorer::Project*)),

8
src/plugins/qmljstools/qmljsmodelmanager.cpp
View File

@@ -223,9 +223,9 @@ void ModelManager::delayedInitialization()
this, SLOT(maybeQueueCppQmlTypeUpdate(CPlusPlus::Document::Ptr)), Qt::DirectConnection); this, SLOT(maybeQueueCppQmlTypeUpdate(CPlusPlus::Document::Ptr)), Qt::DirectConnection);
} }
connect(ProjectExplorer::SessionManager::instance(), SIGNAL(projectRemoved(ProjectExplorer::Project*)), connect(ProjectExplorer::SessionManager::instance(), &ProjectExplorer::SessionManager::projectRemoved,
this, SLOT(removeProjectInfo(ProjectExplorer::Project*))); this, &ModelManager::removeProjectInfo);
connect(ProjectExplorer::ProjectTree::instance(), &ProjectExplorer::ProjectTree::currentProjectChanged, connect(ProjectExplorer::SessionManager::instance(), &ProjectExplorer::SessionManager::startupProjectChanged,
this, &ModelManager::updateDefaultProjectInfo); this, &ModelManager::updateDefaultProjectInfo);
QmlJS::ViewerContext qbsVContext; QmlJS::ViewerContext qbsVContext;
@@ -265,7 +265,7 @@ ModelManagerInterface::WorkingCopy ModelManager::workingCopyInternal() const
void ModelManager::updateDefaultProjectInfo() void ModelManager::updateDefaultProjectInfo()
{ {
// needs to be performed in the ui thread // needs to be performed in the ui thread
ProjectExplorer::Project *currentProject = ProjectExplorer::ProjectTree::currentProject(); ProjectExplorer::Project *currentProject = ProjectExplorer::SessionManager::startupProject();
ProjectInfo newDefaultProjectInfo = projectInfo(currentProject, ProjectInfo newDefaultProjectInfo = projectInfo(currentProject,
defaultProjectInfoForProject(currentProject)); defaultProjectInfoForProject(currentProject));
setDefaultProject(projectInfo(currentProject,newDefaultProjectInfo), currentProject); setDefaultProject(projectInfo(currentProject,newDefaultProjectInfo), currentProject);