diff options
| author | Allan Sandfeld Jensen <allan.jensen@theqtcompany.com> | 2016-06-21 09:47:22 +0000 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2016-06-21 09:47:22 +0000 |
| commit | 349e96d833493faaba2cd879e31811f07507cc37 (patch) | |
| tree | d8aa11b5992093bf44fbbaa8d076375fa008d099 /src/webengine/api/qquickwebengineview.cpp | |
| parent | 3847f51530bad6242f83aabab98e28934bde7cc6 (diff) | |
| parent | 25ccef35eb19fd656eba2a7abe5419972ed28552 (diff) | |
| download | qtwebengine-349e96d833493faaba2cd879e31811f07507cc37.tar.gz | |
Merge "Merge remote-tracking branch 'origin/5.7' into dev" into refs/staging/dev
Diffstat (limited to 'src/webengine/api/qquickwebengineview.cpp')
| -rw-r--r-- | src/webengine/api/qquickwebengineview.cpp | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/src/webengine/api/qquickwebengineview.cpp b/src/webengine/api/qquickwebengineview.cpp index 59b5d17db..ac25cd4d2 100644 --- a/src/webengine/api/qquickwebengineview.cpp +++ b/src/webengine/api/qquickwebengineview.cpp @@ -670,6 +670,12 @@ WebEngineSettings *QQuickWebEngineViewPrivate::webEngineSettings() const return m_settings->d_ptr.data(); } +const QObject *QQuickWebEngineViewPrivate::holdingQObject() const +{ + Q_Q(const QQuickWebEngineView); + return q; +} + void QQuickWebEngineViewPrivate::setDevicePixelRatio(qreal devicePixelRatio) { Q_Q(QQuickWebEngineView); |