summaryrefslogtreecommitdiffstats
path: root/src/tools
diff options
context:
space:
mode:
authorMartin Smith <martin.smith@digia.com>2013-09-12 15:27:38 +0200
committerThe Qt Project <gerrit-noreply@qt-project.org>2013-09-13 14:09:56 +0200
commit93d7ee0da371f9e15fdb0c173df53c28eab307c7 (patch)
treec72568f4b09f2d9d6602a0451e4b78bb75060d39 /src/tools
parent59601e06d96edb5661a3dd91341d74e16dc6b229 (diff)
qdoc: Eliminate duplicate page warnings in some cases
Prevent qdoc from reporting duplicate pages for external pages with the same URL and title. Task-number: QTBUG-33462 Change-Id: Idabdb241aaa4fe105f7b3ea78229ff1ae8776ecf Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
Diffstat (limited to 'src/tools')
-rw-r--r--src/tools/qdoc/qdocdatabase.cpp16
1 files changed, 15 insertions, 1 deletions
diff --git a/src/tools/qdoc/qdocdatabase.cpp b/src/tools/qdoc/qdocdatabase.cpp
index f1a92c2eb3..a50f428d24 100644
--- a/src/tools/qdoc/qdocdatabase.cpp
+++ b/src/tools/qdoc/qdocdatabase.cpp
@@ -1035,7 +1035,21 @@ void QDocDatabase::resolveTargets(InnerNode* root)
DocNode* node = static_cast<DocNode*>(child);
if (!node->title().isEmpty()) {
QString key = Doc::canonicalTitle(node->title());
- docNodesByTitle_.insert(key, node);
+ QList<DocNode*> nodes = docNodesByTitle_.values(key);
+ bool alreadyThere = false;
+ if (!nodes.empty()) {
+ for (int i=0; i< nodes.size(); ++i) {
+ if (nodes[i]->subType() == Node::ExternalPage) {
+ if (node->name() == nodes[i]->name()) {
+ alreadyThere = true;
+ break;
+ }
+ }
+ }
+ }
+ if (!alreadyThere) {
+ docNodesByTitle_.insert(key, node);
+ }
}
if (node->subType() == Node::Collision) {
resolveTargets(node);