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

Merge remote-tracking branch 'origin/4.12'

Browse Source 
Conflicts:
	src/plugins/baremetal/debugservers/uvsc/uvtargetdevicemodel.cpp

Change-Id: I4a90920e52dbbe9eb46aef3437ee3c5a6e7b31c6
This commit is contained in:
Eike Ziller
2020-03-16 08:30:33 +01:00
parent fc9bdf1255 3faa91945a
commit 22cdc47077
181 changed files with 1729 additions and 856 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/plugins/nim/project/nimbletaskstep.cpp
View File

@@ -110,7 +110,7 @@ bool NimbleTaskStep::validate()
QTC_ASSERT(nimbleBuildSystem, return false);
if (!Utils::contains(nimbleBuildSystem->tasks(), [this](const NimbleTask &task){ return task.name == m_taskName; })) {
emit addTask(BuildSystemTask(Task::Error, tr("Nimble task %1 not found").arg(m_taskName)));
emit addTask(BuildSystemTask(Task::Error, tr("Nimble task %1 not found.").arg(m_taskName)));
emitFaultyConfigurationMessage();
return false;
}