summaryrefslogtreecommitdiffstats
path: root/src/tools
diff options
context:
space:
mode:
authorTopi Reinio <topi.reinio@digia.com>2013-05-08 12:47:41 +0200
committerThe Qt Project <gerrit-noreply@qt-project.org>2013-05-10 12:09:41 +0200
commit2e685628b9cb1cd2de585134c2122c2fc4aa2733 (patch)
tree900524fdc3947fdea8e98827c8d3567749728f26 /src/tools
parentc1e24f883824ad894aa121568e4fde8553028d95 (diff)
qdoc: Don't try to add html files for images in .qhp
QDoc adds document nodes as files into the .qhp, including nodes with image subtype. This will generate a lot of unnecessary warnings for missing '<image>.png.html' files from qhelpgenerator when running 'make docs'. This change makes qdoc skip the above step for image nodes to remove the warnings. The images are still always added to .qch in a separate step. Change-Id: Ib07fc8a3ce65f5d4dd700daf00f5f6a36f74a696 Reviewed-by: Martin Smith <martin.smith@digia.com> Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
Diffstat (limited to 'src/tools')
-rw-r--r--src/tools/qdoc/helpprojectwriter.cpp1
1 files changed, 1 insertions, 0 deletions
diff --git a/src/tools/qdoc/helpprojectwriter.cpp b/src/tools/qdoc/helpprojectwriter.cpp
index fdba15700f..0cdb2de776 100644
--- a/src/tools/qdoc/helpprojectwriter.cpp
+++ b/src/tools/qdoc/helpprojectwriter.cpp
@@ -375,6 +375,7 @@ bool HelpProjectWriter::generateSection(HelpProject &project,
case Node::Document: {
const DocNode *docNode = static_cast<const DocNode*>(node);
if (docNode->subType() != Node::ExternalPage &&
+ docNode->subType() != Node::Image &&
!docNode->fullTitle().isEmpty()) {
if (docNode->subType() != Node::File) {