From 590d305f9994cdfa6075f5d305bfb795c9b479d0 Mon Sep 17 00:00:00 2001 From: Topi Reinio Date: Thu, 9 Jul 2015 15:24:52 +0200 Subject: 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 --- src/tools/qdoc/helpprojectwriter.cpp | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) (limited to 'src/tools/qdoc/helpprojectwriter.cpp') 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(); -- cgit v1.2.3