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

Merge remote-tracking branch 'origin/4.11'

Browse Source 
Conflicts:
	share/qtcreator/qml/qmlpuppet/qml2puppet/instances/quick3dnodeinstance.cpp

Change-Id: I8ea57eba526ab830608fd928c28771c5441749f8
This commit is contained in:
Eike Ziller
2019-11-01 15:31:19 +01:00
parent c92c255d10 a1d22fd2f7
commit 04bd6e39c8
170 changed files with 2592 additions and 526 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/plugins/cmakeprojectmanager/cmakeprocess.cpp
View File

@@ -215,12 +215,12 @@ void CMakeProcess::handleProcessFinished(int code, QProcess::ExitStatus status)
QString msg;
if (status != QProcess::NormalExit) {
if (m_processWasCanceled) {
msg = tr("*** cmake process was canceled by the user.");
msg = tr("CMake process was canceled by the user.");
} else {
msg = tr("*** cmake process crashed.");
msg = tr("CMake process crashed.");
}
} else if (code != 0) {
msg = tr("*** cmake process exited with exit code %1.").arg(code);
msg = tr("CMake process exited with exit code %1.").arg(code);
}
if (!msg.isEmpty()) {