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

Fix lupdate issues

Browse Source 
Change-Id: I0a7cc0650b6427d56b4415b2fff6cf39e29c96f9
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
This commit is contained in:
Eike Ziller
2019-06-26 14:41:37 +02:00
parent dcb03c115e
commit 33d49ec072
4 changed files with 31 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/plugins/autotest/boost/boosttestoutputreader.h
View File

@@ -37,6 +37,7 @@ enum class ReportLevel;
class BoostTestOutputReader : public TestOutputReader class BoostTestOutputReader : public TestOutputReader
{ {
Q_OBJECT
public: public:
BoostTestOutputReader(const QFutureInterface<TestResultPtr> &futureInterface, BoostTestOutputReader(const QFutureInterface<TestResultPtr> &futureInterface,
QProcess *testApplication, const QString &buildDirectory, QProcess *testApplication, const QString &buildDirectory,

2
src/plugins/projectexplorer/filterkitaspectsdialog.cpp
View File

@@ -92,7 +92,7 @@ class FilterKitAspectsModel : public TreeModel<TreeItem, FilterTreeItem>
public: public:
FilterKitAspectsModel(const Kit *kit, QObject *parent) : TreeModel(parent) FilterKitAspectsModel(const Kit *kit, QObject *parent) : TreeModel(parent)
{ {
setHeader({tr("Setting"), tr("Visible")}); setHeader({FilterKitAspectsDialog::tr("Setting"), FilterKitAspectsDialog::tr("Visible")});
for (const KitAspect * const aspect : KitManager::kitAspects()) { for (const KitAspect * const aspect : KitManager::kitAspects()) {
if (kit && !aspect->isApplicableToKit(kit)) if (kit && !aspect->isApplicableToKit(kit))
continue; continue;

1
src/plugins/projectexplorer/filterkitaspectsdialog.h
View File

@@ -37,6 +37,7 @@ namespace Internal {
class FilterKitAspectsDialog : public QDialog class FilterKitAspectsDialog : public QDialog
{ {
Q_OBJECT
public: public:
FilterKitAspectsDialog(const Kit *kit, QWidget *parent); FilterKitAspectsDialog(const Kit *kit, QWidget *parent);
QSet<Core::Id> irrelevantAspects() const; QSet<Core::Id> irrelevantAspects() const;

40
src/plugins/valgrind/memchecktool.cpp
View File

@@ -630,7 +630,7 @@ MemcheckToolPrivate::MemcheckToolPrivate()
}); });
action = new QAction(this); action = new QAction(this);
action->setText(tr("Valgrind Memory Analyzer with GDB")); action->setText(MemcheckTool::tr("Valgrind Memory Analyzer with GDB"));
action->setToolTip(MemcheckTool::tr("Valgrind Analyze Memory with GDB uses the " action->setToolTip(MemcheckTool::tr("Valgrind Analyze Memory with GDB uses the "
"Memcheck tool to find memory leaks.\nWhen a problem is detected, " "Memcheck tool to find memory leaks.\nWhen a problem is detected, "
"the application is interrupted and can be debugged.")); "the application is interrupted and can be debugged."));
@@ -650,7 +650,7 @@ MemcheckToolPrivate::MemcheckToolPrivate()
} else { } else {
action = new QAction(MemcheckTool::tr("Heob"), this); action = new QAction(MemcheckTool::tr("Heob"), this);
Core::Command *cmd = Core::ActionManager::registerAction(action, "Memcheck.Local"); Core::Command *cmd = Core::ActionManager::registerAction(action, "Memcheck.Local");
cmd->setDefaultKeySequence(QKeySequence(tr("Ctrl+Alt+H"))); cmd->setDefaultKeySequence(QKeySequence(MemcheckTool::tr("Ctrl+Alt+H")));
connect(action, &QAction::triggered, this, &MemcheckToolPrivate::heobAction); connect(action, &QAction::triggered, this, &MemcheckToolPrivate::heobAction);
menu->addAction(cmd, Debugger::Constants::G_ANALYZER_TOOLS); menu->addAction(cmd, Debugger::Constants::G_ANALYZER_TOOLS);
connect(m_startAction, &QAction::changed, action, [action, this] { connect(m_startAction, &QAction::changed, action, [action, this] {
@@ -659,7 +659,7 @@ MemcheckToolPrivate::MemcheckToolPrivate()
} }
action = new QAction(this); action = new QAction(this);
action->setText(tr("Valgrind Memory Analyzer (External Application)")); action->setText(MemcheckTool::tr("Valgrind Memory Analyzer (External Application)"));
action->setToolTip(toolTip); action->setToolTip(toolTip);
menu->addAction(ActionManager::registerAction(action, "Memcheck.Remote"), menu->addAction(ActionManager::registerAction(action, "Memcheck.Remote"),
Debugger::Constants::G_ANALYZER_REMOTE_TOOLS); Debugger::Constants::G_ANALYZER_REMOTE_TOOLS);
@@ -724,7 +724,7 @@ void MemcheckToolPrivate::heobAction()
} }
} }
if (!hasLocalRc) { if (!hasLocalRc) {
const QString msg = tr("Heob: No local run configuration available."); const QString msg = MemcheckTool::tr("Heob: No local run configuration available.");
TaskHub::addTask(Task::Error, msg, Debugger::Constants::ANALYZERTASK_ID); TaskHub::addTask(Task::Error, msg, Debugger::Constants::ANALYZERTASK_ID);
TaskHub::requestPopup(); TaskHub::requestPopup();
return; return;
@@ -733,7 +733,7 @@ void MemcheckToolPrivate::heobAction()
|| abi.os() != Abi::WindowsOS || abi.os() != Abi::WindowsOS
|| abi.binaryFormat() != Abi::PEFormat || abi.binaryFormat() != Abi::PEFormat
|| (abi.wordWidth() != 32 && abi.wordWidth() != 64)) { || (abi.wordWidth() != 32 && abi.wordWidth() != 64)) {
const QString msg = tr("Heob: No toolchain available."); const QString msg = MemcheckTool::tr("Heob: No toolchain available.");
TaskHub::addTask(Task::Error, msg, Debugger::Constants::ANALYZERTASK_ID); TaskHub::addTask(Task::Error, msg, Debugger::Constants::ANALYZERTASK_ID);
TaskHub::requestPopup(); TaskHub::requestPopup();
return; return;
@@ -746,7 +746,7 @@ void MemcheckToolPrivate::heobAction()
// target executable // target executable
if (executable.isEmpty()) { if (executable.isEmpty()) {
const QString msg = tr("Heob: No executable set."); const QString msg = MemcheckTool::tr("Heob: No executable set.");
TaskHub::addTask(Task::Error, msg, Debugger::Constants::ANALYZERTASK_ID); TaskHub::addTask(Task::Error, msg, Debugger::Constants::ANALYZERTASK_ID);
TaskHub::requestPopup(); TaskHub::requestPopup();
return; return;
@@ -754,7 +754,7 @@ void MemcheckToolPrivate::heobAction()
if (!QFile::exists(executable)) if (!QFile::exists(executable))
executable = Utils::HostOsInfo::withExecutableSuffix(executable); executable = Utils::HostOsInfo::withExecutableSuffix(executable);
if (!QFile::exists(executable)) { if (!QFile::exists(executable)) {
const QString msg = tr("Heob: Cannot find %1.").arg(executable); const QString msg = MemcheckTool::tr("Heob: Cannot find %1.").arg(executable);
TaskHub::addTask(Task::Error, msg, Debugger::Constants::ANALYZERTASK_ID); TaskHub::addTask(Task::Error, msg, Debugger::Constants::ANALYZERTASK_ID);
TaskHub::requestPopup(); TaskHub::requestPopup();
return; return;
@@ -775,8 +775,10 @@ void MemcheckToolPrivate::heobAction()
const QString heob = QString("heob%1.exe").arg(abi.wordWidth()); const QString heob = QString("heob%1.exe").arg(abi.wordWidth());
const QString heobPath = dialog.path() + '/' + heob; const QString heobPath = dialog.path() + '/' + heob;
if (!QFile::exists(heobPath)) { if (!QFile::exists(heobPath)) {
QMessageBox::critical(Core::ICore::mainWindow(), tr("Heob"), QMessageBox::critical(
tr("The %1 executables must be in the appropriate location.") Core::ICore::mainWindow(),
MemcheckTool::tr("Heob"),
MemcheckTool::tr("The %1 executables must be in the appropriate location.")
.arg("<a href=\"https://github.com/ssbssa/heob/releases\">Heob</a>")); .arg("<a href=\"https://github.com/ssbssa/heob/releases\">Heob</a>"));
return; return;
} }
@@ -787,12 +789,18 @@ void MemcheckToolPrivate::heobAction()
const QString dwarfstackPath = dialog.path() + '/' + dwarfstack; const QString dwarfstackPath = dialog.path() + '/' + dwarfstack;
if (!QFile::exists(dwarfstackPath) if (!QFile::exists(dwarfstackPath)
&& CheckableMessageBox::doNotShowAgainInformation( && CheckableMessageBox::doNotShowAgainInformation(
Core::ICore::mainWindow(), tr("Heob"), Core::ICore::mainWindow(),
tr("Heob used with MinGW projects needs the %1 DLLs for proper stacktrace resolution.") MemcheckTool::tr("Heob"),
.arg("<a href=\"https://github.com/ssbssa/dwarfstack/releases\">Dwarfstack</a>"), MemcheckTool::tr("Heob used with MinGW projects needs the %1 DLLs for proper "
ICore::settings(), "HeobDwarfstackInfo", "stacktrace resolution.")
.arg(
"<a "
"href=\"https://github.com/ssbssa/dwarfstack/releases\">Dwarfstack</a>"),
ICore::settings(),
"HeobDwarfstackInfo",
QDialogButtonBox::Ok | QDialogButtonBox::Cancel, QDialogButtonBox::Ok | QDialogButtonBox::Cancel,
QDialogButtonBox::Ok) != QDialogButtonBox::Ok) QDialogButtonBox::Ok)
!= QDialogButtonBox::Ok)
return; return;
} }
@@ -837,7 +845,9 @@ void MemcheckToolPrivate::heobAction()
CREATE_UNICODE_ENVIRONMENT | CREATE_SUSPENDED | CREATE_NEW_CONSOLE, envPtr, CREATE_UNICODE_ENVIRONMENT | CREATE_SUSPENDED | CREATE_NEW_CONSOLE, envPtr,
reinterpret_cast<LPCWSTR>(workingDirectory.utf16()), &si, &pi)) { reinterpret_cast<LPCWSTR>(workingDirectory.utf16()), &si, &pi)) {
DWORD e = GetLastError(); DWORD e = GetLastError();
const QString msg = tr("Heob: Cannot create %1 process (%2).").arg(heob).arg(qt_error_string(e)); const QString msg = MemcheckTool::tr("Heob: Cannot create %1 process (%2).")
.arg(heob)
.arg(qt_error_string(e));
TaskHub::addTask(Task::Error, msg, Debugger::Constants::ANALYZERTASK_ID); TaskHub::addTask(Task::Error, msg, Debugger::Constants::ANALYZERTASK_ID);
TaskHub::requestPopup(); TaskHub::requestPopup();
return; return;