summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorQt Forward Merge Bot <qt_forward_merge_bot@qt-project.org>2020-01-28 03:02:44 +0100
committerQt Forward Merge Bot <qt_forward_merge_bot@qt-project.org>2020-01-28 03:02:44 +0100
commit2dd285bc2852ce7bf6d63dea33996482ad2fcd41 (patch)
tree3eed1e837cd7034413142107dea48beb0322426d
parenta315402ab232e3e4398f0b1c1d6910bdcefaec4f (diff)
parent0d3e12b2f8465fddfd5dff84adce6fb525bfd3ec (diff)
Merge remote-tracking branch 'origin/5.14' into 5.15v5.15.0-alpha1
-rw-r--r--dist/changes-5.14.120
-rw-r--r--src/datavisualization/engine/q3dbars.cpp2
2 files changed, 21 insertions, 1 deletions
diff --git a/dist/changes-5.14.1 b/dist/changes-5.14.1
new file mode 100644
index 00000000..d0086381
--- /dev/null
+++ b/dist/changes-5.14.1
@@ -0,0 +1,20 @@
+Qt 5.14.1 is a bug-fix release. It maintains both forward and backward
+compatibility (source and binary) with Qt 5.14.0.
+
+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/datavisualization/engine/q3dbars.cpp b/src/datavisualization/engine/q3dbars.cpp
index daeedf3c..2f2cf63b 100644
--- a/src/datavisualization/engine/q3dbars.cpp
+++ b/src/datavisualization/engine/q3dbars.cpp
@@ -157,7 +157,7 @@ QBar3DSeries *Q3DBars::primarySeries() const
* to the axes. If the newly added series has specified a selected bar, it will be highlighted and
* any existing selection will be cleared. Only one added series can have an active selection.
*
- * /sa seriesList(), primarySeries
+ * \sa seriesList(), primarySeries
*/
void Q3DBars::addSeries(QBar3DSeries *series)
{