AuroraMiddleware/qt5base-lts
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

qdoc: Include QML type name in method quid

Browse Source 
A case was found where a method inherited from a
QML type marked abstract had the same name as a
method in the inheriting class, and these two
methods received the same quid. This was fixed
by including the QML type name in the guid for
QML methods.

Change-Id: I110eb254b3c6be014cb67fdc5b57b5aa2f575220
Reviewed-by: Casper van Donderen <casper.vandonderen@nokia.com>
This commit is contained in:
Martin Smith 2012-05-16 10:47:28 +02:00 committed by Qt by Nokia
parent 348c3966a0
commit 6eae3e1da3
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/tools/qdoc/node.cpp
View File

@ -527,9 +527,9 @@ QString Node::fileBase() const
*/ */
QString Node::guid() const QString Node::guid() const
{ {
if (uuid.isEmpty()) if (uuid_.isEmpty())
uuid = idForNode(); uuid_ = idForNode();
return uuid; return uuid_;
} }
#if 0 #if 0
@ -2724,7 +2724,7 @@ QString Node::idForNode() const
str = "namespace-member-" + func->name(); str = "namespace-member-" + func->name();
else if (parent_->type() == Fake) { else if (parent_->type() == Fake) {
if (parent_->subType() == QmlClass) if (parent_->subType() == QmlClass)
str = "qml-method-" + func->name(); str = "qml-method-" + parent_->name().toLower() + "-" + func->name();
else else
qDebug() << "qdoc internal error: Node subtype not handled:" qDebug() << "qdoc internal error: Node subtype not handled:"
<< parent_->subType() << func->name(); << parent_->subType() << func->name();
@ -2801,7 +2801,7 @@ QString Node::idForNode() const
break; break;
case Node::QmlMethod: case Node::QmlMethod:
func = static_cast<const FunctionNode*>(this); func = static_cast<const FunctionNode*>(this);
str = "qml-method-" + func->name(); str = "qml-method-" + parent_->name().toLower() + "-" + func->name();
if (func->overloadNumber() != 1) if (func->overloadNumber() != 1)
str += QLatin1Char('-') + QString::number(func->overloadNumber()); str += QLatin1Char('-') + QString::number(func->overloadNumber());
break; break;

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

@ -288,7 +288,7 @@ private:
QString url_; QString url_;
QString sinc; QString sinc;
QString templateStuff_; QString templateStuff_;
mutable QString uuid; mutable QString uuid_;
QString outSubDir_; QString outSubDir_;
QString qmlModuleName_; QString qmlModuleName_;
QString qmlModuleVersionMajor_; QString qmlModuleVersionMajor_;