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

Merge remote-tracking branch 'origin/4.3'

Browse Source 
Change-Id: I4a21e9a9f4c5c2f96ad03ee6ea65afcd0ca511f9
This commit is contained in:
Orgad Shaneh
2017-03-20 17:50:08 +02:00
parent 08ad07baf1 da30b1d9dc
commit 4f66adb9a2
212 changed files with 646 additions and 1021 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/plugins/qmljstools/qmljstoolsplugin.cpp
View File

@@ -72,12 +72,12 @@ bool QmlJSToolsPlugin::initialize(const QStringList &arguments, QString *error)
// Objects
m_modelManager = new ModelManager(this);
// VCSManager *vcsManager = core->vcsManager();
// DocumentManager *fileManager = core->fileManager();
// connect(vcsManager, SIGNAL(repositoryChanged(QString)),
// m_modelManager, SLOT(updateModifiedSourceFiles()));
// connect(fileManager, SIGNAL(filesChangedInternally(QStringList)),
// m_modelManager, SLOT(updateSourceFiles(QStringList)));
// Core::VcsManager *vcsManager = Core::VcsManager::instance();
// Core::DocumentManager *documentManager = Core::DocumentManager::instance();
// connect(vcsManager, &Core::VcsManager::repositoryChanged,
// m_modelManager, &ModelManager::updateModifiedSourceFiles);
// connect(documentManager, &DocumentManager::filesChangedInternally,
// m_modelManager, &ModelManager::updateSourceFiles);
LocatorData *locatorData = new LocatorData;
addAutoReleasedObject(locatorData);