Merge remote-tracking branch 'origin/5.12' into 5.13

Change-Id: If9dc5f167e9471b4633db73ae5a1cb8c1312b478

2 files changed, 6 insertions, 3 deletions

diff --git a/src/macdeployqt/shared/shared.cpp b/src/macdeployqt/shared/shared.cpp
index a94f07f05..aefbc3765 100644
--- a/src/macdeployqt/shared/shared.cpp
+++ b/src/macdeployqt/shared/shared.cpp
@@ -1130,7 +1130,8 @@ void deployPlugins(const ApplicationBundleInfo &appBundleInfo, const QString &pl
         {QStringLiteral("3DRender"), {QStringLiteral("sceneparsers"), QStringLiteral("geometryloaders")}},
         {QStringLiteral("3DQuickRender"), {QStringLiteral("renderplugins")}},
         {QStringLiteral("Positioning"), {QStringLiteral("position")}},
-        {QStringLiteral("Location"), {QStringLiteral("geoservices")}}
+        {QStringLiteral("Location"), {QStringLiteral("geoservices")}},
+        {QStringLiteral("TextToSpeech"), {QStringLiteral("texttospeech")}}
     };
 
     for (const auto &it : map) {
diff --git a/src/qtattributionsscanner/qdocgenerator.cpp b/src/qtattributionsscanner/qdocgenerator.cpp
index 882875ff5..86e84724b 100644
--- a/src/qtattributionsscanner/qdocgenerator.cpp
+++ b/src/qtattributionsscanner/qdocgenerator.cpp
@@ -86,8 +86,10 @@ static void generate(QTextStream &out, const Package &package, const QDir &baseD
     }
 
     out << "\\target " << package.id << "\n\n";
-    out << "\\title " << package.name << "\n";
-    out << "\\brief " << package.license << "\n\n";
+    out << "\\title " << package.name;
+    if (!package.version.isEmpty())
+        out << ", version " << package.version;
+    out << "\n\n\\brief " << package.license << "\n\n";
 
     if (!package.description.isEmpty())
         out << package.description << "\n\n";