aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChristian Kandeler <christian.kandeler@qt.io>2019-03-14 13:27:28 +0100
committerChristian Kandeler <christian.kandeler@qt.io>2019-03-25 17:38:56 +0000
commit47d159273e818dabec8dcb20c9e3cb62cad02bfc (patch)
treee4c4704eeda1526c245a776dcc42b3175b99f752
parent9c596080b769908e387b5aeb926b95f97340d3d4 (diff)
Qmake: Fix infinite reparsing loop
Under certain circumstances, the file system watcher in the qmake project parser keeps emitting the directoryChanged() signal even though there seem to be no changes on the file system. Make sure we reparse only if the directory timestamp has really changed. This amends 76262814b6. Change-Id: Ibdcd1e8405a49e78528bf5903e7caafc371cad1b Reviewed-by: Eike Ziller <eike.ziller@qt.io>
-rw-r--r--src/plugins/qmakeprojectmanager/qmakeparsernodes.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/plugins/qmakeprojectmanager/qmakeparsernodes.cpp b/src/plugins/qmakeprojectmanager/qmakeparsernodes.cpp
index 1a401ee953..671cd5bfec 100644
--- a/src/plugins/qmakeprojectmanager/qmakeparsernodes.cpp
+++ b/src/plugins/qmakeprojectmanager/qmakeparsernodes.cpp
@@ -1631,7 +1631,7 @@ void QmakeProFile::applyEvaluate(QmakeEvalResult *evalResult)
Utils::filtered<QStringList>(result->directoriesWithWildcards.toList(),
[this](const QString &path) {
return !m_wildcardWatcher->watchesDirectory(path);
- }), Utils::FileSystemWatcher::WatchAllChanges);
+ }), Utils::FileSystemWatcher::WatchModifiedDate);
}
if (m_wildcardWatcher) {
if (result->directoriesWithWildcards.isEmpty()) {