From 1c2a4da1c73bfc2456c59146ce615b7e2122e90e Mon Sep 17 00:00:00 2001
From: Jocelyn Turcotte <jocelyn.turcotte@digia.com>
Date: Mon, 7 Jul 2014 18:12:15 +0200
Subject: 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>
---
 src/webenginewidgets/api/qwebenginepage_p.h | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'src/webenginewidgets/api/qwebenginepage_p.h')

diff --git a/src/webenginewidgets/api/qwebenginepage_p.h b/src/webenginewidgets/api/qwebenginepage_p.h
index 3f421ed7e..90924bd8d 100644
--- a/src/webenginewidgets/api/qwebenginepage_p.h
+++ b/src/webenginewidgets/api/qwebenginepage_p.h
@@ -45,7 +45,6 @@
 #include "qwebenginepage.h"
 
 #include "web_contents_adapter_client.h"
-#include <QtCore/private/qobject_p.h>
 #include <QtCore/qcompilerdetection.h>
 #include <QSharedData>
 
@@ -100,10 +99,11 @@ private:
     QHash<quint64, CallbackSharedDataPointer> m_callbackMap;
 };
 
-class QWebEnginePagePrivate : public QObjectPrivate, public WebContentsAdapterClient
+class QWebEnginePagePrivate : public WebContentsAdapterClient
 {
 public:
     Q_DECLARE_PUBLIC(QWebEnginePage)
+    QWebEnginePage *q_ptr;
 
     QWebEnginePagePrivate();
     ~QWebEnginePagePrivate();
-- 
cgit v1.2.3