diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-03-19 03:02:13 +0100 |
|---|---|---|
| committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-03-19 03:02:13 +0100 |
| commit | 6b06d3a25c216a4562e2270f987bff61abe02103 (patch) | |
| tree | e09d24384101e0f34067f6b8d4dd8fa20f51f05b /src | |
| parent | 1668c31166f83189c30aaeb8aed07e014259e963 (diff) | |
| parent | 723318223fbdfda0ccc2f2fa539cf14c6ef5c92f (diff) | |
Merge remote-tracking branch 'origin/5.13' into dev
Change-Id: Ic2ff163b19d51fae2c9f2f53c5c046912ab2bc62
Diffstat (limited to 'src')
| -rw-r--r-- | src/imports/qmlwebsockets/plugins.qmltypes | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/imports/qmlwebsockets/plugins.qmltypes b/src/imports/qmlwebsockets/plugins.qmltypes index 2fb57cd..4f39a36 100644 --- a/src/imports/qmlwebsockets/plugins.qmltypes +++ b/src/imports/qmlwebsockets/plugins.qmltypes @@ -38,7 +38,7 @@ Module { } Signal { name: "statusChanged" - Parameter { name: "status"; type: "Status" } + Parameter { name: "status"; type: "QQmlWebSocket::Status" } } Signal { name: "activeChanged" |