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

Merge remote-tracking branch 'origin/8.0'

Browse Source 
Change-Id: Icef5e28557701243e686d35cf885412eb341e75a
This commit is contained in:
Eike Ziller
2022-06-28 11:35:16 +02:00
parent 9e363c6421 ebf57d37b9
commit f95a1eca34
134 changed files with 595 additions and 520 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/plugins/mcusupport/mcukitmanager.cpp
View File

@@ -470,17 +470,18 @@ void createAutomaticKits(const SettingsHandler::Ptr &settingsHandler)
}
case McuAbstractPackage::Status::InvalidPath: {
printMessage(McuPackage::tr(
"Path %1 does not exist. Add the path in Tools > Options > "
"Path %1 does not exist. Add the path in Edit > Preferences > "
"Devices > MCU.")
.arg(qtForMCUsPackage->path().toUserOutput()),
true);
break;
}
case McuAbstractPackage::Status::EmptyPath: {
printMessage(McuPackage::tr(
"Missing %1. Add the path in Tools > Options > Devices > MCU.")
.arg(qtForMCUsPackage->detectionPath().toUserOutput()),
true);
printMessage(
McuPackage::tr(
"Missing %1. Add the path in Edit > Preferences > Devices > MCU.")
.arg(qtForMCUsPackage->detectionPath().toUserOutput()),
true);
return;
}
default:
@@ -492,7 +493,7 @@ void createAutomaticKits(const SettingsHandler::Ptr &settingsHandler)
if (CMakeProjectManager::CMakeToolManager::cmakeTools().isEmpty()) {
printMessage(
McuPackage::tr(
"No CMake tool was detected. Add a CMake tool in Tools > Options > "
"No CMake tool was detected. Add a CMake tool in Edit > Preferences > "
"Kits > CMake."),
true);
return;