diff options
Diffstat (limited to 'src/tools/qdoc/helpprojectwriter.h')
| -rw-r--r-- | src/tools/qdoc/helpprojectwriter.h | 19 |
1 files changed, 11 insertions, 8 deletions
diff --git a/src/tools/qdoc/helpprojectwriter.h b/src/tools/qdoc/helpprojectwriter.h index 2519e62c13..efc2596296 100644 --- a/src/tools/qdoc/helpprojectwriter.h +++ b/src/tools/qdoc/helpprojectwriter.h @@ -1,7 +1,7 @@ /**************************************************************************** ** -** Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/legal +** Copyright (C) 2015 The Qt Company Ltd. +** Contact: http://www.qt.io/licensing/ ** ** This file is part of the tools applications of the Qt Toolkit. ** @@ -10,9 +10,9 @@ ** 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 Digia. For licensing terms and -** conditions see http://qt.digia.com/licensing. For further information -** use the contact form at http://qt.digia.com/contact-us. +** 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. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser @@ -23,8 +23,8 @@ ** requirements will be met: https://www.gnu.org/licenses/lgpl.html and ** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. ** -** In addition, as a special exception, Digia gives you certain additional -** rights. These rights are described in the Digia Qt LGPL Exception +** 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. ** ** $QT_END_LICENSE$ @@ -50,7 +50,7 @@ struct SubProject { QString title; QString indexTitle; - QHash<Node::Type, QSet<DocNode::SubType> > selectors; + QHash<Node::Type, QSet<DocumentNode::SubType> > selectors; bool sortPages; QString type; QHash<QString, const Node *> nodes; @@ -83,6 +83,9 @@ public: HelpProjectWriter(const Config &config, const QString &defaultFileName, Generator* g); + void reset(const Config &config, + const QString &defaultFileName, + Generator* g); void addExtraFile(const QString &file); void addExtraFiles(const QSet<QString> &files); void generate(); |