Move webengine details to the qml plugin.

Instead of wrapping the web engine view in c++, we can just export it
under a different name in the qml plugin.

Change-Id: I5543ea3ca883d70bd4d605f7cff180445d2bc928
Reviewed-by: Yoann Lopes <[email protected]>

2 files changed, 14 insertions, 23 deletions

diff --git a/src/imports/webview.cpp b/src/imports/webview.cpp
index acd0f66..8847b46 100644
--- a/src/imports/webview.cpp
+++ b/src/imports/webview.cpp
@@ -37,8 +37,14 @@
 #include <QtQml/qqmlextensionplugin.h>
 #include <QtQml/qqml.h>
 
-#include <QtWebView/qquickwebview.h>
-#include <QtWebView/qquickwebviewloadrequest.h>
+
+#if defined(QT_WEBVIEW_WEBENGINE_BACKEND)
+#    include <QtWebEngine/private/qquickwebengineloadrequest_p.h>
+#    include <QtWebEngine/private/qquickwebengineview_p.h>
+#else
+#    include <QtWebView/qquickwebviewloadrequest.h>
+#    include <QtWebView/qquickwebview.h>
+#endif // QT_WEBVIEW_WEBENGINE_BACKEND
 
 QT_BEGIN_NAMESPACE
 
@@ -52,9 +58,14 @@ public:
         Q_ASSERT(QLatin1String(uri) == QLatin1String("QtWebView"));
 
         // @uri QtWebView
-        qmlRegisterType<QQuickWebView>(uri, 1, 0, "WebView");
         const QString &msg = QObject::tr("Cannot create separate instance of WebViewLoadRequest");
+#if defined(QT_WEBVIEW_WEBENGINE_BACKEND)
+        qmlRegisterType<QQuickWebEngineView>(uri, 1, 0, "WebView");
+        qmlRegisterUncreatableType<QQuickWebEngineLoadRequest>(uri, 1, 0, "WebViewLoadRequest", msg);
+#else
+        qmlRegisterType<QQuickWebView>(uri, 1, 0, "WebView");
         qmlRegisterUncreatableType<QQuickWebViewLoadRequest>(uri, 1, 0, "WebViewLoadRequest", msg);
+#endif
     }
 
     void initializeEngine(QQmlEngine *engine, const char *uri)
diff --git a/src/webview/qquickwebview.h b/src/webview/qquickwebview.h
index a95f7a4..37568d1 100644
--- a/src/webview/qquickwebview.h
+++ b/src/webview/qquickwebview.h
@@ -49,9 +49,6 @@
 //
 
 #include <QtWebView/private/qwebviewinterface_p.h>
-
-#if !defined(QT_WEBVIEW_WEBENGINE_BACKEND)
-
 #include <QtWebView/private/qwebview_p.h>
 #include <QtWebView/private/qquickviewcontroller_p.h>
 
@@ -120,21 +117,4 @@ private:
 
 QT_END_NAMESPACE
 
-#else
-
-#include <QtWebEngine/private/qquickwebengineview_p.h>
-
-QT_BEGIN_NAMESPACE
-
-class Q_WEBVIEW_EXPORT QQuickWebView : public QQuickWebEngineView
-{
-    Q_OBJECT
-public:
-    QQuickWebView(QQuickItem *parent = 0) : QQuickWebEngineView(parent) { }
-};
-
-QT_END_NAMESPACE
-
-#endif
-
 #endif // QQUICKWEBVIEW_H