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/webenginewidgets/api/qwebenginepage.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/webenginewidgets/api/qwebenginepage.cpp')
-rw-r--r-- | src/webenginewidgets/api/qwebenginepage.cpp | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/src/webenginewidgets/api/qwebenginepage.cpp b/src/webenginewidgets/api/qwebenginepage.cpp index 8a9f04860..63fb6eb44 100644 --- a/src/webenginewidgets/api/qwebenginepage.cpp +++ b/src/webenginewidgets/api/qwebenginepage.cpp @@ -494,6 +494,12 @@ WebContentsAdapter *QWebEnginePagePrivate::webContentsAdapter() return adapter.data(); } +const QObject *QWebEnginePagePrivate::holdingQObject() const +{ + Q_Q(const QWebEnginePage); + return q; +} + QWebEnginePage::QWebEnginePage(QObject* parent) : QObject(parent) , d_ptr(new QWebEnginePagePrivate()) |