Merge "Merge remote-tracking branch 'origin/5.13' into 5.14"v5.14.0-beta3

3 files changed, 30 insertions, 3 deletions

diff --git a/dist/changes-5.13.2 b/dist/changes-5.13.2
new file mode 100644
index 000000000..f1a1f9dbb
--- /dev/null
+++ b/dist/changes-5.13.2
@@ -0,0 +1,27 @@
+Qt 5.13.2 is a bug-fix release. It maintains both forward and backward
+compatibility (source and binary) with Qt 5.13.0 through 5.13.1.
+
+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.13 series is binary compatible with the 5.12.x series.
+Applications compiled for 5.12 will continue to run with 5.13.
+
+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.
+
+****************************************************************************
+*                         Distance Field Generator                         *
+****************************************************************************
+
+ - [QTBUG-77499] Improved performance when selecting unicode ranges in
+   large fonts.
+ - [QTBUG-77501] Fixed broken text rendering when generating large glyph
+   sets.
diff --git a/src/qdoc/generator.cpp b/src/qdoc/generator.cpp
index e7088c610..fb02f3cc9 100644
--- a/src/qdoc/generator.cpp
+++ b/src/qdoc/generator.cpp
@@ -1446,7 +1446,7 @@ void Generator::generateInvokableNote(const Node *node, CodeMarker *marker)
 
 /*!
   Generate the documentation for \a relative. i.e. \a relative
-  is the node that reporesentas the entity where a qdoc comment
+  is the node that represents the entity where a qdoc comment
   was found, and \a text represents the qdoc comment.
  */
 bool Generator::generateText(const Text &text,
@@ -1686,7 +1686,7 @@ void Generator::generateOverloadedSignal(const Node *node, CodeMarker *marker)
 
 
 /*!
-  Traverses the database recursivly to generate all the documentation.
+  Traverses the database recursively to generate all the documentation.
  */
 void Generator::generateDocs()
 {
diff --git a/src/qdoc/htmlgenerator.cpp b/src/qdoc/htmlgenerator.cpp
index 815f0042f..97222ef13 100644
--- a/src/qdoc/htmlgenerator.cpp
+++ b/src/qdoc/htmlgenerator.cpp
@@ -3024,7 +3024,7 @@ void HtmlGenerator::generateAnnotatedLists(const Node *relative,
   the classes in the class map \a nmm and then generates a
   compact list of the class names alphabetized on the part
   of the name not including the common prefix. You can tell
-  the function to use \a comonPrefix as the common prefix,
+  the function to use \a commonPrefix as the common prefix,
   but normally you let it figure it out itself by looking at
   the name of the first and last classes in the class map
   \a nmm.