summaryrefslogtreecommitdiffstats
path: root/src/tools/qdoc/qdocindexfiles.h
diff options
context:
space:
mode:
authorTopi Reinio <topi.reinio@digia.com>2015-10-09 16:06:36 +0200
committerTopi Reiniƶ <topi.reinio@digia.com>2015-10-13 11:55:46 +0000
commitee634611d4d78d7ee66b79dc765abab231391eab (patch)
tree5933ae846a0db1f4382b75c25f48f1102da3f581 /src/tools/qdoc/qdocindexfiles.h
parent798128856c83f2542af166de0083ed46bcd70704 (diff)
qdoc: Insert targets for function and enum nodes read from the index
QDoc wrote \target and \keyword information into the index file properly, but did not read them back in. This was because the code for handling enum and function elements read their own child elements (without handling targets), and marked the remaining children to be skipped. This commit fixes the issue by refactoring the code for inserting targets into a new function and calling it from relevant places. Change-Id: I85d7b26ce54620daec35b19e447d1a065515b863 Task-number: QTBUG-48687 Reviewed-by: Martin Smith <martin.smith@digia.com>
Diffstat (limited to 'src/tools/qdoc/qdocindexfiles.h')
-rw-r--r--src/tools/qdoc/qdocindexfiles.h3
1 files changed, 3 insertions, 0 deletions
diff --git a/src/tools/qdoc/qdocindexfiles.h b/src/tools/qdoc/qdocindexfiles.h
index 67a7e7226e..9873322b3b 100644
--- a/src/tools/qdoc/qdocindexfiles.h
+++ b/src/tools/qdoc/qdocindexfiles.h
@@ -35,6 +35,7 @@
#define QDOCINDEXFILES_H
#include "node.h"
+#include "tree.h"
QT_BEGIN_NAMESPACE
@@ -43,6 +44,7 @@ class Generator;
class QStringList;
class QDocDatabase;
class QXmlStreamWriter;
+class QXmlStreamAttributes;
class QDocIndexFiles
{
@@ -64,6 +66,7 @@ class QDocIndexFiles
void readIndexFile(const QString& path);
void readIndexSection(QXmlStreamReader &reader, Node* current, const QString& indexUrl);
+ void insertTarget(TargetRec::TargetType type, const QXmlStreamAttributes &attributes, Node *node);
void resolveIndex();
void resolveRelates();
bool generateIndexSection(QXmlStreamWriter& writer, Node* node, bool generateInternalNodes = false);