Merge remote-tracking branch 'origin/stable' into dev

Conflicts:
	configure
	mkspecs/features/create_cmake.prf

Change-Id: I94aea83b83833395d5db399209e0e51b92ef23b5

1 files changed, 4 insertions, 3 deletions

diff --git a/src/tools/qdoc/htmlgenerator.cpp b/src/tools/qdoc/htmlgenerator.cpp
index 4e8103906e..8afc1c749a 100644
--- a/src/tools/qdoc/htmlgenerator.cpp
+++ b/src/tools/qdoc/htmlgenerator.cpp
@@ -4140,11 +4140,12 @@ void HtmlGenerator::generateManifestFile(QString manifest, QString element)
                 if (match) {
                     tags += manifestMetaContent[idx].tags;
                     foreach (const QString &attr, manifestMetaContent[idx].attributes) {
-                        QStringList attrList = attr.split(QLatin1Char(':'), QString::SkipEmptyParts);
+                        QLatin1Char div(':');
+                        QStringList attrList = attr.split(div);
                         if (attrList.count() == 1)
                             attrList.append(QStringLiteral("true"));
-                        if (attrList.count() == 2)
-                            writer.writeAttribute(attrList[0], attrList[1]);
+                        QString attrName = attrList.takeFirst();
+                        writer.writeAttribute(attrName, attrList.join(div));
                     }
                 }
             }