From 81c68fe029adb857eb6ea6ed4c910bf97fc0755f Mon Sep 17 00:00:00 2001 From: Martin Smith Date: Wed, 9 May 2012 14:04:22 +0200 Subject: qdoc: Fixed three qdoc error problems 1. For QML properties documented in a .qml file, qdoc no longer prints the error message that it can't detect whether the property is read-only. 2. For QML properties documented in .cpp files, qdoc now includes the file path and line number, when it prints the error that it can't detect whether the property is read-only. 3. qdoc also includes the completely qualified property name in the error messages described in 2. Change-Id: If88381783fd0f29271f579ae170a0a6f4b1a7344 Reviewed-by: Casper van Donderen --- src/tools/qdoc/cppcodeparser.cpp | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'src/tools/qdoc/cppcodeparser.cpp') diff --git a/src/tools/qdoc/cppcodeparser.cpp b/src/tools/qdoc/cppcodeparser.cpp index 3518881a876..965455a3d59 100644 --- a/src/tools/qdoc/cppcodeparser.cpp +++ b/src/tools/qdoc/cppcodeparser.cpp @@ -964,11 +964,14 @@ Node *CppCodeParser::processTopicCommandGroup(const Doc& doc, QmlClassNode* qmlClass = tree_->findQmlClassNode(module,element); if (qmlClass) { qmlPropGroup = new QmlPropGroupNode(qmlClass,property); //,attached); + qmlPropGroup->setLocation(location()); } } if (qmlPropGroup) { ClassNode *correspondingClass = static_cast(qmlPropGroup->parent())->classNode(); QmlPropertyNode *qmlPropNode = new QmlPropertyNode(qmlPropGroup,property,type,attached); + qmlPropNode->setLocation(location()); + qmlPropNode->setQPropertyFlag(); const PropertyNode *correspondingProperty = 0; if (correspondingClass) { @@ -986,6 +989,8 @@ Node *CppCodeParser::processTopicCommandGroup(const Doc& doc, property, type, attached); + qmlPropNode->setLocation(location()); + qmlPropNode->setQPropertyFlag(); if (correspondingProperty) { bool writableList = type.startsWith("list") && correspondingProperty->dataType().endsWith('*'); qmlPropNode->setReadOnly(!(writableList || correspondingProperty->isWritable())); -- cgit v1.2.3