AuroraMiddleware/qt5base-lts
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

qdoc: Fix incorrect keyword details written to .qhp for QML properties

Browse Source 
QDoc tried to refer to an non-existing node (a parent of a parent) of a
QML property when writing the unique ID of a QML property keyword.

Change-Id: I90ab92b6ac95cfa688ca79a2c4d6c72f0e30d018
Task-number: QTCREATORBUG-3708
Reviewed-by: Martin Smith <martin.smith@digia.com>
This commit is contained in:
Topi Reinio 2015-07-09 15:24:52 +02:00 committed by Topi Reiniö
parent 7a1045b647
commit 590d305f99
1 changed files with 1 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/tools/qdoc/helpprojectwriter.cpp
View File

@ -196,13 +196,7 @@ QStringList HelpProjectWriter::keywordDetails(const Node *node) const
{ {
QStringList details; QStringList details;
if (node->isQmlProperty() || node->isJsProperty()) { if (node->parent() && !node->parent()->name().isEmpty()) {
// "name"
details << node->name();
// "id"
details << node->parent()->parent()->name()+"::"+node->name();
}
else if (node->parent() && !node->parent()->name().isEmpty()) {
// "name" // "name"
if (node->type() == Node::Enum || node->type() == Node::Typedef) if (node->type() == Node::Enum || node->type() == Node::Typedef)
details << node->parent()->name()+"::"+node->name(); details << node->parent()->name()+"::"+node->name();