diff options
Diffstat (limited to 'src/qdoc/helpprojectwriter.cpp')
| -rw-r--r-- | src/qdoc/helpprojectwriter.cpp | 48 |
1 files changed, 27 insertions, 21 deletions
diff --git a/src/qdoc/helpprojectwriter.cpp b/src/qdoc/helpprojectwriter.cpp index 96524100f..e9c6fcc73 100644 --- a/src/qdoc/helpprojectwriter.cpp +++ b/src/qdoc/helpprojectwriter.cpp @@ -1,31 +1,26 @@ /**************************************************************************** ** -** Copyright (C) 2015 The Qt Company Ltd. -** Contact: http://www.qt.io/licensing/ +** Copyright (C) 2016 The Qt Company Ltd. +** Contact: https://www.qt.io/licensing/ ** ** This file is part of the tools applications of the Qt Toolkit. ** -** $QT_BEGIN_LICENSE:LGPL21$ +** $QT_BEGIN_LICENSE:GPL-EXCEPT$ ** Commercial License Usage ** Licensees holding valid commercial Qt licenses may use this file in ** accordance with the commercial license agreement provided with the ** Software or, alternatively, in accordance with the terms contained in ** a written agreement between you and The Qt Company. For licensing terms -** and conditions see http://www.qt.io/terms-conditions. For further -** information use the contact form at http://www.qt.io/contact-us. +** and conditions see https://www.qt.io/terms-conditions. For further +** information use the contact form at https://www.qt.io/contact-us. ** -** GNU Lesser General Public License Usage -** Alternatively, this file may be used under the terms of the GNU Lesser -** General Public License version 2.1 or version 3 as published by the Free -** Software Foundation and appearing in the file LICENSE.LGPLv21 and -** LICENSE.LGPLv3 included in the packaging of this file. Please review the -** following information to ensure the GNU Lesser General Public License -** requirements will be met: https://www.gnu.org/licenses/lgpl.html and -** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. -** -** As a special exception, The Qt Company gives you certain additional -** rights. These rights are described in The Qt Company LGPL Exception -** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. +** GNU General Public License Usage +** Alternatively, this file may be used under the terms of the GNU +** General Public License version 3 as published by the Free Software +** Foundation with exceptions as appearing in the file LICENSE.GPL3-EXCEPT +** included in the packaging of this file. Please review the following +** information to ensure the GNU General Public License requirements will +** be met: https://www.gnu.org/licenses/gpl-3.0.html. ** ** $QT_END_LICENSE$ ** @@ -689,7 +684,9 @@ void HelpProjectWriter::generateProject(HelpProject &project) for (it = project.customFilters.constBegin(); it != project.customFilters.constEnd(); ++it) { writer.writeStartElement("customFilter"); writer.writeAttribute("name", it.key()); - foreach (const QString &filter, it.value()) + QStringList sortedAttributes = it.value().toList(); + sortedAttributes.sort(); + foreach (const QString &filter, sortedAttributes) writer.writeTextElement("filterAttribute", filter); writer.writeEndElement(); // customFilter } @@ -698,7 +695,9 @@ void HelpProjectWriter::generateProject(HelpProject &project) writer.writeStartElement("filterSection"); // Write filterAttribute elements. - foreach (const QString &filterName, project.filterAttributes) + QStringList sortedFilterAttributes = project.filterAttributes.toList(); + sortedFilterAttributes.sort(); + foreach (const QString &filterName, sortedFilterAttributes) writer.writeTextElement("filterAttribute", filterName); writer.writeStartElement("toc"); @@ -816,7 +815,11 @@ void HelpProjectWriter::generateProject(HelpProject &project) } // No contents/nextpage links found, write all nodes unsorted if (!contentsFound) { - foreach (const Node *node, subproject.nodes) + QList<const Node*> subnodes = subproject.nodes.values(); + + std::sort(subnodes.begin(), subnodes.end(), Node::nodeNameLessThan); + + foreach (const Node *node, subnodes) writeNode(project, writer, node); } } @@ -832,6 +835,7 @@ void HelpProjectWriter::generateProject(HelpProject &project) writer.writeEndElement(); // toc writer.writeStartElement("keywords"); + std::sort(project.keywords.begin(), project.keywords.end()); foreach (const QStringList &details, project.keywords) { writer.writeStartElement("keyword"); writer.writeAttribute("name", details[0]); @@ -848,7 +852,9 @@ void HelpProjectWriter::generateProject(HelpProject &project) QSet<QString> files = QSet<QString>::fromList(gen_->outputFileNames()); files.unite(project.files); files.unite(project.extraFiles); - foreach (const QString &usedFile, files) { + QStringList sortedFiles = files.toList(); + sortedFiles.sort(); + foreach (const QString &usedFile, sortedFiles) { if (!usedFile.isEmpty()) writer.writeTextElement("file", usedFile); } |