diff options
| author | Tobias Hunger <tobias.hunger@qt.io> | 2017-01-11 17:25:58 +0100 |
|---|---|---|
| committer | Tobias Hunger <tobias.hunger@qt.io> | 2017-01-18 10:39:16 +0000 |
| commit | 25fbcca96b3254f3ca78dd349c356d9dd5176a52 (patch) | |
| tree | 696cccb1ccbd96a70b513af8fdfb2dbb45e816ea /src/plugins/qmlprojectmanager/qmlproject.cpp | |
| parent | 1d4bf8c157fb14a78d12cf49c7eed3a345f52c1e (diff) | |
| download | qt-creator-25fbcca96b3254f3ca78dd349c356d9dd5176a52.tar.gz | |
KitManager: Get rid of KitMatcher class
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>
Diffstat (limited to 'src/plugins/qmlprojectmanager/qmlproject.cpp')
| -rw-r--r-- | src/plugins/qmlprojectmanager/qmlproject.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/plugins/qmlprojectmanager/qmlproject.cpp b/src/plugins/qmlprojectmanager/qmlproject.cpp index b8ab17a24d..c2e3cb7c87 100644 --- a/src/plugins/qmlprojectmanager/qmlproject.cpp +++ b/src/plugins/qmlprojectmanager/qmlproject.cpp @@ -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; |