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

Merge remote-tracking branch 'origin/11.0' into qds/dev

Browse Source 
Conflicts:
 src/plugins/qmldesigner/CMakeLists.txt
 src/plugins/qmldesignerbase/CMakeLists.txt
 src/plugins/qmlprojectmanager/CMakeLists.txt
Change-Id: If706ae3fe7a7d0e17036ce6285bec772d1f6127d
This commit is contained in:
Tim Jenssen
2023-07-04 17:31:14 +02:00
parent c572855b95 1487f1a0c0
commit 48230d63b8
191 changed files with 68408 additions and 55791 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/tools/process_stub/main.cpp
View File

@@ -185,7 +185,7 @@ void doExit(int exitCode)
std::cout << commandLineParser.value("wait").toStdString() << std::endl;
waitingForExitKeyPress = true;
onKeyPress([exitCode] { doExit(exitCode); });
onKeyPress([] { doExit(0); });
} else {
exit(exitCode);
}
@@ -206,9 +206,7 @@ void onInferiorFinished(int exitCode, QProcess::ExitStatus status)
void onInferiorErrorOccurered(QProcess::ProcessError error)
{
qCInfo(log) << "Inferior error: " << error << inferiorProcess.errorString();
sendCrash(inferiorProcess.exitCode());
doExit(1);
qCWarning(log) << "Inferior error: " << error << inferiorProcess.errorString();
}
void onInferiorStarted()