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

Debugger: Update references to Locals and Expressions

Browse Source 
These are two separate views now

Change-Id: I010ad0b937982704310d102d1f4338ec0c29a370
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
Reviewed-by: hjk <hjk@qt.io>
This commit is contained in:
Robert Loehning
2020-04-08 14:22:24 +02:00
parent 021cab2048
commit ec79f42701
4 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/plugins/debugger/commonoptionspage.cpp
View File

@@ -296,7 +296,7 @@ public:
label->setText("<html><head/><body>\n<p>" label->setText("<html><head/><body>\n<p>"
+ tr("The debugging helpers are used to produce a nice " + tr("The debugging helpers are used to produce a nice "
"display of objects of certain types like QString or " "display of objects of certain types like QString or "
"std::map in the &quot;Locals and Expressions&quot; view.") "std::map in the &quot;Locals&quot; and &quot;Expressions&quot; views.")
+ "</p></body></html>"); + "</p></body></html>");
auto groupBoxCustomDumperCommands = new QGroupBox(debuggingHelperGroupBox); auto groupBoxCustomDumperCommands = new QGroupBox(debuggingHelperGroupBox);

4
src/plugins/debugger/debuggeractions.cpp
View File

@@ -169,7 +169,7 @@ DebuggerSettings::DebuggerSettings()
item->setCheckable(true); item->setCheckable(true);
item->setDefaultValue(true); item->setDefaultValue(true);
item->setSettingsKey(debugModeGroup, "AutoDerefPointers"); item->setSettingsKey(debugModeGroup, "AutoDerefPointers");
item->setToolTip(tr("<p>This switches the Locals and Expressions view to " item->setToolTip(tr("<p>This switches the Locals and Expressions views to "
"automatically dereference pointers. This saves a level in the " "automatically dereference pointers. This saves a level in the "
"tree view, but also loses data for the now-missing intermediate " "tree view, but also loses data for the now-missing intermediate "
"level.")); "level."));
@@ -587,7 +587,7 @@ DebuggerSettings::DebuggerSettings()
item = new SavedAction; item = new SavedAction;
item->setSettingsKey(debugModeGroup, "DisplayStringLimit"); item->setSettingsKey(debugModeGroup, "DisplayStringLimit");
item->setToolTip(tr("<p>The maximum length of string entries in the " item->setToolTip(tr("<p>The maximum length of string entries in the "
"Locals and Expressions pane. Longer than that are cut off " "Locals and Expressions views. Longer than that are cut off "
"and displayed with an ellipsis attached.")); "and displayed with an ellipsis attached."));
item->setDefaultValue(100); item->setDefaultValue(100);
insertItem(DisplayStringLimit, item); insertItem(DisplayStringLimit, item);

4
tests/auto/debugger/tst_dumpers.cpp
View File

@@ -5851,7 +5851,7 @@ void tst_Dumpers::dumper_data()
// + Check("c.r", "1", "int"); // + Check("c.r", "1", "int");
// // Manual: Toogle "Sort Member Alphabetically" in context menu // // Manual: Toogle "Sort Member Alphabetically" in context menu
// // Manual: of "Locals and Expressions" view"); // // Manual: of "Locals" and "Expressions" views");
// // Manual: Check that order of displayed members changes"); // // Manual: Check that order of displayed members changes");
QTest::newRow("Typedef") QTest::newRow("Typedef")
@@ -5966,7 +5966,7 @@ void tst_Dumpers::dumper_data()
// QTest::newRow("TypeFormats") // QTest::newRow("TypeFormats")
// << Data( // << Data(
// "// These tests should result in properly displayed umlauts in the\n" // "// These tests should result in properly displayed umlauts in the\n"
// "// Locals and Expressions view. It is only support on gdb with Python");\n" // "// Locals and Expressions views. It is only support on gdb with Python");\n"
// "const char *s = "aöa";\n" // "const char *s = "aöa";\n"
// "const wchar_t *w = L"aöa";\n" // "const wchar_t *w = L"aöa";\n"
// "QString u;\n" // "QString u;\n"

4
tests/manual/debugger/simple/simple_test_app.cpp
View File

@@ -5304,7 +5304,7 @@ namespace basic {
// Continue. // Continue.
// Manual: Toogle "Sort Member Alphabetically" in context menu // Manual: Toogle "Sort Member Alphabetically" in context menu
// Manual: of "Locals and Expressions" view. // Manual: of "Locals" and "Expressions" views.
// Manual: Check that order of displayed members changes. // Manual: Check that order of displayed members changes.
dummyStatement(&c); dummyStatement(&c);
} }
@@ -5436,7 +5436,7 @@ namespace basic {
void testTypeFormats() void testTypeFormats()
{ {
// These tests should result in properly displayed umlauts in the // These tests should result in properly displayed umlauts in the
// Locals and Expressions view. It is only support on gdb with Python. // Locals and Expressions views. It is only support on gdb with Python.
const char *s = "aöa"; const char *s = "aöa";
const char cs[] = "aöa"; const char cs[] = "aöa";