forked from qt-creator/qt-creator
		
	Renamed classes and files to use the QmlJS prefix.
This commit is contained in:
		@@ -100,8 +100,8 @@ void QmlProjectPlugin::extensionsInitialized()
 | 
			
		||||
 | 
			
		||||
    QmlJSEditor::QmlModelManagerInterface *modelManager = pluginManager->getObject<QmlJSEditor::QmlModelManagerInterface>();
 | 
			
		||||
    Q_ASSERT(modelManager);
 | 
			
		||||
    connect(modelManager, SIGNAL(documentUpdated(Qml::QmlDocument::Ptr)),
 | 
			
		||||
            m_qmlTaskManager, SLOT(documentUpdated(Qml::QmlDocument::Ptr)));
 | 
			
		||||
    connect(modelManager, SIGNAL(documentUpdated(QmlJS::Document::Ptr)),
 | 
			
		||||
            m_qmlTaskManager, SLOT(documentUpdated(QmlJS::Document::Ptr)));
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
Q_EXPORT_PLUGIN(QmlProjectPlugin)
 | 
			
		||||
 
 | 
			
		||||
@@ -48,7 +48,7 @@ void QmlTaskManager::setTaskWindow(ProjectExplorer::TaskWindow *taskWindow)
 | 
			
		||||
    m_taskWindow->addCategory(Constants::TASK_CATEGORY_QML, "Qml");
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
void QmlTaskManager::documentUpdated(Qml::QmlDocument::Ptr doc)
 | 
			
		||||
void QmlTaskManager::documentUpdated(QmlJS::Document::Ptr doc)
 | 
			
		||||
{
 | 
			
		||||
#if 0 // This will give way too many flickering errors in the build-results pane *when you're typing*
 | 
			
		||||
    m_taskWindow->clearTasks(Constants::TASK_CATEGORY_QML);
 | 
			
		||||
 
 | 
			
		||||
@@ -31,7 +31,7 @@
 | 
			
		||||
#define QMLTASKMANAGER_H
 | 
			
		||||
 | 
			
		||||
#include <projectexplorer/taskwindow.h>
 | 
			
		||||
#include <qmljs/qmldocument.h>
 | 
			
		||||
#include <qmljs/qmljsdocument.h>
 | 
			
		||||
 | 
			
		||||
#include <QtCore/QObject>
 | 
			
		||||
 | 
			
		||||
@@ -46,7 +46,7 @@ public:
 | 
			
		||||
    void setTaskWindow(ProjectExplorer::TaskWindow *taskWindow);
 | 
			
		||||
 | 
			
		||||
public slots:
 | 
			
		||||
    void documentUpdated(Qml::QmlDocument::Ptr doc);
 | 
			
		||||
    void documentUpdated(QmlJS::Document::Ptr doc);
 | 
			
		||||
 | 
			
		||||
private:
 | 
			
		||||
    ProjectExplorer::TaskWindow *m_taskWindow;
 | 
			
		||||
 
 | 
			
		||||
		Reference in New Issue
	
	Block a user