diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-09-28 03:00:04 +0200 |
|---|---|---|
| committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-09-28 03:00:11 +0200 |
| commit | 4fe398093d833f53ffc9978953c5f46b964526a2 (patch) | |
| tree | dede9e421b8375ec81f99cd4c8315036ce9a5a07 | |
| parent | 38459e237ee1bb347cc4d2192bca2b5f7f79f4ac (diff) | |
| parent | 8b11abbe26b630d4d8cf46d6389a9919f0cb977f (diff) | |
Merge "Merge remote-tracking branch 'origin/5.14' into 5.15"
| -rw-r--r-- | src/imports/plugins.qmltypes | 13 | ||||
| -rw-r--r-- | src/webview/doc/src/qtwebview-overview.qdoc | 2 |
2 files changed, 10 insertions, 5 deletions
diff --git a/src/imports/plugins.qmltypes b/src/imports/plugins.qmltypes index c07bfe2..945610e 100644 --- a/src/imports/plugins.qmltypes +++ b/src/imports/plugins.qmltypes @@ -4,7 +4,7 @@ import QtQuick.tooling 1.2 // It is used for QML tooling purposes only. // // This file was auto-generated by: -// 'qmlplugindump -nonrelocatable -dependencies dependencies.json QtWebView 1.13' +// 'qmlplugindump -nonrelocatable -dependencies dependencies.json QtWebView 1.14' Module { dependencies: ["QtQuick 2.0"] @@ -22,8 +22,12 @@ Module { name: "QQuickWebView" defaultProperty: "data" prototype: "QQuickViewController" - exports: ["QtWebView/WebView 1.0", "QtWebView/WebView 1.1", "QtWebView/WebView 1.14"] - exportMetaObjectRevisions: [0, 1] + exports: [ + "QtWebView/WebView 1.0", + "QtWebView/WebView 1.1", + "QtWebView/WebView 1.14" + ] + exportMetaObjectRevisions: [0, 1, 14] Enum { name: "LoadStatus" values: { @@ -33,7 +37,7 @@ Module { "LoadFailedStatus": 3 } } - Property { name: "httpUserAgent"; revision: 14; type: "QString" } + Property { name: "httpUserAgent"; revision: 14; type: "string" } Property { name: "url"; type: "QUrl" } Property { name: "loading"; revision: 1; type: "bool"; isReadonly: true } Property { name: "loadProgress"; type: "int"; isReadonly: true } @@ -45,6 +49,7 @@ Module { revision: 1 Parameter { name: "loadRequest"; type: "QQuickWebViewLoadRequest"; isPointer: true } } + Signal { name: "httpUserAgentChanged"; revision: 14 } Method { name: "goBack" } Method { name: "goForward" } Method { name: "reload" } diff --git a/src/webview/doc/src/qtwebview-overview.qdoc b/src/webview/doc/src/qtwebview-overview.qdoc index 195a0f5..8ccadd9 100644 --- a/src/webview/doc/src/qtwebview-overview.qdoc +++ b/src/webview/doc/src/qtwebview-overview.qdoc @@ -36,7 +36,7 @@ it makes sense. This is useful on mobile platforms such as \l {Qt for Android}{Android}, - \l {Qt for iOS}{iOS}, and \l {Qt for WinRT}{WinRT}; especially + \l {Qt for iOS}{iOS}, and \l {Qt for UWP}{UWP (Universal Windows Platform)}; especially on iOS, where policy dictates that all web content is displayed using the operating system's web view. |