Import QtWebKit public headers.

This is the first step toward re-implementing part of the QWebView
API on top of QtWebEngine. The plan is to import the complete headers
to facilitate diffs and progress tracking.

Changes squashed in this commit:
- Use the QWebEngine prefix for class names
- Strip out non-public members and directives
- Allow building using those headers by disabling the Q_PROPERTY
  macros and by adding a dummy implementation for virtual methods
  directly in the header
- Update the widgetsnanobrowser example to comply with the slight
  changes from the previous API

Change-Id: Ia7efa5430f775d09b493544430a04856cc7928f6
Reviewed-by: Pierre Rossi <pierre.rossi@gmail.com>
Reviewed-by: Andras Becsi <andras.becsi@digia.com>

1 files changed, 9 insertions, 5 deletions

diff --git a/lib/widgets/Api/qwebengineview_p.h b/lib/widgets/Api/qwebengineview_p.h
index 9ac5e57e8..d5c803c34 100644
--- a/lib/widgets/Api/qwebengineview_p.h
+++ b/lib/widgets/Api/qwebengineview_p.h
@@ -39,13 +39,14 @@
 **
 ****************************************************************************/
 
-#ifndef QWEBENGINEVIEWPRIVATE_H
-#define QWEBENGINEVIEWPRIVATE_H
+#ifndef QWEBENGINEVIEW_P_H
+#define QWEBENGINEVIEW_P_H
 
 #include "web_contents_adapter_client.h"
 
 #include <QScopedPointer>
 #include <QtWidgets/private/qwidget_p.h>
+#include <QtWebEngineWidgets/qwebengineview.h>
 
 class QWebEngineView;
 class RenderWidgetHostViewQtDelegate;
@@ -53,8 +54,11 @@ class WebContentsAdapter;
 
 class QWebEngineViewPrivate : public QWidgetPrivate, public WebContentsAdapterClient
 {
-    Q_DECLARE_PUBLIC(QWebEngineView)
 public:
+    Q_DECLARE_PUBLIC(QWebEngineView)
+
+    static void bind(QWebEngineView *view, QWebEnginePage *page);
+
     QWebEngineViewPrivate();
 
     virtual RenderWidgetHostViewQtDelegate* CreateRenderWidgetHostViewQtDelegate() Q_DECL_OVERRIDE;
@@ -67,7 +71,7 @@ public:
 
     bool m_isLoading;
     QScopedPointer<WebContentsAdapter> adapter;
-    friend class RenderWidgetHostViewQtDelegateWidget;
+    QWebEnginePage *page;
 };
 
-#endif
+#endif // QWEBENGINEVIEW_P_H