aboutsummaryrefslogtreecommitdiffstats
path: root/src/plugins/projectexplorer/targetsetupwidget.cpp
diff options
context:
space:
mode:
authorhjk <hjk@qt.io>2018-04-24 15:07:02 +0200
committerhjk <hjk@qt.io>2018-04-24 13:42:30 +0000
commitf8937daf717597f696a5ba3963e02878b01ab4ae (patch)
treef170453c517e495a64a87a1444683380a4cf0231 /src/plugins/projectexplorer/targetsetupwidget.cpp
parentef9c5e47bb98a79a71beb45c9b0ffeda2e86f38c (diff)
ProjectExplorer: Make "Manage..." kits button work again
When configuring a newly opened or created project you are able to press a 'Manage...' button that brings up the options page of the kits. Was broken with the rework done on the global object pool. Change-Id: I87d91351c5769655c1192431a53784de1bca77aa Reviewed-by: Christian Stenger <christian.stenger@qt.io>
Diffstat (limited to 'src/plugins/projectexplorer/targetsetupwidget.cpp')
-rw-r--r--src/plugins/projectexplorer/targetsetupwidget.cpp10
1 files changed, 5 insertions, 5 deletions
diff --git a/src/plugins/projectexplorer/targetsetupwidget.cpp b/src/plugins/projectexplorer/targetsetupwidget.cpp
index 258809f712..b59f3dbb56 100644
--- a/src/plugins/projectexplorer/targetsetupwidget.cpp
+++ b/src/plugins/projectexplorer/targetsetupwidget.cpp
@@ -34,7 +34,6 @@
#include "kitoptionspage.h"
#include <coreplugin/icore.h>
-#include <extensionsystem/pluginmanager.h>
#include <utils/algorithm.h>
#include <utils/detailsbutton.h>
@@ -201,12 +200,13 @@ void TargetSetupWidget::targetCheckBoxToggled(bool b)
void TargetSetupWidget::manageKit()
{
- KitOptionsPage *page = ExtensionSystem::PluginManager::getObject<KitOptionsPage>();
- if (!page || !m_kit)
+ if (!m_kit)
return;
- page->showKit(m_kit);
- Core::ICore::showOptionsDialog(Constants::KITS_SETTINGS_PAGE_ID, parentWidget());
+ if (auto kitPage = KitOptionsPage::instance()) {
+ kitPage->showKit(m_kit);
+ Core::ICore::showOptionsDialog(Constants::KITS_SETTINGS_PAGE_ID, parentWidget());
+ }
}
void TargetSetupWidget::setProjectPath(const QString &projectPath)