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

KitManager: Get rid of KitMatcher class

Browse Source 
Use std::function instead. Clean up API while at it.

Change-Id: I6e401ab57f5375e36710c30508c596af3f4b3385
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
This commit is contained in:
Tobias Hunger
2017-01-11 17:25:58 +01:00
parent 1d4bf8c157
commit 25fbcca96b
28 changed files with 126 additions and 157 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/plugins/qmakeprojectmanager/qmakeproject.cpp
View File

@@ -262,7 +262,7 @@ QmakeProject::QmakeProject(QmakeManager *manager, const QString &fileName) :
setDocument(new QmakeProjectFile(fileName));
setProjectContext(Core::Context(QmakeProjectManager::Constants::PROJECT_ID));
setProjectLanguages(Core::Context(ProjectExplorer::Constants::LANG_CXX));
setRequiredKitMatcher(QtSupport::QtKitInformation::qtVersionMatcher());
setRequiredKitPredicate(QtSupport::QtKitInformation::qtVersionPredicate());
const QTextCodec *codec = Core::EditorManager::defaultTextCodec();
m_qmakeVfs->setTextCodec(codec);
@@ -276,9 +276,7 @@ QmakeProject::QmakeProject(QmakeManager *manager, const QString &fileName) :
connect(BuildManager::instance(), &BuildManager::buildQueueFinished,
this, &QmakeProject::buildFinished);
setPreferredKitMatcher(KitMatcher([this](const Kit *kit) -> bool {
return matchesKit(kit);
}));
setPreferredKitPredicate([this](const Kit *kit) -> bool { return matchesKit(kit); });
}
QmakeProject::~QmakeProject()