diff options
| author | Jocelyn Turcotte <jocelyn.turcotte@digia.com> | 2014-07-07 18:12:15 +0200 |
|---|---|---|
| committer | Jocelyn Turcotte <jocelyn.turcotte@digia.com> | 2014-08-04 08:45:25 +0200 |
| commit | 1c2a4da1c73bfc2456c59146ce615b7e2122e90e (patch) | |
| tree | 7690eee799b00b177dc03e1e64706a108bb99abd /src/webengine/api/qquickwebengineview_p_p.h | |
| parent | ddd8ab311271b59514ce0748301e634ca988b62b (diff) | |
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>
Diffstat (limited to 'src/webengine/api/qquickwebengineview_p_p.h')
| -rw-r--r-- | src/webengine/api/qquickwebengineview_p_p.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/webengine/api/qquickwebengineview_p_p.h b/src/webengine/api/qquickwebengineview_p_p.h index e4a315d1a..25b20a0e8 100644 --- a/src/webengine/api/qquickwebengineview_p_p.h +++ b/src/webengine/api/qquickwebengineview_p_p.h @@ -49,7 +49,6 @@ #include <QSharedData> #include <QString> #include <QtCore/qcompilerdetection.h> -#include <QtQuick/private/qquickitem_p.h> #include <QtGui/qaccessibleobject.h> class WebContentsAdapter; @@ -128,10 +127,11 @@ private: Q_DECLARE_PUBLIC(QQuickWebEngineView) }; -class Q_WEBENGINE_PRIVATE_EXPORT QQuickWebEngineViewPrivate : public QQuickItemPrivate, public WebContentsAdapterClient +class Q_WEBENGINE_PRIVATE_EXPORT QQuickWebEngineViewPrivate : public WebContentsAdapterClient { public: Q_DECLARE_PUBLIC(QQuickWebEngineView) + QQuickWebEngineView *q_ptr; QQuickWebEngineViewPrivate(); ~QQuickWebEngineViewPrivate(); |