diff options
author | hjk <hjk@qt.io> | 2020-02-04 11:58:23 +0100 |
---|---|---|
committer | hjk <hjk@qt.io> | 2020-02-04 11:04:10 +0000 |
commit | 99da91fc567244325a4b98ba515875f1fd035a9d (patch) | |
tree | 78675d64aae258e0c81958231e3ea9699a75f621 /src/plugins/qmakeprojectmanager | |
parent | 37aecdd112e496c4f246aed87f6ffaee15f9d4f9 (diff) |
Qmake: Don't access never set QMakePriFile::m_buildSystem
Change-Id: I97e8f0c2b2e53a798bf2762324b4affab99fc938
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
Diffstat (limited to 'src/plugins/qmakeprojectmanager')
-rw-r--r-- | src/plugins/qmakeprojectmanager/qmakeparsernodes.cpp | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/src/plugins/qmakeprojectmanager/qmakeparsernodes.cpp b/src/plugins/qmakeprojectmanager/qmakeparsernodes.cpp index 4aec1f02049..bf9f3f7e5ca 100644 --- a/src/plugins/qmakeprojectmanager/qmakeparsernodes.cpp +++ b/src/plugins/qmakeprojectmanager/qmakeparsernodes.cpp @@ -411,8 +411,11 @@ void QmakePriFile::watchFolders(const QSet<FilePath> &folders) QSet<QString> toWatch = folderStrings; toWatch.subtract(m_watchedFolders); - m_buildSystem->unwatchFolders(Utils::toList(toUnwatch), this); - m_buildSystem->watchFolders(Utils::toList(toWatch), this); + if (m_buildSystem) { + // Check needed on early exit of QmakeProFile::applyEvaluate? + m_buildSystem->unwatchFolders(Utils::toList(toUnwatch), this); + m_buildSystem->watchFolders(Utils::toList(toWatch), this); + } m_watchedFolders = folderStrings; } |