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/qmlprojectmanager/qmlproject.cpp
View File

@@ -339,8 +339,8 @@ Project::RestoreResult QmlProject::fromMap(const QVariantMap &map, QString *erro
if (!activeTarget()) {
// find a kit that matches prerequisites (prefer default one)
QList<Kit*> kits = KitManager::matchingKits(
KitMatcher(std::function<bool(const Kit *)>([this](const Kit *k) -> bool {
QList<Kit*> kits = KitManager::kits(
std::function<bool(const Kit *)>([this](const Kit *k) -> bool {
if (!k->isValid())
return false;
@@ -369,7 +369,7 @@ Project::RestoreResult QmlProject::fromMap(const QVariantMap &map, QString *erro
}
return version->qtVersion() >= minVersion && hasViewer;
})));
}));
if (!kits.isEmpty()) {
Kit *kit = 0;