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

CMake: Keep buildTargets private

Browse Source 
Nobody needs those, so do not export them.

Change-Id: Ia8866ea2a514855c029974645d9b3f3dbcaa14ed
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
This commit is contained in:
Tobias Hunger
2016-10-06 11:31:19 +02:00
parent 9b40c1fc04
commit d41e10a595
2 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/plugins/cmakeprojectmanager/cmakelocatorfilter.cpp
View File

@@ -64,9 +64,9 @@ void CMakeLocatorFilter::prepareSearch(const QString &entry)
CMakeProject *cmakeProject = qobject_cast<CMakeProject *>(p); CMakeProject *cmakeProject = qobject_cast<CMakeProject *>(p);
if (!cmakeProject) if (!cmakeProject)
continue; continue;
foreach (const CMakeBuildTarget &ct, cmakeProject->buildTargets()) { foreach (const QString &title, cmakeProject->buildTargetTitles()) {
if (ct.title.contains(entry)) { if (title.contains(entry)) {
Core::LocatorFilterEntry entry(this, ct.title, cmakeProject->projectFilePath().toString()); Core::LocatorFilterEntry entry(this, title, cmakeProject->projectFilePath().toString());
entry.extraInfo = FileUtils::shortNativePath(cmakeProject->projectFilePath()); entry.extraInfo = FileUtils::shortNativePath(cmakeProject->projectFilePath());
m_result.append(entry); m_result.append(entry);
} }

3
src/plugins/cmakeprojectmanager/cmakeproject.h
View File

@@ -88,7 +88,6 @@ public:
QStringList files(FilesMode fileMode) const final; QStringList files(FilesMode fileMode) const final;
QStringList buildTargetTitles(bool runnable = false) const; QStringList buildTargetTitles(bool runnable = false) const;
QList<CMakeBuildTarget> buildTargets() const;
bool hasBuildTarget(const QString &title) const; bool hasBuildTarget(const QString &title) const;
CMakeBuildTarget buildTargetForTitle(const QString &title); CMakeBuildTarget buildTargetForTitle(const QString &title);
@@ -110,6 +109,8 @@ protected:
bool setupTarget(ProjectExplorer::Target *t) final; bool setupTarget(ProjectExplorer::Target *t) final;
private: private:
QList<CMakeBuildTarget> buildTargets() const;
void handleActiveTargetChanged(); void handleActiveTargetChanged();
void handleActiveBuildConfigurationChanged(); void handleActiveBuildConfigurationChanged();
void handleParsingStarted(); void handleParsingStarted();