From b1d3eee42d5bca4316aaf32f4697f5defe53d3a7 Mon Sep 17 00:00:00 2001
From: hjk <hjk@qt.io>
Date: Thu, 5 Nov 2020 11:42:38 +0100
Subject: [PATCH] ProjectExplorer: Set focus to TargetSetupPage when shown

This ensures the "Configure Project" button can be activated
with <Return>

Fixes: QTCREATORBUG-20720
Change-Id: Ia20848cf2b4a1a2fcd33f9652a9a09796fd85c54
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
---
 src/plugins/projectexplorer/targetsetuppage.cpp | 6 ++++++
 src/plugins/projectexplorer/targetsetuppage.h   | 2 ++
 2 files changed, 8 insertions(+)

diff --git a/src/plugins/projectexplorer/targetsetuppage.cpp b/src/plugins/projectexplorer/targetsetuppage.cpp
index b0735c96775..305606f70fd 100644
--- a/src/plugins/projectexplorer/targetsetuppage.cpp
+++ b/src/plugins/projectexplorer/targetsetuppage.cpp
@@ -540,6 +540,12 @@ void TargetSetupPage::doInitializePage()
     updateVisibility();
 }
 
+void TargetSetupPage::showEvent(QShowEvent *event)
+{
+    WizardPage::showEvent(event);
+    setFocus(); // Ensure "Configure Project" gets triggered on <Return>
+}
+
 void TargetSetupPage::changeAllKitsSelections()
 {
     if (m_ui->allKitsCheckBox->checkState() == Qt::PartiallyChecked)
diff --git a/src/plugins/projectexplorer/targetsetuppage.h b/src/plugins/projectexplorer/targetsetuppage.h
index e962d8fde3d..1b893e8c31c 100644
--- a/src/plugins/projectexplorer/targetsetuppage.h
+++ b/src/plugins/projectexplorer/targetsetuppage.h
@@ -88,6 +88,8 @@ public:
 private:
     void doInitializePage();
 
+    void showEvent(QShowEvent *event) final;
+
     void handleKitAddition(Kit *k);
     void handleKitRemoval(Kit *k);
     void handleKitUpdate(Kit *k);