Don't inherit from Qt private types

Do the d_ptr magic ourselves to avoid having to include private
headers from qtcore, qtgui and qtdeclarative.

It is hackish to hide QObject's d_ptr member to have the macros
working in a public class, but if anything goes wrong we just
need to replace the private macro convenience while maintaining
the binary compatibility of the stored extra opaque pointer.

Change-Id: Idb92f4f902826bef9068a5c2ef6ea31fc3fa15b2
Reviewed-by: Andras Becsi <andras.becsi@digia.com>

1 files changed, 6 insertions, 3 deletions

diff --git a/src/webenginewidgets/api/qwebengineview.cpp b/src/webenginewidgets/api/qwebengineview.cpp
index 03bb474bb..13ee75cf9 100644
--- a/src/webenginewidgets/api/qwebengineview.cpp
+++ b/src/webenginewidgets/api/qwebengineview.cpp
@@ -99,16 +99,19 @@ static QAccessibleInterface *webAccessibleFactory(const QString &, QObject *obje
 }
 
 QWebEngineViewPrivate::QWebEngineViewPrivate()
-    : QWidgetPrivate(QObjectPrivateVersion)
-    , page(0)
+    : page(0)
     , m_pendingContextMenuEvent(false)
 {
     QAccessible::installFactory(&webAccessibleFactory);
 }
 
 QWebEngineView::QWebEngineView(QWidget *parent)
-    : QWidget(*(new QWebEngineViewPrivate), parent, 0)
+    : QWidget(parent)
+    , d_ptr(new QWebEngineViewPrivate)
 {
+    Q_D(QWebEngineView);
+    d->q_ptr = this;
+
     // This causes the child RenderWidgetHostViewQtDelegateWidgets to fill this widget.
     setLayout(new QStackedLayout);
 }