summaryrefslogtreecommitdiff
path: root/src/plugins/cmakeprojectmanager/cmakeproject.h
diff options
context:
space:
mode:
authorcon <qtc-committer@nokia.com>2009-09-30 18:36:31 +0200
committercon <qtc-committer@nokia.com>2009-10-01 10:05:06 +0200
commit5f9cb8fe14cbadb2fa3a3f274377a0f417d35661 (patch)
treecdc879c54457b63ebe2cc269ad073370140ca0a8 /src/plugins/cmakeprojectmanager/cmakeproject.h
parentc22923c47c73897bd6ce9f9555830526d3776baf (diff)
downloadqt-creator-5f9cb8fe14cbadb2fa3a3f274377a0f417d35661.tar.gz
Results of review.
Diffstat (limited to 'src/plugins/cmakeprojectmanager/cmakeproject.h')
-rw-r--r--src/plugins/cmakeprojectmanager/cmakeproject.h4
1 files changed, 3 insertions, 1 deletions
diff --git a/src/plugins/cmakeprojectmanager/cmakeproject.h b/src/plugins/cmakeprojectmanager/cmakeproject.h
index b34c870f78..df456ca8f5 100644
--- a/src/plugins/cmakeprojectmanager/cmakeproject.h
+++ b/src/plugins/cmakeprojectmanager/cmakeproject.h
@@ -122,7 +122,6 @@ public:
ProjectExplorer::ToolChain::ToolChainType toolChainType() const;
ProjectExplorer::ToolChain *toolChain(ProjectExplorer::BuildConfiguration *configuration) const;
- bool parseCMakeLists();
protected:
virtual void saveSettingsImpl(ProjectExplorer::PersistentSettingsWriter &writer);
virtual bool restoreSettingsImpl(ProjectExplorer::PersistentSettingsReader &reader);
@@ -135,6 +134,7 @@ private slots:
void slotActiveBuildConfiguration();
private:
+ bool parseCMakeLists();
void updateToolChain(const QString &compiler);
void buildTree(CMakeProjectNode *rootNode, QList<ProjectExplorer::FileNode *> list);
@@ -155,6 +155,8 @@ private:
ProjectExplorer::FileWatcher *m_watcher;
bool m_insideFileChanged;
QSet<QString> m_watchedFiles;
+
+ friend class CMakeBuildConfigurationFactory; // for parseCMakeLists
};
class CMakeCbpParser : public QXmlStreamReader