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

Merge remote-tracking branch 'origin/4.9'

Browse Source 
Conflicts:
	doc/src/howto/creator-sidebar-views.qdoc
	doc/src/howto/creator-ui.qdoc
	qbs/modules/qtc/qtc.qbs
	qtcreator.pri
	src/plugins/autotest/testresultmodel.cpp
	src/plugins/autotest/testresultmodel.h

Change-Id: I24cc585ca7782cb1d9cb0b8b73b46892b41937fd
This commit is contained in:
Eike Ziller
2019-05-08 12:41:25 +02:00
parent d0839bc1de 75e408584a
commit 4545c81e57
108 changed files with 1536 additions and 737 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1624,25 +1624,38 @@ void QmakeProFile::applyEvaluate(QmakeEvalResult *evalResult)
m_wildcardWatcher = std::make_unique<Utils::FileSystemWatcher>();
QObject::connect(
m_wildcardWatcher.get(), &Utils::FileSystemWatcher::directoryChanged,
[this]() {
scheduleUpdate();
[this](QString path) {
QStringList directoryContents = QDir(path).entryList();
if (m_wildcardDirectoryContents.value(path) != directoryContents) {
m_wildcardDirectoryContents.insert(path, directoryContents);
scheduleUpdate();
}
});
}
m_wildcardWatcher->addDirectories(
Utils::filtered<QStringList>(result->directoriesWithWildcards.toList(),
[this](const QString &path) {
return !m_wildcardWatcher->watchesDirectory(path);
}), Utils::FileSystemWatcher::WatchModifiedDate);
const QStringList directoriesToAdd = Utils::filtered<QStringList>(
result->directoriesWithWildcards.toList(),
[this](const QString &path) {
return !m_wildcardWatcher->watchesDirectory(path);
});
for (QString path : directoriesToAdd)
m_wildcardDirectoryContents.insert(path, QDir(path).entryList());
m_wildcardWatcher->addDirectories(directoriesToAdd,
Utils::FileSystemWatcher::WatchModifiedDate);
}
if (m_wildcardWatcher) {
if (result->directoriesWithWildcards.isEmpty()) {
m_wildcardWatcher.reset();
m_wildcardDirectoryContents.clear();
} else {
m_wildcardWatcher->removeDirectories(
Utils::filtered<QStringList>(m_wildcardWatcher->directories(),
const QStringList directoriesToRemove =
Utils::filtered<QStringList>(
m_wildcardWatcher->directories(),
[&result](const QString &path) {
return !result->directoriesWithWildcards.contains(path);
}));
});
m_wildcardWatcher->removeDirectories(directoriesToRemove);
for (QString path : directoriesToRemove)
m_wildcardDirectoryContents.remove(path);
}
}