diff --git a/src/plugins/autotest/boost/boosttestoutputreader.cpp b/src/plugins/autotest/boost/boosttestoutputreader.cpp index ecc93648da9..7338c6a6609 100644 --- a/src/plugins/autotest/boost/boosttestoutputreader.cpp +++ b/src/plugins/autotest/boost/boosttestoutputreader.cpp @@ -421,17 +421,17 @@ void BoostTestOutputReader::onFinished(int exitCode, QProcess::ExitStatus /*exit if (m_logLevel == LogLevel::Nothing && m_reportLevel == ReportLevel::No) { switch (exitCode) { case 0: - reportNoOutputFinish(tr("Running tests exited with ") + "boost::exit_success.", + reportNoOutputFinish(tr("Running tests exited with %1").arg("boost::exit_success."), ResultType::Pass); break; case 200: reportNoOutputFinish( - tr("Running tests exited with ") + "boost::exit_test_exception.", + tr("Running tests exited with %1").arg("boost::exit_test_exception."), ResultType::MessageFatal); break; case 201: - reportNoOutputFinish(tr("Running tests exited with ") - + "boost::exit_test_failure.", ResultType::Fail); + reportNoOutputFinish(tr("Running tests exited with %1") + .arg("boost::exit_test_failure."), ResultType::Fail); break; } } else if (exitCode != 0 && exitCode != 201 && !m_description.isEmpty()) { diff --git a/src/plugins/clangtools/clangtool.cpp b/src/plugins/clangtools/clangtool.cpp index 27b2fe2c219..5866103df4b 100644 --- a/src/plugins/clangtools/clangtool.cpp +++ b/src/plugins/clangtools/clangtool.cpp @@ -1155,7 +1155,7 @@ void ClangTool::updateForCurrentState() const bool hasErrorText = !m_infoBarWidget->errorText().isEmpty(); const bool hasErrors = m_filesFailed > 0; if (hasErrors && !hasErrorText) { - const QString text = makeLink( tr("Failed to analyze %1 files.").arg(m_filesFailed)); + const QString text = makeLink(tr("Failed to analyze %n file(s).", nullptr, m_filesFailed)); m_infoBarWidget->setError(InfoBarWidget::Warning, text, [this]() { showOutputPane(); }); } @@ -1171,9 +1171,8 @@ void ClangTool::updateForCurrentState() if (m_filesCount == 0) { infoText = tr("Analyzing..."); // Not yet fully started/initialized } else { - infoText = tr("Analyzing... %1 of %2 files processed.") - .arg(m_filesSucceeded + m_filesFailed) - .arg(m_filesCount); + infoText = tr("Analyzing... %1 of %n file(s) processed.", nullptr, m_filesCount) + .arg(m_filesSucceeded + m_filesFailed); } break; case State::PreparationStarted: @@ -1186,7 +1185,7 @@ void ClangTool::updateForCurrentState() infoText = tr("Analysis stopped by user."); break; case State::AnalyzerFinished: - infoText = tr("Finished processing %1 files.").arg(m_filesCount); + infoText = tr("Finished processing %n file(s).", nullptr, m_filesCount); break; case State::ImportFinished: infoText = tr("Diagnostics imported."); diff --git a/src/plugins/clangtools/clangtoolruncontrol.cpp b/src/plugins/clangtools/clangtoolruncontrol.cpp index bd4ee19758c..4a8cbcfbf4b 100644 --- a/src/plugins/clangtools/clangtoolruncontrol.cpp +++ b/src/plugins/clangtools/clangtoolruncontrol.cpp @@ -418,7 +418,7 @@ void ClangToolRunWorker::finalize() { const QString toolName = tool()->name(); if (m_filesNotAnalyzed.size() != 0) { - appendMessage(tr("Error: Failed to analyze %1 files.").arg(m_filesNotAnalyzed.size()), + appendMessage(tr("Error: Failed to analyze %n files.", nullptr, m_filesNotAnalyzed.size()), ErrorMessageFormat); Target *target = runControl()->target(); if (target && target->activeBuildConfiguration() && !target->activeBuildConfiguration()->buildDirectory().exists() diff --git a/src/plugins/cppeditor/cppquickfixprojectsettingswidget.ui b/src/plugins/cppeditor/cppquickfixprojectsettingswidget.ui index ec419845a13..d0c047b9b68 100644 --- a/src/plugins/cppeditor/cppquickfixprojectsettingswidget.ui +++ b/src/plugins/cppeditor/cppquickfixprojectsettingswidget.ui @@ -10,9 +10,6 @@ 345 - - Form - diff --git a/src/plugins/cppeditor/cppquickfixsettingswidget.ui b/src/plugins/cppeditor/cppquickfixsettingswidget.ui index 41b68d8ba96..44ad80f9180 100644 --- a/src/plugins/cppeditor/cppquickfixsettingswidget.ui +++ b/src/plugins/cppeditor/cppquickfixsettingswidget.ui @@ -10,9 +10,6 @@ 1074 - - Form - diff --git a/src/plugins/qmldesigner/components/bindingeditor/signallist.cpp b/src/plugins/qmldesigner/components/bindingeditor/signallist.cpp index 5eb9ceabfaa..f87000ddbab 100644 --- a/src/plugins/qmldesigner/components/bindingeditor/signallist.cpp +++ b/src/plugins/qmldesigner/components/bindingeditor/signallist.cpp @@ -96,8 +96,8 @@ void SignalList::prepareDialog() m_dialog = new SignalListDialog(Core::ICore::dialogParent()); m_dialog->setAttribute(Qt::WA_DeleteOnClose); m_dialog->initialize(m_model); - m_dialog->setWindowTitle(::QmlDesigner::SignalList::tr("Signal List for ") - + m_modelNode.validId()); + m_dialog->setWindowTitle(::QmlDesigner::SignalList::tr("Signal List for %1") + .arg(m_modelNode.validId())); auto *delegate = static_cast(m_dialog->tableView()->itemDelegate()); connect(delegate, &SignalListDelegate::connectClicked, this, &SignalList::connectClicked); diff --git a/src/plugins/vcsbase/submiteditorwidget.cpp b/src/plugins/vcsbase/submiteditorwidget.cpp index 843310f2906..714dbe59d3f 100644 --- a/src/plugins/vcsbase/submiteditorwidget.cpp +++ b/src/plugins/vcsbase/submiteditorwidget.cpp @@ -546,10 +546,10 @@ void SubmitEditorWidget::verifyDescription() "
    " "
  • Avoid very short commit messages.
  • " "
  • Consider the first line as subject (like in email) " - "and keep it shorter than %1 characters.
  • " + "and keep it shorter than %n characters." "
  • After an empty second line, a longer description can be added.
  • " "
  • Describe why the change was done, not how it was done.
  • " - "
").arg(MaxSubjectLength)); + "", nullptr, MaxSubjectLength)); } }