diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2020-04-25 03:03:02 +0200 |
|---|---|---|
| committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2020-04-25 03:03:02 +0200 |
| commit | 2e9d87b721549b091f84f5e27b121f9259d2de62 (patch) | |
| tree | 5e037720b49707367a9ee5a7c54accaf4665af5a | |
| parent | 59749d56d666a6687fcedc2f7892080467db8574 (diff) | |
| parent | 44c239aa1b9ff3a349f9c88f8ad3abd16aa48f3f (diff) | |
| download | qtquickcontrols-2e9d87b721549b091f84f5e27b121f9259d2de62.tar.gz | |
Merge remote-tracking branch 'origin/5.15' into dev
Change-Id: I31184909e2a74b6e79c966669e88ab8f9dd3ef1c
| -rw-r--r-- | dist/changes-5.14.2 | 20 | ||||
| -rw-r--r-- | src/controls/Styles/Android/CursorHandleStyle.qml | 2 |
2 files changed, 21 insertions, 1 deletions
diff --git a/dist/changes-5.14.2 b/dist/changes-5.14.2 new file mode 100644 index 00000000..68a00517 --- /dev/null +++ b/dist/changes-5.14.2 @@ -0,0 +1,20 @@ +Qt 5.14.2 is a bug-fix release. It maintains both forward and backward +compatibility (source and binary) with Qt 5.14.0 through 5.14.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.14 series is binary compatible with the 5.13.x series. +Applications compiled for 5.13 will continue to run with 5.14. + +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/controls/Styles/Android/CursorHandleStyle.qml b/src/controls/Styles/Android/CursorHandleStyle.qml index a4b772c5..ecf204cf 100644 --- a/src/controls/Styles/Android/CursorHandleStyle.qml +++ b/src/controls/Styles/Android/CursorHandleStyle.qml @@ -68,7 +68,7 @@ DrawableLoader { Connections { target: styleData - onActivated: idle.restart() + function onActivated() { idle.restart() } function onPressedChanged() { if (!styleData.pressed) idle.restart() |