diff options
| author | Eike Ziller <eike.ziller@qt.io> | 2020-03-19 09:35:50 +0100 |
|---|---|---|
| committer | Eike Ziller <eike.ziller@qt.io> | 2020-03-19 09:35:50 +0100 |
| commit | c8a2ea54333b4d0582afb62b4120558f8c6945e7 (patch) | |
| tree | 156b198998adf6b034944ec58bc74cca41830b6d /src/plugins/cppcheck | |
| parent | 070aca8fea5fec0c31542c1b70e60bd9c493300a (diff) | |
| parent | ff6dd4dc2e95ce39fd423ca520c72fe50dc64aa1 (diff) | |
Merge remote-tracking branch 'origin/4.12'
Conflicts:
src/plugins/qmldesigner/components/curveeditor/detail/graphicsview.cpp
Change-Id: I2a0ccb84560174c5170d5baaff526c0e095f0ba0
Diffstat (limited to 'src/plugins/cppcheck')
| -rw-r--r-- | src/plugins/cppcheck/cppcheckplugin.cpp | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/src/plugins/cppcheck/cppcheckplugin.cpp b/src/plugins/cppcheck/cppcheckplugin.cpp index e38e367dae..4bbab6a4de 100644 --- a/src/plugins/cppcheck/cppcheckplugin.cpp +++ b/src/plugins/cppcheck/cppcheckplugin.cpp @@ -60,8 +60,7 @@ public: CppcheckOptionsPage options; DiagnosticsModel manualRunModel; CppcheckTool manualRunTool; - Utils::Perspective perspective{Constants::PERSPECTIVE_ID, - tr("Cppcheck", "CppcheckPlugin")}; + Utils::Perspective perspective{Constants::PERSPECTIVE_ID, CppcheckPlugin::tr("Cppcheck")}; QAction *manualRunAction; void startManualRun(); @@ -85,7 +84,7 @@ CppcheckPluginPrivate::CppcheckPluginPrivate() : auto action = new QAction(this); action->setEnabled(false); action->setIcon(Utils::Icons::PREV_TOOLBAR.icon()); - action->setToolTip(tr("Go to previous diagnostic.")); + action->setToolTip(CppcheckPlugin::tr("Go to previous diagnostic.")); connect(action, &QAction::triggered, manualRunView, &Debugger::DetailedErrorView::goBack); connect (&manualRunModel, &DiagnosticsModel::hasDataChanged, @@ -98,7 +97,7 @@ CppcheckPluginPrivate::CppcheckPluginPrivate() : auto action = new QAction(this); action->setEnabled(false); action->setIcon(Utils::Icons::NEXT_TOOLBAR.icon()); - action->setToolTip(tr("Go to next diagnostic.")); + action->setToolTip(CppcheckPlugin::tr("Go to next diagnostic.")); connect(action, &QAction::triggered, manualRunView, &Debugger::DetailedErrorView::goNext); connect (&manualRunModel, &DiagnosticsModel::hasDataChanged, @@ -111,7 +110,7 @@ CppcheckPluginPrivate::CppcheckPluginPrivate() : auto action = new QAction(this); action->setEnabled(false); action->setIcon(Utils::Icons::CLEAN_TOOLBAR.icon()); - action->setToolTip(tr("Clear")); + action->setToolTip(CppcheckPlugin::tr("Clear")); connect(action, &QAction::triggered, &manualRunModel, &DiagnosticsModel::clear); connect (&manualRunModel, &DiagnosticsModel::hasDataChanged, |