diff options
| author | Eike Ziller <eike.ziller@qt.io> | 2019-01-15 08:30:54 +0100 |
|---|---|---|
| committer | Eike Ziller <eike.ziller@qt.io> | 2019-01-15 08:40:23 +0100 |
| commit | 71d60ee9c863c178adb8d80814f7ea912ea74101 (patch) | |
| tree | 2dd0c0fee304d0660f96963a33eec690ba605ebc /src/plugins/debugger/debuggertooltipmanager.cpp | |
| parent | 09c1c170d279047cbb873523b9ef9fc305e8b76d (diff) | |
| parent | a111daf93ea954b86791581ea3ac53e15ea145d4 (diff) | |
| download | qt-creator-71d60ee9c863c178adb8d80814f7ea912ea74101.tar.gz | |
Merge remote-tracking branch 'origin/4.8'
Conflicts:
src/plugins/cpptools/compileroptionsbuilder.cpp
Change-Id: I522f91de70aff28692d7c3a050e8d52df0b82a76
Diffstat (limited to 'src/plugins/debugger/debuggertooltipmanager.cpp')
| -rw-r--r-- | src/plugins/debugger/debuggertooltipmanager.cpp | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/src/plugins/debugger/debuggertooltipmanager.cpp b/src/plugins/debugger/debuggertooltipmanager.cpp index e858bb49d2..aefa93e688 100644 --- a/src/plugins/debugger/debuggertooltipmanager.cpp +++ b/src/plugins/debugger/debuggertooltipmanager.cpp @@ -1185,7 +1185,6 @@ void DebuggerToolTipManagerPrivate::slotTooltipOverrideRequested { QTC_ASSERT(handled, return); QTC_ASSERT(editorWidget, return); - *handled = false; if (!boolSetting(UseToolTipsInMainEditor)) return; |