1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

qdoc: Instantiator::objectAt now appear in docs

Browse Source 
There was a bug in bool CppCodeParser::splitQmlMethodArg(),
which has now been fixed. The bug occurred when there was a
"::" in the return type.

Change-Id: Id31ed0d4a03d84e76fb69403441a3491ec884ddc
Task-number: QTBUG-47438
Reviewed-by: Topi Reiniö <topi.reinio@digia.com>
Reviewed-by: Andrew Knight <andrew.knight@intopalo.com>
This commit is contained in:
Martin Smith 2015-08-11 11:58:02 +02:00
parent 8c5ce68fcf
commit 330da82cc2
1 changed files with 24 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

49
src/tools/qdoc/cppcodeparser.cpp
View File

@ -687,10 +687,10 @@ bool CppCodeParser::splitQmlPropertyArg(const QString& arg,
<type> <QML-type>::<name>(<param>, <param>, ...)
<type> <QML-module>::<QML-type>::<name>(<param>, <param>, ...)
This function splits the argument into one of those two
forms, sets \a module, \a qmlTypeName, and \a name, and returns
true. If the argument doesn't match either form, an error
message is emitted and false is returned.
This function splits the \a{arg}ument into one of those
two forms, sets \a type, \a module, and \a qmlTypeName,
and returns true. If the argument doesn't match either
form, an error message is emitted and false is returned.
\note The two QML types \e{Component} and \e{QtObject} never
have a module qualifier.
@ -700,30 +700,29 @@ bool CppCodeParser::splitQmlMethodArg(const QString& arg,
QString& module,
QString& qmlTypeName)
{
QStringList colonSplit(arg.split("::"));
QString name;
int leftParen = arg.indexOf(QChar('('));
if (leftParen > 0)
name = arg.left(leftParen);
else
name = arg;
int firstBlank = name.indexOf(QChar(' '));
if (firstBlank > 0) {
type = name.left(firstBlank);
name = name.right(name.length() - firstBlank - 1);
}
else
type.clear();
QStringList colonSplit(name.split("::"));
if (colonSplit.size() > 1) {
QStringList blankSplit = colonSplit[0].split(QLatin1Char(' '));
if (blankSplit.size() > 1) {
type = blankSplit[0];
if (colonSplit.size() > 2) {
module = blankSplit[1];
qmlTypeName = colonSplit[1];
}
else {
module.clear();
qmlTypeName = blankSplit[1];
}
if (colonSplit.size() > 2) {
module = colonSplit[0];
qmlTypeName = colonSplit[1];
}
else {
type.clear();
if (colonSplit.size() > 2) {
module = colonSplit[0];
qmlTypeName = colonSplit[1];
}
else {
module.clear();
qmlTypeName = colonSplit[0];
}
module.clear();
qmlTypeName = colonSplit[0];
}
return true;
}