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

2
src/plugins/qmlprojectmanager/QmlProjectManager.pluginspec
View File

@@ -15,7 +15,7 @@ Alternatively, this plugin may be used under the terms of the GNU Lesser General
<dependencyList>
<dependency name="ProjectExplorer" version="1.3.80"/>
<dependency name="TextEditor" version="1.3.80"/>
<dependency name="QmlEditor" version="1.3.80"/>
<dependency name="QmlJSEditor" version="1.3.80"/>
<dependency name="Help" version="1.3.80"/>
</dependencyList>
</plugin>

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();

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

@@ -42,7 +42,7 @@
#include <QtCore/QDir>
namespace QmlEditor {
namespace QmlJSEditor {
class QmlModelManagerInterface;
}
@@ -194,7 +194,7 @@ private:
QString m_filesFileName;
Internal::QmlProjectFile *m_file;
QString m_projectName;
QmlEditor::QmlModelManagerInterface *m_modelManager;
QmlJSEditor::QmlModelManagerInterface *m_modelManager;
QStringList m_files;

2
src/plugins/qmlprojectmanager/qmlprojectmanager_dependencies.pri
View File

@@ -1,3 +1,3 @@
include(../../plugins/projectexplorer/projectexplorer.pri)
include(../../plugins/texteditor/texteditor.pri)
include(../../plugins/qmleditor/qmleditor.pri)
include(../../plugins/qmljseditor/qmljseditor.pri)

4
src/plugins/qmlprojectmanager/qmlprojectplugin.cpp
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)));