diff options
| author | Liang Qi <liang.qi@qt.io> | 2016-08-02 11:31:51 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2016-08-02 11:31:51 +0200 |
| commit | 33b456b7868f05817a4da898ff01de4552a28986 (patch) | |
| tree | 2c8796fe5157f8eec824f4ab0a9d65b6dbdebced /src/xmlpatterns/parser | |
| parent | 690c12790d23dbc8151610b6d20492f9d6eefac5 (diff) | |
| parent | 30a4041893c8132040cd982c9ca1204345801750 (diff) | |
| download | qtxmlpatterns-33b456b7868f05817a4da898ff01de4552a28986.tar.gz | |
Merge remote-tracking branch 'origin/5.7' into dev
Conflicts:
.qmake.conf
Change-Id: If96447854450a284f77e5ec087e76b866ef1bb06
Diffstat (limited to 'src/xmlpatterns/parser')
| -rw-r--r-- | src/xmlpatterns/parser/qmaintainingreader_tpl_p.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/xmlpatterns/parser/qmaintainingreader_tpl_p.h b/src/xmlpatterns/parser/qmaintainingreader_tpl_p.h index c57caab..fae1818 100644 --- a/src/xmlpatterns/parser/qmaintainingreader_tpl_p.h +++ b/src/xmlpatterns/parser/qmaintainingreader_tpl_p.h @@ -201,7 +201,7 @@ void MaintainingReader<TokenLookupClass, LookupKey>::validateElement(const Looku formatKeyword(name()), allowed.first()); } - else if(totalCount == 1) + else if(totalCount == 2) { /* Note, allowed has already had formatKeyword() applied. */ translationString = QtXmlPatterns::tr("Attribute %1 cannot appear on the element %2. Allowed is %3, %4, and the standard attributes.") |