Merge remote-tracking branch 'origin/6.0'

Change-Id: I405e3f95b0cdcd7b2686f31baae16c03c787f007
2022-01-06 10:46:57 +01:00
parent 2f71b49399 243521380b
commit 65e8c864af
145 changed files with 2686 additions and 472 deletions
--- a/src/plugins/projectexplorer/appoutputpane.cpp
+++ b/src/plugins/projectexplorer/appoutputpane.cpp
@@ -605,9 +605,10 @@ void AppOutputPane::stopRunControl()
    RunControl *rc = m_runControlTabs.at(index).runControl;
    QTC_ASSERT(rc, return);

-    if (rc->isRunning() && optionallyPromptToStop(rc))
-        rc->initiateStop();
-    else {
+    if (rc->isRunning()) {
+        if (optionallyPromptToStop(rc))
+            rc->initiateStop();
+    } else {
        QTC_CHECK(false);
        rc->forceStop();
    }