summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorQt Forward Merge Bot <qt_forward_merge_bot@qt-project.org>2019-07-16 03:03:49 +0200
committerQt Forward Merge Bot <qt_forward_merge_bot@qt-project.org>2019-07-16 03:03:49 +0200
commit29390f5b720a2595e29f35bd444b6224df6bf3da (patch)
tree1d1b683017a778832cf6c36e5806febe573082ad
parent579eef07ada618446cd5d4cbd839f24f32f065e5 (diff)
parentaa450db462db5fca847ed05c1e05c1779161cc8b (diff)
Merge remote-tracking branch 'origin/5.13' into dev
-rw-r--r--dist/changes-5.12.420
-rw-r--r--src/doc/qtspeech.qdocconf1
2 files changed, 21 insertions, 0 deletions
diff --git a/dist/changes-5.12.4 b/dist/changes-5.12.4
new file mode 100644
index 0000000..a285cd8
--- /dev/null
+++ b/dist/changes-5.12.4
@@ -0,0 +1,20 @@
+Qt 5.12.4 is a bug-fix release. It maintains both forward and backward
+compatibility (source and binary) with Qt 5.12.0 through 5.12.3.
+
+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/doc/qtspeech.qdocconf b/src/doc/qtspeech.qdocconf
index b77de7e..cd6fb78 100644
--- a/src/doc/qtspeech.qdocconf
+++ b/src/doc/qtspeech.qdocconf
@@ -1,4 +1,5 @@
include($QT_INSTALL_DOCS/global/qt-module-defaults.qdocconf)
+include($QT_INSTALL_DOCS/config/exampleurl-qtspeech.qdocconf)
project = QtSpeech
description = Qt Text-To-Speech library