summaryrefslogtreecommitdiffstats
path: root/src/corelib/kernel
diff options
context:
space:
mode:
authorTopi Reinio <topi.reinio@digia.com>2013-05-28 13:47:32 +0200
committerThe Qt Project <gerrit-noreply@qt-project.org>2013-05-30 12:49:42 +0200
commit389b6f51613a2d34b132b3955e8595bc594a336a (patch)
treeea0b493c7d8d372c4d61415ff89705b3d501e31f /src/corelib/kernel
parentc3bec846ac89bb79fbdfa5e2bedb3495b0055b09 (diff)
qdoc: Handle collision nodes when building index files
Currently qdoc skips collision nodes (and their children) when reading index files. This means that cross-linking between modules does not work for nodes that are defined under a collision page node. Most notably, the QML global object 'Qt' cannot be linked to from outside Qml module as it collides with Qt namespace. This change fixes the issue by skipping collision nodes and only processing their children when writing index files. In addition, we need to adjust the function that searches for nodes to the possibility that there may be multiple nodes with the same name but different type. Task-number: QTBUG-31096 Change-Id: Ic71d714f85539d8537021c73d8f1a527006a6f23 Reviewed-by: Martin Smith <martin.smith@digia.com>
Diffstat (limited to 'src/corelib/kernel')
0 files changed, 0 insertions, 0 deletions