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

Qmake: Don't access never set QMakePriFile::m_buildSystem

Browse Source 
Change-Id: I97e8f0c2b2e53a798bf2762324b4affab99fc938
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
This commit is contained in:
hjk
2020-02-04 11:58:23 +01:00
parent 37aecdd112
commit 99da91fc56
1 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -411,8 +411,11 @@ void QmakePriFile::watchFolders(const QSet<FilePath> &folders)
QSet<QString> toWatch = folderStrings; QSet<QString> toWatch = folderStrings;
toWatch.subtract(m_watchedFolders); toWatch.subtract(m_watchedFolders);
if (m_buildSystem) {
// Check needed on early exit of QmakeProFile::applyEvaluate?
m_buildSystem->unwatchFolders(Utils::toList(toUnwatch), this); m_buildSystem->unwatchFolders(Utils::toList(toUnwatch), this);
m_buildSystem->watchFolders(Utils::toList(toWatch), this); m_buildSystem->watchFolders(Utils::toList(toWatch), this);
}
m_watchedFolders = folderStrings; m_watchedFolders = folderStrings;
} }