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

Merge remote-tracking branch 'origin/4.10'

Browse Source 
Change-Id: Iaf27911e4e9fb762c1a24c84c458462bafe95728
This commit is contained in:
Tim Jenssen
2019-07-12 15:53:56 +02:00
parent f7520b7d99 51cd2885ef
commit 333b33edbe
126 changed files with 9456 additions and 6532 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/plugins/genericprojectmanager/genericproject.cpp
View File

@@ -291,7 +291,7 @@ bool GenericProject::addFiles(const QStringList &filePaths)
for (const QString &filePath : filePaths)
insertSorted(&newList, baseDir.relativeFilePath(filePath));
const QSet<QString> includes = m_projectIncludePaths.toSet();
const QSet<QString> includes = Utils::toSet(m_projectIncludePaths);
QSet<QString> toAdd;
for (const QString &filePath : filePaths) {