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

 Conflicts:
	.qmake.conf
	src/qdoc/qmlmarkupvisitor.h
	src/qdoc/qmlvisitor.h
	tests/auto/qtattributionsscanner/testdata/good/expected.json

Done-With: Kai Koehne <kai.koehne@qt.io>
Change-Id: I180ee214d1e5999fc1279b092bd9214b6bf8f858

3 files changed, 5 insertions, 0 deletions

diff --git a/src/qtattributionsscanner/jsongenerator.cpp b/src/qtattributionsscanner/jsongenerator.cpp
index 37d0426af..44fb784aa 100644
--- a/src/qtattributionsscanner/jsongenerator.cpp
+++ b/src/qtattributionsscanner/jsongenerator.cpp
@@ -58,6 +58,7 @@ static QJsonObject generate(Package package)
     obj.insert(QStringLiteral("LicenseFile"), package.licenseFile);
 
     obj.insert(QStringLiteral("Copyright"), package.copyright);
+    obj.insert(QStringLiteral("PackageComment"), package.packageComment);
 
     return obj;
 }
diff --git a/src/qtattributionsscanner/package.h b/src/qtattributionsscanner/package.h
index a0cb82fdd..4a8a9e3e2 100644
--- a/src/qtattributionsscanner/package.h
+++ b/src/qtattributionsscanner/package.h
@@ -53,6 +53,8 @@ struct Package {
     QString licenseFile; // path to file containing the license text. Optional.
 
     QString copyright; // A list of copyright owners. Mandatory.
+
+    QString packageComment; // Further comments about the package. Optional.
 };
 
 #endif // PACKAGE_H
diff --git a/src/qtattributionsscanner/scanner.cpp b/src/qtattributionsscanner/scanner.cpp
index a6c38a3f0..dc7b88fbf 100644
--- a/src/qtattributionsscanner/scanner.cpp
+++ b/src/qtattributionsscanner/scanner.cpp
@@ -120,6 +120,8 @@ static Package readPackage(const QJsonObject &object, const QString &filePath, L
             p.licenseFile = QDir(directory).absoluteFilePath(value);
         } else if (key == QLatin1String("Copyright")) {
             p.copyright = value;
+        } else if (key == QLatin1String("PackageComment")) {
+            p.packageComment = value;
         } else if (key == QLatin1String("QDocModule")) {
             p.qdocModule = value;
         } else if (key == QLatin1String("Description")) {