aboutsummaryrefslogtreecommitdiffstats
path: root/src/plugins/cmakeprojectmanager/tealeafreader.h
diff options
context:
space:
mode:
authorTobias Hunger <[email protected]>2017-09-28 11:32:39 +0200
committerTobias Hunger <[email protected]>2017-10-06 09:53:40 +0000
commit02533e61cf617157257e048fc79812c4fb880f35 (patch)
tree95aa2e90746adb1ed1089423cf49e7ea9b514877 /src/plugins/cmakeprojectmanager/tealeafreader.h
parent1fa26bd9b3dd5269dc44a000cd525e26e6904328 (diff)
CMake: Fix project parsing notification
This builds on top of 08677c0b014cc44d944e32d462f502a67c948404 and fixes one more code path to go through a common entry/exit point. Change-Id: I1d00fa9242f247028e5d3b0ef3b5fe1d3f4cb03d Reviewed-by: hjk <[email protected]> Reviewed-by: Tim Jenssen <[email protected]>
Diffstat (limited to 'src/plugins/cmakeprojectmanager/tealeafreader.h')
-rw-r--r--src/plugins/cmakeprojectmanager/tealeafreader.h9
1 files changed, 3 insertions, 6 deletions
diff --git a/src/plugins/cmakeprojectmanager/tealeafreader.h b/src/plugins/cmakeprojectmanager/tealeafreader.h
index 9853a1b0a2b..2e699aecf16 100644
--- a/src/plugins/cmakeprojectmanager/tealeafreader.h
+++ b/src/plugins/cmakeprojectmanager/tealeafreader.h
@@ -46,15 +46,14 @@ public:
TeaLeafReader();
~TeaLeafReader() final;
- bool isCompatible(const Parameters &p) final;
+ bool isCompatible(const BuildDirParameters &p) final;
void resetData() final;
- void parse(bool force) final;
+ void parse(bool forceConfiguration) final;
void stop() final;
bool isParsing() const final;
- bool hasData() const final;
- QList<CMakeBuildTarget> buildTargets() const final;
+ QList<CMakeBuildTarget> takeBuildTargets() final;
CMakeConfig takeParsedConfiguration() final;
void generateProjectTree(CMakeProjectNode *root,
const QList<const ProjectExplorer::FileNode *> &allFiles) final;
@@ -80,8 +79,6 @@ private:
ProjectExplorer::IOutputParser *m_parser = nullptr;
QFutureInterface<void> *m_future = nullptr;
- bool m_hasData = false;
-
QSet<Utils::FileName> m_cmakeFiles;
QString m_projectName;
QList<CMakeBuildTarget> m_buildTargets;