diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2018-06-23 03:01:30 +0200 |
|---|---|---|
| committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2018-06-23 03:01:30 +0200 |
| commit | 81205d62c91c05ab0639052baeeb637236159473 (patch) | |
| tree | 3c617096123c0938679ae471e0a64ee41611d6d5 | |
| parent | 16872a9eeb89678446593998e04ed77e35c0f979 (diff) | |
| parent | cf06df0f8e0488be366aab2645fd5470992c8a4e (diff) | |
Merge remote-tracking branch 'origin/5.11' into dev
Change-Id: I10832de7d3c67ed67ec4b183023ed4ca65729e36
| -rw-r--r-- | dist/changes-5.11.1 | 24 | ||||
| -rw-r--r-- | src/scxml/qscxmlnulldatamodel.cpp | 2 |
2 files changed, 25 insertions, 1 deletions
diff --git a/dist/changes-5.11.1 b/dist/changes-5.11.1 new file mode 100644 index 0000000..030ea3f --- /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/src/scxml/qscxmlnulldatamodel.cpp b/src/scxml/qscxmlnulldatamodel.cpp index 3054383..4759d22 100644 --- a/src/scxml/qscxmlnulldatamodel.cpp +++ b/src/scxml/qscxmlnulldatamodel.cpp @@ -115,7 +115,7 @@ private: /*! * \class QScxmlNullDataModel * \brief The QScxmlNullDataModel class is the null data model for a Qt SCXML - * stateMachine + * stateMachine. * \since 5.7 * \inmodule QtScxml * |