summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorQt Forward Merge Bot <qt_forward_merge_bot@qt-project.org>2019-07-16 03:01:30 +0200
committerQt Forward Merge Bot <qt_forward_merge_bot@qt-project.org>2019-07-16 03:01:30 +0200
commitdbc39cfed6d9be303d030cdcd30a1d36d5fcd09b (patch)
tree5f422f9c8b3df4f201840254956e43a29e17395e
parent2d64455935f2f6c715c2e13131b198ad4b2f9dee (diff)
parent0634c8104558dbb7acd314d52cf4b039c8c3689d (diff)
downloadqtwebsockets-dbc39cfed6d9be303d030cdcd30a1d36d5fcd09b.tar.gz
Merge remote-tracking branch 'origin/5.13' into dev
Change-Id: Ifa55b6563a15a91d7906d9e84936c4484323f809
-rw-r--r--dist/changes-5.12.420
-rw-r--r--src/websockets/doc/qtwebsockets.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/websockets/doc/qtwebsockets.qdocconf b/src/websockets/doc/qtwebsockets.qdocconf
index ba77c82..56d54a2 100644
--- a/src/websockets/doc/qtwebsockets.qdocconf
+++ b/src/websockets/doc/qtwebsockets.qdocconf
@@ -1,4 +1,5 @@
include($QT_INSTALL_DOCS/global/qt-module-defaults.qdocconf)
+include($QT_INSTALL_DOCS/config/exampleurl-qtwebsockets.qdocconf)
project = QtWebSockets
description = Qt WebSockets Reference Documentation