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

8
src/plugins/qmakeprojectmanager/qmakeparsernodes.cpp
View File

@@ -385,8 +385,8 @@ void QmakePriFile::watchFolders(const QSet<FilePath> &folders)
QSet<QString> toWatch = folderStrings;
toWatch.subtract(m_watchedFolders);
m_project->unwatchFolders(toUnwatch.toList(), this);
m_project->watchFolders(toWatch.toList(), this);
m_project->unwatchFolders(Utils::toList(toUnwatch), this);
m_project->watchFolders(Utils::toList(toWatch), this);
m_watchedFolders = folderStrings;
}
@@ -1366,7 +1366,7 @@ QmakeEvalResult *QmakeProFile::evaluate(const QmakeEvalInput &input)
result->includedFiles.children.insert(subDirName, subDir);
}
result->exactSubdirs = subDirs.toSet();
result->exactSubdirs = Utils::toSet(subDirs);
}
// Convert ProFileReader::includeFiles to IncludedPriFile structure
@@ -1691,7 +1691,7 @@ void QmakeProFile::applyEvaluate(QmakeEvalResult *evalResult)
});
}
const QStringList directoriesToAdd = Utils::filtered<QStringList>(
result->directoriesWithWildcards.toList(),
Utils::toList(result->directoriesWithWildcards),
[this](const QString &path) {
return !m_wildcardWatcher->watchesDirectory(path);
});