diff options
| author | Martin Smith <martin.smith@nokia.com> | 2012-05-09 14:04:22 +0200 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2012-05-09 20:10:44 +0200 |
| commit | 81c68fe029adb857eb6ea6ed4c910bf97fc0755f (patch) | |
| tree | 82ea1248f87750f3a3f0bf95814e1c46bdf9c5b6 /src/tools/qdoc/node.h | |
| parent | 66ca9382c978bba137219df86b677c9fdc0d4d1c (diff) | |
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 <casper.vandonderen@nokia.com>
Diffstat (limited to 'src/tools/qdoc/node.h')
| -rw-r--r-- | src/tools/qdoc/node.h | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/src/tools/qdoc/node.h b/src/tools/qdoc/node.h index 8218b22fc3..0b8758d92f 100644 --- a/src/tools/qdoc/node.h +++ b/src/tools/qdoc/node.h @@ -230,6 +230,7 @@ public: QString guid() const; QString ditaXmlHref(); QString extractClassName(const QString &string) const; + virtual QString qmlTypeName() const { return name_; } virtual QString qmlModuleName() const { return qmlModuleName_; } virtual QString qmlModuleVersion() const { return qmlModuleVersionMajor_ + "." + qmlModuleVersionMinor_; } virtual QString qmlModuleIdentifier() const { return qmlModuleName_ + qmlModuleVersionMajor_; } @@ -579,6 +580,7 @@ public: virtual ~QmlPropGroupNode() { } virtual bool isQmlNode() const { return true; } virtual bool isQtQuickNode() const { return parent()->isQtQuickNode(); } + virtual QString qmlTypeName() const { return parent()->qmlTypeName(); } virtual QString qmlModuleName() const { return parent()->qmlModuleName(); } virtual QString qmlModuleVersion() const { return parent()->qmlModuleVersion(); } virtual QString qmlModuleIdentifier() const { return parent()->qmlModuleIdentifier(); } @@ -626,6 +628,7 @@ public: virtual bool isAttached() const { return attached_; } virtual bool isQmlNode() const { return true; } virtual bool isQtQuickNode() const { return parent()->isQtQuickNode(); } + virtual QString qmlTypeName() const { return parent()->qmlTypeName(); } virtual QString qmlModuleName() const { return parent()->qmlModuleName(); } virtual QString qmlModuleVersion() const { return parent()->qmlModuleVersion(); } virtual QString qmlModuleIdentifier() const { return parent()->qmlModuleIdentifier(); } @@ -635,6 +638,7 @@ public: const QString& element() const { return static_cast<QmlPropGroupNode*>(parent())->element(); } void appendQmlPropNode(QmlPropertyNode* p) { qmlPropNodes_.append(p); } const NodeList& qmlPropNodes() const { return qmlPropNodes_; } + void setQPropertyFlag() { qproperty_ = true; } private: QString type_; @@ -642,6 +646,7 @@ private: FlagValue designable_; bool isdefault_; bool attached_; + bool qproperty_; FlagValue readOnly_; NodeList qmlPropNodes_; }; @@ -803,6 +808,7 @@ public: (type() == QmlSignalHandler)); } virtual bool isQtQuickNode() const { return parent()->isQtQuickNode(); } + virtual QString qmlTypeName() const { return parent()->qmlTypeName(); } virtual QString qmlModuleName() const { return parent()->qmlModuleName(); } virtual QString qmlModuleVersion() const { return parent()->qmlModuleVersion(); } virtual QString qmlModuleIdentifier() const { return parent()->qmlModuleIdentifier(); } |