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

KitManager: Use static API as other singletons do

Browse Source 
Change-Id: Ia49c6552a5aae72870687ef9c64f2642fbe24155
Reviewed-by: hjk <hjk121@nokiamail.com>
This commit is contained in:
Tobias Hunger
2013-08-21 12:48:46 +02:00
parent 6ee2d554e1
commit 95859289b8
38 changed files with 160 additions and 171 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/plugins/qbsprojectmanager/qbsproject.cpp
View File

@@ -357,9 +357,9 @@ bool QbsProject::fromMap(const QVariantMap &map)
if (!Project::fromMap(map))
return false;
ProjectExplorer::KitManager *km = ProjectExplorer::KitManager::instance();
if (!activeTarget() && km->defaultKit()) {
ProjectExplorer::Target *t = new ProjectExplorer::Target(this, km->defaultKit());
ProjectExplorer::Kit *defaultKit = ProjectExplorer::KitManager::defaultKit();
if (!activeTarget() && defaultKit) {
ProjectExplorer::Target *t = new ProjectExplorer::Target(this, defaultKit);
t->updateDefaultBuildConfigurations();
t->updateDefaultDeployConfigurations();
t->updateDefaultRunConfigurations();
@@ -496,7 +496,7 @@ void QbsProject::updateCppCodeModel(const qbs::ProjectData &prj)
if (ProjectExplorer::Target *target = activeTarget())
k = target->kit();
else
k = ProjectExplorer::KitManager::instance()->defaultKit();
k = ProjectExplorer::KitManager::defaultKit();
qtVersion = QtSupport::QtKitInformation::qtVersion(k);
CppTools::CppModelManagerInterface *modelmanager =