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 | |
| parent | 1668c31166f83189c30aaeb8aed07e014259e963 (diff) | |
| parent | 723318223fbdfda0ccc2f2fa539cf14c6ef5c92f (diff) | |
| download | qtwebsockets-6b06d3a25c216a4562e2270f987bff61abe02103.tar.gz | |
Merge remote-tracking branch 'origin/5.13' into dev
Change-Id: Ic2ff163b19d51fae2c9f2f53c5c046912ab2bc62
| -rw-r--r-- | dist/changes-5.12.2 | 20 | ||||
| -rw-r--r-- | src/imports/qmlwebsockets/plugins.qmltypes | 2 |
2 files changed, 21 insertions, 1 deletions
diff --git a/dist/changes-5.12.2 b/dist/changes-5.12.2 new file mode 100644 index 0000000..0c8bd85 --- /dev/null +++ b/dist/changes-5.12.2 @@ -0,0 +1,20 @@ +Qt 5.12.2 is a bug-fix release. It maintains both forward and backward +compatibility (source and binary) with Qt 5.12.0 through 5.12.1. + +For more details, refer to the online documentation included in this +distribution. The documentation is also available online: + +https://doc.qt.io/qt-5/index.html + +The Qt version 5.12 series is binary compatible with the 5.11.x series. +Applications compiled for 5.11 will continue to run with 5.12. + +Some of the changes listed in this file include issue tracking numbers +corresponding to tasks in the Qt Bug Tracker: + +https://bugreports.qt.io/ + +Each of these identifiers can be entered in the bug tracker to obtain more +information about a particular change. + + - This release contains only minor code improvements. 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" |