diff options
| author | Eike Ziller <eike.ziller@qt.io> | 2020-03-16 08:30:33 +0100 |
|---|---|---|
| committer | Eike Ziller <eike.ziller@qt.io> | 2020-03-16 08:30:33 +0100 |
| commit | 22cdc470776ec3a2447688eaca972ec018a2d024 (patch) | |
| tree | 785dc530c98f7a31954ae2350ac079fb200b210c /src/plugins/nim | |
| parent | fc9bdf1255741f9261572d8560c6d8d1def76828 (diff) | |
| parent | 3faa91945afc056a8b9ebe3d564be47d57de3576 (diff) | |
| download | qt-creator-22cdc470776ec3a2447688eaca972ec018a2d024.tar.gz | |
Merge remote-tracking branch 'origin/4.12'
Conflicts:
src/plugins/baremetal/debugservers/uvsc/uvtargetdevicemodel.cpp
Change-Id: I4a90920e52dbbe9eb46aef3437ee3c5a6e7b31c6
Diffstat (limited to 'src/plugins/nim')
| -rw-r--r-- | src/plugins/nim/project/nimbletaskstep.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/plugins/nim/project/nimbletaskstep.cpp b/src/plugins/nim/project/nimbletaskstep.cpp index fd45a1686d..f5f95160d3 100644 --- a/src/plugins/nim/project/nimbletaskstep.cpp +++ b/src/plugins/nim/project/nimbletaskstep.cpp @@ -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; } |