diff options
| author | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2019-06-13 15:39:54 +0200 |
|---|---|---|
| committer | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2019-07-08 11:03:00 +0200 |
| commit | fdec963fe2048a70513440ee7da34d7d34bf73af (patch) | |
| tree | f7c49d10815b8413aaefe18f3793ffa34beff185 /src/core/render_widget_host_view_qt.cpp | |
| parent | c4415f98106d5a1950ef000b6ee211dff24728f9 (diff) | |
Backport various minor fixes
Needed when building against a newer qt.
Change-Id: Id4b2db637c2d8acb6ddcd492f1c66e086e54262c
Reviewed-by: Michal Klocek <michal.klocek@qt.io>
Diffstat (limited to 'src/core/render_widget_host_view_qt.cpp')
| -rw-r--r-- | src/core/render_widget_host_view_qt.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/core/render_widget_host_view_qt.cpp b/src/core/render_widget_host_view_qt.cpp index ef2834041..4b00fbc17 100644 --- a/src/core/render_widget_host_view_qt.cpp +++ b/src/core/render_widget_host_view_qt.cpp @@ -637,7 +637,8 @@ void RenderWidgetHostViewQt::Destroy() void RenderWidgetHostViewQt::SetTooltipText(const base::string16 &tooltip_text) { - m_adapterClient->setToolTip(toQt(tooltip_text)); + if (m_adapterClient) + m_adapterClient->setToolTip(toQt(tooltip_text)); } void RenderWidgetHostViewQt::CopyFromCompositingSurface(const gfx::Rect& src_subrect, const gfx::Size& dst_size, const content::ReadbackRequestCallback& callback, const SkColorType color_type) |