diff options
Diffstat (limited to 'src/qdoc/htmlgenerator.cpp')
| -rw-r--r-- | src/qdoc/htmlgenerator.cpp | 46 |
1 files changed, 27 insertions, 19 deletions
diff --git a/src/qdoc/htmlgenerator.cpp b/src/qdoc/htmlgenerator.cpp index 684fa417d..690ba9527 100644 --- a/src/qdoc/htmlgenerator.cpp +++ b/src/qdoc/htmlgenerator.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$ ** @@ -608,7 +603,7 @@ int HtmlGenerator::generateAtom(const Atom *atom, const Node *relative, CodeMark out() << "<p>For example, if you have code like</p>\n"; // fallthrough case Atom::CodeBad: - out() << "<pre class=\"cpp\">" + out() << "<pre class=\"cpp plain\">" << trimmedTrailing(protectEnc(plainCode(indent(codeIndent,atom->string()))), codePrefix, codeSuffix) << "</pre>\n"; break; @@ -1939,6 +1934,19 @@ void HtmlGenerator::generateNavigationBar(const QString &title, << Atom(Atom::FormattingRight, ATOM_FORMATTING_LINK) << Atom(itemRight); + } else if (node->isAggregate()) { + QStringList groups = static_cast<const Aggregate*>(node)->groupNames(); + if (groups.length() == 1) { + const Node *groupNode = qdb_->findNodeByNameAndType(QStringList(groups[0]), Node::Group); + if (groupNode && !groupNode->title().isEmpty()) { + navigationbar << Atom(itemLeft) + << Atom(Atom::NavLink, groupNode->name()) + << Atom(Atom::FormattingLeft, ATOM_FORMATTING_LINK) + << Atom(Atom::String, groupNode->title()) + << Atom(Atom::FormattingRight, ATOM_FORMATTING_LINK) + << Atom(itemRight); + } + } } navigationbar << Atom(itemLeft) << Atom(Atom::String, title) @@ -2365,7 +2373,7 @@ void HtmlGenerator::generateQmlRequisites(QmlTypeNode *qcn, CodeMarker *marker) //add the inherited-by to the map NodeList subs; - QmlTypeNode::subclasses(qcn->name(), subs); + QmlTypeNode::subclasses(qcn, subs); if (!subs.isEmpty()) { text.clear(); text << Atom::ParaLeft; |