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

Merge remote-tracking branch 'origin/3.1'

Browse Source 
Conflicts:
	src/plugins/clangcodemodel/test/clangcompletion_test.cpp
	src/plugins/cmakeprojectmanager/cmakeopenprojectwizard.cpp
	src/plugins/projectexplorer/projectexplorer.pro
	src/plugins/qmldesigner/designercore/instances/nodeinstanceserverproxy.cpp
	src/plugins/vcsbase/vcsplugin.cpp
	src/shared/qbs

Change-Id: I9e5882be79ac5e8c7dfab4a57f16509d7569636a
This commit is contained in:
Eike Ziller
2014-05-16 16:54:50 +02:00
parent d46a73eacf 1398480f3a
commit 6d1cc58697
64 changed files with 1227 additions and 236 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/plugins/qmljseditor/qmljseditor.cpp
View File

@@ -139,6 +139,8 @@ void QmlJSTextEditorWidget::ctor()
m_modelManager = QmlJS::ModelManagerInterface::instance();
m_contextPane = ExtensionSystem::PluginManager::getObject<QmlJS::IContextPane>();
m_modelManager->activateScan();
m_contextPaneTimer = new QTimer(this);
m_contextPaneTimer->setInterval(UPDATE_OUTLINE_INTERVAL);
m_contextPaneTimer->setSingleShot(true);

2
src/plugins/qmljseditor/qmljseditordocument.cpp
View File

@@ -449,6 +449,8 @@ QmlJSEditorDocumentPrivate::QmlJSEditorDocumentPrivate(QmlJSEditorDocument *pare
m_updateOutlineModelTimer.setInterval(UPDATE_OUTLINE_INTERVAL);
m_updateOutlineModelTimer.setSingleShot(true);
connect(&m_updateOutlineModelTimer, SIGNAL(timeout()), this, SLOT(updateOutlineModel()));
modelManager->updateSourceFiles(QStringList(parent->filePath()), false);
}
QmlJSEditorDocumentPrivate::~QmlJSEditorDocumentPrivate()