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

ProjectExplorer: Clean up KitsManager API

Browse Source 
Change-Id: Ib0b11918fbae9577928b6209a913afb3eccc48b5
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
This commit is contained in:
hjk
2013-09-10 17:59:34 +02:00
parent dd956b326d
commit f9aa1207d2
11 changed files with 82 additions and 85 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/plugins/qmlprojectmanager/qmlproject.cpp
View File

@@ -50,6 +50,7 @@
#include <QDebug>
using namespace Core;
using namespace ProjectExplorer;
namespace QmlProjectManager {
namespace Internal {
@@ -377,12 +378,12 @@ bool QmlProject::fromMap(const QVariantMap &map)
if (!activeTarget()) {
// find a kit that matches prerequisites (prefer default one)
Internal::QmlProjectKitMatcher matcher(defaultImport());
QList<ProjectExplorer::Kit*> kits = ProjectExplorer::KitManager::kits(&matcher);
QList<Kit*> kits = KitManager::matchingKits(matcher);
if (!kits.isEmpty()) {
ProjectExplorer::Kit *kit = 0;
if (kits.contains(ProjectExplorer::KitManager::defaultKit())) {
kit = ProjectExplorer::KitManager::defaultKit();
Kit *kit = 0;
if (kits.contains(KitManager::defaultKit())) {
kit = KitManager::defaultKit();
} else {
kit = kits.first();
}
@@ -392,7 +393,7 @@ bool QmlProject::fromMap(const QVariantMap &map)
// addedTarget calls updateEnabled on the runconfigurations
// which needs to happen after refresh
foreach (ProjectExplorer::Target *t, targets())
foreach (Target *t, targets())
addedTarget(t);
connect(this, SIGNAL(addedTarget(ProjectExplorer::Target*)),