diff options
author | Qt Continuous Integration System <qt-info@nokia.com> | 2011-08-22 11:22:35 (GMT) |
---|---|---|
committer | Qt Continuous Integration System <qt-info@nokia.com> | 2011-08-22 11:22:35 (GMT) |
commit | 2b18e27c041f17bbc8989aa0ef5363df34edb8e6 (patch) | |
tree | 484a943b81f79ae74aca22f6370b77dbea8c9050 /src/xml | |
parent | 4b90559d0a8b693241dd79682d0d31362497468b (diff) | |
parent | 9e88a2f1468b9a4f500b878f514db7f7a1f5eadc (diff) | |
download | Qt-2b18e27c041f17bbc8989aa0ef5363df34edb8e6.zip Qt-2b18e27c041f17bbc8989aa0ef5363df34edb8e6.tar.gz Qt-2b18e27c041f17bbc8989aa0ef5363df34edb8e6.tar.bz2 |
Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-qa-team
* 'master' of git://scm.dev.nokia.troll.no/qt/qt-qa-team:
Doc: Fixing typo
Diffstat (limited to 'src/xml')
-rw-r--r-- | src/xml/dom/qdom.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/xml/dom/qdom.cpp b/src/xml/dom/qdom.cpp index 7c7cafc..ccc6e8b 100644 --- a/src/xml/dom/qdom.cpp +++ b/src/xml/dom/qdom.cpp @@ -3487,10 +3487,10 @@ QDomDocumentTypePrivate::QDomDocumentTypePrivate(QDomDocumentTypePrivate* n, boo QDomNodePrivate* p = first; while (p) { if (p->isEntity()) - // Dont use normal insert function since we would create infinite recursion + // Don't use normal insert function since we would create infinite recursion entities->map.insertMulti(p->nodeName(), p); if (p->isNotation()) - // Dont use normal insert function since we would create infinite recursion + // Don't use normal insert function since we would create infinite recursion notations->map.insertMulti(p->nodeName(), p); p = p->next; } @@ -5725,7 +5725,7 @@ static QByteArray encodeEntity(const QByteArray& str) len += 4; i += 5; } else if (d[i] == '&' && i + 1 < len && d[i+1] == '#') { - // Dont encode < or " or &custom;. + // Don't encode < or " or &custom;. // Only encode character references tmp.replace(i, 1, "&"); d = tmp; |