diff options
author | Liang Qi <liang.qi@theqtcompany.com> | 2015-07-01 11:05:26 +0200 |
---|---|---|
committer | Liang Qi <liang.qi@theqtcompany.com> | 2015-07-01 11:05:26 +0200 |
commit | 0aa2d318b1524cdab42ab9988270779ddcc1922a (patch) | |
tree | 695c70702763ba2c66eb398ae9d545fc712a9e2d /src/tools | |
parent | 6251d4dafc86bcbec09d1962050af9924249d419 (diff) | |
parent | 49049d90470eb3e94bda77d19ab7f7c57a0bd57f (diff) |
Merge remote-tracking branch 'origin/5.5' into dev
Conflicts:
src/corelib/global/qglobal.cpp
src/corelib/global/qglobal.h
src/corelib/global/qsysinfo.h
src/corelib/global/qsystemdetection.h
src/corelib/kernel/qobjectdefs.h
src/plugins/plugins.pro
tests/auto/widgets/itemviews/qlistview/qlistview.pro
Change-Id: Ib55aa79d707c4c1453fb9d697f6cf92211ed665c
Diffstat (limited to 'src/tools')
-rw-r--r-- | src/tools/qdoc/doc/qdoc-manual-markupcmds.qdoc | 8 | ||||
-rw-r--r-- | src/tools/qdoc/doc/qdoc-manual-topiccmds.qdoc | 2 | ||||
-rw-r--r-- | src/tools/qdoc/htmlgenerator.cpp | 15 |
3 files changed, 18 insertions, 7 deletions
diff --git a/src/tools/qdoc/doc/qdoc-manual-markupcmds.qdoc b/src/tools/qdoc/doc/qdoc-manual-markupcmds.qdoc index 9458d96045..fc576157f7 100644 --- a/src/tools/qdoc/doc/qdoc-manual-markupcmds.qdoc +++ b/src/tools/qdoc/doc/qdoc-manual-markupcmds.qdoc @@ -2178,7 +2178,7 @@ \image happyguy.jpg "Happy guy" Qt provides single-source portability across Microsoft - Windows, Mac OS X, Linux, and all major commercial Unix + Windows, OS X, Linux, and all major commercial Unix variants. It is also available for embedded devices. * / \endcode @@ -2191,7 +2191,7 @@ \image happyguy.jpg image "Happy guy" Qt provides single-source portability across Microsoft - Windows, Mac OS X, Linux, and all major commercial Unix + Windows, OS X, Linux, and all major commercial Unix variants. It is also available for embedded devices. \endquotation @@ -3282,7 +3282,7 @@ / *! Qt::HANDLE is a platform-specific handle type for system objects. This is equivalent to - \c{void *} on Windows and Mac OS X, and to + \c{void *} on Windows and OS X, and to \c{unsigned long} on X11. \warning Using this type is not portable. @@ -3294,7 +3294,7 @@ \quotation Qt::HANDLE is a platform-specific handle type for system objects. This is equivalent to - \c{void *} on Windows and Mac OS X, and to + \c{void *} on Windows and OS X, and to \c{unsigned long} on X11. \warning Using this type is not portable. diff --git a/src/tools/qdoc/doc/qdoc-manual-topiccmds.qdoc b/src/tools/qdoc/doc/qdoc-manual-topiccmds.qdoc index 4ebe0e6cb0..f5351b851c 100644 --- a/src/tools/qdoc/doc/qdoc-manual-topiccmds.qdoc +++ b/src/tools/qdoc/doc/qdoc-manual-topiccmds.qdoc @@ -947,7 +947,7 @@ Qt is a C++ toolkit for cross-platform GUI application development. Qt provides single-source - portability across Microsoft Windows, Mac OS X, Linux, + portability across Microsoft Windows, OS X, Linux, and all major commercial Unix variants. Qt provides application developers with all the diff --git a/src/tools/qdoc/htmlgenerator.cpp b/src/tools/qdoc/htmlgenerator.cpp index 77c4c7a929..3dbb5a589f 100644 --- a/src/tools/qdoc/htmlgenerator.cpp +++ b/src/tools/qdoc/htmlgenerator.cpp @@ -1978,6 +1978,7 @@ void HtmlGenerator::generateHeader(const QString& title, out() << QString(postPostHeader).replace("\\" + COMMAND_VERSION, qdb_->version()); navigationLinks.clear(); + refMap.clear(); if (node && !node->links().empty()) { QPair<QString,QString> linkPair; @@ -4449,6 +4450,7 @@ void HtmlGenerator::generateManifestFile(const QString &manifest, const QString writer.writeAttribute("module", project); writer.writeStartElement(manifest); + QStringList usedAttributes; i = exampleNodeMap.begin(); while (i != exampleNodeMap.end()) { const ExampleNode* en = i.value(); @@ -4462,6 +4464,10 @@ void HtmlGenerator::generateManifestFile(const QString &manifest, const QString ++i; continue; } + // attributes that are always written for the element + usedAttributes.clear(); + usedAttributes << "name" << "docUrl" << "projectPath"; + writer.writeStartElement(element); writer.writeAttribute("name", en->title()); QString docUrl = manifestDir + fileBase(en) + ".html"; @@ -4495,8 +4501,10 @@ void HtmlGenerator::generateManifestFile(const QString &manifest, const QString writer.writeAttribute("projectPath", examplesPath + proFiles[0]); } } - if (!en->imageFileName().isEmpty()) + if (!en->imageFileName().isEmpty()) { writer.writeAttribute("imageUrl", manifestDir + en->imageFileName()); + usedAttributes << "imageUrl"; + } QString fullName = project + QLatin1Char('/') + en->title(); QSet<QString> tags; @@ -4522,7 +4530,10 @@ void HtmlGenerator::generateManifestFile(const QString &manifest, const QString if (attrList.count() == 1) attrList.append(QStringLiteral("true")); QString attrName = attrList.takeFirst(); - writer.writeAttribute(attrName, attrList.join(div)); + if (!usedAttributes.contains(attrName)) { + writer.writeAttribute(attrName, attrList.join(div)); + usedAttributes << attrName; + } } } } |