1 files changed, 14 insertions, 1 deletions
diff --git a/src/webenginewidgets/api/qwebengineview.cpp b/src/webenginewidgets/api/qwebengineview.cpp
index 9b3f62217..7ea451fc5 100644
--- a/src/webenginewidgets/api/qwebengineview.cpp
+++ b/src/webenginewidgets/api/qwebengineview.cpp
@@ -50,8 +50,9 @@
 #include <QAction>
 #include <QMenu>
 #include <QContextMenuEvent>
-#include <QStackedLayout>
 #include <QPageLayout>
+#include <QStackedLayout>
+#include <QToolTip>
 
 QT_BEGIN_NAMESPACE
 
@@ -327,6 +328,18 @@ bool QWebEngineView::event(QEvent *ev)
         ev->accept();
         return true;
     }
+
+    // Override QWidget's default ToolTip handler since it doesn't hide tooltip on empty text.
+    if (ev->type() == QEvent::ToolTip) {
+        if (!toolTip().isEmpty())
+            QToolTip::showText(static_cast<QHelpEvent *>(ev)->globalPos(), toolTip(), this, QRect(), toolTipDuration());
+        else
+            QToolTip::hideText();
+
+        ev->accept();
+        return true;
+    }
+
     return QWidget::event(ev);
 }