whytofly
/
qt6-bb10
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

qdoc: Fix regression in Node type testing 

When support for documenting JavaScript was added to qdoc,
some tests qdoc uses to determine whether an entity is a
QML signal or a QML method were modified incorrectly, a
case of premature optimization. This caused QML methods to
be listed as QML signals in the documentation. This update
corrects those tests.

Change-Id: Ie6d5b43a03a6f3ae39982292cb9ad92952de0bff
Task-number: QTBUG-44825
Reviewed-by: Gunnar Sletta <gunnar@sletta.org>
bb10
Martin Smith 2015-03-06 10:32:16 +01:00
parent 100ffb60ef
commit 495b3d357d
1 changed files with 18 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
src/tools/qdoc/node.h
View File

@ -884,12 +884,24 @@ public:
bool isOverload() const { return ove; }
bool isReimp() const Q_DECL_OVERRIDE { return reimp; }
bool isFunction() const Q_DECL_OVERRIDE { return true; }
virtual bool isQmlSignal() const Q_DECL_OVERRIDE { return genus() == Node::QML; }
virtual bool isJsSignal() const Q_DECL_OVERRIDE { return genus() == Node::JS; }
virtual bool isQmlSignalHandler() const Q_DECL_OVERRIDE { return genus() == Node::QML; }
virtual bool isJsSignalHandler() const Q_DECL_OVERRIDE { return genus() == Node::JS; }
virtual bool isQmlMethod() const Q_DECL_OVERRIDE { return genus() == Node::QML; }
virtual bool isJsMethod() const Q_DECL_OVERRIDE { return genus() == Node::JS; }
virtual bool isQmlSignal() const Q_DECL_OVERRIDE {
return (type() == Node::QmlSignal) && (genus() == Node::QML);
}
virtual bool isJsSignal() const Q_DECL_OVERRIDE {
return (type() == Node::QmlSignal) && (genus() == Node::JS);
}
virtual bool isQmlSignalHandler() const Q_DECL_OVERRIDE {
return (type() == Node::QmlSignalHandler) && (genus() == Node::QML);
}
virtual bool isJsSignalHandler() const Q_DECL_OVERRIDE {
return (type() == Node::QmlSignalHandler) && (genus() == Node::JS);
}
virtual bool isQmlMethod() const Q_DECL_OVERRIDE {
return (type() == Node::QmlMethod) && (genus() == Node::QML);
}
virtual bool isJsMethod() const Q_DECL_OVERRIDE {
return (type() == Node::QmlMethod) && (genus() == Node::JS);
}
int overloadNumber() const;
const QList<Parameter>& parameters() const { return params; }
QStringList parameterNames() const;