diff options
| author | Adam Kallai <kadam@inf.u-szeged.hu> | 2016-06-20 16:19:49 +0200 |
|---|---|---|
| committer | Adam Kallai <kadam@inf.u-szeged.hu> | 2016-07-20 08:12:28 +0000 |
| commit | 4578283f988abb9d738113953ce43340f15cf1d7 (patch) | |
| tree | f1206c7872ae791ea1d9403068793e44d686511f /src/webengine/api | |
| parent | 59c603b801b37ced083698bec813c1dbaf2c58e8 (diff) | |
Add ToolTip support for Qt WebEngine (QML)
[ChangeLog][QtWebEngineQML][QQuickWebEngineView] ToolTip
(HTML global title attribute) are now handled.
Task-numner: QTBUG-54108
Change-Id: I78cc3c1e934a822d6399ebd35c8c7895fbdf5749
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
Diffstat (limited to 'src/webengine/api')
| -rw-r--r-- | src/webengine/api/qquickwebengineview.cpp | 5 | ||||
| -rw-r--r-- | src/webengine/api/qquickwebengineview_p_p.h | 2 |
2 files changed, 6 insertions, 1 deletions
diff --git a/src/webengine/api/qquickwebengineview.cpp b/src/webengine/api/qquickwebengineview.cpp index b660b06be..983e8c30e 100644 --- a/src/webengine/api/qquickwebengineview.cpp +++ b/src/webengine/api/qquickwebengineview.cpp @@ -1106,6 +1106,11 @@ bool QQuickWebEngineViewPrivate::isEnabled() const return q->isEnabled(); } +void QQuickWebEngineViewPrivate::setToolTip(const QString &toolTipText) +{ + ui()->showToolTip(toolTipText); +} + bool QQuickWebEngineView::isLoading() const { Q_D(const QQuickWebEngineView); diff --git a/src/webengine/api/qquickwebengineview_p_p.h b/src/webengine/api/qquickwebengineview_p_p.h index e82aebbd4..45332ddb1 100644 --- a/src/webengine/api/qquickwebengineview_p_p.h +++ b/src/webengine/api/qquickwebengineview_p_p.h @@ -188,7 +188,7 @@ public: void startDragging(const content::DropData &dropData, Qt::DropActions allowedActions, const QPixmap &pixmap, const QPoint &offset) Q_DECL_OVERRIDE; virtual bool isEnabled() const Q_DECL_OVERRIDE; - virtual void setToolTip(const QString &toolTipText) Q_DECL_OVERRIDE { Q_UNUSED(toolTipText); } + virtual void setToolTip(const QString &toolTipText) Q_DECL_OVERRIDE; const QObject *holdingQObject() const Q_DECL_OVERRIDE; virtual QSharedPointer<QtWebEngineCore::BrowserContextAdapter> browserContextAdapter() Q_DECL_OVERRIDE; |