diff options
| author | aavit <qt-info@nokia.com> | 2011-09-08 19:42:31 (GMT) |
|---|---|---|
| committer | aavit <qt-info@nokia.com> | 2011-09-08 19:42:31 (GMT) |
| commit | a2c2c71ecd84e90f72697dfd57544c8d506c78e2 (patch) | |
| tree | c5e31ff16e2471d33a124a6a37f4e48acdacd235 /tests/auto/qxmlsimplereader | |
| parent | 6326227674efa85c1a5320141041110d211efc75 (diff) | |
| parent | 260005374b9b930aa583cd117aba96f8f4b34131 (diff) | |
| download | Qt-a2c2c71ecd84e90f72697dfd57544c8d506c78e2.zip Qt-a2c2c71ecd84e90f72697dfd57544c8d506c78e2.tar.gz Qt-a2c2c71ecd84e90f72697dfd57544c8d506c78e2.tar.bz2 | |
Merge remote-tracking branch 'qt-mainline/4.8'
Conflicts:
tools/qvfb/qvfbshmem.cpp
Diffstat (limited to 'tests/auto/qxmlsimplereader')
| -rwxr-xr-x | tests/auto/qxmlsimplereader/xmldocs/valid/ext-sa/015.ent | bin | 0 -> 2130 bytes | |||
| -rw-r--r-- | tests/auto/qxmlsimplereader/xmldocs/valid/ext-sa/015.xml | 5 | ||||
| -rw-r--r-- | tests/auto/qxmlsimplereader/xmldocs/valid/ext-sa/015.xml.ref | 10 |
3 files changed, 15 insertions, 0 deletions
diff --git a/tests/auto/qxmlsimplereader/xmldocs/valid/ext-sa/015.ent b/tests/auto/qxmlsimplereader/xmldocs/valid/ext-sa/015.ent Binary files differnew file mode 100755 index 0000000..86a8679 --- /dev/null +++ b/tests/auto/qxmlsimplereader/xmldocs/valid/ext-sa/015.ent diff --git a/tests/auto/qxmlsimplereader/xmldocs/valid/ext-sa/015.xml b/tests/auto/qxmlsimplereader/xmldocs/valid/ext-sa/015.xml new file mode 100644 index 0000000..0e7b9cc --- /dev/null +++ b/tests/auto/qxmlsimplereader/xmldocs/valid/ext-sa/015.xml @@ -0,0 +1,5 @@ +<!DOCTYPE doc [
+<!ELEMENT doc (#PCDATA)>
+<!ENTITY e SYSTEM "015.ent">
+]>
+<doc>&e;</doc>
diff --git a/tests/auto/qxmlsimplereader/xmldocs/valid/ext-sa/015.xml.ref b/tests/auto/qxmlsimplereader/xmldocs/valid/ext-sa/015.xml.ref new file mode 100644 index 0000000..1ec309a --- /dev/null +++ b/tests/auto/qxmlsimplereader/xmldocs/valid/ext-sa/015.xml.ref @@ -0,0 +1,10 @@ +setDocumentLocator(locator={columnNumber=1, lineNumber=1}) +startDocument() + startDTD(name="doc", publicId="", systemId="") + externalEntityDecl(name="e", publicId="", systemId="015.ent") + endDTD() + startElement(namespaceURI="", localName="doc", qName="doc", atts=[]) + resolveEntity(publicId="", systemId="015.ent", ret={}) + skippedEntity(name="e") + endElement(namespaceURI="", localName="doc", qName="doc") +endDocument() |