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

Revert "Remove the QmlJSEditor dependency from Qt4ProjectManager."

Browse Source 
This reverts commit f8c5001382.
This commit is contained in:
dt
2010-09-27 11:16:43 +01:00
parent 699ff22851
commit 299f139553
8 changed files with 9 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/plugins/qt4projectmanager/qt4project.cpp
View File

@@ -567,17 +567,11 @@ void Qt4Project::updateCppCodeModel()
void Qt4Project::updateQmlJSCodeModel()
{
QObject *modelManager =
ExtensionSystem::PluginManager::instance()->getObjectByName(QmlJS::MODELMANAGERINTERFACE_OBJECTNAME);
QmlJS::ModelManagerInterface *modelManager = QmlJS::ModelManagerInterface::instance();
if (!modelManager)
return;
QmlJS::ModelManagerInterface::ProjectInfo projectInfo;
bool success = QMetaObject::invokeMethod(
modelManager, "projectInfo", Qt::DirectConnection,
Q_RETURN_ARG(QmlJS::ModelManagerInterface::ProjectInfo, projectInfo),
Q_ARG(ProjectExplorer::Project *, this));
QTC_ASSERT(success, return);
QmlJS::ModelManagerInterface::ProjectInfo projectInfo = modelManager->projectInfo(this);
// Not essential since the QmlJS engine parses required files on demand.
//projectInfo.sourceFiles = ...
@@ -590,10 +584,7 @@ void Qt4Project::updateQmlJSCodeModel()
}
projectInfo.importPaths.removeDuplicates();
success = QMetaObject::invokeMethod(
modelManager, "updateProjectInfo", Qt::DirectConnection,
Q_ARG(QmlJS::ModelManagerInterface::ProjectInfo, projectInfo));
QTC_ASSERT(success, return);
modelManager->updateProjectInfo(projectInfo);
}
void Qt4Project::qtVersionsChanged()