diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2018-06-23 03:00:46 +0200 |
|---|---|---|
| committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2018-06-23 03:00:46 +0200 |
| commit | 631069f6d02095cedc14a595367f4404b8f17040 (patch) | |
| tree | bce12d32c26025dba5a5487de03fb17a35ced7e1 | |
| parent | cc270d39bc60ab2ada6d4ae8589239b90ce2df96 (diff) | |
| parent | 4d2d9a85932e960e39396b375a7842756c8415fe (diff) | |
Merge remote-tracking branch 'origin/5.11' into dev
Change-Id: I22c00453350070d69e03d1d4cf426a86fbcf0c9c
| -rw-r--r-- | dist/changes-5.11.1 | 24 | ||||
| -rw-r--r-- | examples/datavisualization/qmlaxisdrag/doc/src/qmlaxisdrag.qdoc | 2 | ||||
| -rw-r--r-- | examples/datavisualization/rotations/doc/src/rotations.qdoc | 2 |
3 files changed, 26 insertions, 2 deletions
diff --git a/dist/changes-5.11.1 b/dist/changes-5.11.1 new file mode 100644 index 00000000..030ea3fe --- /dev/null +++ b/dist/changes-5.11.1 @@ -0,0 +1,24 @@ +Qt 5.11.1 is a bug-fix release. It maintains both forward and backward +compatibility (source and binary) with Qt 5.11.0. + +For more details, refer to the online documentation included in this +distribution. The documentation is also available online: + +http://doc.qt.io/qt-5/index.html + +The Qt version 5.11 series is binary compatible with the 5.10.x series. +Applications compiled for 5.10 will continue to run with 5.11. + +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. + +**************************************************************************** +* Qt 5.11.1 Changes * +**************************************************************************** + + - This release contains only minor code improvements. diff --git a/examples/datavisualization/qmlaxisdrag/doc/src/qmlaxisdrag.qdoc b/examples/datavisualization/qmlaxisdrag/doc/src/qmlaxisdrag.qdoc index bfc49385..f0dea871 100644 --- a/examples/datavisualization/qmlaxisdrag/doc/src/qmlaxisdrag.qdoc +++ b/examples/datavisualization/qmlaxisdrag/doc/src/qmlaxisdrag.qdoc @@ -29,7 +29,7 @@ \example qmlaxisdrag \title Qt Quick 2 Axis Dragging Example \ingroup qtdatavisualization_examples - \brief Implementing axis dragging in QML + \brief Implementing axis dragging in QML. \since QtDataVisualization 1.1 The Qt Quick 2 axis dragging example concentrates on showing how to implement axis range diff --git a/examples/datavisualization/rotations/doc/src/rotations.qdoc b/examples/datavisualization/rotations/doc/src/rotations.qdoc index a2af0c24..5f1b8887 100644 --- a/examples/datavisualization/rotations/doc/src/rotations.qdoc +++ b/examples/datavisualization/rotations/doc/src/rotations.qdoc @@ -29,7 +29,7 @@ \example rotations \title Rotations Example \ingroup qtdatavisualization_examples - \brief Using rotated scatter items + \brief Using rotated scatter items. This example shows how to do the following: |