summaryrefslogtreecommitdiff
path: root/lib/widgets/Api
diff options
context:
space:
mode:
Diffstat (limited to 'lib/widgets/Api')
-rw-r--r--lib/widgets/Api/qwebengineview.cpp14
-rw-r--r--lib/widgets/Api/qwebengineview.h4
-rw-r--r--lib/widgets/Api/qwebengineview_p.h5
3 files changed, 11 insertions, 12 deletions
diff --git a/lib/widgets/Api/qwebengineview.cpp b/lib/widgets/Api/qwebengineview.cpp
index a7a135fc8..369aa6efa 100644
--- a/lib/widgets/Api/qwebengineview.cpp
+++ b/lib/widgets/Api/qwebengineview.cpp
@@ -49,19 +49,22 @@
#include <QUrl>
QWebEngineViewPrivate::QWebEngineViewPrivate()
- : m_isLoading(false)
+ : QWidgetPrivate(QObjectPrivateVersion)
+ , m_isLoading(false)
, adapter(new WebContentsAdapter(this))
{
}
void QWebEngineViewPrivate::titleChanged(const QString &title)
{
- Q_EMIT q_ptr->titleChanged(title);
+ Q_Q(QWebEngineView);
+ Q_EMIT q->titleChanged(title);
}
void QWebEngineViewPrivate::urlChanged(const QUrl &url)
{
- Q_EMIT q_ptr->urlChanged(url);
+ Q_Q(QWebEngineView);
+ Q_EMIT q->urlChanged(url);
}
void QWebEngineViewPrivate::loadingStateChanged()
@@ -99,10 +102,9 @@ RenderWidgetHostViewQtDelegate *QWebEngineViewPrivate::CreateRenderWidgetHostVie
return new RenderWidgetHostViewQtDelegateWidget;
}
-QWebEngineView::QWebEngineView()
- : d_ptr(new QWebEngineViewPrivate)
+QWebEngineView::QWebEngineView(QWidget *parent)
+ : QWidget(*(new QWebEngineViewPrivate), parent, 0)
{
- d_ptr->q_ptr=this;
// This causes the child RenderWidgetHostViewQtDelegateWidgets to fill this widget.
setLayout(new QStackedLayout);
}
diff --git a/lib/widgets/Api/qwebengineview.h b/lib/widgets/Api/qwebengineview.h
index a86218538..b75f62369 100644
--- a/lib/widgets/Api/qwebengineview.h
+++ b/lib/widgets/Api/qwebengineview.h
@@ -45,14 +45,13 @@
#include <qtwebenginewidgetsglobal.h>
#include <QWidget>
-#include <QScopedPointer>
class QWebEngineViewPrivate;
class QWEBENGINEWIDGETS_EXPORT QWebEngineView : public QWidget {
Q_OBJECT
public:
- QWebEngineView();
+ QWebEngineView(QWidget *parent = 0);
~QWebEngineView();
void load(const QUrl& url);
@@ -73,7 +72,6 @@ Q_SIGNALS:
private:
Q_DECLARE_PRIVATE(QWebEngineView);
- QScopedPointer<QWebEngineViewPrivate> d_ptr;
};
#endif // QWEBENGINEVIEW_H
diff --git a/lib/widgets/Api/qwebengineview_p.h b/lib/widgets/Api/qwebengineview_p.h
index 5c623a097..9ac5e57e8 100644
--- a/lib/widgets/Api/qwebengineview_p.h
+++ b/lib/widgets/Api/qwebengineview_p.h
@@ -45,16 +45,15 @@
#include "web_contents_adapter_client.h"
#include <QScopedPointer>
+#include <QtWidgets/private/qwidget_p.h>
class QWebEngineView;
class RenderWidgetHostViewQtDelegate;
class WebContentsAdapter;
-class QWebEngineViewPrivate : public WebContentsAdapterClient
+class QWebEngineViewPrivate : public QWidgetPrivate, public WebContentsAdapterClient
{
Q_DECLARE_PUBLIC(QWebEngineView)
- QWebEngineView *q_ptr;
-
public:
QWebEngineViewPrivate();