From c0fa797ba33f0d15be1ba5d4b3587f47ccb02f0f Mon Sep 17 00:00:00 2001
From: Martin Smith <martin.smith@nokia.com>
Date: Thu, 19 Aug 2010 12:47:03 +0200
Subject: qdoc3: Added more pagewords & elements to the search index.

Task-nr: QTBUG-11113
---
 doc/src/xml-processing/xquery-introduction.qdoc | 1 +
 tools/qdoc3/htmlgenerator.cpp                   | 6 +++---
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/doc/src/xml-processing/xquery-introduction.qdoc b/doc/src/xml-processing/xquery-introduction.qdoc
index b79c205..b5356f7 100644
--- a/doc/src/xml-processing/xquery-introduction.qdoc
+++ b/doc/src/xml-processing/xquery-introduction.qdoc
@@ -29,6 +29,7 @@
 \page xquery-introduction.html
 \title A Short Path to XQuery
 
+\pagekeywords XPath XQuery
 \startpage XQuery
 \target XQuery-introduction
 
diff --git a/tools/qdoc3/htmlgenerator.cpp b/tools/qdoc3/htmlgenerator.cpp
index 6fbc2a9..f3390de 100644
--- a/tools/qdoc3/htmlgenerator.cpp
+++ b/tools/qdoc3/htmlgenerator.cpp
@@ -4436,6 +4436,9 @@ bool HtmlGenerator::generatePageElement(QXmlStreamWriter& writer,
 
     if (node->isInnerNode()) {
         const InnerNode* inner = static_cast<const InnerNode*>(node);
+        if (!inner->pageKeywords().isEmpty())
+            pageWords << inner->pageKeywords();
+
         switch (node->type()) {
         case Node::Fake:
             {
@@ -4463,9 +4466,6 @@ bool HtmlGenerator::generatePageElement(QXmlStreamWriter& writer,
             pageWords << title;
             break;
         }
-
-        if (!inner->pageKeywords().isEmpty())
-            pageWords << inner->pageKeywords();
     }
     else {
         switch (node->type()) {
-- 
cgit v0.12