Started merging the JS and QML editor plug-ins.

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

View File

@@ -44,7 +44,7 @@
#include <texteditor/texteditoractionhandler.h>
#include <projectexplorer/taskwindow.h>
#include <qmleditor/qmlmodelmanagerinterface.h>
#include <qmljseditor/qmlmodelmanagerinterface.h>
#include <QtCore/QtPlugin>
@@ -98,7 +98,7 @@ void QmlProjectPlugin::extensionsInitialized()
ProjectExplorer::TaskWindow *taskWindow = pluginManager->getObject<ProjectExplorer::TaskWindow>();
m_qmlTaskManager->setTaskWindow(taskWindow);
QmlEditor::QmlModelManagerInterface *modelManager = pluginManager->getObject<QmlEditor::QmlModelManagerInterface>();
QmlJSEditor::QmlModelManagerInterface *modelManager = pluginManager->getObject<QmlJSEditor::QmlModelManagerInterface>();
Q_ASSERT(modelManager);
connect(modelManager, SIGNAL(documentUpdated(Qml::QmlDocument::Ptr)),
m_qmlTaskManager, SLOT(documentUpdated(Qml::QmlDocument::Ptr)));