Debugger: Make tooltips in Stack view configurable

Task-number: QTCREATORBUG-10194
Change-Id: If4a4580adbf50f4e00f78bae01999e275659f8e0
Reviewed-by: David Schulz <david.schulz@digia.com>

4 files changed, 13 insertions, 1 deletions

diff --git a/src/plugins/debugger/commonoptionspage.cpp b/src/plugins/debugger/commonoptionspage.cpp
index 9a0f1c834a..b75581e001 100644
--- a/src/plugins/debugger/commonoptionspage.cpp
+++ b/src/plugins/debugger/commonoptionspage.cpp
@@ -178,6 +178,7 @@ CommonOptionsPageWidget::CommonOptionsPageWidget
     m_group->insert(dc->action(AlwaysAdjustBreakpointsColumnWidths), 0);
     m_group->insert(dc->action(AlwaysAdjustModulesColumnWidths), 0);
     m_group->insert(dc->action(UseToolTipsInBreakpointsView), 0);
+    m_group->insert(dc->action(UseToolTipsInStackView), 0);
     m_group->insert(dc->action(UseAddressInBreakpointsView), 0);
     m_group->insert(dc->action(UseAddressInStackView), 0);
     m_group->insert(dc->action(AlwaysAdjustStackColumnWidths), 0);
diff --git a/src/plugins/debugger/debuggeractions.cpp b/src/plugins/debugger/debuggeractions.cpp
index e3b5549b7e..a8d4de09f5 100644
--- a/src/plugins/debugger/debuggeractions.cpp
+++ b/src/plugins/debugger/debuggeractions.cpp
@@ -543,6 +543,15 @@ DebuggerSettings::DebuggerSettings()
     insertItem(UseToolTipsInBreakpointsView, item);
 
     item = new SavedAction(this);
+    item->setSettingsKey(debugModeGroup, QLatin1String("UseToolTipsInBreakpointsView"));
+    item->setText(tr("Use Tooltips in Stack View when Debugging"));
+    item->setToolTip(tr("Checking this will enable tooltips in the stack "
+        "view during debugging."));
+    item->setCheckable(true);
+    item->setDefaultValue(true);
+    insertItem(UseToolTipsInStackView, item);
+
+    item = new SavedAction(this);
     item->setSettingsKey(debugModeGroup, QLatin1String("UseAddressInBreakpointsView"));
     item->setText(tr("Show Address Data in Breakpoints View when Debugging"));
     item->setToolTip(tr("Checking this will show a column with address "
diff --git a/src/plugins/debugger/stackhandler.cpp b/src/plugins/debugger/stackhandler.cpp
index f09060bd4e..984ea555a9 100644
--- a/src/plugins/debugger/stackhandler.cpp
+++ b/src/plugins/debugger/stackhandler.cpp
@@ -122,7 +122,7 @@ QVariant StackHandler::data(const QModelIndex &index, int role) const
             ? m_positionIcon : m_emptyIcon;
     }
 
-    if (role == Qt::ToolTipRole)
+    if (role == Qt::ToolTipRole && debuggerCore()->boolSetting(UseToolTipsInStackView))
         return frame.toToolTip();
 
     return QVariant();
diff --git a/src/plugins/debugger/stackwindow.cpp b/src/plugins/debugger/stackwindow.cpp
index 39b112189e..35c3358f9a 100644
--- a/src/plugins/debugger/stackwindow.cpp
+++ b/src/plugins/debugger/stackwindow.cpp
@@ -175,6 +175,8 @@ void StackTreeView::contextMenuEvent(QContextMenuEvent *ev)
         menu.addAction(debuggerCore()->action(UseAddressInStackView));
 
     menu.addSeparator();
+    menu.addAction(debuggerCore()->action(UseToolTipsInStackView));
+    menu.addSeparator();
 
     addBaseContextActions(&menu);