feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Merge remote-tracking branch 'origin/8.0'

Browse Source 
Conflicts:
	src/plugins/todo/optionsdialog.cpp
	src/plugins/todo/todoprojectsettingswidget.cpp

Change-Id: I24ca90c2fc2cd707df901d42694df6d0e27d696d
This commit is contained in:
Eike Ziller
2022-07-20 11:53:36 +02:00
parent 034acdeeb2 e1b0ba2473
commit 3ec87e37ee
77 changed files with 917 additions and 227 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/plugins/projectexplorer/appoutputpane.cpp
View File

@@ -606,8 +606,10 @@ void AppOutputPane::stopRunControl()
QTC_ASSERT(rc, return);
if (rc->isRunning()) {
if (optionallyPromptToStop(rc))
if (optionallyPromptToStop(rc)) {
rc->initiateStop();
enableButtons(rc);
}
} else {
QTC_CHECK(false);
rc->forceStop();