diff options
| author | Topi Reinio <topi.reinio@digia.com> | 2015-07-09 15:24:52 +0200 |
|---|---|---|
| committer | Topi Reiniö <topi.reinio@digia.com> | 2015-07-31 07:28:50 +0000 |
| commit | 590d305f9994cdfa6075f5d305bfb795c9b479d0 (patch) | |
| tree | ff926b0a7803e5c084b8c6407366dc745e4d1238 /src | |
| parent | 7a1045b647be1aa4357fcc9cf70749105d9a118b (diff) | |
qdoc: Fix incorrect keyword details written to .qhp for QML properties
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>
Diffstat (limited to 'src')
| -rw-r--r-- | src/tools/qdoc/helpprojectwriter.cpp | 8 |
1 files changed, 1 insertions, 7 deletions
diff --git a/src/tools/qdoc/helpprojectwriter.cpp b/src/tools/qdoc/helpprojectwriter.cpp index 90b1d9cfe3..d00f75e32d 100644 --- a/src/tools/qdoc/helpprojectwriter.cpp +++ b/src/tools/qdoc/helpprojectwriter.cpp @@ -196,13 +196,7 @@ QStringList HelpProjectWriter::keywordDetails(const Node *node) const { QStringList details; - if (node->isQmlProperty() || node->isJsProperty()) { - // "name" - details << node->name(); - // "id" - details << node->parent()->parent()->name()+"::"+node->name(); - } - else if (node->parent() && !node->parent()->name().isEmpty()) { + if (node->parent() && !node->parent()->name().isEmpty()) { // "name" if (node->type() == Node::Enum || node->type() == Node::Typedef) details << node->parent()->name()+"::"+node->name(); |