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

Merge remote-tracking branch 'origin/qds-1.59' into 4.13

Browse Source 
Change-Id: Ic720f3adab305c5ef8cd10e713ccabf510eff0c0
This commit is contained in:
Tim Jenssen
2020-08-13 08:34:24 +02:00
parent 24ca17f714 dc870f538d
commit 4fe5b923cd
93 changed files with 3704 additions and 1066 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/plugins/qmlprojectmanager/qmlproject.cpp
View File

@@ -372,7 +372,7 @@ void QmlBuildSystem::generateProjectTree()
auto newRoot = std::make_unique<QmlProjectNode>(project());
for (const QString &f : m_projectItem.data()->files()) {
for (const QString &f : m_projectItem->files()) {
const Utils::FilePath fileName = Utils::FilePath::fromString(f);
const FileType fileType = (fileName == projectFilePath())
? FileType::Project : FileNode::fileTypeForFileName(fileName);