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

Started merging the JS and QML editor plug-ins.

Browse Source
This commit is contained in:
Erik Verbruggen
2010-01-15 17:20:03 +01:00
parent 898e84ceff
commit 96e31c2a0f
81 changed files with 243 additions and 11009 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/plugins/qmlprojectmanager/qmlproject.cpp
View File

@@ -41,7 +41,7 @@
#include <coreplugin/editormanager/ieditor.h>
#include <coreplugin/modemanager.h>
#include <qmleditor/qmlmodelmanagerinterface.h>
#include <qmljseditor/qmlmodelmanagerinterface.h>
#include <utils/synchronousprocess.h>
@@ -71,7 +71,7 @@ using namespace ProjectExplorer;
QmlProject::QmlProject(Manager *manager, const QString &fileName)
: m_manager(manager),
m_fileName(fileName),
m_modelManager(ExtensionSystem::PluginManager::instance()->getObject<QmlEditor::QmlModelManagerInterface>())
m_modelManager(ExtensionSystem::PluginManager::instance()->getObject<QmlJSEditor::QmlModelManagerInterface>())
{
QFileInfo fileInfo(m_fileName);
m_projectName = fileInfo.completeBaseName();