summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorQt Forward Merge Bot <qt_forward_merge_bot@qt-project.org>2018-06-23 03:00:50 +0200
committerQt Forward Merge Bot <qt_forward_merge_bot@qt-project.org>2018-06-23 03:00:50 +0200
commit3ce4782101ba9ddc711d00aa0de5f15bda721405 (patch)
tree0c1792930948b41c250f7dc51464a3f52ba30afa
parent9bf0b2d853552a5e0033d4c38ec013553efe36e6 (diff)
parent72d6faa5fb31aaba2bf2dea25971f23b34244f24 (diff)
Merge remote-tracking branch 'origin/5.11' into dev
-rw-r--r--dist/changes-5.11.124
-rw-r--r--src/winextras/doc/src/qtwinextras-module-cpp.qdoc2
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/winextras/doc/src/qtwinextras-module-cpp.qdoc b/src/winextras/doc/src/qtwinextras-module-cpp.qdoc
index af8768f..92e74e0 100644
--- a/src/winextras/doc/src/qtwinextras-module-cpp.qdoc
+++ b/src/winextras/doc/src/qtwinextras-module-cpp.qdoc
@@ -28,7 +28,7 @@
/*!
\module QtWinExtras
\title Qt Windows Extras C++ Classes
- \brief Provides classes and functions for using some Windows APIs in a Qt way
+ \brief Provides classes and functions for using some Windows APIs in a Qt way.
\ingroup modules
\ingroup technology-apis