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

Merge remote-tracking branch 'origin/3.5'

Browse Source 
Change-Id: I1ce0fa92e5c469d591d3030d1a4f168dcee232ba
This commit is contained in:
Eike Ziller
2015-08-06 11:36:29 +02:00
parent d567dfff73 053b2b649f
commit 37f6b4397d
34 changed files with 523 additions and 380 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/plugins/qbsprojectmanager/qbsproject.cpp
View File

@@ -858,6 +858,13 @@ void QbsProject::updateQmlJsCodeModel()
QmlJS::ModelManagerInterface::ProjectInfo projectInfo =
modelManager->defaultProjectInfoForProject(this);
foreach (const qbs::ProductData &product, m_projectData.allProducts()) {
static const QString propertyName = QLatin1String("qmlImportPaths");
foreach (const QString &path, product.properties().value(propertyName).toStringList()) {
projectInfo.importPaths.maybeInsert(Utils::FileName::fromString(path),
QmlJS::Dialect::Qml);
}
}
setProjectLanguage(ProjectExplorer::Constants::LANG_QMLJS, !projectInfo.sourceFiles.isEmpty());
modelManager->updateProjectInfo(projectInfo, this);