Bump the qml revision number.

Change-Id: I87c4a0eeaf01179ec347f5f3922aef48405f8ae0
Reviewed-by: Yoann Lopes <yoann.lopes@theqtcompany.com>

3 files changed, 49 insertions, 21 deletions

diff --git a/src/imports/plugins.qmltypes b/src/imports/plugins.qmltypes
index 896d803..ca96f89 100644
--- a/src/imports/plugins.qmltypes
+++ b/src/imports/plugins.qmltypes
@@ -2,55 +2,82 @@ import QtQuick.tooling 1.1
 
 // This file describes the plugin-supplied types contained in the library.
 // It is used for QML tooling purposes only.
+//
+// This file was auto-generated by:
+// 'qmlplugindump -nonrelocatable QtWebView 1.0'
 
 Module {
     Component {
-        name: "QQuickWebViewLoadRequest"
-        prototype: "QObject"
-        exports: ["QtWebView/WebViewLoadRequest 1.0"]
-        isCreatable: false
-        exportMetaObjectRevisions: [0]
-        Property { name: "url"; type: "QUrl"; isReadonly: true }
-        Property { name: "status"; type: "QQuickWebView::LoadStatus"; isReadonly: true }
-        Property { name: "errorString"; type: "string"; isReadonly: true }
+        name: "QQuickViewController"
+        defaultProperty: "data"
+        prototype: "QQuickItem"
+        Method {
+            name: "onWindowChanged"
+            Parameter { name: "window"; type: "QQuickWindow"; isPointer: true }
+        }
+        Method { name: "onVisibleChanged" }
     }
     Component {
-        name: "QWebView"
+        name: "QQuickWebView"
         defaultProperty: "data"
-        prototype: "QQuickItem"
+        prototype: "QQuickViewController"
         exports: ["QtWebView/WebView 1.0"]
         exportMetaObjectRevisions: [0]
+        Enum {
+            name: "LoadStatus"
+            values: {
+                "LoadStartedStatus": 0,
+                "LoadStoppedStatus": 1,
+                "LoadSucceededStatus": 2,
+                "LoadFailedStatus": 3
+            }
+        }
         Property { name: "url"; type: "QUrl" }
         Property { name: "loading"; type: "bool"; isReadonly: true }
         Property { name: "loadProgress"; type: "int"; isReadonly: true }
         Property { name: "title"; type: "string"; isReadonly: true }
         Property { name: "canGoBack"; type: "bool"; isReadonly: true }
         Property { name: "canGoForward"; type: "bool"; isReadonly: true }
-        Method { name: "goBack" }
-        Method { name: "goForward" }
-        Method { name: "reload" }
-        Method { name: "stop" }
         Signal {
             name: "loadingChanged"
+            revision: 1
             Parameter { name: "loadRequest"; type: "QQuickWebViewLoadRequest"; isPointer: true }
         }
+        Method { name: "goBack" }
+        Method { name: "goForward" }
+        Method { name: "reload" }
+        Method { name: "stop" }
         Method {
             name: "loadHtml"
+            revision: 1
             Parameter { name: "html"; type: "string" }
             Parameter { name: "baseUrl"; type: "QUrl" }
         }
         Method {
             name: "loadHtml"
+            revision: 1
             Parameter { name: "html"; type: "string" }
         }
         Method {
             name: "runJavaScript"
+            revision: 1
             Parameter { name: "script"; type: "string" }
-            Parameter { name: "callback"; type: "QJValue" }
+            Parameter { name: "callback"; type: "QJSValue" }
         }
         Method {
             name: "runJavaScript"
+            revision: 1
             Parameter { name: "script"; type: "string" }
         }
     }
+    Component {
+        name: "QQuickWebViewLoadRequest"
+        prototype: "QObject"
+        exports: ["QtWebView/WebViewLoadRequest 1.1"]
+        isCreatable: false
+        exportMetaObjectRevisions: [0]
+        Property { name: "url"; type: "QUrl"; isReadonly: true }
+        Property { name: "status"; type: "QQuickWebView::LoadStatus"; isReadonly: true }
+        Property { name: "errorString"; type: "string"; isReadonly: true }
+    }
 }
diff --git a/src/imports/webview.cpp b/src/imports/webview.cpp
index 8847b46..b02f15c 100644
--- a/src/imports/webview.cpp
+++ b/src/imports/webview.cpp
@@ -61,10 +61,11 @@ public:
         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);
+        qmlRegisterUncreatableType<QQuickWebEngineLoadRequest>(uri, 1, 1, "WebViewLoadRequest", msg);
 #else
         qmlRegisterType<QQuickWebView>(uri, 1, 0, "WebView");
-        qmlRegisterUncreatableType<QQuickWebViewLoadRequest>(uri, 1, 0, "WebViewLoadRequest", msg);
+        qmlRegisterRevision<QQuickWebView, 1>(uri, 1, 1);
+        qmlRegisterUncreatableType<QQuickWebViewLoadRequest>(uri, 1, 1, "WebViewLoadRequest", msg);
 #endif
     }
 
diff --git a/src/webview/qquickwebview.h b/src/webview/qquickwebview.h
index 37568d1..d59b515 100644
--- a/src/webview/qquickwebview.h
+++ b/src/webview/qquickwebview.h
@@ -92,14 +92,14 @@ public Q_SLOTS:
     void goForward() Q_DECL_OVERRIDE;
     void reload() Q_DECL_OVERRIDE;
     void stop() Q_DECL_OVERRIDE;
-    void loadHtml(const QString &html, const QUrl &baseUrl = QUrl()) Q_DECL_OVERRIDE;
-    void runJavaScript(const QString& script,
-                       const QJSValue &callback = QJSValue());
+    Q_REVISION(1) void loadHtml(const QString &html, const QUrl &baseUrl = QUrl()) Q_DECL_OVERRIDE;
+    Q_REVISION(1) void runJavaScript(const QString& script,
+                                     const QJSValue &callback = QJSValue());
 
 Q_SIGNALS:
     void titleChanged();
     void urlChanged();
-    void loadingChanged(QQuickWebViewLoadRequest *loadRequest);
+    Q_REVISION(1) void loadingChanged(QQuickWebViewLoadRequest *loadRequest);
     void loadProgressChanged();
 
 protected: