diff options
| author | Tobias Hunger <[email protected]> | 2016-12-01 15:25:32 +0100 |
|---|---|---|
| committer | Tobias Hunger <[email protected]> | 2016-12-02 12:00:09 +0000 |
| commit | 63c0fbc4e407e1829a5e3eb0418f103b269367bf (patch) | |
| tree | 97f1a088657cec261235504a09a659ce3c2f5476 /src/plugins/cmakeprojectmanager/tealeafreader.h | |
| parent | 5a88e4c9ad57c024253602ed9b9d6588808bbb47 (diff) | |
CMake: Cache cmake configuration only once
This fixes saves memory and fixes some update issues with the cmake
configuration, where the three layers of caches used to interfere
with each other.
Task-number: QTCREATORBUG-17360
Change-Id: I5564bbe46ca8de6b38dd710100bfc18fad98eac5
Reviewed-by: Tim Jenssen <[email protected]>
Diffstat (limited to 'src/plugins/cmakeprojectmanager/tealeafreader.h')
| -rw-r--r-- | src/plugins/cmakeprojectmanager/tealeafreader.h | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/src/plugins/cmakeprojectmanager/tealeafreader.h b/src/plugins/cmakeprojectmanager/tealeafreader.h index 7451de7ed9b..5c09e577995 100644 --- a/src/plugins/cmakeprojectmanager/tealeafreader.h +++ b/src/plugins/cmakeprojectmanager/tealeafreader.h @@ -55,7 +55,7 @@ public: bool hasData() const final; QList<CMakeBuildTarget> buildTargets() const final; - CMakeConfig parsedConfiguration() const final; + CMakeConfig takeParsedConfiguration() final; void generateProjectTree(CMakeListsNode *root, const QList<ProjectExplorer::FileNode *> &allFiles) final; QSet<Core::Id> updateCodeModel(CppTools::ProjectPartBuilder &ppBuilder) final; @@ -82,7 +82,6 @@ private: bool m_hasData = false; - mutable CMakeConfig m_cmakeCache; QSet<Utils::FileName> m_cmakeFiles; QString m_projectName; QList<CMakeBuildTarget> m_buildTargets; |