diff options
| author | Eike Ziller <eike.ziller@qt.io> | 2020-04-14 09:47:38 +0200 |
|---|---|---|
| committer | Eike Ziller <eike.ziller@qt.io> | 2020-04-14 09:47:38 +0200 |
| commit | deb0eaf7950e4aa4067af730367e61cbd732d178 (patch) | |
| tree | 4c393e8a00b4e4ef3e2cdba9a99b755f59a6b8ba /src/plugins/baremetal | |
| parent | e86a2bfdd2d3778456c828efbf1265804908815c (diff) | |
| parent | af061c81b7ea9e4b8e75ac63a2e172b5653f9037 (diff) | |
Merge remote-tracking branch 'origin/4.12'
Conflicts:
cmake/QtCreatorIDEBranding.cmake
qbs/modules/qtc/qtc.qbs
qtcreator_ide_branding.pri
src/plugins/cmakeprojectmanager/cmakebuildsystem.cpp
Change-Id: I34c3d1fd5be90537e37d15e00b1a0d455d1bf81d
Diffstat (limited to 'src/plugins/baremetal')
| -rw-r--r-- | src/plugins/baremetal/debugservers/uvsc/stlinkuvscserverprovider.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/plugins/baremetal/debugservers/uvsc/stlinkuvscserverprovider.cpp b/src/plugins/baremetal/debugservers/uvsc/stlinkuvscserverprovider.cpp index 619560642e8..074bce6164d 100644 --- a/src/plugins/baremetal/debugservers/uvsc/stlinkuvscserverprovider.cpp +++ b/src/plugins/baremetal/debugservers/uvsc/stlinkuvscserverprovider.cpp @@ -179,7 +179,7 @@ FilePath StLinkUvscServerProvider::optionsFilePath(DebuggerRunTool *runTool, const StLinkUvProjectOptions projectOptions(this); if (!writer.write(&projectOptions)) { errorMessage = BareMetalDebugSupport::tr( - "Unable to create an uVision project options template"); + "Unable to create a uVision project options template."); return {}; } return optionsPath; |