From db288667fecfe740a9cb37df83950738cdf449b6 Mon Sep 17 00:00:00 2001
From: Christian Kandeler <christian.kandeler@qt.io>
Date: Fri, 28 Jun 2019 11:38:52 +0200
Subject: [PATCH] ProjectExplorer: Prevent inadvertant "configure" in target
 setup page

When the user presses the return key, this must only lead to project
setup if clicking the "Configure Project" button would have been
possible. Otherwise the prerequisites are not met.

Change-Id: I247b9ff3a0600798667c7f95a99e7b61e7171706
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
---
 src/plugins/projectexplorer/targetsettingspanel.cpp | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/plugins/projectexplorer/targetsettingspanel.cpp b/src/plugins/projectexplorer/targetsettingspanel.cpp
index adaba34842a..3d22124f9a4 100644
--- a/src/plugins/projectexplorer/targetsettingspanel.cpp
+++ b/src/plugins/projectexplorer/targetsettingspanel.cpp
@@ -95,8 +95,10 @@ protected:
 
     void keyPressEvent(QKeyEvent *event) override
     {
-        if (m_targetSetupPage && m_targetSetupPage->importLineEditHasFocus())
+        if ((m_targetSetupPage && m_targetSetupPage->importLineEditHasFocus())
+                || (m_configureButton && !m_configureButton->isEnabled())) {
             return;
+        }
         if (event->key() == Qt::Key_Return || event->key() == Qt::Key_Enter) {
             event->accept();
             if (m_targetSetupPage)