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

Consistently use "Callgrind" and "Memcheck"

Browse Source 
Change-Id: Ib9727153fcf653cf11b07592639f544a856a8ad9
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
This commit is contained in:
Eike Ziller
2023-06-13 15:21:50 +02:00
parent 4d77487382
commit 7a605e9a59
3 changed files with 7 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
doc/qtcreator/src/projects/creator-only/creator-projects-settings-run-analyze.qdocinc
View File

@@ -35,7 +35,7 @@
\endlist \endlist
For more information about the CallGrind and MemCheck settings, see: For more information about the Callgrind and Memcheck settings, see:
\list \list

7
src/plugins/valgrind/valgrindconfigwidget.cpp
View File

@@ -40,7 +40,7 @@ ValgrindConfigWidget::ValgrindConfigWidget(ValgrindBaseSettings *settings)
{ {
using namespace Layouting; using namespace Layouting;
ValgrindBaseSettings &s = *settings; ValgrindBaseSettings &s = *settings;
// clang-format off
Grid generic { Grid generic {
s.valgrindExecutable, br, s.valgrindExecutable, br,
s.valgrindArguments, br, s.valgrindArguments, br,
@@ -78,10 +78,11 @@ ValgrindConfigWidget::ValgrindConfigWidget(ValgrindBaseSettings *settings)
Column { Column {
Group { title(Tr::tr("Valgrind Generic Settings")), generic }, Group { title(Tr::tr("Valgrind Generic Settings")), generic },
Group { title(Tr::tr("MemCheck Memory Analysis Options")), memcheck }, Group { title(Tr::tr("Memcheck Memory Analysis Options")), memcheck },
Group { title(Tr::tr("CallGrind Profiling Options")), callgrind }, Group { title(Tr::tr("Callgrind Profiling Options")), callgrind },
st, st,
}.attachTo(this); }.attachTo(this);
// clang-format on
} }
// ValgrindOptionsPage // ValgrindOptionsPage

4
src/plugins/valgrind/valgrindsettings.cpp
View File

@@ -233,7 +233,7 @@ ValgrindBaseSettings::ValgrindBaseSettings(bool global)
// Memcheck // Memcheck
memcheckArguments.setSettingsKey(base + "Memcheck.Arguments"); memcheckArguments.setSettingsKey(base + "Memcheck.Arguments");
memcheckArguments.setDisplayStyle(StringAspect::LineEditDisplay); memcheckArguments.setDisplayStyle(StringAspect::LineEditDisplay);
memcheckArguments.setLabelText(Tr::tr("Extra MemCheck arguments:")); memcheckArguments.setLabelText(Tr::tr("Extra Memcheck arguments:"));
filterExternalIssues.setSettingsKey(base + "FilterExternalIssues"); filterExternalIssues.setSettingsKey(base + "FilterExternalIssues");
filterExternalIssues.setDefaultValue(true); filterExternalIssues.setDefaultValue(true);
@@ -273,7 +273,7 @@ ValgrindBaseSettings::ValgrindBaseSettings(bool global)
callgrindArguments.setSettingsKey(base + "Callgrind.Arguments"); callgrindArguments.setSettingsKey(base + "Callgrind.Arguments");
callgrindArguments.setDisplayStyle(StringAspect::LineEditDisplay); callgrindArguments.setDisplayStyle(StringAspect::LineEditDisplay);
callgrindArguments.setLabelText(Tr::tr("Extra CallGrind arguments:")); callgrindArguments.setLabelText(Tr::tr("Extra Callgrind arguments:"));
enableEventToolTips.setDefaultValue(true); enableEventToolTips.setDefaultValue(true);
enableEventToolTips.setSettingsKey(base + "Callgrind.EnableEventToolTips"); enableEventToolTips.setSettingsKey(base + "Callgrind.EnableEventToolTips");