diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-09-26 14:32:20 +0200 |
|---|---|---|
| committer | Topi Reiniö <topi.reinio@qt.io> | 2019-09-27 10:05:55 +0000 |
| commit | dcd5df5823d61e3ad479f259dfd4a25d67a54e4a (patch) | |
| tree | e9f47da9963fbc60dba4a46eccf21c425c6f4bef /src/qdoc/webxmlgenerator.h | |
| parent | 0407495a027b8e662c773eafb50ab66fd4638962 (diff) | |
| parent | c8e79294237260d735324663932a676d8084efcb (diff) | |
Merge remote-tracking branch 'origin/5.13' into 5.14
Change-Id: I5c06b3e0177fcccd988620ab269f75632689a54c
Diffstat (limited to 'src/qdoc/webxmlgenerator.h')
| -rw-r--r-- | src/qdoc/webxmlgenerator.h | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/src/qdoc/webxmlgenerator.h b/src/qdoc/webxmlgenerator.h index b52ffb398..5e3e0e9e2 100644 --- a/src/qdoc/webxmlgenerator.h +++ b/src/qdoc/webxmlgenerator.h @@ -34,6 +34,7 @@ #include "htmlgenerator.h" #include "qdocindexfiles.h" +#include <QtCore/qscopedpointer.h> #include <QtCore/qxmlstream.h> QT_BEGIN_NAMESPACE @@ -54,6 +55,7 @@ protected: void generateCppReferencePage(Aggregate *aggregate, CodeMarker *marker) override; void generatePageNode(PageNode *pn, CodeMarker *marker) override; void generateDocumentation(Node *node) override; + void generateExampleFilePage(const Node *en, const QString &file, CodeMarker *marker) override; QString fileExtension() const override; virtual const Atom *addAtomElements(QXmlStreamWriter &writer, const Atom *atom, @@ -64,6 +66,7 @@ protected: private: const QPair<QString,QString> anchorForNode(const Node *node); void generateAnnotatedList(QXmlStreamWriter &writer, const Node *relative, const NodeMap &nodeMap); + void generateAnnotatedList(QXmlStreamWriter &writer, const Node *relative, const NodeList &nodeList); void generateFullName(QXmlStreamWriter &writer, const Node *node, const Node *relative); void generateRelations(QXmlStreamWriter &writer, const Node *node); @@ -77,6 +80,8 @@ private: bool hasQuotingInformation; int numTableRows; QString quoteCommand; + QScopedPointer<QXmlStreamWriter> currentWriter; + bool supplement = false; }; QT_END_NAMESPACE |