forked from qt-creator/qt-creator
Merge remote-tracking branch 'origin/14.0'
Conflicts: cmake/QtCreatorIDEBranding.cmake qbs/modules/qtc/qtc.qbs src/plugins/qmljseditor/qmljseditordocument.cpp Change-Id: Ibef70b4c0eba5ccd5da7b05ca2bd3a9e8ee1cc0c
This commit is contained in:
@@ -542,6 +542,7 @@ public:
|
||||
void positionShow(const TextEditorWidget *editorWidget);
|
||||
|
||||
void updateTooltip(DebuggerEngine *engine);
|
||||
void updateTooltip2(DebuggerEngine *engine);
|
||||
|
||||
void setState(DebuggerTooltipState newState);
|
||||
void destroy();
|
||||
@@ -660,6 +661,11 @@ DebuggerToolTipHolder::DebuggerToolTipHolder(const DebuggerToolTipContext &conte
|
||||
// after normal WatchModel update.
|
||||
|
||||
void DebuggerToolTipHolder::updateTooltip(DebuggerEngine *engine)
|
||||
{
|
||||
QTimer::singleShot(0, [this, engine] { updateTooltip2(engine); });
|
||||
}
|
||||
|
||||
void DebuggerToolTipHolder::updateTooltip2(DebuggerEngine *engine)
|
||||
{
|
||||
widget->setEngine(engine);
|
||||
|
||||
|
||||
Reference in New Issue
Block a user