diff options
| author | Liang Qi <liang.qi@qt.io> | 2016-08-01 11:15:38 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2016-08-01 11:15:38 +0200 |
| commit | 30a4041893c8132040cd982c9ca1204345801750 (patch) | |
| tree | 39d35ef5a52becbf833608b8c86cd0c5bf8fe837 /src/xmlpatterns/parser/qmaintainingreader_tpl_p.h | |
| parent | e0207675f2cb28713c9cfce1ecc5854a082d3d2c (diff) | |
| parent | c0b6fbcadbefcc8a91e5db7fd98662dddcd7a0f8 (diff) | |
| download | qtxmlpatterns-30a4041893c8132040cd982c9ca1204345801750.tar.gz | |
Merge remote-tracking branch 'origin/5.6' into 5.7
Change-Id: I0653ca8dd6a9b6ee2314911c7679a1c056dc3709
Diffstat (limited to 'src/xmlpatterns/parser/qmaintainingreader_tpl_p.h')
| -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.") |