summaryrefslogtreecommitdiffstats
path: root/src/tools/qdoc/atom.cpp
diff options
context:
space:
mode:
authorMartin Smith <[email protected]>2014-08-04 14:26:04 +0200
committerMartin Smith <[email protected]>2014-08-22 18:24:02 +0200
commitf752a7ab6cb022c136f91d471616edda0c55a612 (patch)
treeae1a73bb645983a742fde702a05885d7f91b91b6 /src/tools/qdoc/atom.cpp
parentaf7f944dc507734d449355ee8e09674b2993349a (diff)
qdoc: Report error in square bracket parameter
This update makes qdoc report an error, when it can't recognize a parameter in square brackets. Change-Id: I45d31ec875ac533736ee4a565ff3f217353068dd Task-number: QTBUG-39221 Reviewed-by: Topi Reiniƶ <[email protected]>
Diffstat (limited to 'src/tools/qdoc/atom.cpp')
-rw-r--r--src/tools/qdoc/atom.cpp9
1 files changed, 7 insertions, 2 deletions
diff --git a/src/tools/qdoc/atom.cpp b/src/tools/qdoc/atom.cpp
index 0c17a38e51e..de99dc4d5a2 100644
--- a/src/tools/qdoc/atom.cpp
+++ b/src/tools/qdoc/atom.cpp
@@ -146,6 +146,8 @@ QT_BEGIN_NAMESPACE
\value UnknownCommand
*/
+QString Atom::noError_ = QString();
+
static const struct {
const char *english;
int no;
@@ -399,6 +401,7 @@ LinkAtom::LinkAtom(const QString& p1, const QString& p2)
genus_ = Node::CPP;
continue;
}
+ error_ = p2;
break;
}
}
@@ -410,7 +413,8 @@ LinkAtom::LinkAtom(const LinkAtom& t)
: Atom(Link, t.string()),
genus_(t.genus_),
goal_(t.goal_),
- domain_(t.domain_)
+ domain_(t.domain_),
+ error_(t.error_)
{
// nothing
}
@@ -424,7 +428,8 @@ LinkAtom::LinkAtom(Atom* previous, const LinkAtom& t)
: Atom(previous, Link, t.string()),
genus_(t.genus_),
goal_(t.goal_),
- domain_(t.domain_)
+ domain_(t.domain_),
+ error_(t.error_)
{
previous->next_ = this;
}