Merge remote-tracking branch 'origin/13.0'

Conflicts:
	cmake/QtCreatorIDEBranding.cmake
	doc/qtcreator/src/overview/creator-only/creator-keyboard-shortcuts.qdoc
	qbs/modules/qtc/qtc.qbs
	src/plugins/remotelinux/linuxdevicetester.cpp

Change-Id: I8434e41dcfbb50f6ed032a3e0af1591eb19b79eb
This commit is contained in:
Eike Ziller
2024-03-20 15:01:51 +01:00
107 changed files with 9346 additions and 9167 deletions

View File

@@ -77,10 +77,15 @@ DebuggerRunConfigurationAspect::DebuggerRunConfigurationAspect(Target *target)
const auto setSummaryText = [this, details] {
const auto describe = [](const TriStateAspect &aspect, const QString &name) {
if (aspect() == TriState::Enabled)
if (aspect() == TriState::Enabled) {
//: %1 is C++, QML, or Python
return Tr::tr("Enable %1 debugger.").arg(name);
if (aspect() == TriState::Disabled)
}
if (aspect() == TriState::Disabled) {
//: %1 is C++, QML, or Python
return Tr::tr("Disable %1 debugger.").arg(name);
}
//: %1 is C++, QML, or Python
return Tr::tr("Try to determine need for %1 debugger.").arg(name);
};