diff options
| author | Tobias Hunger <tobias.hunger@digia.com> | 2013-08-21 12:48:46 +0200 |
|---|---|---|
| committer | Tobias Hunger <tobias.hunger@digia.com> | 2013-08-21 16:55:16 +0200 |
| commit | 95859289b8cd48009515829c762869191d5adb92 (patch) | |
| tree | fd50c8d09144c21afc4b52854336f91db9b6dca0 /src/plugins/cmakeprojectmanager/cmakeopenprojectwizard.cpp | |
| parent | 6ee2d554e1316e4d2e97510551c77696e65ce3d4 (diff) | |
| download | qt-creator-95859289b8cd48009515829c762869191d5adb92.tar.gz | |
KitManager: Use static API as other singletons do
Change-Id: Ia49c6552a5aae72870687ef9c64f2642fbe24155
Reviewed-by: hjk <hjk121@nokiamail.com>
Diffstat (limited to 'src/plugins/cmakeprojectmanager/cmakeopenprojectwizard.cpp')
| -rw-r--r-- | src/plugins/cmakeprojectmanager/cmakeopenprojectwizard.cpp | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/src/plugins/cmakeprojectmanager/cmakeopenprojectwizard.cpp b/src/plugins/cmakeprojectmanager/cmakeopenprojectwizard.cpp index ab3f402fa6..ec38b920a0 100644 --- a/src/plugins/cmakeprojectmanager/cmakeopenprojectwizard.cpp +++ b/src/plugins/cmakeprojectmanager/cmakeopenprojectwizard.cpp @@ -292,8 +292,7 @@ bool CMakeOpenProjectWizard::compatibleKitExist() const bool hasNinjaGenerator = m_cmakeManager->hasCodeBlocksNinjaGenerator(); bool preferNinja = m_cmakeManager->preferNinja(); - QList<ProjectExplorer::Kit *> kitList = - ProjectExplorer::KitManager::instance()->kits(); + QList<ProjectExplorer::Kit *> kitList = ProjectExplorer::KitManager::kits(); foreach (ProjectExplorer::Kit *k, kitList) { // OfferNinja and ForceNinja differ in what they return @@ -665,8 +664,7 @@ void CMakeRunPage::initializePage() QByteArray cachedGenerator = cachedGeneratorFromFile(m_buildDirectory + QLatin1String("/CMakeCache.txt")); m_generatorComboBox->show(); - QList<ProjectExplorer::Kit *> kitList = - ProjectExplorer::KitManager::instance()->kits(); + QList<ProjectExplorer::Kit *> kitList = ProjectExplorer::KitManager::kits(); int defaultIndex = 0; foreach (ProjectExplorer::Kit *k, kitList) { @@ -675,7 +673,7 @@ void CMakeRunPage::initializePage() preferNinja, hasCodeBlocksGenerator); - if (k == ProjectExplorer::KitManager::instance()->defaultKit()) + if (k == ProjectExplorer::KitManager::defaultKit()) defaultIndex = m_generatorComboBox->count(); foreach (const GeneratorInfo &info, infos) |