ProjectExplorer: Consolidate some Session::active* accesses

Change-Id: I47b0f6c2c60b2f7c86b6ffd1ad3df393d1321c8b
Reviewed-by: Christian Stenger <christian.stenger@qt.io>

1 files changed, 5 insertions, 4 deletions

diff --git a/src/plugins/clangcodemodel/clangcodemodelplugin.cpp b/src/plugins/clangcodemodel/clangcodemodelplugin.cpp
index 51aaa6ba7a..58a6f23877 100644
--- a/src/plugins/clangcodemodel/clangcodemodelplugin.cpp
+++ b/src/plugins/clangcodemodel/clangcodemodelplugin.cpp
@@ -65,16 +65,17 @@ static void addProjectPanelWidget()
     ProjectExplorer::ProjectPanelFactory::registerFactory(panelFactory);
 }
 
-void ClangCodeModelPlugin::generateCompilationDB() {
+void ClangCodeModelPlugin::generateCompilationDB()
+{
     using namespace CppTools;
 
-    ProjectExplorer::Project *project = ProjectExplorer::SessionManager::startupProject();
-    if (!project || !project->activeTarget())
+    ProjectExplorer::Target *target = ProjectExplorer::SessionManager::startupTarget();
+    if (!target)
         return;
 
     QFuture<Utils::GenerateCompilationDbResult> task
             = QtConcurrent::run(&Utils::generateCompilationDB,
-                                CppModelManager::instance()->projectInfo(project));
+                                CppModelManager::instance()->projectInfo(target->project()));
     Core::ProgressManager::addTask(task, tr("Generating Compilation DB"), "generate compilation db");
     m_generatorWatcher.setFuture(task);
 }