384 files changed, 0 insertions, 2436 deletions
diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/ext-sa/001.ent b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/ext-sa/001.ent
deleted file mode 100644
index 1cff3fd44f..0000000000
--- a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/ext-sa/001.ent
+++ /dev/null
@@ -1 +0,0 @@
-Data
diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/ext-sa/001.xml b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/ext-sa/001.xml
deleted file mode 100644
index 147d70d2d1..0000000000
--- a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/ext-sa/001.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<!DOCTYPE doc [
-<!ELEMENT doc (#PCDATA)>
-<!ENTITY e SYSTEM "001.ent">
-]>
-<doc>&e;</doc>
diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/ext-sa/001.xml.ref b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/ext-sa/001.xml.ref
deleted file mode 100644
index 355c937e11..0000000000
--- a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/ext-sa/001.xml.ref
+++ /dev/null
@@ -1,10 +0,0 @@
-setDocumentLocator(locator={columnNumber=1, lineNumber=1})
-startDocument()
-   startDTD(name="doc", publicId="", systemId="")
-      externalEntityDecl(name="e", publicId="", systemId="001.ent")
-   endDTD()
-   startElement(namespaceURI="", localName="doc", qName="doc", atts=[])
-      resolveEntity(publicId="", systemId="001.ent", ret={})
-      skippedEntity(name="e")
-   endElement(namespaceURI="", localName="doc", qName="doc")
-endDocument()
diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/ext-sa/002.ent b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/ext-sa/002.ent
deleted file mode 100644
index 45f6d8e74e..0000000000
--- a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/ext-sa/002.ent
+++ /dev/null
@@ -1 +0,0 @@
-Data
-\ No newline at end of file
diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/ext-sa/002.xml b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/ext-sa/002.xml
deleted file mode 100644
index 9eaf91724f..0000000000
--- a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/ext-sa/002.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<!DOCTYPE doc [
-<!ELEMENT doc (#PCDATA)>
-<!ENTITY e SYSTEM "002.ent">
-]>
-<doc>&e;</doc>
diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/ext-sa/002.xml.ref b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/ext-sa/002.xml.ref
deleted file mode 100644
index f843995646..0000000000
--- a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/ext-sa/002.xml.ref
+++ /dev/null
@@ -1,10 +0,0 @@
-setDocumentLocator(locator={columnNumber=1, lineNumber=1})
-startDocument()
-   startDTD(name="doc", publicId="", systemId="")
-      externalEntityDecl(name="e", publicId="", systemId="002.ent")
-   endDTD()
-   startElement(namespaceURI="", localName="doc", qName="doc", atts=[])
-      resolveEntity(publicId="", systemId="002.ent", ret={})
-      skippedEntity(name="e")
-   endElement(namespaceURI="", localName="doc", qName="doc")
-endDocument()
diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/ext-sa/003.ent b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/ext-sa/003.ent
deleted file mode 100644
index e69de29bb2..0000000000
--- a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/ext-sa/003.ent
+++ /dev/null
diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/ext-sa/003.xml b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/ext-sa/003.xml
deleted file mode 100644
index bb60b663ef..0000000000
--- a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/ext-sa/003.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<!DOCTYPE doc [
-<!ELEMENT doc (#PCDATA)>
-<!ENTITY e SYSTEM "003.ent">
-]>
-<doc>&e;</doc>
diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/ext-sa/003.xml.ref b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/ext-sa/003.xml.ref
deleted file mode 100644
index 79d3531637..0000000000
--- a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/ext-sa/003.xml.ref
+++ /dev/null
@@ -1,10 +0,0 @@
-setDocumentLocator(locator={columnNumber=1, lineNumber=1})
-startDocument()
-   startDTD(name="doc", publicId="", systemId="")
-      externalEntityDecl(name="e", publicId="", systemId="003.ent")
-   endDTD()
-   startElement(namespaceURI="", localName="doc", qName="doc", atts=[])
-      resolveEntity(publicId="", systemId="003.ent", ret={})
-      skippedEntity(name="e")
-   endElement(namespaceURI="", localName="doc", qName="doc")
-endDocument()
diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/ext-sa/004.ent b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/ext-sa/004.ent
deleted file mode 100644
index 3436f20001..0000000000
--- a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/ext-sa/004.ent
+++ /dev/null
@@ -1 +0,0 @@
-Data
-\ No newline at end of file
diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/ext-sa/004.xml b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/ext-sa/004.xml
deleted file mode 100644
index 074498ce19..0000000000
--- a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/ext-sa/004.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<!DOCTYPE doc [
-<!ELEMENT doc (#PCDATA)>
-<!ENTITY e SYSTEM "004.ent">
-]>
-<doc>&e;</doc>
diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/ext-sa/004.xml.ref b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/ext-sa/004.xml.ref
deleted file mode 100644
index 38abcb2fc6..0000000000
--- a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/ext-sa/004.xml.ref
+++ /dev/null
@@ -1,10 +0,0 @@
-setDocumentLocator(locator={columnNumber=1, lineNumber=1})
-startDocument()
-   startDTD(name="doc", publicId="", systemId="")
-      externalEntityDecl(name="e", publicId="", systemId="004.ent")
-   endDTD()
-   startElement(namespaceURI="", localName="doc", qName="doc", atts=[])
-      resolveEntity(publicId="", systemId="004.ent", ret={})
-      skippedEntity(name="e")
-   endElement(namespaceURI="", localName="doc", qName="doc")
-endDocument()
diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/ext-sa/005.ent b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/ext-sa/005.ent
deleted file mode 100644
index c6e97f821f..0000000000
--- a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/ext-sa/005.ent
+++ /dev/null
@@ -1 +0,0 @@
-<e/><e/><e/>
-\ No newline at end of file
diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/ext-sa/005.xml b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/ext-sa/005.xml
deleted file mode 100644
index 82a6228205..0000000000
--- a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/ext-sa/005.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<!DOCTYPE doc [
-<!ELEMENT doc (e*)>
-<!ELEMENT e EMPTY>
-<!ENTITY e SYSTEM "005.ent">
-]>
-<doc>&e;</doc>
diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/ext-sa/005.xml.ref b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/ext-sa/005.xml.ref
deleted file mode 100644
index 2601030f2a..0000000000
--- a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/ext-sa/005.xml.ref
+++ /dev/null
@@ -1,10 +0,0 @@
-setDocumentLocator(locator={columnNumber=1, lineNumber=1})
-startDocument()
-   startDTD(name="doc", publicId="", systemId="")
-      externalEntityDecl(name="e", publicId="", systemId="005.ent")
-   endDTD()
-   startElement(namespaceURI="", localName="doc", qName="doc", atts=[])
-      resolveEntity(publicId="", systemId="005.ent", ret={})
-      skippedEntity(name="e")
-   endElement(namespaceURI="", localName="doc", qName="doc")
-endDocument()
diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/ext-sa/006.ent b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/ext-sa/006.ent
deleted file mode 100644
index 4df2f0c2ac..0000000000
--- a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/ext-sa/006.ent
+++ /dev/null
@@ -1,4 +0,0 @@
-Data
-<e/>
-More data
-<e/>
diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/ext-sa/006.xml b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/ext-sa/006.xml
deleted file mode 100644
index 0b326cad4c..0000000000
--- a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/ext-sa/006.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<!DOCTYPE doc [
-<!ELEMENT doc (#PCDATA|e)*>
-<!ELEMENT e EMPTY>
-<!ENTITY e SYSTEM "006.ent">
-]>
-<doc>&e;</doc>
diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/ext-sa/006.xml.ref b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/ext-sa/006.xml.ref
deleted file mode 100644
index 17fd238b67..0000000000
--- a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/ext-sa/006.xml.ref
+++ /dev/null
@@ -1,10 +0,0 @@
-setDocumentLocator(locator={columnNumber=1, lineNumber=1})
-startDocument()
-   startDTD(name="doc", publicId="", systemId="")
-      externalEntityDecl(name="e", publicId="", systemId="006.ent")
-   endDTD()
-   startElement(namespaceURI="", localName="doc", qName="doc", atts=[])
-      resolveEntity(publicId="", systemId="006.ent", ret={})
-      skippedEntity(name="e")
-   endElement(namespaceURI="", localName="doc", qName="doc")
-endDocument()
diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/ext-sa/007.ent b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/ext-sa/007.ent
deleted file mode 100644
index ab1d696dd7..0000000000
--- a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/ext-sa/007.ent
+++ /dev/null
diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/ext-sa/007.xml b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/ext-sa/007.xml
deleted file mode 100644
index 825e3b286a..0000000000
--- a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/ext-sa/007.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<!DOCTYPE doc [
-<!ELEMENT doc (#PCDATA)>
-<!ENTITY e SYSTEM "007.ent">
-]>
-<doc>X&e;Z</doc>
diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/ext-sa/007.xml.ref b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/ext-sa/007.xml.ref
deleted file mode 100644
index 81e7ccdaf3..0000000000
--- a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/ext-sa/007.xml.ref
+++ /dev/null
@@ -1,11 +0,0 @@
-setDocumentLocator(locator={columnNumber=1, lineNumber=1})
-startDocument()
-   startDTD(name="doc", publicId="", systemId="")
-      externalEntityDecl(name="e", publicId="", systemId="007.ent")
-   endDTD()
-   startElement(namespaceURI="", localName="doc", qName="doc", atts=[])
-      resolveEntity(publicId="", systemId="007.ent", ret={})
-      skippedEntity(name="e")
-      characters(ch="XZ")
-   endElement(namespaceURI="", localName="doc", qName="doc")
-endDocument()
diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/ext-sa/008.ent b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/ext-sa/008.ent
deleted file mode 100644
index c6ca61f9c8..0000000000
--- a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/ext-sa/008.ent
+++ /dev/null
diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/ext-sa/008.xml b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/ext-sa/008.xml
deleted file mode 100644
index 3c001b6cb3..0000000000
--- a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/ext-sa/008.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<!DOCTYPE doc [
-<!ELEMENT doc (#PCDATA)>
-<!ENTITY e SYSTEM "008.ent">
-]>
-<doc>X&e;Z</doc>
diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/ext-sa/008.xml.ref b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/ext-sa/008.xml.ref
deleted file mode 100644
index eb7f1086e1..0000000000
--- a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/ext-sa/008.xml.ref
+++ /dev/null
@@ -1,11 +0,0 @@
-setDocumentLocator(locator={columnNumber=1, lineNumber=1})
-startDocument()
-   startDTD(name="doc", publicId="", systemId="")
-      externalEntityDecl(name="e", publicId="", systemId="008.ent")
-   endDTD()
-   startElement(namespaceURI="", localName="doc", qName="doc", atts=[])
-      resolveEntity(publicId="", systemId="008.ent", ret={})
-      skippedEntity(name="e")
-      characters(ch="XZ")
-   endElement(namespaceURI="", localName="doc", qName="doc")
-endDocument()
diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/ext-sa/009.ent b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/ext-sa/009.ent
deleted file mode 100644
index 67c3297611..0000000000
--- a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/ext-sa/009.ent
+++ /dev/null
@@ -1 +0,0 @@
-
-\ No newline at end of file
diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/ext-sa/009.xml b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/ext-sa/009.xml
deleted file mode 100644
index a5866e5a77..0000000000
--- a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/ext-sa/009.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<!DOCTYPE doc [
-<!ELEMENT doc (#PCDATA)>
-<!ENTITY e SYSTEM "009.ent">
-]>
-<doc>&e;</doc>
diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/ext-sa/009.xml.ref b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/ext-sa/009.xml.ref
deleted file mode 100644
index 5c294de017..0000000000
--- a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/ext-sa/009.xml.ref
+++ /dev/null
@@ -1,10 +0,0 @@
-setDocumentLocator(locator={columnNumber=1, lineNumber=1})
-startDocument()
-   startDTD(name="doc", publicId="", systemId="")
-      externalEntityDecl(name="e", publicId="", systemId="009.ent")
-   endDTD()
-   startElement(namespaceURI="", localName="doc", qName="doc", atts=[])
-      resolveEntity(publicId="", systemId="009.ent", ret={})
-      skippedEntity(name="e")
-   endElement(namespaceURI="", localName="doc", qName="doc")
-endDocument()
diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/ext-sa/010.ent b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/ext-sa/010.ent
deleted file mode 100644
index e69de29bb2..0000000000
--- a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/ext-sa/010.ent
+++ /dev/null
diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/ext-sa/010.xml b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/ext-sa/010.xml
deleted file mode 100644
index 418e9b0141..0000000000
--- a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/ext-sa/010.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<!DOCTYPE doc [
-<!ELEMENT doc (#PCDATA)>
-<!ENTITY e SYSTEM "010.ent">
-]>
-<doc>&e;</doc>
diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/ext-sa/010.xml.ref b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/ext-sa/010.xml.ref
deleted file mode 100644
index 4dc03c6dba..0000000000
--- a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/ext-sa/010.xml.ref
+++ /dev/null
@@ -1,10 +0,0 @@
-setDocumentLocator(locator={columnNumber=1, lineNumber=1})
-startDocument()
-   startDTD(name="doc", publicId="", systemId="")
-      externalEntityDecl(name="e", publicId="", systemId="010.ent")
-   endDTD()
-   startElement(namespaceURI="", localName="doc", qName="doc", atts=[])
-      resolveEntity(publicId="", systemId="010.ent", ret={})
-      skippedEntity(name="e")
-   endElement(namespaceURI="", localName="doc", qName="doc")
-endDocument()
diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/ext-sa/011.ent b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/ext-sa/011.ent
deleted file mode 100644
index b19be3a497..0000000000
--- a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/ext-sa/011.ent
+++ /dev/null
@@ -1 +0,0 @@
-xyzzy
diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/ext-sa/011.xml b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/ext-sa/011.xml
deleted file mode 100644
index 2ceefa1d21..0000000000
--- a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/ext-sa/011.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<!DOCTYPE doc [
-<!ELEMENT doc (#PCDATA)>
-<!ENTITY e PUBLIC "a not very interesting file" "011.ent">
-]>
-<doc>&e;</doc>
diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/ext-sa/011.xml.ref b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/ext-sa/011.xml.ref
deleted file mode 100644
index c078139d84..0000000000
--- a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/ext-sa/011.xml.ref
+++ /dev/null
@@ -1,10 +0,0 @@
-setDocumentLocator(locator={columnNumber=1, lineNumber=1})
-startDocument()
-   startDTD(name="doc", publicId="", systemId="")
-      externalEntityDecl(name="e", publicId="a not very interesting file", systemId="011.ent")
-   endDTD()
-   startElement(namespaceURI="", localName="doc", qName="doc", atts=[])
-      resolveEntity(publicId="a not very interesting file", systemId="011.ent", ret={})
-      skippedEntity(name="e")
-   endElement(namespaceURI="", localName="doc", qName="doc")
-endDocument()
diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/ext-sa/012.ent b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/ext-sa/012.ent
deleted file mode 100644
index 8eb1fb9c41..0000000000
--- a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/ext-sa/012.ent
+++ /dev/null
@@ -1 +0,0 @@
-&e4;
-\ No newline at end of file
diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/ext-sa/012.xml b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/ext-sa/012.xml
deleted file mode 100644
index 5a8f009b4a..0000000000
--- a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/ext-sa/012.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<!DOCTYPE doc [
-<!ENTITY e1 "&e2;">
-<!ENTITY e2 "&e3;">
-<!ENTITY e3 SYSTEM "012.ent">
-<!ENTITY e4 "&e5;">
-<!ENTITY e5 "(e5)">
-<!ELEMENT doc (#PCDATA)>
-]>
-<doc>&e1;</doc>
diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/ext-sa/012.xml.ref b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/ext-sa/012.xml.ref
deleted file mode 100644
index 2af77a3b99..0000000000
--- a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/ext-sa/012.xml.ref
+++ /dev/null
@@ -1,14 +0,0 @@
-setDocumentLocator(locator={columnNumber=1, lineNumber=1})
-startDocument()
-   startDTD(name="doc", publicId="", systemId="")
-      internatlEntityDecl(name="e1", value="&e2;")
-      internatlEntityDecl(name="e2", value="&e3;")
-      externalEntityDecl(name="e3", publicId="", systemId="012.ent")
-      internatlEntityDecl(name="e4", value="&e5;")
-      internatlEntityDecl(name="e5", value="(e5)")
-   endDTD()
-   startElement(namespaceURI="", localName="doc", qName="doc", atts=[])
-      resolveEntity(publicId="", systemId="012.ent", ret={})
-      skippedEntity(name="e3")
-   endElement(namespaceURI="", localName="doc", qName="doc")
-endDocument()
diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/ext-sa/013.ent b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/ext-sa/013.ent
deleted file mode 100644
index 7f25c502dd..0000000000
--- a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/ext-sa/013.ent
+++ /dev/null
@@ -1 +0,0 @@
-<e/>
-\ No newline at end of file
diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/ext-sa/013.xml b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/ext-sa/013.xml
deleted file mode 100644
index 7717c97afe..0000000000
--- a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/ext-sa/013.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<!DOCTYPE doc [
-<!ELEMENT doc (e)>
-<!ELEMENT e (#PCDATA)>
-<!ATTLIST e
-  a1 CDATA "a1 default"
-  a2 NMTOKENS "a2 default"
->
-<!ENTITY x SYSTEM "013.ent">
-]>
-<doc>&x;</doc>
diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/ext-sa/013.xml.ref b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/ext-sa/013.xml.ref
deleted file mode 100644
index 92fb65a2d2..0000000000
--- a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/ext-sa/013.xml.ref
+++ /dev/null
@@ -1,12 +0,0 @@
-setDocumentLocator(locator={columnNumber=1, lineNumber=1})
-startDocument()
-   startDTD(name="doc", publicId="", systemId="")
-      attributeDecl(eName="e", aName="a1", type="", valueDefault="", value="")
-      attributeDecl(eName="e", aName="a2", type="", valueDefault="", value="")
-      externalEntityDecl(name="x", publicId="", systemId="013.ent")
-   endDTD()
-   startElement(namespaceURI="", localName="doc", qName="doc", atts=[])
-      resolveEntity(publicId="", systemId="013.ent", ret={})
-      skippedEntity(name="x")
-   endElement(namespaceURI="", localName="doc", qName="doc")
-endDocument()
diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/ext-sa/014.ent b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/ext-sa/014.ent
deleted file mode 100644
index 470fd6fe44..0000000000
--- a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/ext-sa/014.ent
+++ /dev/null
diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/ext-sa/014.xml b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/ext-sa/014.xml
deleted file mode 100644
index 816fd1e796..0000000000
--- a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/ext-sa/014.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<!DOCTYPE doc [
-<!ELEMENT doc (#PCDATA)>
-<!ENTITY e SYSTEM "014.ent">
-]>
-<doc>&e;</doc>
diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/ext-sa/014.xml.ref b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/ext-sa/014.xml.ref
deleted file mode 100644
index a087786e69..0000000000
--- a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/ext-sa/014.xml.ref
+++ /dev/null
@@ -1,10 +0,0 @@
-setDocumentLocator(locator={columnNumber=1, lineNumber=1})
-startDocument()
-   startDTD(name="doc", publicId="", systemId="")
-      externalEntityDecl(name="e", publicId="", systemId="014.ent")
-   endDTD()
-   startElement(namespaceURI="", localName="doc", qName="doc", atts=[])
-      resolveEntity(publicId="", systemId="014.ent", ret={})
-      skippedEntity(name="e")
-   endElement(namespaceURI="", localName="doc", qName="doc")
-endDocument()
diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/ext-sa/undef_entity_1.xml b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/ext-sa/undef_entity_1.xml
deleted file mode 100644
index e91a10895e..0000000000
--- a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/ext-sa/undef_entity_1.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no" ?>
-<!DOCTYPE foo SYSTEM "foo.dtd" [
-    <!ENTITY def "foo">
-]>
-<foo>
-    <!-- check that the call to skippedEntity() is inserted in the right place -->
-    <a>abc&undef;gh</a>
-    <b>&undef;gh</b>
-    <c>abc&undef;</c>
-    <d>&undef;</d>
-    <e>&undef;&def;&undef;&def;</e>
-    <e>a&undef;b&def;c&undef;d&def;e</e>
-</foo>
diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/ext-sa/undef_entity_1.xml.ref b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/ext-sa/undef_entity_1.xml.ref
deleted file mode 100644
index 67f1fbe808..0000000000
--- a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/ext-sa/undef_entity_1.xml.ref
+++ /dev/null
@@ -1,47 +0,0 @@
-setDocumentLocator(locator={columnNumber=1, lineNumber=1})
-startDocument()
-   processingInstruction(target="xml", data="version='1.0' encoding='UTF-8' standalone='no'")
-   startDTD(name="foo", publicId="", systemId="foo.dtd")
-      internatlEntityDecl(name="def", value="foo")
-   endDTD()
-   startElement(namespaceURI="", localName="foo", qName="foo", atts=[])
-      characters(ch="\n    ")
-      comment(ch=" check that the call to skippedEntity() is inserted in the right place ")
-      characters(ch="\n    ")
-      startElement(namespaceURI="", localName="a", qName="a", atts=[])
-         characters(ch="abc")
-         skippedEntity(name="undef")
-         characters(ch="gh")
-      endElement(namespaceURI="", localName="a", qName="a")
-      characters(ch="\n    ")
-      startElement(namespaceURI="", localName="b", qName="b", atts=[])
-         skippedEntity(name="undef")
-         characters(ch="gh")
-      endElement(namespaceURI="", localName="b", qName="b")
-      characters(ch="\n    ")
-      startElement(namespaceURI="", localName="c", qName="c", atts=[])
-         characters(ch="abc")
-         skippedEntity(name="undef")
-      endElement(namespaceURI="", localName="c", qName="c")
-      characters(ch="\n    ")
-      startElement(namespaceURI="", localName="d", qName="d", atts=[])
-         skippedEntity(name="undef")
-      endElement(namespaceURI="", localName="d", qName="d")
-      characters(ch="\n    ")
-      startElement(namespaceURI="", localName="e", qName="e", atts=[])
-         skippedEntity(name="undef")
-         characters(ch="foo")
-         skippedEntity(name="undef")
-         characters(ch="foo")
-      endElement(namespaceURI="", localName="e", qName="e")
-      characters(ch="\n    ")
-      startElement(namespaceURI="", localName="e", qName="e", atts=[])
-         characters(ch="a")
-         skippedEntity(name="undef")
-         characters(ch="bfooc")
-         skippedEntity(name="undef")
-         characters(ch="dfooe")
-      endElement(namespaceURI="", localName="e", qName="e")
-      characters(ch="\n")
-   endElement(namespaceURI="", localName="foo", qName="foo")
-endDocument()
diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/ext-sa/undef_entity_2.xml b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/ext-sa/undef_entity_2.xml
deleted file mode 100644
index a1fb393371..0000000000
--- a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/ext-sa/undef_entity_2.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no" ?>
-<!DOCTYPE foo SYSTEM "foo.dtd" [
-    <!ENTITY a1 "&a2;">
-    <!ENTITY a2 "&a3;">
-    <!ENTITY def "foo">
-]>
-<foo>
-    <a>abc&a1;gh</a>
-    <b>&a1;gh</b>
-    <c>abc&a1;</c>
-    <d>&a1;</d>
-    <e>&a1;&def;&a1;&def;</e>
-    <e>a&a1;b&def;c&a1;d&def;e</e>
-</foo>
diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/ext-sa/undef_entity_2.xml.ref b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/ext-sa/undef_entity_2.xml.ref
deleted file mode 100644
index a7ed3a2848..0000000000
--- a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/ext-sa/undef_entity_2.xml.ref
+++ /dev/null
@@ -1,47 +0,0 @@
-setDocumentLocator(locator={columnNumber=1, lineNumber=1})
-startDocument()
-   processingInstruction(target="xml", data="version='1.0' encoding='UTF-8' standalone='no'")
-   startDTD(name="foo", publicId="", systemId="foo.dtd")
-      internatlEntityDecl(name="a1", value="&a2;")
-      internatlEntityDecl(name="a2", value="&a3;")
-      internatlEntityDecl(name="def", value="foo")
-   endDTD()
-   startElement(namespaceURI="", localName="foo", qName="foo", atts=[])
-      characters(ch="\n    ")
-      startElement(namespaceURI="", localName="a", qName="a", atts=[])
-         characters(ch="abc")
-         skippedEntity(name="a3")
-         characters(ch="gh")
-      endElement(namespaceURI="", localName="a", qName="a")
-      characters(ch="\n    ")
-      startElement(namespaceURI="", localName="b", qName="b", atts=[])
-         skippedEntity(name="a3")
-         characters(ch="gh")
-      endElement(namespaceURI="", localName="b", qName="b")
-      characters(ch="\n    ")
-      startElement(namespaceURI="", localName="c", qName="c", atts=[])
-         characters(ch="abc")
-         skippedEntity(name="a3")
-      endElement(namespaceURI="", localName="c", qName="c")
-      characters(ch="\n    ")
-      startElement(namespaceURI="", localName="d", qName="d", atts=[])
-         skippedEntity(name="a3")
-      endElement(namespaceURI="", localName="d", qName="d")
-      characters(ch="\n    ")
-      startElement(namespaceURI="", localName="e", qName="e", atts=[])
-         skippedEntity(name="a3")
-         characters(ch="foo")
-         skippedEntity(name="a3")
-         characters(ch="foo")
-      endElement(namespaceURI="", localName="e", qName="e")
-      characters(ch="\n    ")
-      startElement(namespaceURI="", localName="e", qName="e", atts=[])
-         characters(ch="a")
-         skippedEntity(name="a3")
-         characters(ch="bfooc")
-         skippedEntity(name="a3")
-         characters(ch="dfooe")
-      endElement(namespaceURI="", localName="e", qName="e")
-      characters(ch="\n")
-   endElement(namespaceURI="", localName="foo", qName="foo")
-endDocument()
diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/ext-sa/undef_entity_3.xml b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/ext-sa/undef_entity_3.xml
deleted file mode 100644
index ae745d4da1..0000000000
--- a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/ext-sa/undef_entity_3.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no" ?>
-<!DOCTYPE foo SYSTEM "foo.dtd" [
-    <!ENTITY a1 "&a2;">
-    <!ENTITY a2 "&a3;">
-    <!ENTITY def "foo">
-]>
-<foo>
-    <a attr="foo&a1;bar&def;ding"/>
-</foo>
diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/ext-sa/undef_entity_3.xml.ref b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/ext-sa/undef_entity_3.xml.ref
deleted file mode 100644
index 09f8e96b9c..0000000000
--- a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/ext-sa/undef_entity_3.xml.ref
+++ /dev/null
@@ -1,16 +0,0 @@
-setDocumentLocator(locator={columnNumber=1, lineNumber=1})
-startDocument()
-   processingInstruction(target="xml", data="version='1.0' encoding='UTF-8' standalone='no'")
-   startDTD(name="foo", publicId="", systemId="foo.dtd")
-      internatlEntityDecl(name="a1", value="&a2;")
-      internatlEntityDecl(name="a2", value="&a3;")
-      internatlEntityDecl(name="def", value="foo")
-   endDTD()
-   startElement(namespaceURI="", localName="foo", qName="foo", atts=[])
-      characters(ch="\n    ")
-      skippedEntity(name="a3")
-      startElement(namespaceURI="", localName="a", qName="a", atts=[{localName="attr", qName="attr", uri="", type="CDATA", value="foobarfooding"}])
-      endElement(namespaceURI="", localName="a", qName="a")
-      characters(ch="\n")
-   endElement(namespaceURI="", localName="foo", qName="foo")
-endDocument()
diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/not-sa/001.ent b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/not-sa/001.ent
deleted file mode 100644
index e69de29bb2..0000000000
--- a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/not-sa/001.ent
+++ /dev/null
diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/not-sa/001.xml b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/not-sa/001.xml
deleted file mode 100644
index 2d6f41a137..0000000000
--- a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/not-sa/001.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<!DOCTYPE doc SYSTEM "001.ent" [
-<!ELEMENT doc EMPTY>
-]>
-<doc></doc>
diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/not-sa/001.xml.ref b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/not-sa/001.xml.ref
deleted file mode 100644
index eea47ce41b..0000000000
--- a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/not-sa/001.xml.ref
+++ /dev/null
@@ -1,7 +0,0 @@
-setDocumentLocator(locator={columnNumber=1, lineNumber=1})
-startDocument()
-   startDTD(name="doc", publicId="", systemId="001.ent")
-   endDTD()
-   startElement(namespaceURI="", localName="doc", qName="doc", atts=[])
-   endElement(namespaceURI="", localName="doc", qName="doc")
-endDocument()
diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/not-sa/002.ent b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/not-sa/002.ent
deleted file mode 100644
index 67c3297611..0000000000
--- a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/not-sa/002.ent
+++ /dev/null
@@ -1 +0,0 @@
-
-\ No newline at end of file
diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/not-sa/002.xml b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/not-sa/002.xml
deleted file mode 100644
index 023fce8499..0000000000
--- a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/not-sa/002.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<!DOCTYPE doc SYSTEM "002.ent" [
-<!ELEMENT doc EMPTY>
-]>
-<doc></doc>
diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/not-sa/002.xml.ref b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/not-sa/002.xml.ref
deleted file mode 100644
index cbaf6dc22d..0000000000
--- a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/not-sa/002.xml.ref
+++ /dev/null
@@ -1,7 +0,0 @@
-setDocumentLocator(locator={columnNumber=1, lineNumber=1})
-startDocument()
-   startDTD(name="doc", publicId="", systemId="002.ent")
-   endDTD()
-   startElement(namespaceURI="", localName="doc", qName="doc", atts=[])
-   endElement(namespaceURI="", localName="doc", qName="doc")
-endDocument()
diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/not-sa/003-1.ent b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/not-sa/003-1.ent
deleted file mode 100644
index 931f3ad6d8..0000000000
--- a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/not-sa/003-1.ent
+++ /dev/null
@@ -1,3 +0,0 @@
-<!ELEMENT doc EMPTY>
-<!ENTITY % e SYSTEM "003-2.ent">
-<!ATTLIST doc a1 CDATA %e; "v1">
diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/not-sa/003-2.ent b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/not-sa/003-2.ent
deleted file mode 100644
index e69de29bb2..0000000000
--- a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/not-sa/003-2.ent
+++ /dev/null
diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/not-sa/003.xml b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/not-sa/003.xml
deleted file mode 100644
index 63a5e8bdfc..0000000000
--- a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/not-sa/003.xml
+++ /dev/null
@@ -1,2 +0,0 @@
-<!DOCTYPE doc SYSTEM "003-1.ent">
-<doc></doc>
diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/not-sa/003.xml.ref b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/not-sa/003.xml.ref
deleted file mode 100644
index 4f83c741fb..0000000000
--- a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/not-sa/003.xml.ref
+++ /dev/null
@@ -1,7 +0,0 @@
-setDocumentLocator(locator={columnNumber=1, lineNumber=1})
-startDocument()
-   startDTD(name="doc", publicId="", systemId="003-1.ent")
-   endDTD()
-   startElement(namespaceURI="", localName="doc", qName="doc", atts=[])
-   endElement(namespaceURI="", localName="doc", qName="doc")
-endDocument()
diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/not-sa/004-1.ent b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/not-sa/004-1.ent
deleted file mode 100644
index 40f7ff58a2..0000000000
--- a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/not-sa/004-1.ent
+++ /dev/null
@@ -1,4 +0,0 @@
-<!ELEMENT doc EMPTY>
-<!ENTITY % e1 SYSTEM "004-2.ent">
-<!ENTITY % e2 "%e1;">
-%e1;
diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/not-sa/004-2.ent b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/not-sa/004-2.ent
deleted file mode 100644
index 61def75cb7..0000000000
--- a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/not-sa/004-2.ent
+++ /dev/null
@@ -1 +0,0 @@
-<!ATTLIST doc a1 CDATA "value">
diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/not-sa/004.xml b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/not-sa/004.xml
deleted file mode 100644
index adc9201496..0000000000
--- a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/not-sa/004.xml
+++ /dev/null
@@ -1,2 +0,0 @@
-<!DOCTYPE doc SYSTEM "004-1.ent">
-<doc></doc>
diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/not-sa/004.xml.ref b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/not-sa/004.xml.ref
deleted file mode 100644
index e2d3af888e..0000000000
--- a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/not-sa/004.xml.ref
+++ /dev/null
@@ -1,7 +0,0 @@
-setDocumentLocator(locator={columnNumber=1, lineNumber=1})
-startDocument()
-   startDTD(name="doc", publicId="", systemId="004-1.ent")
-   endDTD()
-   startElement(namespaceURI="", localName="doc", qName="doc", atts=[])
-   endElement(namespaceURI="", localName="doc", qName="doc")
-endDocument()
diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/not-sa/005-1.ent b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/not-sa/005-1.ent
deleted file mode 100644
index ade9599032..0000000000
--- a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/not-sa/005-1.ent
+++ /dev/null
@@ -1,3 +0,0 @@
-<!ELEMENT doc EMPTY>
-<!ENTITY % e SYSTEM "005-2.ent">
-%e;
diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/not-sa/005-2.ent b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/not-sa/005-2.ent
deleted file mode 100644
index bef50b1f38..0000000000
--- a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/not-sa/005-2.ent
+++ /dev/null
@@ -1 +0,0 @@
-<!ATTLIST doc a1 CDATA "v1">
diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/not-sa/005.xml b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/not-sa/005.xml
deleted file mode 100644
index 6bd44cfee0..0000000000
--- a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/not-sa/005.xml
+++ /dev/null
@@ -1,2 +0,0 @@
-<!DOCTYPE doc SYSTEM "005-1.ent">
-<doc></doc>
diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/not-sa/005.xml.ref b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/not-sa/005.xml.ref
deleted file mode 100644
index 8057322cf2..0000000000
--- a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/not-sa/005.xml.ref
+++ /dev/null
@@ -1,7 +0,0 @@
-setDocumentLocator(locator={columnNumber=1, lineNumber=1})
-startDocument()
-   startDTD(name="doc", publicId="", systemId="005-1.ent")
-   endDTD()
-   startElement(namespaceURI="", localName="doc", qName="doc", atts=[])
-   endElement(namespaceURI="", localName="doc", qName="doc")
-endDocument()
diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/not-sa/006.ent b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/not-sa/006.ent
deleted file mode 100644
index 8f305a82bd..0000000000
--- a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/not-sa/006.ent
+++ /dev/null
@@ -1,2 +0,0 @@
-<!ELEMENT doc EMPTY>
-<!ATTLIST doc a1 CDATA "w1" a2 CDATA "w2">
diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/not-sa/006.xml b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/not-sa/006.xml
deleted file mode 100644
index eb80bb7409..0000000000
--- a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/not-sa/006.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<!DOCTYPE doc SYSTEM "006.ent" [
-<!ATTLIST doc a1 CDATA "v1">
-]>
-<doc></doc>
diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/not-sa/006.xml.ref b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/not-sa/006.xml.ref
deleted file mode 100644
index e2e2584353..0000000000
--- a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/not-sa/006.xml.ref
+++ /dev/null
@@ -1,8 +0,0 @@
-setDocumentLocator(locator={columnNumber=1, lineNumber=1})
-startDocument()
-   startDTD(name="doc", publicId="", systemId="006.ent")
-      attributeDecl(eName="doc", aName="a1", type="", valueDefault="", value="")
-   endDTD()
-   startElement(namespaceURI="", localName="doc", qName="doc", atts=[])
-   endElement(namespaceURI="", localName="doc", qName="doc")
-endDocument()
diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/not-sa/007.ent b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/not-sa/007.ent
deleted file mode 100644
index fbf4ca4947..0000000000
--- a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/not-sa/007.ent
+++ /dev/null
@@ -1,2 +0,0 @@
-<!ELEMENT doc (#PCDATA)>
-<!ATTLIST doc a1 CDATA "v1">
diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/not-sa/007.xml b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/not-sa/007.xml
deleted file mode 100644
index 38897e34ea..0000000000
--- a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/not-sa/007.xml
+++ /dev/null
@@ -1,2 +0,0 @@
-<!DOCTYPE doc SYSTEM "007.ent">
-<doc></doc>
diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/not-sa/007.xml.ref b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/not-sa/007.xml.ref
deleted file mode 100644
index d96790fb37..0000000000
--- a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/not-sa/007.xml.ref
+++ /dev/null
@@ -1,7 +0,0 @@
-setDocumentLocator(locator={columnNumber=1, lineNumber=1})
-startDocument()
-   startDTD(name="doc", publicId="", systemId="007.ent")
-   endDTD()
-   startElement(namespaceURI="", localName="doc", qName="doc", atts=[])
-   endElement(namespaceURI="", localName="doc", qName="doc")
-endDocument()
diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/not-sa/008.ent b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/not-sa/008.ent
deleted file mode 100644
index fbf4ca4947..0000000000
--- a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/not-sa/008.ent
+++ /dev/null
@@ -1,2 +0,0 @@
-<!ELEMENT doc (#PCDATA)>
-<!ATTLIST doc a1 CDATA "v1">
diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/not-sa/008.xml b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/not-sa/008.xml
deleted file mode 100644
index bf777a7ff2..0000000000
--- a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/not-sa/008.xml
+++ /dev/null
@@ -1,2 +0,0 @@
-<!DOCTYPE doc PUBLIC "whatever" "008.ent">
-<doc></doc>
diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/not-sa/008.xml.ref b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/not-sa/008.xml.ref
deleted file mode 100644
index 08ba9c035b..0000000000
--- a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/not-sa/008.xml.ref
+++ /dev/null
@@ -1,7 +0,0 @@
-setDocumentLocator(locator={columnNumber=1, lineNumber=1})
-startDocument()
-   startDTD(name="doc", publicId="whatever", systemId="008.ent")
-   endDTD()
-   startElement(namespaceURI="", localName="doc", qName="doc", atts=[])
-   endElement(namespaceURI="", localName="doc", qName="doc")
-endDocument()
diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/not-sa/009.ent b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/not-sa/009.ent
deleted file mode 100644
index fbf4ca4947..0000000000
--- a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/not-sa/009.ent
+++ /dev/null
@@ -1,2 +0,0 @@
-<!ELEMENT doc (#PCDATA)>
-<!ATTLIST doc a1 CDATA "v1">
diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/not-sa/009.xml b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/not-sa/009.xml
deleted file mode 100644
index c17562fe68..0000000000
--- a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/not-sa/009.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<!DOCTYPE doc PUBLIC "whatever" "009.ent" [
-<!ATTLIST doc a2 CDATA "v2">
-]>
-<doc></doc>
diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/not-sa/009.xml.ref b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/not-sa/009.xml.ref
deleted file mode 100644
index d789785173..0000000000
--- a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/not-sa/009.xml.ref
+++ /dev/null
@@ -1,8 +0,0 @@
-setDocumentLocator(locator={columnNumber=1, lineNumber=1})
-startDocument()
-   startDTD(name="doc", publicId="whatever", systemId="009.ent")
-      attributeDecl(eName="doc", aName="a2", type="", valueDefault="", value="")
-   endDTD()
-   startElement(namespaceURI="", localName="doc", qName="doc", atts=[])
-   endElement(namespaceURI="", localName="doc", qName="doc")
-endDocument()
diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/not-sa/010.ent b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/not-sa/010.ent
deleted file mode 100644
index 52a28f5deb..0000000000
--- a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/not-sa/010.ent
+++ /dev/null
@@ -1,2 +0,0 @@
-<!ELEMENT doc (#PCDATA)>
-<!ATTLIST doc a1 CDATA "v2">
diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/not-sa/010.xml b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/not-sa/010.xml
deleted file mode 100644
index 2786b328f3..0000000000
--- a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/not-sa/010.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<!DOCTYPE doc SYSTEM "010.ent" [
-<!ATTLIST doc a1 CDATA "v1">
-]>
-<doc></doc>
diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/not-sa/010.xml.ref b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/not-sa/010.xml.ref
deleted file mode 100644
index 6045d46296..0000000000
--- a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/not-sa/010.xml.ref
+++ /dev/null
@@ -1,8 +0,0 @@
-setDocumentLocator(locator={columnNumber=1, lineNumber=1})
-startDocument()
-   startDTD(name="doc", publicId="", systemId="010.ent")
-      attributeDecl(eName="doc", aName="a1", type="", valueDefault="", value="")
-   endDTD()
-   startElement(namespaceURI="", localName="doc", qName="doc", atts=[])
-   endElement(namespaceURI="", localName="doc", qName="doc")
-endDocument()
diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/not-sa/011.ent b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/not-sa/011.ent
deleted file mode 100644
index fbf4ca4947..0000000000
--- a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/not-sa/011.ent
+++ /dev/null
@@ -1,2 +0,0 @@
-<!ELEMENT doc (#PCDATA)>
-<!ATTLIST doc a1 CDATA "v1">
diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/not-sa/011.xml b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/not-sa/011.xml
deleted file mode 100644
index 03b482bbb6..0000000000
--- a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/not-sa/011.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<!DOCTYPE doc [
-<!ENTITY % e SYSTEM "011.ent">
-%e;
-]>
-<doc></doc>
diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/not-sa/011.xml.ref b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/not-sa/011.xml.ref
deleted file mode 100644
index 09fd89bd38..0000000000
--- a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/not-sa/011.xml.ref
+++ /dev/null
@@ -1,10 +0,0 @@
-setDocumentLocator(locator={columnNumber=1, lineNumber=1})
-startDocument()
-   startDTD(name="doc", publicId="", systemId="")
-      externalEntityDecl(name="%e", publicId="", systemId="011.ent")
-      resolveEntity(publicId="", systemId="011.ent", ret={})
-      skippedEntity(name="%e")
-   endDTD()
-   startElement(namespaceURI="", localName="doc", qName="doc", atts=[])
-   endElement(namespaceURI="", localName="doc", qName="doc")
-endDocument()
diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/not-sa/012.ent b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/not-sa/012.ent
deleted file mode 100644
index 7e372e65e9..0000000000
--- a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/not-sa/012.ent
+++ /dev/null
@@ -1,3 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!ELEMENT doc (#PCDATA)>
-<!ATTLIST doc a1 CDATA "v1">
diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/not-sa/012.xml b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/not-sa/012.xml
deleted file mode 100644
index 1967edbba7..0000000000
--- a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/not-sa/012.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<!DOCTYPE doc [
-<!ENTITY % e SYSTEM "012.ent">
-%e;
-]>
-<doc></doc>
diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/not-sa/012.xml.ref b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/not-sa/012.xml.ref
deleted file mode 100644
index 8d90b187dd..0000000000
--- a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/not-sa/012.xml.ref
+++ /dev/null
@@ -1,10 +0,0 @@
-setDocumentLocator(locator={columnNumber=1, lineNumber=1})
-startDocument()
-   startDTD(name="doc", publicId="", systemId="")
-      externalEntityDecl(name="%e", publicId="", systemId="012.ent")
-      resolveEntity(publicId="", systemId="012.ent", ret={})
-      skippedEntity(name="%e")
-   endDTD()
-   startElement(namespaceURI="", localName="doc", qName="doc", atts=[])
-   endElement(namespaceURI="", localName="doc", qName="doc")
-endDocument()
diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/not-sa/013.ent b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/not-sa/013.ent
deleted file mode 100644
index a3691d9f08..0000000000
--- a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/not-sa/013.ent
+++ /dev/null
@@ -1,4 +0,0 @@
-<!ELEMENT doc (#PCDATA)>
-<![ INCLUDE [
-<!ATTLIST doc a1 CDATA "v1">
-]]>
diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/not-sa/013.xml b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/not-sa/013.xml
deleted file mode 100644
index cf44f2600a..0000000000
--- a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/not-sa/013.xml
+++ /dev/null
@@ -1,2 +0,0 @@
-<!DOCTYPE doc SYSTEM "013.ent">
-<doc></doc>
diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/not-sa/013.xml.ref b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/not-sa/013.xml.ref
deleted file mode 100644
index d84839e625..0000000000
--- a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/not-sa/013.xml.ref
+++ /dev/null
@@ -1,7 +0,0 @@
-setDocumentLocator(locator={columnNumber=1, lineNumber=1})
-startDocument()
-   startDTD(name="doc", publicId="", systemId="013.ent")
-   endDTD()
-   startElement(namespaceURI="", localName="doc", qName="doc", atts=[])
-   endElement(namespaceURI="", localName="doc", qName="doc")
-endDocument()
diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/not-sa/014.ent b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/not-sa/014.ent
deleted file mode 100644
index 6eaf779329..0000000000
--- a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/not-sa/014.ent
+++ /dev/null
@@ -1,4 +0,0 @@
-<!ELEMENT doc (#PCDATA)>
-<![ %e; [
-<!ATTLIST doc a1 CDATA "v1">
-]]>
diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/not-sa/014.xml b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/not-sa/014.xml
deleted file mode 100644
index bd08502489..0000000000
--- a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/not-sa/014.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<!DOCTYPE doc SYSTEM "014.ent" [
-<!ENTITY % e "INCLUDE">
-]>
-<doc></doc>
diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/not-sa/014.xml.ref b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/not-sa/014.xml.ref
deleted file mode 100644
index f9c8220bbb..0000000000
--- a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/not-sa/014.xml.ref
+++ /dev/null
@@ -1,8 +0,0 @@
-setDocumentLocator(locator={columnNumber=1, lineNumber=1})
-startDocument()
-   startDTD(name="doc", publicId="", systemId="014.ent")
-      internatlEntityDecl(name="%e", value="INCLUDE")
-   endDTD()
-   startElement(namespaceURI="", localName="doc", qName="doc", atts=[])
-   endElement(namespaceURI="", localName="doc", qName="doc")
-endDocument()
diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/not-sa/015.ent b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/not-sa/015.ent
deleted file mode 100644
index 00d2f30e1d..0000000000
--- a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/not-sa/015.ent
+++ /dev/null
@@ -1,5 +0,0 @@
-<!ELEMENT doc (#PCDATA)>
-<![ %e; [
-<!ATTLIST doc a1 CDATA "v1">
-]]>
-<!ATTLIST doc a2 CDATA "v2">
diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/not-sa/015.xml b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/not-sa/015.xml
deleted file mode 100644
index e04e75ffca..0000000000
--- a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/not-sa/015.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<!DOCTYPE doc SYSTEM "015.ent" [
-<!ENTITY % e "IGNORE">
-]>
-<doc></doc>
diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/not-sa/015.xml.ref b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/not-sa/015.xml.ref
deleted file mode 100644
index de94a45356..0000000000
--- a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/not-sa/015.xml.ref
+++ /dev/null
@@ -1,8 +0,0 @@
-setDocumentLocator(locator={columnNumber=1, lineNumber=1})
-startDocument()
-   startDTD(name="doc", publicId="", systemId="015.ent")
-      internatlEntityDecl(name="%e", value="IGNORE")
-   endDTD()
-   startElement(namespaceURI="", localName="doc", qName="doc", atts=[])
-   endElement(namespaceURI="", localName="doc", qName="doc")
-endDocument()
diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/not-sa/016.ent b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/not-sa/016.ent
deleted file mode 100644
index bf77ef8336..0000000000
--- a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/not-sa/016.ent
+++ /dev/null
@@ -1,4 +0,0 @@
-<!ELEMENT doc (#PCDATA)>
-<![%e;[
-<!ATTLIST doc a1 CDATA "v1">
-]]>
diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/not-sa/016.xml b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/not-sa/016.xml
deleted file mode 100644
index 4ccf4af350..0000000000
--- a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/not-sa/016.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<!DOCTYPE doc SYSTEM "016.ent" [
-<!ENTITY % e "INCLUDE">
-]>
-<doc></doc>
diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/not-sa/016.xml.ref b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/not-sa/016.xml.ref
deleted file mode 100644
index 7c234cfc5f..0000000000
--- a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/not-sa/016.xml.ref
+++ /dev/null
@@ -1,8 +0,0 @@
-setDocumentLocator(locator={columnNumber=1, lineNumber=1})
-startDocument()
-   startDTD(name="doc", publicId="", systemId="016.ent")
-      internatlEntityDecl(name="%e", value="INCLUDE")
-   endDTD()
-   startElement(namespaceURI="", localName="doc", qName="doc", atts=[])
-   endElement(namespaceURI="", localName="doc", qName="doc")
-endDocument()
diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/not-sa/017.ent b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/not-sa/017.ent
deleted file mode 100644
index ffd9adde61..0000000000
--- a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/not-sa/017.ent
+++ /dev/null
@@ -1,3 +0,0 @@
-<!ELEMENT doc (#PCDATA)>
-<!ENTITY % e "<!ATTLIST doc a1 CDATA 'v1'>">
-%e;
diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/not-sa/017.xml b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/not-sa/017.xml
deleted file mode 100644
index 7fe18f4c7a..0000000000
--- a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/not-sa/017.xml
+++ /dev/null
@@ -1,2 +0,0 @@
-<!DOCTYPE doc SYSTEM "017.ent">
-<doc></doc>
diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/not-sa/017.xml.ref b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/not-sa/017.xml.ref
deleted file mode 100644
index 25cc198610..0000000000
--- a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/not-sa/017.xml.ref
+++ /dev/null
@@ -1,7 +0,0 @@
-setDocumentLocator(locator={columnNumber=1, lineNumber=1})
-startDocument()
-   startDTD(name="doc", publicId="", systemId="017.ent")
-   endDTD()
-   startElement(namespaceURI="", localName="doc", qName="doc", atts=[])
-   endElement(namespaceURI="", localName="doc", qName="doc")
-endDocument()
diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/not-sa/018.ent b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/not-sa/018.ent
deleted file mode 100644
index 2d46f76fc3..0000000000
--- a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/not-sa/018.ent
+++ /dev/null
@@ -1,3 +0,0 @@
-<!ELEMENT doc (#PCDATA)>
-<!ENTITY % e "'v1'">
-<!ATTLIST doc a1 CDATA %e;>
diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/not-sa/018.xml b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/not-sa/018.xml
deleted file mode 100644
index 31e90f2405..0000000000
--- a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/not-sa/018.xml
+++ /dev/null
@@ -1,2 +0,0 @@
-<!DOCTYPE doc SYSTEM "018.ent">
-<doc></doc>
diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/not-sa/018.xml.ref b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/not-sa/018.xml.ref
deleted file mode 100644
index 3db7bc846b..0000000000
--- a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/not-sa/018.xml.ref
+++ /dev/null
@@ -1,7 +0,0 @@
-setDocumentLocator(locator={columnNumber=1, lineNumber=1})
-startDocument()
-   startDTD(name="doc", publicId="", systemId="018.ent")
-   endDTD()
-   startElement(namespaceURI="", localName="doc", qName="doc", atts=[])
-   endElement(namespaceURI="", localName="doc", qName="doc")
-endDocument()
diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/not-sa/019.ent b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/not-sa/019.ent
deleted file mode 100644
index d18201a98b..0000000000
--- a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/not-sa/019.ent
+++ /dev/null
@@ -1,3 +0,0 @@
-<!ELEMENT doc (#PCDATA)>
-<!ENTITY % e "'v1'">
-<!ATTLIST doc a1 CDATA%e;>
diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/not-sa/019.xml b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/not-sa/019.xml
deleted file mode 100644
index b7a18faba0..0000000000
--- a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/not-sa/019.xml
+++ /dev/null
@@ -1,2 +0,0 @@
-<!DOCTYPE doc SYSTEM "019.ent">
-<doc></doc>
diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/not-sa/019.xml.ref b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/not-sa/019.xml.ref
deleted file mode 100644
index 9961aa93b4..0000000000
--- a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/not-sa/019.xml.ref
+++ /dev/null
@@ -1,7 +0,0 @@
-setDocumentLocator(locator={columnNumber=1, lineNumber=1})
-startDocument()
-   startDTD(name="doc", publicId="", systemId="019.ent")
-   endDTD()
-   startElement(namespaceURI="", localName="doc", qName="doc", atts=[])
-   endElement(namespaceURI="", localName="doc", qName="doc")
-endDocument()
diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/not-sa/020.ent b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/not-sa/020.ent
deleted file mode 100644
index 815291c6d2..0000000000
--- a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/not-sa/020.ent
+++ /dev/null
@@ -1,3 +0,0 @@
-<!ENTITY % e "doc">
-<!ELEMENT doc (#PCDATA)>
-<!ATTLIST%e;a1 CDATA "v1">
diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/not-sa/020.xml b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/not-sa/020.xml
deleted file mode 100644
index d70892f7ad..0000000000
--- a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/not-sa/020.xml
+++ /dev/null
@@ -1,2 +0,0 @@
-<!DOCTYPE doc SYSTEM "020.ent">
-<doc></doc>
diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/not-sa/020.xml.ref b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/not-sa/020.xml.ref
deleted file mode 100644
index fc9a0535c1..0000000000
--- a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/not-sa/020.xml.ref
+++ /dev/null
@@ -1,7 +0,0 @@
-setDocumentLocator(locator={columnNumber=1, lineNumber=1})
-startDocument()
-   startDTD(name="doc", publicId="", systemId="020.ent")
-   endDTD()
-   startElement(namespaceURI="", localName="doc", qName="doc", atts=[])
-   endElement(namespaceURI="", localName="doc", qName="doc")
-endDocument()
diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/not-sa/021.ent b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/not-sa/021.ent
deleted file mode 100644
index 9f8f2afd2b..0000000000
--- a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/not-sa/021.ent
+++ /dev/null
@@ -1,3 +0,0 @@
-<!ENTITY % e "doc a1 CDATA">
-<!ELEMENT doc (#PCDATA)>
-<!ATTLIST %e; "v1">
diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/not-sa/021.xml b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/not-sa/021.xml
deleted file mode 100644
index 70c28730db..0000000000
--- a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/not-sa/021.xml
+++ /dev/null
@@ -1,2 +0,0 @@
-<!DOCTYPE doc SYSTEM "021.ent">
-<doc></doc>
diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/not-sa/021.xml.ref b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/not-sa/021.xml.ref
deleted file mode 100644
index e6d91722d3..0000000000
--- a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/not-sa/021.xml.ref
+++ /dev/null
@@ -1,7 +0,0 @@
-setDocumentLocator(locator={columnNumber=1, lineNumber=1})
-startDocument()
-   startDTD(name="doc", publicId="", systemId="021.ent")
-   endDTD()
-   startElement(namespaceURI="", localName="doc", qName="doc", atts=[])
-   endElement(namespaceURI="", localName="doc", qName="doc")
-endDocument()
diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/not-sa/022.ent b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/not-sa/022.ent
deleted file mode 100644
index 26f2d8beb2..0000000000
--- a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/not-sa/022.ent
+++ /dev/null
@@ -1,3 +0,0 @@
-<!ENTITY % e "INCLUDE[">
-<!ELEMENT doc (#PCDATA)>
-<![ %e; <!ATTLIST doc a1 CDATA "v1"> ]]>
diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/not-sa/022.xml b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/not-sa/022.xml
deleted file mode 100644
index b639f2551c..0000000000
--- a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/not-sa/022.xml
+++ /dev/null
@@ -1,2 +0,0 @@
-<!DOCTYPE doc SYSTEM "022.ent">
-<doc></doc>
diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/not-sa/022.xml.ref b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/not-sa/022.xml.ref
deleted file mode 100644
index de3ddf732f..0000000000
--- a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/not-sa/022.xml.ref
+++ /dev/null
@@ -1,7 +0,0 @@
-setDocumentLocator(locator={columnNumber=1, lineNumber=1})
-startDocument()
-   startDTD(name="doc", publicId="", systemId="022.ent")
-   endDTD()
-   startElement(namespaceURI="", localName="doc", qName="doc", atts=[])
-   endElement(namespaceURI="", localName="doc", qName="doc")
-endDocument()
diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/not-sa/023.ent b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/not-sa/023.ent
deleted file mode 100644
index e3268819f7..0000000000
--- a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/not-sa/023.ent
+++ /dev/null
@@ -1,5 +0,0 @@
-<!ELEMENT doc (#PCDATA)>
-<!ENTITY % e1 "do">
-<!ENTITY % e2 "c">
-<!ENTITY % e3 "%e1;%e2;">
-<!ATTLIST %e3; a1 CDATA "v1">
diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/not-sa/023.xml b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/not-sa/023.xml
deleted file mode 100644
index 1c2484b70b..0000000000
--- a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/not-sa/023.xml
+++ /dev/null
@@ -1,2 +0,0 @@
-<!DOCTYPE doc SYSTEM "023.ent">
-<doc></doc>
diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/not-sa/023.xml.ref b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/not-sa/023.xml.ref
deleted file mode 100644
index a150bde52a..0000000000
--- a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/not-sa/023.xml.ref
+++ /dev/null
@@ -1,7 +0,0 @@
-setDocumentLocator(locator={columnNumber=1, lineNumber=1})
-startDocument()
-   startDTD(name="doc", publicId="", systemId="023.ent")
-   endDTD()
-   startElement(namespaceURI="", localName="doc", qName="doc", atts=[])
-   endElement(namespaceURI="", localName="doc", qName="doc")
-endDocument()
diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/not-sa/024.ent b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/not-sa/024.ent
deleted file mode 100644
index aa6d0eccac..0000000000
--- a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/not-sa/024.ent
+++ /dev/null
@@ -1,4 +0,0 @@
-<!ELEMENT doc (#PCDATA)>
-<!ENTITY % e1 "'v1'">
-<!ENTITY % e2 'a1 CDATA %e1;'>
-<!ATTLIST doc %e2;>
diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/not-sa/024.xml b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/not-sa/024.xml
deleted file mode 100644
index 96e1ecb61b..0000000000
--- a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/not-sa/024.xml
+++ /dev/null
@@ -1,2 +0,0 @@
-<!DOCTYPE doc SYSTEM "024.ent">
-<doc></doc>
diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/not-sa/024.xml.ref b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/not-sa/024.xml.ref
deleted file mode 100644
index e97c61bd94..0000000000
--- a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/not-sa/024.xml.ref
+++ /dev/null
@@ -1,7 +0,0 @@
-setDocumentLocator(locator={columnNumber=1, lineNumber=1})
-startDocument()
-   startDTD(name="doc", publicId="", systemId="024.ent")
-   endDTD()
-   startElement(namespaceURI="", localName="doc", qName="doc", atts=[])
-   endElement(namespaceURI="", localName="doc", qName="doc")
-endDocument()
diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/not-sa/025.ent b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/not-sa/025.ent
deleted file mode 100644
index 389d259eb1..0000000000
--- a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/not-sa/025.ent
+++ /dev/null
@@ -1,5 +0,0 @@
-<!ELEMENT doc EMPTY>
-<!ENTITY % e "x">
-<!ENTITY % e "y">
-<!ENTITY % v "'%e;'">
-<!ATTLIST doc a1 CDATA %v;>
diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/not-sa/025.xml b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/not-sa/025.xml
deleted file mode 100644
index 8fdbc14c47..0000000000
--- a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/not-sa/025.xml
+++ /dev/null
@@ -1,2 +0,0 @@
-<!DOCTYPE doc SYSTEM "025.ent">
-<doc></doc>
diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/not-sa/025.xml.ref b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/not-sa/025.xml.ref
deleted file mode 100644
index 1eca607181..0000000000
--- a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/not-sa/025.xml.ref
+++ /dev/null
@@ -1,7 +0,0 @@
-setDocumentLocator(locator={columnNumber=1, lineNumber=1})
-startDocument()
-   startDTD(name="doc", publicId="", systemId="025.ent")
-   endDTD()
-   startElement(namespaceURI="", localName="doc", qName="doc", atts=[])
-   endElement(namespaceURI="", localName="doc", qName="doc")
-endDocument()
diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/not-sa/026.ent b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/not-sa/026.ent
deleted file mode 100644
index bdc93af639..0000000000
--- a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/not-sa/026.ent
+++ /dev/null
@@ -1 +0,0 @@
-<!ATTLIST doc a1 CDATA "w1">
diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/not-sa/026.xml b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/not-sa/026.xml
deleted file mode 100644
index 7b109c0913..0000000000
--- a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/not-sa/026.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<!DOCTYPE doc [
-<!ELEMENT doc ANY>
-<!ENTITY % e SYSTEM "026.ent">
-%e;
-<!ATTLIST doc a1 CDATA "x1" a2 CDATA "x2">
-]>
-<doc></doc>
diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/not-sa/026.xml.ref b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/not-sa/026.xml.ref
deleted file mode 100644
index 1bea883d9c..0000000000
--- a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/not-sa/026.xml.ref
+++ /dev/null
@@ -1,12 +0,0 @@
-setDocumentLocator(locator={columnNumber=1, lineNumber=1})
-startDocument()
-   startDTD(name="doc", publicId="", systemId="")
-      externalEntityDecl(name="%e", publicId="", systemId="026.ent")
-      resolveEntity(publicId="", systemId="026.ent", ret={})
-      skippedEntity(name="%e")
-      attributeDecl(eName="doc", aName="a1", type="", valueDefault="", value="")
-      attributeDecl(eName="doc", aName="a2", type="", valueDefault="", value="")
-   endDTD()
-   startElement(namespaceURI="", localName="doc", qName="doc", atts=[])
-   endElement(namespaceURI="", localName="doc", qName="doc")
-endDocument()
diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/not-sa/027.ent b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/not-sa/027.ent
deleted file mode 100644
index 712cce3700..0000000000
--- a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/not-sa/027.ent
+++ /dev/null
@@ -1,2 +0,0 @@
-<!ENTITY % e "">
-<!ELEMENT doc (#PCDATA %e;)>
diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/not-sa/027.xml b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/not-sa/027.xml
deleted file mode 100644
index d0c8c7abb5..0000000000
--- a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/not-sa/027.xml
+++ /dev/null
@@ -1,2 +0,0 @@
-<!DOCTYPE doc SYSTEM "027.ent">
-<doc></doc>
diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/not-sa/027.xml.ref b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/not-sa/027.xml.ref
deleted file mode 100644
index d010327624..0000000000
--- a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/not-sa/027.xml.ref
+++ /dev/null
@@ -1,7 +0,0 @@
-setDocumentLocator(locator={columnNumber=1, lineNumber=1})
-startDocument()
-   startDTD(name="doc", publicId="", systemId="027.ent")
-   endDTD()
-   startElement(namespaceURI="", localName="doc", qName="doc", atts=[])
-   endElement(namespaceURI="", localName="doc", qName="doc")
-endDocument()
diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/not-sa/028.ent b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/not-sa/028.ent
deleted file mode 100644
index ac249d7b2c..0000000000
--- a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/not-sa/028.ent
+++ /dev/null
@@ -1,2 +0,0 @@
-<!ELEMENT doc (#PCDATA)>
-<![INCLUDE[<!ATTLIST doc a1 CDATA "v1">]]>
diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/not-sa/028.xml b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/not-sa/028.xml
deleted file mode 100644
index 50e5248cbf..0000000000
--- a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/not-sa/028.xml
+++ /dev/null
@@ -1,2 +0,0 @@
-<!DOCTYPE doc SYSTEM "028.ent">
-<doc></doc>
diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/not-sa/028.xml.ref b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/not-sa/028.xml.ref
deleted file mode 100644
index 8466141897..0000000000
--- a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/not-sa/028.xml.ref
+++ /dev/null
@@ -1,7 +0,0 @@
-setDocumentLocator(locator={columnNumber=1, lineNumber=1})
-startDocument()
-   startDTD(name="doc", publicId="", systemId="028.ent")
-   endDTD()
-   startElement(namespaceURI="", localName="doc", qName="doc", atts=[])
-   endElement(namespaceURI="", localName="doc", qName="doc")
-endDocument()
diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/not-sa/029.ent b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/not-sa/029.ent
deleted file mode 100644
index df94df5560..0000000000
--- a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/not-sa/029.ent
+++ /dev/null
@@ -1,3 +0,0 @@
-<!ELEMENT doc (#PCDATA)>
-<![IGNORE[<!ATTLIST doc a1 CDATA "v1">]]>
-<!ATTLIST doc a1 CDATA "v2">
diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/not-sa/029.xml b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/not-sa/029.xml
deleted file mode 100644
index 07e226c1d7..0000000000
--- a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/not-sa/029.xml
+++ /dev/null
@@ -1,2 +0,0 @@
-<!DOCTYPE doc SYSTEM "029.ent">
-<doc></doc>
diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/not-sa/029.xml.ref b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/not-sa/029.xml.ref
deleted file mode 100644
index 0bffc4aaa7..0000000000
--- a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/not-sa/029.xml.ref
+++ /dev/null
@@ -1,7 +0,0 @@
-setDocumentLocator(locator={columnNumber=1, lineNumber=1})
-startDocument()
-   startDTD(name="doc", publicId="", systemId="029.ent")
-   endDTD()
-   startElement(namespaceURI="", localName="doc", qName="doc", atts=[])
-   endElement(namespaceURI="", localName="doc", qName="doc")
-endDocument()
diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/not-sa/030.ent b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/not-sa/030.ent
deleted file mode 100644
index e3864460df..0000000000
--- a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/not-sa/030.ent
+++ /dev/null
@@ -1,3 +0,0 @@
-<!ELEMENT doc (#PCDATA)>
-<![IGNORE[]]>
-<![INCLUDE[]]>
diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/not-sa/030.xml b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/not-sa/030.xml
deleted file mode 100644
index 01fc2be4ca..0000000000
--- a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/not-sa/030.xml
+++ /dev/null
@@ -1,2 +0,0 @@
-<!DOCTYPE doc SYSTEM "030.ent">
-<doc></doc>
diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/not-sa/030.xml.ref b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/not-sa/030.xml.ref
deleted file mode 100644
index 51e7f033f9..0000000000
--- a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/not-sa/030.xml.ref
+++ /dev/null
@@ -1,7 +0,0 @@
-setDocumentLocator(locator={columnNumber=1, lineNumber=1})
-startDocument()
-   startDTD(name="doc", publicId="", systemId="030.ent")
-   endDTD()
-   startElement(namespaceURI="", localName="doc", qName="doc", atts=[])
-   endElement(namespaceURI="", localName="doc", qName="doc")
-endDocument()
diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/not-sa/031-1.ent b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/not-sa/031-1.ent
deleted file mode 100644
index f7f94ab152..0000000000
--- a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/not-sa/031-1.ent
+++ /dev/null
@@ -1,3 +0,0 @@
-<!ELEMENT doc (#PCDATA)>
-<!ENTITY % e SYSTEM "031-2.ent">
-<!ENTITY e "<![CDATA[%e;]]>">
diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/not-sa/031-2.ent b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/not-sa/031-2.ent
deleted file mode 100644
index bef50b1f38..0000000000
--- a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/not-sa/031-2.ent
+++ /dev/null
@@ -1 +0,0 @@
-<!ATTLIST doc a1 CDATA "v1">
diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/not-sa/031.xml b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/not-sa/031.xml
deleted file mode 100644
index c3fe5fca71..0000000000
--- a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/not-sa/031.xml
+++ /dev/null
@@ -1,2 +0,0 @@
-<!DOCTYPE doc SYSTEM "031-1.ent">
-<doc>&e;</doc>
diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/not-sa/031.xml.ref b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/not-sa/031.xml.ref
deleted file mode 100644
index 72ab9d974f..0000000000
--- a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/not-sa/031.xml.ref
+++ /dev/null
@@ -1,8 +0,0 @@
-setDocumentLocator(locator={columnNumber=1, lineNumber=1})
-startDocument()
-   startDTD(name="doc", publicId="", systemId="031-1.ent")
-   endDTD()
-   startElement(namespaceURI="", localName="doc", qName="doc", atts=[])
-      skippedEntity(name="e")
-   endElement(namespaceURI="", localName="doc", qName="doc")
-endDocument()
diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/001.xml b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/001.xml
deleted file mode 100644
index 7fbef49502..0000000000
--- a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/001.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<!DOCTYPE doc [
-<!ELEMENT doc (#PCDATA)>
-]>
-<doc></doc>
diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/001.xml.ref b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/001.xml.ref
deleted file mode 100644
index 37b53fc0b3..0000000000
--- a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/001.xml.ref
+++ /dev/null
@@ -1,7 +0,0 @@
-setDocumentLocator(locator={columnNumber=1, lineNumber=1})
-startDocument()
-   startDTD(name="doc", publicId="", systemId="")
-   endDTD()
-   startElement(namespaceURI="", localName="doc", qName="doc", atts=[])
-   endElement(namespaceURI="", localName="doc", qName="doc")
-endDocument()
diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/002.xml b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/002.xml
deleted file mode 100644
index 2e3f1d81dd..0000000000
--- a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/002.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<!DOCTYPE doc [
-<!ELEMENT doc (#PCDATA)>
-]>
-<doc ></doc>
diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/002.xml.ref b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/002.xml.ref
deleted file mode 100644
index 37b53fc0b3..0000000000
--- a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/002.xml.ref
+++ /dev/null
@@ -1,7 +0,0 @@
-setDocumentLocator(locator={columnNumber=1, lineNumber=1})
-startDocument()
-   startDTD(name="doc", publicId="", systemId="")
-   endDTD()
-   startElement(namespaceURI="", localName="doc", qName="doc", atts=[])
-   endElement(namespaceURI="", localName="doc", qName="doc")
-endDocument()
diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/003.xml b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/003.xml
deleted file mode 100644
index c841b81784..0000000000
--- a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/003.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<!DOCTYPE doc [
-<!ELEMENT doc (#PCDATA)>
-]>
-<doc></doc >
diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/003.xml.ref b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/003.xml.ref
deleted file mode 100644
index 37b53fc0b3..0000000000
--- a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/003.xml.ref
+++ /dev/null
@@ -1,7 +0,0 @@
-setDocumentLocator(locator={columnNumber=1, lineNumber=1})
-startDocument()
-   startDTD(name="doc", publicId="", systemId="")
-   endDTD()
-   startElement(namespaceURI="", localName="doc", qName="doc", atts=[])
-   endElement(namespaceURI="", localName="doc", qName="doc")
-endDocument()
diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/004.xml b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/004.xml
deleted file mode 100644
index a9c5756933..0000000000
--- a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/004.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<!DOCTYPE doc [
-<!ELEMENT doc (#PCDATA)>
-<!ATTLIST doc a1 CDATA #IMPLIED>
-]>
-<doc a1="v1"></doc>
diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/004.xml.ref b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/004.xml.ref
deleted file mode 100644
index 2d7bfdfd73..0000000000
--- a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/004.xml.ref
+++ /dev/null
@@ -1,8 +0,0 @@
-setDocumentLocator(locator={columnNumber=1, lineNumber=1})
-startDocument()
-   startDTD(name="doc", publicId="", systemId="")
-      attributeDecl(eName="doc", aName="a1", type="", valueDefault="", value="")
-   endDTD()
-   startElement(namespaceURI="", localName="doc", qName="doc", atts=[{localName="a1", qName="a1", uri="", type="CDATA", value="v1"}])
-   endElement(namespaceURI="", localName="doc", qName="doc")
-endDocument()
diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/005.xml b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/005.xml
deleted file mode 100644
index b069efe727..0000000000
--- a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/005.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<!DOCTYPE doc [
-<!ELEMENT doc (#PCDATA)>
-<!ATTLIST doc a1 CDATA #IMPLIED>
-]>
-<doc a1 = "v1"></doc>
diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/005.xml.ref b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/005.xml.ref
deleted file mode 100644
index 2d7bfdfd73..0000000000
--- a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/005.xml.ref
+++ /dev/null
@@ -1,8 +0,0 @@
-setDocumentLocator(locator={columnNumber=1, lineNumber=1})
-startDocument()
-   startDTD(name="doc", publicId="", systemId="")
-      attributeDecl(eName="doc", aName="a1", type="", valueDefault="", value="")
-   endDTD()
-   startElement(namespaceURI="", localName="doc", qName="doc", atts=[{localName="a1", qName="a1", uri="", type="CDATA", value="v1"}])
-   endElement(namespaceURI="", localName="doc", qName="doc")
-endDocument()
diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/006.xml b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/006.xml
deleted file mode 100644
index 39a346342f..0000000000
--- a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/006.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<!DOCTYPE doc [
-<!ELEMENT doc (#PCDATA)>
-<!ATTLIST doc a1 CDATA #IMPLIED>
-]>
-<doc a1='v1'></doc>
diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/006.xml.ref b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/006.xml.ref
deleted file mode 100644
index 2d7bfdfd73..0000000000
--- a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/006.xml.ref
+++ /dev/null
@@ -1,8 +0,0 @@
-setDocumentLocator(locator={columnNumber=1, lineNumber=1})
-startDocument()
-   startDTD(name="doc", publicId="", systemId="")
-      attributeDecl(eName="doc", aName="a1", type="", valueDefault="", value="")
-   endDTD()
-   startElement(namespaceURI="", localName="doc", qName="doc", atts=[{localName="a1", qName="a1", uri="", type="CDATA", value="v1"}])
-   endElement(namespaceURI="", localName="doc", qName="doc")
-endDocument()
diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/007.xml b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/007.xml
deleted file mode 100644
index cc3dc53166..0000000000
--- a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/007.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<!DOCTYPE doc [
-<!ELEMENT doc (#PCDATA)>
-]>
-<doc>&#32;</doc>
diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/007.xml.ref b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/007.xml.ref
deleted file mode 100644
index 016a577ded..0000000000
--- a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/007.xml.ref
+++ /dev/null
@@ -1,8 +0,0 @@
-setDocumentLocator(locator={columnNumber=1, lineNumber=1})
-startDocument()
-   startDTD(name="doc", publicId="", systemId="")
-   endDTD()
-   startElement(namespaceURI="", localName="doc", qName="doc", atts=[])
-      characters(ch=" ")
-   endElement(namespaceURI="", localName="doc", qName="doc")
-endDocument()
diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/008.xml b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/008.xml
deleted file mode 100644
index b3370eb1cc..0000000000
--- a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/008.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<!DOCTYPE doc [
-<!ELEMENT doc (#PCDATA)>
-]>
-<doc>&amp;&lt;&gt;&quot;&apos;</doc>
diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/008.xml.ref b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/008.xml.ref
deleted file mode 100644
index 2c879a43a9..0000000000
--- a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/008.xml.ref
+++ /dev/null
@@ -1,8 +0,0 @@
-setDocumentLocator(locator={columnNumber=1, lineNumber=1})
-startDocument()
-   startDTD(name="doc", publicId="", systemId="")
-   endDTD()
-   startElement(namespaceURI="", localName="doc", qName="doc", atts=[])
-      characters(ch="&<>\"'")
-   endElement(namespaceURI="", localName="doc", qName="doc")
-endDocument()
diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/009.xml b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/009.xml
deleted file mode 100644
index 0fa183eccf..0000000000
--- a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/009.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<!DOCTYPE doc [
-<!ELEMENT doc (#PCDATA)>
-]>
-<doc>&#x20;</doc>
diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/009.xml.ref b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/009.xml.ref
deleted file mode 100644
index 016a577ded..0000000000
--- a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/009.xml.ref
+++ /dev/null
@@ -1,8 +0,0 @@
-setDocumentLocator(locator={columnNumber=1, lineNumber=1})
-startDocument()
-   startDTD(name="doc", publicId="", systemId="")
-   endDTD()
-   startElement(namespaceURI="", localName="doc", qName="doc", atts=[])
-      characters(ch=" ")
-   endElement(namespaceURI="", localName="doc", qName="doc")
-endDocument()
diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/010.xml b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/010.xml
deleted file mode 100644
index eb64d18590..0000000000
--- a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/010.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<!DOCTYPE doc [
-<!ELEMENT doc (#PCDATA)>
-<!ATTLIST doc a1 CDATA #IMPLIED>
-]>
-<doc a1="v1" ></doc>
diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/010.xml.ref b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/010.xml.ref
deleted file mode 100644
index 2d7bfdfd73..0000000000
--- a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/010.xml.ref
+++ /dev/null
@@ -1,8 +0,0 @@
-setDocumentLocator(locator={columnNumber=1, lineNumber=1})
-startDocument()
-   startDTD(name="doc", publicId="", systemId="")
-      attributeDecl(eName="doc", aName="a1", type="", valueDefault="", value="")
-   endDTD()
-   startElement(namespaceURI="", localName="doc", qName="doc", atts=[{localName="a1", qName="a1", uri="", type="CDATA", value="v1"}])
-   endElement(namespaceURI="", localName="doc", qName="doc")
-endDocument()
diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/011.xml b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/011.xml
deleted file mode 100644
index 4cac44b4e4..0000000000
--- a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/011.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<!DOCTYPE doc [
-<!ELEMENT doc (#PCDATA)>
-<!ATTLIST doc a1 CDATA #IMPLIED a2 CDATA #IMPLIED>
-]>
-<doc a1="v1" a2="v2"></doc>
diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/011.xml.ref b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/011.xml.ref
deleted file mode 100644
index 9fc96fdb80..0000000000
--- a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/011.xml.ref
+++ /dev/null
@@ -1,9 +0,0 @@
-setDocumentLocator(locator={columnNumber=1, lineNumber=1})
-startDocument()
-   startDTD(name="doc", publicId="", systemId="")
-      attributeDecl(eName="doc", aName="a1", type="", valueDefault="", value="")
-      attributeDecl(eName="doc", aName="a2", type="", valueDefault="", value="")
-   endDTD()
-   startElement(namespaceURI="", localName="doc", qName="doc", atts=[{localName="a1", qName="a1", uri="", type="CDATA", value="v1"}, {localName="a2", qName="a2", uri="", type="CDATA", value="v2"}])
-   endElement(namespaceURI="", localName="doc", qName="doc")
-endDocument()
diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/012.xml b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/012.xml
deleted file mode 100644
index 6ce2a3eae2..0000000000
--- a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/012.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<!DOCTYPE doc [
-<!ELEMENT doc (#PCDATA)>
-<!ATTLIST doc : CDATA #IMPLIED>
-]>
-<doc :="v1"></doc>
diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/012.xml.ref b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/012.xml.ref
deleted file mode 100644
index 00c76deaf9..0000000000
--- a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/012.xml.ref
+++ /dev/null
@@ -1,8 +0,0 @@
-setDocumentLocator(locator={columnNumber=1, lineNumber=1})
-startDocument()
-   startDTD(name="doc", publicId="", systemId="")
-      attributeDecl(eName="doc", aName=":", type="", valueDefault="", value="")
-   endDTD()
-   startElement(namespaceURI="", localName="doc", qName="doc", atts=[{localName="", qName=":", uri="", type="CDATA", value="v1"}])
-   endElement(namespaceURI="", localName="doc", qName="doc")
-endDocument()
diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/013.xml b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/013.xml
deleted file mode 100644
index 2f4aae4e28..0000000000
--- a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/013.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<!DOCTYPE doc [
-<!ELEMENT doc (#PCDATA)>
-<!ATTLIST doc _.-0123456789 CDATA #IMPLIED>
-]>
-<doc _.-0123456789="v1"></doc>
diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/013.xml.ref b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/013.xml.ref
deleted file mode 100644
index ef2903d87a..0000000000
--- a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/013.xml.ref
+++ /dev/null
@@ -1,8 +0,0 @@
-setDocumentLocator(locator={columnNumber=1, lineNumber=1})
-startDocument()
-   startDTD(name="doc", publicId="", systemId="")
-      attributeDecl(eName="doc", aName="_.-0123456789", type="", valueDefault="", value="")
-   endDTD()
-   startElement(namespaceURI="", localName="doc", qName="doc", atts=[{localName="_.-0123456789", qName="_.-0123456789", uri="", type="CDATA", value="v1"}])
-   endElement(namespaceURI="", localName="doc", qName="doc")
-endDocument()
diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/014.xml b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/014.xml
deleted file mode 100644
index 47f1f723e3..0000000000
--- a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/014.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<!DOCTYPE doc [
-<!ELEMENT doc (#PCDATA)>
-<!ATTLIST doc abcdefghijklmnopqrstuvwxyz CDATA #IMPLIED>
-]>
-<doc abcdefghijklmnopqrstuvwxyz="v1"></doc>
diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/014.xml.ref b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/014.xml.ref
deleted file mode 100644
index bbf1ff75e7..0000000000
--- a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/014.xml.ref
+++ /dev/null
@@ -1,8 +0,0 @@
-setDocumentLocator(locator={columnNumber=1, lineNumber=1})
-startDocument()
-   startDTD(name="doc", publicId="", systemId="")
-      attributeDecl(eName="doc", aName="abcdefghijklmnopqrstuvwxyz", type="", valueDefault="", value="")
-   endDTD()
-   startElement(namespaceURI="", localName="doc", qName="doc", atts=[{localName="abcdefghijklmnopqrstuvwxyz", qName="abcdefghijklmnopqrstuvwxyz", uri="", type="CDATA", value="v1"}])
-   endElement(namespaceURI="", localName="doc", qName="doc")
-endDocument()
diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/015.xml b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/015.xml
deleted file mode 100644
index 861df8a610..0000000000
--- a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/015.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<!DOCTYPE doc [
-<!ELEMENT doc (#PCDATA)>
-<!ATTLIST doc ABCDEFGHIJKLMNOPQRSTUVWXYZ CDATA #IMPLIED>
-]>
-<doc ABCDEFGHIJKLMNOPQRSTUVWXYZ="v1"></doc>
diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/015.xml.ref b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/015.xml.ref
deleted file mode 100644
index 882da5a6fd..0000000000
--- a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/015.xml.ref
+++ /dev/null
@@ -1,8 +0,0 @@
-setDocumentLocator(locator={columnNumber=1, lineNumber=1})
-startDocument()
-   startDTD(name="doc", publicId="", systemId="")
-      attributeDecl(eName="doc", aName="ABCDEFGHIJKLMNOPQRSTUVWXYZ", type="", valueDefault="", value="")
-   endDTD()
-   startElement(namespaceURI="", localName="doc", qName="doc", atts=[{localName="ABCDEFGHIJKLMNOPQRSTUVWXYZ", qName="ABCDEFGHIJKLMNOPQRSTUVWXYZ", uri="", type="CDATA", value="v1"}])
-   endElement(namespaceURI="", localName="doc", qName="doc")
-endDocument()
diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/016.xml b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/016.xml
deleted file mode 100644
index 66b1973c5d..0000000000
--- a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/016.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<!DOCTYPE doc [
-<!ELEMENT doc (#PCDATA)>
-]>
-<doc><?pi?></doc>
diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/016.xml.ref b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/016.xml.ref
deleted file mode 100644
index 32c60b28a7..0000000000
--- a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/016.xml.ref
+++ /dev/null
@@ -1,8 +0,0 @@
-setDocumentLocator(locator={columnNumber=1, lineNumber=1})
-startDocument()
-   startDTD(name="doc", publicId="", systemId="")
-   endDTD()
-   startElement(namespaceURI="", localName="doc", qName="doc", atts=[])
-      processingInstruction(target="pi", data="")
-   endElement(namespaceURI="", localName="doc", qName="doc")
-endDocument()
diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/017.xml b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/017.xml
deleted file mode 100644
index 827ba963bf..0000000000
--- a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/017.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<!DOCTYPE doc [
-<!ELEMENT doc (#PCDATA)>
-]>
-<doc><?pi some data ? > <??></doc>
diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/017.xml.ref b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/017.xml.ref
deleted file mode 100644
index 604d975e15..0000000000
--- a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/017.xml.ref
+++ /dev/null
@@ -1,8 +0,0 @@
-setDocumentLocator(locator={columnNumber=1, lineNumber=1})
-startDocument()
-   startDTD(name="doc", publicId="", systemId="")
-   endDTD()
-   startElement(namespaceURI="", localName="doc", qName="doc", atts=[])
-      processingInstruction(target="pi", data="some data ? > <?")
-   endElement(namespaceURI="", localName="doc", qName="doc")
-endDocument()
diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/018.xml b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/018.xml
deleted file mode 100644
index 4570903fee..0000000000
--- a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/018.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<!DOCTYPE doc [
-<!ELEMENT doc (#PCDATA)>
-]>
-<doc><![CDATA[<foo>]]></doc>
diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/018.xml.ref b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/018.xml.ref
deleted file mode 100644
index 21117d22b4..0000000000
--- a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/018.xml.ref
+++ /dev/null
@@ -1,10 +0,0 @@
-setDocumentLocator(locator={columnNumber=1, lineNumber=1})
-startDocument()
-   startDTD(name="doc", publicId="", systemId="")
-   endDTD()
-   startElement(namespaceURI="", localName="doc", qName="doc", atts=[])
-      startCDATA()
-         characters(ch="<foo>")
-      endCDATA()
-   endElement(namespaceURI="", localName="doc", qName="doc")
-endDocument()
diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/019.xml b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/019.xml
deleted file mode 100644
index 3e6b74cbf2..0000000000
--- a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/019.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<!DOCTYPE doc [
-<!ELEMENT doc (#PCDATA)>
-]>
-<doc><![CDATA[<&]]></doc>
diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/019.xml.ref b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/019.xml.ref
deleted file mode 100644
index f95f625b33..0000000000
--- a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/019.xml.ref
+++ /dev/null
@@ -1,10 +0,0 @@
-setDocumentLocator(locator={columnNumber=1, lineNumber=1})
-startDocument()
-   startDTD(name="doc", publicId="", systemId="")
-   endDTD()
-   startElement(namespaceURI="", localName="doc", qName="doc", atts=[])
-      startCDATA()
-         characters(ch="<&")
-      endCDATA()
-   endElement(namespaceURI="", localName="doc", qName="doc")
-endDocument()
diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/020.xml b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/020.xml
deleted file mode 100644
index f749551a1b..0000000000
--- a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/020.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<!DOCTYPE doc [
-<!ELEMENT doc (#PCDATA)>
-]>
-<doc><![CDATA[<&]>]]]></doc>
diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/020.xml.ref b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/020.xml.ref
deleted file mode 100644
index ff6ff3683c..0000000000
--- a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/020.xml.ref
+++ /dev/null
@@ -1,10 +0,0 @@
-setDocumentLocator(locator={columnNumber=1, lineNumber=1})
-startDocument()
-   startDTD(name="doc", publicId="", systemId="")
-   endDTD()
-   startElement(namespaceURI="", localName="doc", qName="doc", atts=[])
-      startCDATA()
-         characters(ch="<&]>]")
-      endCDATA()
-   endElement(namespaceURI="", localName="doc", qName="doc")
-endDocument()
diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/021.xml b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/021.xml
deleted file mode 100644
index 13dda8c8a5..0000000000
--- a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/021.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<!DOCTYPE doc [
-<!ELEMENT doc (#PCDATA)>
-]>
-<doc><!-- a comment --></doc>
diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/021.xml.ref b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/021.xml.ref
deleted file mode 100644
index 52bf68a717..0000000000
--- a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/021.xml.ref
+++ /dev/null
@@ -1,8 +0,0 @@
-setDocumentLocator(locator={columnNumber=1, lineNumber=1})
-startDocument()
-   startDTD(name="doc", publicId="", systemId="")
-   endDTD()
-   startElement(namespaceURI="", localName="doc", qName="doc", atts=[])
-      comment(ch=" a comment ")
-   endElement(namespaceURI="", localName="doc", qName="doc")
-endDocument()
diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/022.xml b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/022.xml
deleted file mode 100644
index 41d300e950..0000000000
--- a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/022.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<!DOCTYPE doc [
-<!ELEMENT doc (#PCDATA)>
-]>
-<doc><!-- a comment ->--></doc>
diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/022.xml.ref b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/022.xml.ref
deleted file mode 100644
index b299ce71ee..0000000000
--- a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/022.xml.ref
+++ /dev/null
@@ -1,8 +0,0 @@
-setDocumentLocator(locator={columnNumber=1, lineNumber=1})
-startDocument()
-   startDTD(name="doc", publicId="", systemId="")
-   endDTD()
-   startElement(namespaceURI="", localName="doc", qName="doc", atts=[])
-      comment(ch=" a comment ->")
-   endElement(namespaceURI="", localName="doc", qName="doc")
-endDocument()
diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/023.xml b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/023.xml
deleted file mode 100644
index 3837b831ad..0000000000
--- a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/023.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<!DOCTYPE doc [
-<!ELEMENT doc (#PCDATA)>
-<!ENTITY e "">
-]>
-<doc>&e;</doc>
diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/023.xml.ref b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/023.xml.ref
deleted file mode 100644
index b59c216593..0000000000
--- a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/023.xml.ref
+++ /dev/null
@@ -1,8 +0,0 @@
-setDocumentLocator(locator={columnNumber=1, lineNumber=1})
-startDocument()
-   startDTD(name="doc", publicId="", systemId="")
-      internatlEntityDecl(name="e", value="")
-   endDTD()
-   startElement(namespaceURI="", localName="doc", qName="doc", atts=[])
-   endElement(namespaceURI="", localName="doc", qName="doc")
-endDocument()
diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/024.xml b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/024.xml
deleted file mode 100644
index b0655c634c..0000000000
--- a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/024.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<!DOCTYPE doc [
-<!ELEMENT doc (foo)>
-<!ELEMENT foo (#PCDATA)>
-<!ENTITY e "&#60;foo></foo>">
-]>
-<doc>&e;</doc>
diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/024.xml.ref b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/024.xml.ref
deleted file mode 100644
index 00f7fce160..0000000000
--- a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/024.xml.ref
+++ /dev/null
@@ -1,10 +0,0 @@
-setDocumentLocator(locator={columnNumber=1, lineNumber=1})
-startDocument()
-   startDTD(name="doc", publicId="", systemId="")
-      internatlEntityDecl(name="e", value="<foo></foo>")
-   endDTD()
-   startElement(namespaceURI="", localName="doc", qName="doc", atts=[])
-      startElement(namespaceURI="", localName="foo", qName="foo", atts=[])
-      endElement(namespaceURI="", localName="foo", qName="foo")
-   endElement(namespaceURI="", localName="doc", qName="doc")
-endDocument()
diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/025.xml b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/025.xml
deleted file mode 100644
index ed01f36d89..0000000000
--- a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/025.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<!DOCTYPE doc [
-<!ELEMENT doc (foo*)>
-<!ELEMENT foo (#PCDATA)>
-]>
-<doc><foo/><foo></foo></doc>
diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/025.xml.ref b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/025.xml.ref
deleted file mode 100644
index 6a7605c082..0000000000
--- a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/025.xml.ref
+++ /dev/null
@@ -1,11 +0,0 @@
-setDocumentLocator(locator={columnNumber=1, lineNumber=1})
-startDocument()
-   startDTD(name="doc", publicId="", systemId="")
-   endDTD()
-   startElement(namespaceURI="", localName="doc", qName="doc", atts=[])
-      startElement(namespaceURI="", localName="foo", qName="foo", atts=[])
-      endElement(namespaceURI="", localName="foo", qName="foo")
-      startElement(namespaceURI="", localName="foo", qName="foo", atts=[])
-      endElement(namespaceURI="", localName="foo", qName="foo")
-   endElement(namespaceURI="", localName="doc", qName="doc")
-endDocument()
diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/026.xml b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/026.xml
deleted file mode 100644
index 1ba033c1a7..0000000000
--- a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/026.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<!DOCTYPE doc [
-<!ELEMENT doc (foo*)>
-<!ELEMENT foo EMPTY>
-]>
-<doc><foo/><foo></foo></doc>
diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/026.xml.ref b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/026.xml.ref
deleted file mode 100644
index 6a7605c082..0000000000
--- a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/026.xml.ref
+++ /dev/null
@@ -1,11 +0,0 @@
-setDocumentLocator(locator={columnNumber=1, lineNumber=1})
-startDocument()
-   startDTD(name="doc", publicId="", systemId="")
-   endDTD()
-   startElement(namespaceURI="", localName="doc", qName="doc", atts=[])
-      startElement(namespaceURI="", localName="foo", qName="foo", atts=[])
-      endElement(namespaceURI="", localName="foo", qName="foo")
-      startElement(namespaceURI="", localName="foo", qName="foo", atts=[])
-      endElement(namespaceURI="", localName="foo", qName="foo")
-   endElement(namespaceURI="", localName="doc", qName="doc")
-endDocument()
diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/027.xml b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/027.xml
deleted file mode 100644
index ee02439051..0000000000
--- a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/027.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<!DOCTYPE doc [
-<!ELEMENT doc (foo*)>
-<!ELEMENT foo ANY>
-]>
-<doc><foo/><foo></foo></doc>
diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/027.xml.ref b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/027.xml.ref
deleted file mode 100644
index 6a7605c082..0000000000
--- a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/027.xml.ref
+++ /dev/null
@@ -1,11 +0,0 @@
-setDocumentLocator(locator={columnNumber=1, lineNumber=1})
-startDocument()
-   startDTD(name="doc", publicId="", systemId="")
-   endDTD()
-   startElement(namespaceURI="", localName="doc", qName="doc", atts=[])
-      startElement(namespaceURI="", localName="foo", qName="foo", atts=[])
-      endElement(namespaceURI="", localName="foo", qName="foo")
-      startElement(namespaceURI="", localName="foo", qName="foo", atts=[])
-      endElement(namespaceURI="", localName="foo", qName="foo")
-   endElement(namespaceURI="", localName="doc", qName="doc")
-endDocument()
diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/028.xml b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/028.xml
deleted file mode 100644
index 3d95747913..0000000000
--- a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/028.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0"?>
-<!DOCTYPE doc [
-<!ELEMENT doc (#PCDATA)>
-]>
-<doc></doc>
diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/028.xml.ref b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/028.xml.ref
deleted file mode 100644
index dcda37de1e..0000000000
--- a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/028.xml.ref
+++ /dev/null
@@ -1,8 +0,0 @@
-setDocumentLocator(locator={columnNumber=1, lineNumber=1})
-startDocument()
-   processingInstruction(target="xml", data="version='1.0'")
-   startDTD(name="doc", publicId="", systemId="")
-   endDTD()
-   startElement(namespaceURI="", localName="doc", qName="doc", atts=[])
-   endElement(namespaceURI="", localName="doc", qName="doc")
-endDocument()
diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/029.xml b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/029.xml
deleted file mode 100644
index 909f6ff712..0000000000
--- a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/029.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version='1.0'?>
-<!DOCTYPE doc [
-<!ELEMENT doc (#PCDATA)>
-]>
-<doc></doc>
diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/029.xml.ref b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/029.xml.ref
deleted file mode 100644
index dcda37de1e..0000000000
--- a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/029.xml.ref
+++ /dev/null
@@ -1,8 +0,0 @@
-setDocumentLocator(locator={columnNumber=1, lineNumber=1})
-startDocument()
-   processingInstruction(target="xml", data="version='1.0'")
-   startDTD(name="doc", publicId="", systemId="")
-   endDTD()
-   startElement(namespaceURI="", localName="doc", qName="doc", atts=[])
-   endElement(namespaceURI="", localName="doc", qName="doc")
-endDocument()
diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/030.xml b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/030.xml
deleted file mode 100644
index 3a7ddaa716..0000000000
--- a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/030.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version = "1.0"?>
-<!DOCTYPE doc [
-<!ELEMENT doc (#PCDATA)>
-]>
-<doc></doc>
diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/030.xml.ref b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/030.xml.ref
deleted file mode 100644
index dcda37de1e..0000000000
--- a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/030.xml.ref
+++ /dev/null
@@ -1,8 +0,0 @@
-setDocumentLocator(locator={columnNumber=1, lineNumber=1})
-startDocument()
-   processingInstruction(target="xml", data="version='1.0'")
-   startDTD(name="doc", publicId="", systemId="")
-   endDTD()
-   startElement(namespaceURI="", localName="doc", qName="doc", atts=[])
-   endElement(namespaceURI="", localName="doc", qName="doc")
-endDocument()
diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/031.xml b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/031.xml
deleted file mode 100644
index a58e05867f..0000000000
--- a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/031.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version='1.0' encoding="UTF-8"?>
-<!DOCTYPE doc [
-<!ELEMENT doc (#PCDATA)>
-]>
-<doc></doc>
diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/031.xml.ref b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/031.xml.ref
deleted file mode 100644
index 7d81068e24..0000000000
--- a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/031.xml.ref
+++ /dev/null
@@ -1,8 +0,0 @@
-setDocumentLocator(locator={columnNumber=1, lineNumber=1})
-startDocument()
-   processingInstruction(target="xml", data="version='1.0' encoding='UTF-8'")
-   startDTD(name="doc", publicId="", systemId="")
-   endDTD()
-   startElement(namespaceURI="", localName="doc", qName="doc", atts=[])
-   endElement(namespaceURI="", localName="doc", qName="doc")
-endDocument()
diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/032.xml b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/032.xml
deleted file mode 100644
index be55c8d721..0000000000
--- a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/032.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version='1.0' standalone='yes'?>
-<!DOCTYPE doc [
-<!ELEMENT doc (#PCDATA)>
-]>
-<doc></doc>
diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/032.xml.ref b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/032.xml.ref
deleted file mode 100644
index 96d8f1014d..0000000000
--- a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/032.xml.ref
+++ /dev/null
@@ -1,8 +0,0 @@
-setDocumentLocator(locator={columnNumber=1, lineNumber=1})
-startDocument()
-   processingInstruction(target="xml", data="version='1.0' standalone='yes'")
-   startDTD(name="doc", publicId="", systemId="")
-   endDTD()
-   startElement(namespaceURI="", localName="doc", qName="doc", atts=[])
-   endElement(namespaceURI="", localName="doc", qName="doc")
-endDocument()
diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/033.xml b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/033.xml
deleted file mode 100644
index a3f9053868..0000000000
--- a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/033.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version='1.0' encoding="UTF-8" standalone='yes'?>
-<!DOCTYPE doc [
-<!ELEMENT doc (#PCDATA)>
-]>
-<doc></doc>
diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/033.xml.ref b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/033.xml.ref
deleted file mode 100644
index d56d96d584..0000000000
--- a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/033.xml.ref
+++ /dev/null
@@ -1,8 +0,0 @@
-setDocumentLocator(locator={columnNumber=1, lineNumber=1})
-startDocument()
-   processingInstruction(target="xml", data="version='1.0' encoding='UTF-8' standalone='yes'")
-   startDTD(name="doc", publicId="", systemId="")
-   endDTD()
-   startElement(namespaceURI="", localName="doc", qName="doc", atts=[])
-   endElement(namespaceURI="", localName="doc", qName="doc")
-endDocument()
diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/034.xml b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/034.xml
deleted file mode 100644
index 7d52f31c0e..0000000000
--- a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/034.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<!DOCTYPE doc [
-<!ELEMENT doc (#PCDATA)>
-]>
-<doc/>
diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/034.xml.ref b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/034.xml.ref
deleted file mode 100644
index 37b53fc0b3..0000000000
--- a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/034.xml.ref
+++ /dev/null
@@ -1,7 +0,0 @@
-setDocumentLocator(locator={columnNumber=1, lineNumber=1})
-startDocument()
-   startDTD(name="doc", publicId="", systemId="")
-   endDTD()
-   startElement(namespaceURI="", localName="doc", qName="doc", atts=[])
-   endElement(namespaceURI="", localName="doc", qName="doc")
-endDocument()
diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/035.xml b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/035.xml
deleted file mode 100644
index f109a8b782..0000000000
--- a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/035.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<!DOCTYPE doc [
-<!ELEMENT doc (#PCDATA)>
-]>
-<doc />
diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/035.xml.ref b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/035.xml.ref
deleted file mode 100644
index 37b53fc0b3..0000000000
--- a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/035.xml.ref
+++ /dev/null
@@ -1,7 +0,0 @@
-setDocumentLocator(locator={columnNumber=1, lineNumber=1})
-startDocument()
-   startDTD(name="doc", publicId="", systemId="")
-   endDTD()
-   startElement(namespaceURI="", localName="doc", qName="doc", atts=[])
-   endElement(namespaceURI="", localName="doc", qName="doc")
-endDocument()
diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/036.xml b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/036.xml
deleted file mode 100644
index 8ab2b3fb16..0000000000
--- a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/036.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<!DOCTYPE doc [
-<!ELEMENT doc (#PCDATA)>
-]>
-<doc></doc>
-<?pi data?>
diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/036.xml.ref b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/036.xml.ref
deleted file mode 100644
index db2cbb1e8d..0000000000
--- a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/036.xml.ref
+++ /dev/null
@@ -1,8 +0,0 @@
-setDocumentLocator(locator={columnNumber=1, lineNumber=1})
-startDocument()
-   startDTD(name="doc", publicId="", systemId="")
-   endDTD()
-   startElement(namespaceURI="", localName="doc", qName="doc", atts=[])
-   endElement(namespaceURI="", localName="doc", qName="doc")
-   processingInstruction(target="pi", data="data")
-endDocument()
diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/037.xml b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/037.xml
deleted file mode 100644
index f9b2113940..0000000000
--- a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/037.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<!DOCTYPE doc [
-<!ELEMENT doc (#PCDATA)>
-]>
-<doc></doc>
-<!-- comment -->
-
diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/037.xml.ref b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/037.xml.ref
deleted file mode 100644
index 12d6a77cad..0000000000
--- a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/037.xml.ref
+++ /dev/null
@@ -1,8 +0,0 @@
-setDocumentLocator(locator={columnNumber=1, lineNumber=1})
-startDocument()
-   startDTD(name="doc", publicId="", systemId="")
-   endDTD()
-   startElement(namespaceURI="", localName="doc", qName="doc", atts=[])
-   endElement(namespaceURI="", localName="doc", qName="doc")
-   comment(ch=" comment ")
-endDocument()
diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/038.xml b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/038.xml
deleted file mode 100644
index d14f41bfe2..0000000000
--- a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/038.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<!-- comment -->
-<!DOCTYPE doc [
-<!ELEMENT doc (#PCDATA)>
-]>
-<doc></doc>
-
diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/038.xml.ref b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/038.xml.ref
deleted file mode 100644
index d24c10b495..0000000000
--- a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/038.xml.ref
+++ /dev/null
@@ -1,8 +0,0 @@
-setDocumentLocator(locator={columnNumber=1, lineNumber=1})
-startDocument()
-   comment(ch=" comment ")
-   startDTD(name="doc", publicId="", systemId="")
-   endDTD()
-   startElement(namespaceURI="", localName="doc", qName="doc", atts=[])
-   endElement(namespaceURI="", localName="doc", qName="doc")
-endDocument()
diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/039.xml b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/039.xml
deleted file mode 100644
index 0897316e46..0000000000
--- a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/039.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?pi data?>
-<!DOCTYPE doc [
-<!ELEMENT doc (#PCDATA)>
-]>
-<doc></doc>
diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/039.xml.ref b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/039.xml.ref
deleted file mode 100644
index 9eb38b42bb..0000000000
--- a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/039.xml.ref
+++ /dev/null
@@ -1,8 +0,0 @@
-setDocumentLocator(locator={columnNumber=1, lineNumber=1})
-startDocument()
-   processingInstruction(target="pi", data="data")
-   startDTD(name="doc", publicId="", systemId="")
-   endDTD()
-   startElement(namespaceURI="", localName="doc", qName="doc", atts=[])
-   endElement(namespaceURI="", localName="doc", qName="doc")
-endDocument()
diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/040.xml b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/040.xml
deleted file mode 100644
index 12c419b65b..0000000000
--- a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/040.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<!DOCTYPE doc [
-<!ELEMENT doc (#PCDATA)>
-<!ATTLIST doc a1 CDATA #IMPLIED>
-]>
-<doc a1="&quot;&lt;&amp;&gt;&apos;"></doc>
diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/040.xml.ref b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/040.xml.ref
deleted file mode 100644
index 81409bdc13..0000000000
--- a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/040.xml.ref
+++ /dev/null
@@ -1,8 +0,0 @@
-setDocumentLocator(locator={columnNumber=1, lineNumber=1})
-startDocument()
-   startDTD(name="doc", publicId="", systemId="")
-      attributeDecl(eName="doc", aName="a1", type="", valueDefault="", value="")
-   endDTD()
-   startElement(namespaceURI="", localName="doc", qName="doc", atts=[{localName="a1", qName="a1", uri="", type="CDATA", value="\"<&>'"}])
-   endElement(namespaceURI="", localName="doc", qName="doc")
-endDocument()
diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/041.xml b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/041.xml
deleted file mode 100644
index a59f536277..0000000000
--- a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/041.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<!DOCTYPE doc [
-<!ELEMENT doc (#PCDATA)>
-<!ATTLIST doc a1 CDATA #IMPLIED>
-]>
-<doc a1="&#65;"></doc>
diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/041.xml.ref b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/041.xml.ref
deleted file mode 100644
index 13f83dffcf..0000000000
--- a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/041.xml.ref
+++ /dev/null
@@ -1,8 +0,0 @@
-setDocumentLocator(locator={columnNumber=1, lineNumber=1})
-startDocument()
-   startDTD(name="doc", publicId="", systemId="")
-      attributeDecl(eName="doc", aName="a1", type="", valueDefault="", value="")
-   endDTD()
-   startElement(namespaceURI="", localName="doc", qName="doc", atts=[{localName="a1", qName="a1", uri="", type="CDATA", value="A"}])
-   endElement(namespaceURI="", localName="doc", qName="doc")
-endDocument()
diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/042.xml b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/042.xml
deleted file mode 100644
index 5d7c650944..0000000000
--- a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/042.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<!DOCTYPE doc [
-<!ELEMENT doc (#PCDATA)>
-]>
-<doc>&#00000000000000000000000000000000065;</doc>
diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/042.xml.ref b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/042.xml.ref
deleted file mode 100644
index ed02b8c709..0000000000
--- a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/042.xml.ref
+++ /dev/null
@@ -1,8 +0,0 @@
-setDocumentLocator(locator={columnNumber=1, lineNumber=1})
-startDocument()
-   startDTD(name="doc", publicId="", systemId="")
-   endDTD()
-   startElement(namespaceURI="", localName="doc", qName="doc", atts=[])
-      characters(ch="A")
-   endElement(namespaceURI="", localName="doc", qName="doc")
-endDocument()
diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/043.xml b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/043.xml
deleted file mode 100644
index a8095dfe28..0000000000
--- a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/043.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<!DOCTYPE doc [
-<!ATTLIST doc a1 CDATA #IMPLIED>
-<!ELEMENT doc (#PCDATA)>
-]>
-<doc a1="foo
-bar"></doc>
diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/043.xml.ref b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/043.xml.ref
deleted file mode 100644
index 3f898a182a..0000000000
--- a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/043.xml.ref
+++ /dev/null
@@ -1,8 +0,0 @@
-setDocumentLocator(locator={columnNumber=1, lineNumber=1})
-startDocument()
-   startDTD(name="doc", publicId="", systemId="")
-      attributeDecl(eName="doc", aName="a1", type="", valueDefault="", value="")
-   endDTD()
-   startElement(namespaceURI="", localName="doc", qName="doc", atts=[{localName="a1", qName="a1", uri="", type="CDATA", value="foo\r\nbar"}])
-   endElement(namespaceURI="", localName="doc", qName="doc")
-endDocument()
diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/044.xml b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/044.xml
deleted file mode 100644
index bee1d23e1a..0000000000
--- a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/044.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<!DOCTYPE doc [
-<!ELEMENT doc (e*)>
-<!ELEMENT e EMPTY>
-<!ATTLIST e a1 CDATA "v1" a2 CDATA "v2" a3 CDATA #IMPLIED>
-]>
-<doc>
-<e a3="v3"/>
-<e a1="w1"/>
-<e a2="w2" a3="v3"/>
-</doc>
diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/044.xml.ref b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/044.xml.ref
deleted file mode 100644
index daab693b31..0000000000
--- a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/044.xml.ref
+++ /dev/null
@@ -1,20 +0,0 @@
-setDocumentLocator(locator={columnNumber=1, lineNumber=1})
-startDocument()
-   startDTD(name="doc", publicId="", systemId="")
-      attributeDecl(eName="e", aName="a1", type="", valueDefault="", value="")
-      attributeDecl(eName="e", aName="a2", type="", valueDefault="", value="")
-      attributeDecl(eName="e", aName="a3", type="", valueDefault="", value="")
-   endDTD()
-   startElement(namespaceURI="", localName="doc", qName="doc", atts=[])
-      characters(ch="\r\n")
-      startElement(namespaceURI="", localName="e", qName="e", atts=[{localName="a3", qName="a3", uri="", type="CDATA", value="v3"}])
-      endElement(namespaceURI="", localName="e", qName="e")
-      characters(ch="\r\n")
-      startElement(namespaceURI="", localName="e", qName="e", atts=[{localName="a1", qName="a1", uri="", type="CDATA", value="w1"}])
-      endElement(namespaceURI="", localName="e", qName="e")
-      characters(ch="\r\n")
-      startElement(namespaceURI="", localName="e", qName="e", atts=[{localName="a2", qName="a2", uri="", type="CDATA", value="w2"}, {localName="a3", qName="a3", uri="", type="CDATA", value="v3"}])
-      endElement(namespaceURI="", localName="e", qName="e")
-      characters(ch="\r\n")
-   endElement(namespaceURI="", localName="doc", qName="doc")
-endDocument()
diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/045.xml b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/045.xml
deleted file mode 100644
index e2567f532d..0000000000
--- a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/045.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<!DOCTYPE doc [
-<!ELEMENT doc (#PCDATA)>
-<!ATTLIST doc a1 CDATA "v1">
-<!ATTLIST doc a1 CDATA "z1">
-]>
-<doc></doc>
diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/045.xml.ref b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/045.xml.ref
deleted file mode 100644
index 566221ae0d..0000000000
--- a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/045.xml.ref
+++ /dev/null
@@ -1,9 +0,0 @@
-setDocumentLocator(locator={columnNumber=1, lineNumber=1})
-startDocument()
-   startDTD(name="doc", publicId="", systemId="")
-      attributeDecl(eName="doc", aName="a1", type="", valueDefault="", value="")
-      attributeDecl(eName="doc", aName="a1", type="", valueDefault="", value="")
-   endDTD()
-   startElement(namespaceURI="", localName="doc", qName="doc", atts=[])
-   endElement(namespaceURI="", localName="doc", qName="doc")
-endDocument()
diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/046.xml b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/046.xml
deleted file mode 100644
index c50a2846f9..0000000000
--- a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/046.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<!DOCTYPE doc [
-<!ELEMENT doc (#PCDATA)>
-<!ATTLIST doc a1 CDATA "v1">
-<!ATTLIST doc a2 CDATA "v2">
-]>
-<doc></doc>
diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/046.xml.ref b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/046.xml.ref
deleted file mode 100644
index 7b1a28d90c..0000000000
--- a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/046.xml.ref
+++ /dev/null
@@ -1,9 +0,0 @@
-setDocumentLocator(locator={columnNumber=1, lineNumber=1})
-startDocument()
-   startDTD(name="doc", publicId="", systemId="")
-      attributeDecl(eName="doc", aName="a1", type="", valueDefault="", value="")
-      attributeDecl(eName="doc", aName="a2", type="", valueDefault="", value="")
-   endDTD()
-   startElement(namespaceURI="", localName="doc", qName="doc", atts=[])
-   endElement(namespaceURI="", localName="doc", qName="doc")
-endDocument()
diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/047.xml b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/047.xml
deleted file mode 100644
index a4c688cf1a..0000000000
--- a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/047.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<!DOCTYPE doc [
-<!ELEMENT doc (#PCDATA)>
-]>
-<doc>X
-Y</doc>
diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/047.xml.ref b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/047.xml.ref
deleted file mode 100644
index 3af5bf2d74..0000000000
--- a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/047.xml.ref
+++ /dev/null
@@ -1,8 +0,0 @@
-setDocumentLocator(locator={columnNumber=1, lineNumber=1})
-startDocument()
-   startDTD(name="doc", publicId="", systemId="")
-   endDTD()
-   startElement(namespaceURI="", localName="doc", qName="doc", atts=[])
-      characters(ch="X\r\nY")
-   endElement(namespaceURI="", localName="doc", qName="doc")
-endDocument()
diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/048.xml b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/048.xml
deleted file mode 100644
index c6b2dedbba..0000000000
--- a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/048.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<!DOCTYPE doc [
-<!ELEMENT doc (#PCDATA)>
-]>
-<doc>]</doc>
diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/048.xml.ref b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/048.xml.ref
deleted file mode 100644
index 0e8482350f..0000000000
--- a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/048.xml.ref
+++ /dev/null
@@ -1,8 +0,0 @@
-setDocumentLocator(locator={columnNumber=1, lineNumber=1})
-startDocument()
-   startDTD(name="doc", publicId="", systemId="")
-   endDTD()
-   startElement(namespaceURI="", localName="doc", qName="doc", atts=[])
-      characters(ch="]")
-   endElement(namespaceURI="", localName="doc", qName="doc")
-endDocument()
diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/049.xml b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/049.xml
deleted file mode 100644
index c3cc797b59..0000000000
--- a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/049.xml
+++ /dev/null
diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/049.xml.ref b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/049.xml.ref
deleted file mode 100644
index 72897d1943..0000000000
--- a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/049.xml.ref
+++ /dev/null
@@ -1,8 +0,0 @@
-setDocumentLocator(locator={columnNumber=1, lineNumber=1})
-startDocument()
-   startDTD(name="doc", publicId="", systemId="")
-   endDTD()
-   startElement(namespaceURI="", localName="doc", qName="doc", atts=[])
-      characters(ch="£")
-   endElement(namespaceURI="", localName="doc", qName="doc")
-endDocument()
diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/050.xml b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/050.xml
deleted file mode 100644
index 12303b1af2..0000000000
--- a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/050.xml
+++ /dev/null
diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/050.xml.ref b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/050.xml.ref
deleted file mode 100644
index 8f39355258..0000000000
--- a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/050.xml.ref
+++ /dev/null
@@ -1,8 +0,0 @@
-setDocumentLocator(locator={columnNumber=1, lineNumber=1})
-startDocument()
-   startDTD(name="doc", publicId="", systemId="")
-   endDTD()
-   startElement(namespaceURI="", localName="doc", qName="doc", atts=[])
-      characters(ch="เจมส์")
-   endElement(namespaceURI="", localName="doc", qName="doc")
-endDocument()
diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/051.xml b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/051.xml
deleted file mode 100644
index 7ae8f6c73a..0000000000
--- a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/051.xml
+++ /dev/null
diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/051.xml.ref b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/051.xml.ref
deleted file mode 100644
index 71a89a922c..0000000000
--- a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/051.xml.ref
+++ /dev/null
@@ -1,7 +0,0 @@
-setDocumentLocator(locator={columnNumber=1, lineNumber=1})
-startDocument()
-   startDTD(name="เจมส์", publicId="", systemId="")
-   endDTD()
-   startElement(namespaceURI="", localName="เจมส์", qName="เจมส์", atts=[])
-   endElement(namespaceURI="", localName="เจมส์", qName="เจมส์")
-endDocument()
diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/052.xml b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/052.xml
deleted file mode 100644
index 3f33a4c760..0000000000
--- a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/052.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<!DOCTYPE doc [
-<!ELEMENT doc (#PCDATA)>
-]>
-<doc>𐀀􏿽</doc>
diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/052.xml.ref b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/052.xml.ref
deleted file mode 100644
index 0b806c96a8..0000000000
--- a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/052.xml.ref
+++ /dev/null
@@ -1,8 +0,0 @@
-setDocumentLocator(locator={columnNumber=1, lineNumber=1})
-startDocument()
-   startDTD(name="doc", publicId="", systemId="")
-   endDTD()
-   startElement(namespaceURI="", localName="doc", qName="doc", atts=[])
-      characters(ch="𐀀􏿽")
-   endElement(namespaceURI="", localName="doc", qName="doc")
-endDocument()
diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/053.xml b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/053.xml
deleted file mode 100644
index 0d88f28718..0000000000
--- a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/053.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<!DOCTYPE doc [
-<!ENTITY e "<e/>">
-<!ELEMENT doc (e)>
-<!ELEMENT e EMPTY>
-]>
-<doc>&e;</doc>
diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/053.xml.ref b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/053.xml.ref
deleted file mode 100644
index 2aa90a79d0..0000000000
--- a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/053.xml.ref
+++ /dev/null
@@ -1,10 +0,0 @@
-setDocumentLocator(locator={columnNumber=1, lineNumber=1})
-startDocument()
-   startDTD(name="doc", publicId="", systemId="")
-      internatlEntityDecl(name="e", value="<e/>")
-   endDTD()
-   startElement(namespaceURI="", localName="doc", qName="doc", atts=[])
-      startElement(namespaceURI="", localName="e", qName="e", atts=[])
-      endElement(namespaceURI="", localName="e", qName="e")
-   endElement(namespaceURI="", localName="doc", qName="doc")
-endDocument()
diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/054.xml b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/054.xml
deleted file mode 100644
index 5d1c88b946..0000000000
--- a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/054.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<!DOCTYPE doc [
-<!ELEMENT doc (#PCDATA)>
-]>
-
-
-<doc
-></doc
->
-
-
diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/054.xml.ref b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/054.xml.ref
deleted file mode 100644
index 37b53fc0b3..0000000000
--- a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/054.xml.ref
+++ /dev/null
@@ -1,7 +0,0 @@
-setDocumentLocator(locator={columnNumber=1, lineNumber=1})
-startDocument()
-   startDTD(name="doc", publicId="", systemId="")
-   endDTD()
-   startElement(namespaceURI="", localName="doc", qName="doc", atts=[])
-   endElement(namespaceURI="", localName="doc", qName="doc")
-endDocument()
diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/055.xml b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/055.xml
deleted file mode 100644
index da0292c5bc..0000000000
--- a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/055.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<!DOCTYPE doc [
-<!ELEMENT doc (#PCDATA)>
-]>
-<?pi  data?>
-<doc></doc>
diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/055.xml.ref b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/055.xml.ref
deleted file mode 100644
index dc3312be38..0000000000
--- a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/055.xml.ref
+++ /dev/null
@@ -1,8 +0,0 @@
-setDocumentLocator(locator={columnNumber=1, lineNumber=1})
-startDocument()
-   startDTD(name="doc", publicId="", systemId="")
-   endDTD()
-   processingInstruction(target="pi", data="data")
-   startElement(namespaceURI="", localName="doc", qName="doc", atts=[])
-   endElement(namespaceURI="", localName="doc", qName="doc")
-endDocument()
diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/056.xml b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/056.xml
deleted file mode 100644
index 144871b2a3..0000000000
--- a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/056.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<!DOCTYPE doc [
-<!ELEMENT doc (#PCDATA)>
-]>
-<doc>&#x0000000000000000000000000000000000000041;</doc>
diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/056.xml.ref b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/056.xml.ref
deleted file mode 100644
index ed02b8c709..0000000000
--- a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/056.xml.ref
+++ /dev/null
@@ -1,8 +0,0 @@
-setDocumentLocator(locator={columnNumber=1, lineNumber=1})
-startDocument()
-   startDTD(name="doc", publicId="", systemId="")
-   endDTD()
-   startElement(namespaceURI="", localName="doc", qName="doc", atts=[])
-      characters(ch="A")
-   endElement(namespaceURI="", localName="doc", qName="doc")
-endDocument()
diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/057.xml b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/057.xml
deleted file mode 100644
index c1ac849ed1..0000000000
--- a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/057.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<!DOCTYPE doc [
-<!ELEMENT doc (a*)>
-]>
-<doc></doc>
diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/057.xml.ref b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/057.xml.ref
deleted file mode 100644
index 37b53fc0b3..0000000000
--- a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/057.xml.ref
+++ /dev/null
@@ -1,7 +0,0 @@
-setDocumentLocator(locator={columnNumber=1, lineNumber=1})
-startDocument()
-   startDTD(name="doc", publicId="", systemId="")
-   endDTD()
-   startElement(namespaceURI="", localName="doc", qName="doc", atts=[])
-   endElement(namespaceURI="", localName="doc", qName="doc")
-endDocument()
diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/058.xml b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/058.xml
deleted file mode 100644
index 2ff23b233f..0000000000
--- a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/058.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<!DOCTYPE doc [
-<!ATTLIST doc a1 NMTOKENS #IMPLIED>
-<!ELEMENT doc (#PCDATA)>
-]>
-<doc a1=" 1  	2 	"></doc>
diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/058.xml.ref b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/058.xml.ref
deleted file mode 100644
index 0acf5f4acd..0000000000
--- a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/058.xml.ref
+++ /dev/null
@@ -1,8 +0,0 @@
-setDocumentLocator(locator={columnNumber=1, lineNumber=1})
-startDocument()
-   startDTD(name="doc", publicId="", systemId="")
-      attributeDecl(eName="doc", aName="a1", type="", valueDefault="", value="")
-   endDTD()
-   startElement(namespaceURI="", localName="doc", qName="doc", atts=[{localName="a1", qName="a1", uri="", type="CDATA", value=" 1  \t2 \t"}])
-   endElement(namespaceURI="", localName="doc", qName="doc")
-endDocument()
diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/059.xml b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/059.xml
deleted file mode 100644
index 2171480ecf..0000000000
--- a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/059.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<!DOCTYPE doc [
-<!ELEMENT doc (e*)>
-<!ELEMENT e EMPTY>
-<!ATTLIST e a1 CDATA #IMPLIED a2 CDATA #IMPLIED a3 CDATA #IMPLIED>
-]>
-<doc>
-<e a1="v1" a2="v2" a3="v3"/>
-<e a1="w1" a2="v2"/>
-<e a1="v1" a2="w2" a3="v3"/>
-</doc>
diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/059.xml.ref b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/059.xml.ref
deleted file mode 100644
index 8a73895f0d..0000000000
--- a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/059.xml.ref
+++ /dev/null
@@ -1,20 +0,0 @@
-setDocumentLocator(locator={columnNumber=1, lineNumber=1})
-startDocument()
-   startDTD(name="doc", publicId="", systemId="")
-      attributeDecl(eName="e", aName="a1", type="", valueDefault="", value="")
-      attributeDecl(eName="e", aName="a2", type="", valueDefault="", value="")
-      attributeDecl(eName="e", aName="a3", type="", valueDefault="", value="")
-   endDTD()
-   startElement(namespaceURI="", localName="doc", qName="doc", atts=[])
-      characters(ch="\r\n")
-      startElement(namespaceURI="", localName="e", qName="e", atts=[{localName="a1", qName="a1", uri="", type="CDATA", value="v1"}, {localName="a2", qName="a2", uri="", type="CDATA", value="v2"}, {localName="a3", qName="a3", uri="", type="CDATA", value="v3"}])
-      endElement(namespaceURI="", localName="e", qName="e")
-      characters(ch="\r\n")
-      startElement(namespaceURI="", localName="e", qName="e", atts=[{localName="a1", qName="a1", uri="", type="CDATA", value="w1"}, {localName="a2", qName="a2", uri="", type="CDATA", value="v2"}])
-      endElement(namespaceURI="", localName="e", qName="e")
-      characters(ch="\r\n")
-      startElement(namespaceURI="", localName="e", qName="e", atts=[{localName="a1", qName="a1", uri="", type="CDATA", value="v1"}, {localName="a2", qName="a2", uri="", type="CDATA", value="w2"}, {localName="a3", qName="a3", uri="", type="CDATA", value="v3"}])
-      endElement(namespaceURI="", localName="e", qName="e")
-      characters(ch="\r\n")
-   endElement(namespaceURI="", localName="doc", qName="doc")
-endDocument()
diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/060.xml b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/060.xml
deleted file mode 100644
index 6cd6b4386b..0000000000
--- a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/060.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<!DOCTYPE doc [
-<!ELEMENT doc (#PCDATA)>
-]>
-<doc>X&#10;Y</doc>
diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/060.xml.ref b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/060.xml.ref
deleted file mode 100644
index ea1cbd40c0..0000000000
--- a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/060.xml.ref
+++ /dev/null
@@ -1,8 +0,0 @@
-setDocumentLocator(locator={columnNumber=1, lineNumber=1})
-startDocument()
-   startDTD(name="doc", publicId="", systemId="")
-   endDTD()
-   startElement(namespaceURI="", localName="doc", qName="doc", atts=[])
-      characters(ch="X\nY")
-   endElement(namespaceURI="", localName="doc", qName="doc")
-endDocument()
diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/061.xml b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/061.xml
deleted file mode 100644
index bbdc152492..0000000000
--- a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/061.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<!DOCTYPE doc [
-<!ELEMENT doc (#PCDATA)>
-]>
-<doc>&#163;</doc>
diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/061.xml.ref b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/061.xml.ref
deleted file mode 100644
index 72897d1943..0000000000
--- a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/061.xml.ref
+++ /dev/null
@@ -1,8 +0,0 @@
-setDocumentLocator(locator={columnNumber=1, lineNumber=1})
-startDocument()
-   startDTD(name="doc", publicId="", systemId="")
-   endDTD()
-   startElement(namespaceURI="", localName="doc", qName="doc", atts=[])
-      characters(ch="£")
-   endElement(namespaceURI="", localName="doc", qName="doc")
-endDocument()
diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/062.xml b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/062.xml
deleted file mode 100644
index f4ba53090a..0000000000
--- a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/062.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<!DOCTYPE doc [
-<!ELEMENT doc (#PCDATA)>
-]>
-<doc>&#xe40;&#xe08;&#xe21;ส์</doc>
diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/062.xml.ref b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/062.xml.ref
deleted file mode 100644
index 8f39355258..0000000000
--- a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/062.xml.ref
+++ /dev/null
@@ -1,8 +0,0 @@
-setDocumentLocator(locator={columnNumber=1, lineNumber=1})
-startDocument()
-   startDTD(name="doc", publicId="", systemId="")
-   endDTD()
-   startElement(namespaceURI="", localName="doc", qName="doc", atts=[])
-      characters(ch="เจมส์")
-   endElement(namespaceURI="", localName="doc", qName="doc")
-endDocument()
diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/063.xml b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/063.xml
deleted file mode 100644
index 9668f2da73..0000000000
--- a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/063.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<!DOCTYPE เจมส์ [
-<!ELEMENT เจมส์ (#PCDATA)>
-]>
-<เจมส์></เจมส์>
diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/063.xml.ref b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/063.xml.ref
deleted file mode 100644
index 71a89a922c..0000000000
--- a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/063.xml.ref
+++ /dev/null
@@ -1,7 +0,0 @@
-setDocumentLocator(locator={columnNumber=1, lineNumber=1})
-startDocument()
-   startDTD(name="เจมส์", publicId="", systemId="")
-   endDTD()
-   startElement(namespaceURI="", localName="เจมส์", qName="เจมส์", atts=[])
-   endElement(namespaceURI="", localName="เจมส์", qName="เจมส์")
-endDocument()
diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/064.xml b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/064.xml
deleted file mode 100644
index 74a97aa431..0000000000
--- a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/064.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<!DOCTYPE doc [
-<!ELEMENT doc (#PCDATA)>
-]>
-<doc>&#x10000;&#x10FFFD;</doc>
diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/064.xml.ref b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/064.xml.ref
deleted file mode 100644
index 0b806c96a8..0000000000
--- a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/064.xml.ref
+++ /dev/null
@@ -1,8 +0,0 @@
-setDocumentLocator(locator={columnNumber=1, lineNumber=1})
-startDocument()
-   startDTD(name="doc", publicId="", systemId="")
-   endDTD()
-   startElement(namespaceURI="", localName="doc", qName="doc", atts=[])
-      characters(ch="𐀀􏿽")
-   endElement(namespaceURI="", localName="doc", qName="doc")
-endDocument()
diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/065.xml b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/065.xml
deleted file mode 100644
index f708f2bc17..0000000000
--- a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/065.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<!DOCTYPE doc [
-<!ENTITY e "&#60;">
-<!ELEMENT doc (#PCDATA)>
-]>
-<doc></doc>
diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/065.xml.ref b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/065.xml.ref
deleted file mode 100644
index ba31414499..0000000000
--- a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/065.xml.ref
+++ /dev/null
@@ -1,8 +0,0 @@
-setDocumentLocator(locator={columnNumber=1, lineNumber=1})
-startDocument()
-   startDTD(name="doc", publicId="", systemId="")
-      internatlEntityDecl(name="e", value="<")
-   endDTD()
-   startElement(namespaceURI="", localName="doc", qName="doc", atts=[])
-   endElement(namespaceURI="", localName="doc", qName="doc")
-endDocument()
diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/066.xml b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/066.xml
deleted file mode 100644
index a27340b9a7..0000000000
--- a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/066.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<!DOCTYPE doc [
-<!ELEMENT doc (#PCDATA)>
-<!ATTLIST doc a1 CDATA #IMPLIED>
-<!-- 34 is double quote -->
-<!ENTITY e1 "&#34;">
-]>
-<doc a1="&e1;"></doc>
diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/066.xml.ref b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/066.xml.ref
deleted file mode 100644
index d650af13d3..0000000000
--- a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/066.xml.ref
+++ /dev/null
@@ -1,10 +0,0 @@
-setDocumentLocator(locator={columnNumber=1, lineNumber=1})
-startDocument()
-   startDTD(name="doc", publicId="", systemId="")
-      attributeDecl(eName="doc", aName="a1", type="", valueDefault="", value="")
-      comment(ch=" 34 is double quote ")
-      internatlEntityDecl(name="e1", value="\"")
-   endDTD()
-   startElement(namespaceURI="", localName="doc", qName="doc", atts=[{localName="a1", qName="a1", uri="", type="CDATA", value="\""}])
-   endElement(namespaceURI="", localName="doc", qName="doc")
-endDocument()
diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/067.xml b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/067.xml
deleted file mode 100644
index a0ccf772a5..0000000000
--- a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/067.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<!DOCTYPE doc [
-<!ELEMENT doc (#PCDATA)>
-]>
-<doc>&#13;</doc>
diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/067.xml.ref b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/067.xml.ref
deleted file mode 100644
index 9a2358d700..0000000000
--- a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/067.xml.ref
+++ /dev/null
@@ -1,8 +0,0 @@
-setDocumentLocator(locator={columnNumber=1, lineNumber=1})
-startDocument()
-   startDTD(name="doc", publicId="", systemId="")
-   endDTD()
-   startElement(namespaceURI="", localName="doc", qName="doc", atts=[])
-      characters(ch="\r")
-   endElement(namespaceURI="", localName="doc", qName="doc")
-endDocument()
diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/068.xml b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/068.xml
deleted file mode 100644
index 8ed806b9a3..0000000000
--- a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/068.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<!DOCTYPE doc [
-<!ELEMENT doc (#PCDATA)>
-<!ENTITY e "&#13;">
-]>
-<doc>&e;</doc>
diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/068.xml.ref b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/068.xml.ref
deleted file mode 100644
index 8ebf150e48..0000000000
--- a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/068.xml.ref
+++ /dev/null
@@ -1,9 +0,0 @@
-setDocumentLocator(locator={columnNumber=1, lineNumber=1})
-startDocument()
-   startDTD(name="doc", publicId="", systemId="")
-      internatlEntityDecl(name="e", value="\r")
-   endDTD()
-   startElement(namespaceURI="", localName="doc", qName="doc", atts=[])
-      characters(ch="\r")
-   endElement(namespaceURI="", localName="doc", qName="doc")
-endDocument()
diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/069.xml b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/069.xml
deleted file mode 100644
index 2437f60530..0000000000
--- a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/069.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<!DOCTYPE doc [
-<!ELEMENT doc (#PCDATA)>
-<!NOTATION n PUBLIC "whatever">
-]>
-<doc></doc>
diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/069.xml.ref b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/069.xml.ref
deleted file mode 100644
index c5685c6d7a..0000000000
--- a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/069.xml.ref
+++ /dev/null
@@ -1,8 +0,0 @@
-setDocumentLocator(locator={columnNumber=1, lineNumber=1})
-startDocument()
-   startDTD(name="doc", publicId="", systemId="")
-      notationDecl(name="n", publicId="whatever", systemId="")
-   endDTD()
-   startElement(namespaceURI="", localName="doc", qName="doc", atts=[])
-   endElement(namespaceURI="", localName="doc", qName="doc")
-endDocument()
diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/070.xml b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/070.xml
deleted file mode 100644
index eef097df76..0000000000
--- a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/070.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<!DOCTYPE doc [
-<!ENTITY % e "<!ELEMENT doc (#PCDATA)>">
-%e;
-]>
-<doc></doc>
diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/070.xml.ref b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/070.xml.ref
deleted file mode 100644
index 2525ef6ae3..0000000000
--- a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/070.xml.ref
+++ /dev/null
@@ -1,8 +0,0 @@
-setDocumentLocator(locator={columnNumber=1, lineNumber=1})
-startDocument()
-   startDTD(name="doc", publicId="", systemId="")
-      internatlEntityDecl(name="%e", value="<!ELEMENT doc (#PCDATA)>")
-   endDTD()
-   startElement(namespaceURI="", localName="doc", qName="doc", atts=[])
-   endElement(namespaceURI="", localName="doc", qName="doc")
-endDocument()
diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/071.xml b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/071.xml
deleted file mode 100644
index ebfba230a4..0000000000
--- a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/071.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<!DOCTYPE doc [
-<!ELEMENT doc (#PCDATA)>
-<!ATTLIST doc a ID #IMPLIED>
-]>
-<doc></doc>
diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/071.xml.ref b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/071.xml.ref
deleted file mode 100644
index 0b8e512b33..0000000000
--- a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/071.xml.ref
+++ /dev/null
@@ -1,8 +0,0 @@
-setDocumentLocator(locator={columnNumber=1, lineNumber=1})
-startDocument()
-   startDTD(name="doc", publicId="", systemId="")
-      attributeDecl(eName="doc", aName="a", type="", valueDefault="", value="")
-   endDTD()
-   startElement(namespaceURI="", localName="doc", qName="doc", atts=[])
-   endElement(namespaceURI="", localName="doc", qName="doc")
-endDocument()
diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/072.xml b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/072.xml
deleted file mode 100644
index 6ef39dc49e..0000000000
--- a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/072.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<!DOCTYPE doc [
-<!ELEMENT doc (#PCDATA)>
-<!ATTLIST doc a IDREF #IMPLIED>
-]>
-<doc></doc>
diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/072.xml.ref b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/072.xml.ref
deleted file mode 100644
index 0b8e512b33..0000000000
--- a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/072.xml.ref
+++ /dev/null
@@ -1,8 +0,0 @@
-setDocumentLocator(locator={columnNumber=1, lineNumber=1})
-startDocument()
-   startDTD(name="doc", publicId="", systemId="")
-      attributeDecl(eName="doc", aName="a", type="", valueDefault="", value="")
-   endDTD()
-   startElement(namespaceURI="", localName="doc", qName="doc", atts=[])
-   endElement(namespaceURI="", localName="doc", qName="doc")
-endDocument()
diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/073.xml b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/073.xml
deleted file mode 100644
index 217476d9a9..0000000000
--- a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/073.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<!DOCTYPE doc [
-<!ELEMENT doc (#PCDATA)>
-<!ATTLIST doc a IDREFS #IMPLIED>
-]>
-<doc></doc>
diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/073.xml.ref b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/073.xml.ref
deleted file mode 100644
index 0b8e512b33..0000000000
--- a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/073.xml.ref
+++ /dev/null
@@ -1,8 +0,0 @@
-setDocumentLocator(locator={columnNumber=1, lineNumber=1})
-startDocument()
-   startDTD(name="doc", publicId="", systemId="")
-      attributeDecl(eName="doc", aName="a", type="", valueDefault="", value="")
-   endDTD()
-   startElement(namespaceURI="", localName="doc", qName="doc", atts=[])
-   endElement(namespaceURI="", localName="doc", qName="doc")
-endDocument()
diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/074.xml b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/074.xml
deleted file mode 100644
index 8b2354ff73..0000000000
--- a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/074.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<!DOCTYPE doc [
-<!ELEMENT doc (#PCDATA)>
-<!ATTLIST doc a ENTITY #IMPLIED>
-]>
-<doc></doc>
diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/074.xml.ref b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/074.xml.ref
deleted file mode 100644
index 0b8e512b33..0000000000
--- a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/074.xml.ref
+++ /dev/null
@@ -1,8 +0,0 @@
-setDocumentLocator(locator={columnNumber=1, lineNumber=1})
-startDocument()
-   startDTD(name="doc", publicId="", systemId="")
-      attributeDecl(eName="doc", aName="a", type="", valueDefault="", value="")
-   endDTD()
-   startElement(namespaceURI="", localName="doc", qName="doc", atts=[])
-   endElement(namespaceURI="", localName="doc", qName="doc")
-endDocument()
diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/075.xml b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/075.xml
deleted file mode 100644
index 33c012441a..0000000000
--- a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/075.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<!DOCTYPE doc [
-<!ELEMENT doc (#PCDATA)>
-<!ATTLIST doc a ENTITIES #IMPLIED>
-]>
-<doc></doc>
diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/075.xml.ref b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/075.xml.ref
deleted file mode 100644
index 0b8e512b33..0000000000
--- a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/075.xml.ref
+++ /dev/null
@@ -1,8 +0,0 @@
-setDocumentLocator(locator={columnNumber=1, lineNumber=1})
-startDocument()
-   startDTD(name="doc", publicId="", systemId="")
-      attributeDecl(eName="doc", aName="a", type="", valueDefault="", value="")
-   endDTD()
-   startElement(namespaceURI="", localName="doc", qName="doc", atts=[])
-   endElement(namespaceURI="", localName="doc", qName="doc")
-endDocument()
diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/076.xml b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/076.xml
deleted file mode 100644
index 65b731cf6d..0000000000
--- a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/076.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<!DOCTYPE doc [
-<!ELEMENT doc (#PCDATA)>
-<!ATTLIST doc a NOTATION (n1|n2) #IMPLIED>
-<!NOTATION n1 SYSTEM "http://www.w3.org/">
-<!NOTATION n2 SYSTEM "http://www.w3.org/">
-]>
-<doc></doc>
diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/076.xml.ref b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/076.xml.ref
deleted file mode 100644
index 3145f641b2..0000000000
--- a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/076.xml.ref
+++ /dev/null
@@ -1,10 +0,0 @@
-setDocumentLocator(locator={columnNumber=1, lineNumber=1})
-startDocument()
-   startDTD(name="doc", publicId="", systemId="")
-      attributeDecl(eName="doc", aName="a", type="", valueDefault="", value="")
-      notationDecl(name="n1", publicId="", systemId="http://www.w3.org/")
-      notationDecl(name="n2", publicId="", systemId="http://www.w3.org/")
-   endDTD()
-   startElement(namespaceURI="", localName="doc", qName="doc", atts=[])
-   endElement(namespaceURI="", localName="doc", qName="doc")
-endDocument()
diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/077.xml b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/077.xml
deleted file mode 100644
index e5f301eac8..0000000000
--- a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/077.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<!DOCTYPE doc [
-<!ELEMENT doc (#PCDATA)>
-<!ATTLIST doc a (1|2) #IMPLIED>
-]>
-<doc></doc>
diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/077.xml.ref b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/077.xml.ref
deleted file mode 100644
index 0b8e512b33..0000000000
--- a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/077.xml.ref
+++ /dev/null
@@ -1,8 +0,0 @@
-setDocumentLocator(locator={columnNumber=1, lineNumber=1})
-startDocument()
-   startDTD(name="doc", publicId="", systemId="")
-      attributeDecl(eName="doc", aName="a", type="", valueDefault="", value="")
-   endDTD()
-   startElement(namespaceURI="", localName="doc", qName="doc", atts=[])
-   endElement(namespaceURI="", localName="doc", qName="doc")
-endDocument()
diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/078.xml b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/078.xml
deleted file mode 100644
index b31f40f94e..0000000000
--- a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/078.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<!DOCTYPE doc [
-<!ELEMENT doc (#PCDATA)>
-<!ATTLIST doc a CDATA #REQUIRED>
-]>
-<doc a="v"></doc>
diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/078.xml.ref b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/078.xml.ref
deleted file mode 100644
index 6b4e3c4f31..0000000000
--- a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/078.xml.ref
+++ /dev/null
@@ -1,8 +0,0 @@
-setDocumentLocator(locator={columnNumber=1, lineNumber=1})
-startDocument()
-   startDTD(name="doc", publicId="", systemId="")
-      attributeDecl(eName="doc", aName="a", type="", valueDefault="", value="")
-   endDTD()
-   startElement(namespaceURI="", localName="doc", qName="doc", atts=[{localName="a", qName="a", uri="", type="CDATA", value="v"}])
-   endElement(namespaceURI="", localName="doc", qName="doc")
-endDocument()
diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/079.xml b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/079.xml
deleted file mode 100644
index a3290d6cbb..0000000000
--- a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/079.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<!DOCTYPE doc [
-<!ELEMENT doc (#PCDATA)>
-<!ATTLIST doc a CDATA #FIXED "v">
-]>
-<doc a="v"></doc>
diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/079.xml.ref b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/079.xml.ref
deleted file mode 100644
index 6b4e3c4f31..0000000000
--- a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/079.xml.ref
+++ /dev/null
@@ -1,8 +0,0 @@
-setDocumentLocator(locator={columnNumber=1, lineNumber=1})
-startDocument()
-   startDTD(name="doc", publicId="", systemId="")
-      attributeDecl(eName="doc", aName="a", type="", valueDefault="", value="")
-   endDTD()
-   startElement(namespaceURI="", localName="doc", qName="doc", atts=[{localName="a", qName="a", uri="", type="CDATA", value="v"}])
-   endElement(namespaceURI="", localName="doc", qName="doc")
-endDocument()
diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/080.xml b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/080.xml
deleted file mode 100644
index 3208fa9aa5..0000000000
--- a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/080.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<!DOCTYPE doc [
-<!ELEMENT doc (#PCDATA)>
-<!ATTLIST doc a CDATA #FIXED "v">
-]>
-<doc></doc>
diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/080.xml.ref b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/080.xml.ref
deleted file mode 100644
index 0b8e512b33..0000000000
--- a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/080.xml.ref
+++ /dev/null
@@ -1,8 +0,0 @@
-setDocumentLocator(locator={columnNumber=1, lineNumber=1})
-startDocument()
-   startDTD(name="doc", publicId="", systemId="")
-      attributeDecl(eName="doc", aName="a", type="", valueDefault="", value="")
-   endDTD()
-   startElement(namespaceURI="", localName="doc", qName="doc", atts=[])
-   endElement(namespaceURI="", localName="doc", qName="doc")
-endDocument()
diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/081.xml b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/081.xml
deleted file mode 100644
index 51ee1a375c..0000000000
--- a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/081.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<!DOCTYPE doc [
-<!ELEMENT doc (a, b, c)>
-<!ELEMENT a (a?)>
-<!ELEMENT b (b*)>
-<!ELEMENT c (a | b)+>
-]>
-<doc><a/><b/><c><a/></c></doc>
diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/081.xml.ref b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/081.xml.ref
deleted file mode 100644
index 1bc73000f8..0000000000
--- a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/081.xml.ref
+++ /dev/null
@@ -1,15 +0,0 @@
-setDocumentLocator(locator={columnNumber=1, lineNumber=1})
-startDocument()
-   startDTD(name="doc", publicId="", systemId="")
-   endDTD()
-   startElement(namespaceURI="", localName="doc", qName="doc", atts=[])
-      startElement(namespaceURI="", localName="a", qName="a", atts=[])
-      endElement(namespaceURI="", localName="a", qName="a")
-      startElement(namespaceURI="", localName="b", qName="b", atts=[])
-      endElement(namespaceURI="", localName="b", qName="b")
-      startElement(namespaceURI="", localName="c", qName="c", atts=[])
-         startElement(namespaceURI="", localName="a", qName="a", atts=[])
-         endElement(namespaceURI="", localName="a", qName="a")
-      endElement(namespaceURI="", localName="c", qName="c")
-   endElement(namespaceURI="", localName="doc", qName="doc")
-endDocument()
diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/082.xml b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/082.xml
deleted file mode 100644
index d5245ac51a..0000000000
--- a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/082.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<!DOCTYPE doc [
-<!ENTITY % e SYSTEM "e.dtd">
-<!ELEMENT doc (#PCDATA)>
-]>
-<doc></doc>
diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/082.xml.ref b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/082.xml.ref
deleted file mode 100644
index a333feb826..0000000000
--- a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/082.xml.ref
+++ /dev/null
@@ -1,8 +0,0 @@
-setDocumentLocator(locator={columnNumber=1, lineNumber=1})
-startDocument()
-   startDTD(name="doc", publicId="", systemId="")
-      externalEntityDecl(name="%e", publicId="", systemId="e.dtd")
-   endDTD()
-   startElement(namespaceURI="", localName="doc", qName="doc", atts=[])
-   endElement(namespaceURI="", localName="doc", qName="doc")
-endDocument()
diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/083.xml b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/083.xml
deleted file mode 100644
index 937cfc0bdd..0000000000
--- a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/083.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<!DOCTYPE doc [
-<!ENTITY % e PUBLIC 'whatever' "e.dtd">
-<!ELEMENT doc (#PCDATA)>
-]>
-<doc></doc>
diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/083.xml.ref b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/083.xml.ref
deleted file mode 100644
index d52b5aa8b9..0000000000
--- a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/083.xml.ref
+++ /dev/null
@@ -1,8 +0,0 @@
-setDocumentLocator(locator={columnNumber=1, lineNumber=1})
-startDocument()
-   startDTD(name="doc", publicId="", systemId="")
-      externalEntityDecl(name="%e", publicId="whatever", systemId="e.dtd")
-   endDTD()
-   startElement(namespaceURI="", localName="doc", qName="doc", atts=[])
-   endElement(namespaceURI="", localName="doc", qName="doc")
-endDocument()
diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/084.xml b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/084.xml
deleted file mode 100644
index 82760767aa..0000000000
--- a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/084.xml
+++ /dev/null
@@ -1 +0,0 @@
-<!DOCTYPE doc [<!ELEMENT doc (#PCDATA)>]><doc></doc>
diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/084.xml.ref b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/084.xml.ref
deleted file mode 100644
index 37b53fc0b3..0000000000
--- a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/084.xml.ref
+++ /dev/null
@@ -1,7 +0,0 @@
-setDocumentLocator(locator={columnNumber=1, lineNumber=1})
-startDocument()
-   startDTD(name="doc", publicId="", systemId="")
-   endDTD()
-   startElement(namespaceURI="", localName="doc", qName="doc", atts=[])
-   endElement(namespaceURI="", localName="doc", qName="doc")
-endDocument()
diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/085.xml b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/085.xml
deleted file mode 100644
index cf5834f2a5..0000000000
--- a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/085.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<!DOCTYPE doc [
-<!ELEMENT doc (#PCDATA)>
-<!ENTITY % e "<foo>">
-<!ENTITY e "">
-]>
-<doc>&e;</doc>
diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/085.xml.ref b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/085.xml.ref
deleted file mode 100644
index 8f9cdcc6d0..0000000000
--- a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/085.xml.ref
+++ /dev/null
@@ -1,9 +0,0 @@
-setDocumentLocator(locator={columnNumber=1, lineNumber=1})
-startDocument()
-   startDTD(name="doc", publicId="", systemId="")
-      internatlEntityDecl(name="%e", value="<foo>")
-   endDTD()
-   startElement(namespaceURI="", localName="doc", qName="doc", atts=[])
-      skippedEntity(name="e")
-   endElement(namespaceURI="", localName="doc", qName="doc")
-endDocument()
diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/086.xml b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/086.xml
deleted file mode 100644
index bbc3080db6..0000000000
--- a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/086.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<!DOCTYPE doc [
-<!ELEMENT doc (#PCDATA)>
-<!ENTITY e "">
-<!ENTITY e "<foo>">
-]>
-<doc>&e;</doc>
diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/086.xml.ref b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/086.xml.ref
deleted file mode 100644
index b59c216593..0000000000
--- a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/086.xml.ref
+++ /dev/null
@@ -1,8 +0,0 @@
-setDocumentLocator(locator={columnNumber=1, lineNumber=1})
-startDocument()
-   startDTD(name="doc", publicId="", systemId="")
-      internatlEntityDecl(name="e", value="")
-   endDTD()
-   startElement(namespaceURI="", localName="doc", qName="doc", atts=[])
-   endElement(namespaceURI="", localName="doc", qName="doc")
-endDocument()
diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/087.xml b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/087.xml
deleted file mode 100644
index 34797a67d7..0000000000
--- a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/087.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<!DOCTYPE doc [
-<!ENTITY e "<foo/&#62;">
-<!ELEMENT doc (foo)>
-<!ELEMENT foo EMPTY>
-]>
-<doc>&e;</doc>
diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/087.xml.ref b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/087.xml.ref
deleted file mode 100644
index 33d23092ef..0000000000
--- a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/087.xml.ref
+++ /dev/null
@@ -1,10 +0,0 @@
-setDocumentLocator(locator={columnNumber=1, lineNumber=1})
-startDocument()
-   startDTD(name="doc", publicId="", systemId="")
-      internatlEntityDecl(name="e", value="<foo/>")
-   endDTD()
-   startElement(namespaceURI="", localName="doc", qName="doc", atts=[])
-      startElement(namespaceURI="", localName="foo", qName="foo", atts=[])
-      endElement(namespaceURI="", localName="foo", qName="foo")
-   endElement(namespaceURI="", localName="doc", qName="doc")
-endDocument()
diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/088.xml b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/088.xml
deleted file mode 100644
index f97d96848d..0000000000
--- a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/088.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<!DOCTYPE doc [
-<!ELEMENT doc (#PCDATA)>
-<!ENTITY e "&lt;foo>">
-]>
-<doc>&e;</doc>
diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/088.xml.ref b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/088.xml.ref
deleted file mode 100644
index db24f3408f..0000000000
--- a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/088.xml.ref
+++ /dev/null
@@ -1,9 +0,0 @@
-setDocumentLocator(locator={columnNumber=1, lineNumber=1})
-startDocument()
-   startDTD(name="doc", publicId="", systemId="")
-      internatlEntityDecl(name="e", value="&lt;foo>")
-   endDTD()
-   startElement(namespaceURI="", localName="doc", qName="doc", atts=[])
-      characters(ch="<foo>")
-   endElement(namespaceURI="", localName="doc", qName="doc")
-endDocument()
diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/089.xml b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/089.xml
deleted file mode 100644
index 2d80c8f3fb..0000000000
--- a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/089.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<!DOCTYPE doc [
-<!ENTITY e "&#x10000;&#x10FFFD;&#x10FFFF;">
-<!ELEMENT doc (#PCDATA)>
-]>
-<doc>&e;</doc>
diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/089.xml.ref b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/089.xml.ref
deleted file mode 100644
index f09bc2bd09..0000000000
--- a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/089.xml.ref
+++ /dev/null
@@ -1,9 +0,0 @@
-setDocumentLocator(locator={columnNumber=1, lineNumber=1})
-startDocument()
-   startDTD(name="doc", publicId="", systemId="")
-      internatlEntityDecl(name="e", value="𐀀􏿽􏿿")
-   endDTD()
-   startElement(namespaceURI="", localName="doc", qName="doc", atts=[])
-      characters(ch="𐀀􏿽􏿿")
-   endElement(namespaceURI="", localName="doc", qName="doc")
-endDocument()
diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/090.xml b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/090.xml
deleted file mode 100644
index c392c96084..0000000000
--- a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/090.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<!DOCTYPE doc [
-<!ATTLIST e a NOTATION (n) #IMPLIED>
-<!ELEMENT doc (e)*>
-<!ELEMENT e (#PCDATA)>
-<!NOTATION n PUBLIC "whatever">
-]>
-<doc></doc>
diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/090.xml.ref b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/090.xml.ref
deleted file mode 100644
index 1cc0f1e082..0000000000
--- a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/090.xml.ref
+++ /dev/null
@@ -1,9 +0,0 @@
-setDocumentLocator(locator={columnNumber=1, lineNumber=1})
-startDocument()
-   startDTD(name="doc", publicId="", systemId="")
-      attributeDecl(eName="e", aName="a", type="", valueDefault="", value="")
-      notationDecl(name="n", publicId="whatever", systemId="")
-   endDTD()
-   startElement(namespaceURI="", localName="doc", qName="doc", atts=[])
-   endElement(namespaceURI="", localName="doc", qName="doc")
-endDocument()
diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/091.xml b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/091.xml
deleted file mode 100644
index 7343d0f795..0000000000
--- a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/091.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<!DOCTYPE doc [
-<!NOTATION n SYSTEM "http://www.w3.org/">
-<!ENTITY e SYSTEM "http://www.w3.org/" NDATA n>
-<!ELEMENT doc (#PCDATA)>
-<!ATTLIST doc a ENTITY "e">
-]>
-<doc></doc>
diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/091.xml.ref b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/091.xml.ref
deleted file mode 100644
index da92a9d906..0000000000
--- a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/091.xml.ref
+++ /dev/null
@@ -1,10 +0,0 @@
-setDocumentLocator(locator={columnNumber=1, lineNumber=1})
-startDocument()
-   startDTD(name="doc", publicId="", systemId="")
-      notationDecl(name="n", publicId="", systemId="http://www.w3.org/")
-      unparsedEntityDecl(name="e", publicId="", systemId="http://www.w3.org/", notationName="n")
-      attributeDecl(eName="doc", aName="a", type="", valueDefault="", value="")
-   endDTD()
-   startElement(namespaceURI="", localName="doc", qName="doc", atts=[])
-   endElement(namespaceURI="", localName="doc", qName="doc")
-endDocument()
diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/092.xml b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/092.xml
deleted file mode 100644
index 627b74ecdf..0000000000
--- a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/092.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<!DOCTYPE doc [
-<!ELEMENT doc (a)*>
-<!ELEMENT a EMPTY>
-]>
-<doc>
-<a/>
-    <a/>	<a/>
-
-
-</doc>
diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/092.xml.ref b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/092.xml.ref
deleted file mode 100644
index 3b9e06dc9e..0000000000
--- a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/092.xml.ref
+++ /dev/null
@@ -1,17 +0,0 @@
-setDocumentLocator(locator={columnNumber=1, lineNumber=1})
-startDocument()
-   startDTD(name="doc", publicId="", systemId="")
-   endDTD()
-   startElement(namespaceURI="", localName="doc", qName="doc", atts=[])
-      characters(ch="\r\n")
-      startElement(namespaceURI="", localName="a", qName="a", atts=[])
-      endElement(namespaceURI="", localName="a", qName="a")
-      characters(ch="\r\n    ")
-      startElement(namespaceURI="", localName="a", qName="a", atts=[])
-      endElement(namespaceURI="", localName="a", qName="a")
-      characters(ch="\t")
-      startElement(namespaceURI="", localName="a", qName="a", atts=[])
-      endElement(namespaceURI="", localName="a", qName="a")
-      characters(ch="\r\n\r\n\r\n")
-   endElement(namespaceURI="", localName="doc", qName="doc")
-endDocument()
diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/093.xml b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/093.xml
deleted file mode 100644
index 968acb628f..0000000000
--- a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/093.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<!DOCTYPE doc [
-<!ELEMENT doc (#PCDATA)>
-]>
-<doc>
-
-</doc>
-\ No newline at end of file
diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/093.xml.ref b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/093.xml.ref
deleted file mode 100644
index 2e8bee6814..0000000000
--- a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/093.xml.ref
+++ /dev/null
@@ -1,8 +0,0 @@
-setDocumentLocator(locator={columnNumber=1, lineNumber=1})
-startDocument()
-   startDTD(name="doc", publicId="", systemId="")
-   endDTD()
-   startElement(namespaceURI="", localName="doc", qName="doc", atts=[])
-      characters(ch="\r\n\r\r")
-   endElement(namespaceURI="", localName="doc", qName="doc")
-endDocument()
diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/094.xml b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/094.xml
deleted file mode 100644
index 5726e7db6f..0000000000
--- a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/094.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<!DOCTYPE doc [
-<!ENTITY % e "foo">
-<!ELEMENT doc (#PCDATA)>
-<!ATTLIST doc a1 CDATA "%e;">
-]>
-<doc></doc>
diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/094.xml.ref b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/094.xml.ref
deleted file mode 100644
index 4f42980c0b..0000000000
--- a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/094.xml.ref
+++ /dev/null
@@ -1,9 +0,0 @@
-setDocumentLocator(locator={columnNumber=1, lineNumber=1})
-startDocument()
-   startDTD(name="doc", publicId="", systemId="")
-      internatlEntityDecl(name="%e", value="foo")
-      attributeDecl(eName="doc", aName="a1", type="", valueDefault="", value="")
-   endDTD()
-   startElement(namespaceURI="", localName="doc", qName="doc", atts=[])
-   endElement(namespaceURI="", localName="doc", qName="doc")
-endDocument()
diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/095.xml b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/095.xml
deleted file mode 100644
index 1fe69596da..0000000000
--- a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/095.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<!DOCTYPE doc [
-<!ATTLIST doc a1 CDATA #IMPLIED>
-<!ATTLIST doc a1 NMTOKENS #IMPLIED>
-<!ELEMENT doc (#PCDATA)>
-]>
-<doc a1="1  2"></doc>
diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/095.xml.ref b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/095.xml.ref
deleted file mode 100644
index 567feee5ad..0000000000
--- a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/095.xml.ref
+++ /dev/null
@@ -1,9 +0,0 @@
-setDocumentLocator(locator={columnNumber=1, lineNumber=1})
-startDocument()
-   startDTD(name="doc", publicId="", systemId="")
-      attributeDecl(eName="doc", aName="a1", type="", valueDefault="", value="")
-      attributeDecl(eName="doc", aName="a1", type="", valueDefault="", value="")
-   endDTD()
-   startElement(namespaceURI="", localName="doc", qName="doc", atts=[{localName="a1", qName="a1", uri="", type="CDATA", value="1  2"}])
-   endElement(namespaceURI="", localName="doc", qName="doc")
-endDocument()
diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/096.xml b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/096.xml
deleted file mode 100644
index a6f8f43620..0000000000
--- a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/096.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<!DOCTYPE doc [
-<!ATTLIST doc a1 NMTOKENS " 1  	2 	">
-<!ELEMENT doc (#PCDATA)>
-]>
-<doc></doc>
diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/096.xml.ref b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/096.xml.ref
deleted file mode 100644
index 1e3200f48c..0000000000
--- a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/096.xml.ref
+++ /dev/null
@@ -1,8 +0,0 @@
-setDocumentLocator(locator={columnNumber=1, lineNumber=1})
-startDocument()
-   startDTD(name="doc", publicId="", systemId="")
-      attributeDecl(eName="doc", aName="a1", type="", valueDefault="", value="")
-   endDTD()
-   startElement(namespaceURI="", localName="doc", qName="doc", atts=[])
-   endElement(namespaceURI="", localName="doc", qName="doc")
-endDocument()
diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/097.ent b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/097.ent
deleted file mode 100644
index e06554ace2..0000000000
--- a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/097.ent
+++ /dev/null
@@ -1 +0,0 @@
-<!ATTLIST doc a2 CDATA #IMPLIED>
diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/097.xml b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/097.xml
deleted file mode 100644
index c606afa97f..0000000000
--- a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/097.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<!DOCTYPE doc [
-<!ELEMENT doc (#PCDATA)>
-<!ENTITY % e SYSTEM "097.ent">
-<!ATTLIST doc a1 CDATA "v1">
-%e;
-<!ATTLIST doc a2 CDATA "v2">
-]>
-<doc></doc>
diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/097.xml.ref b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/097.xml.ref
deleted file mode 100644
index b211a094ed..0000000000
--- a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/097.xml.ref
+++ /dev/null
@@ -1,12 +0,0 @@
-setDocumentLocator(locator={columnNumber=1, lineNumber=1})
-startDocument()
-   startDTD(name="doc", publicId="", systemId="")
-      externalEntityDecl(name="%e", publicId="", systemId="097.ent")
-      attributeDecl(eName="doc", aName="a1", type="", valueDefault="", value="")
-      resolveEntity(publicId="", systemId="097.ent", ret={})
-      skippedEntity(name="%e")
-      attributeDecl(eName="doc", aName="a2", type="", valueDefault="", value="")
-   endDTD()
-   startElement(namespaceURI="", localName="doc", qName="doc", atts=[])
-   endElement(namespaceURI="", localName="doc", qName="doc")
-endDocument()
diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/098.xml b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/098.xml
deleted file mode 100644
index 33a64ce5ae..0000000000
--- a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/098.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<!DOCTYPE doc [
-<!ELEMENT doc (#PCDATA)>
-]>
-<doc><?pi x
-y?></doc>
diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/098.xml.ref b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/098.xml.ref
deleted file mode 100644
index 5108be0763..0000000000
--- a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/098.xml.ref
+++ /dev/null
@@ -1,8 +0,0 @@
-setDocumentLocator(locator={columnNumber=1, lineNumber=1})
-startDocument()
-   startDTD(name="doc", publicId="", systemId="")
-   endDTD()
-   startElement(namespaceURI="", localName="doc", qName="doc", atts=[])
-      processingInstruction(target="pi", data="x\r\ny")
-   endElement(namespaceURI="", localName="doc", qName="doc")
-endDocument()
diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/099.xml b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/099.xml
deleted file mode 100644
index 1b7214a137..0000000000
--- a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/099.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!DOCTYPE doc [
-<!ELEMENT doc (#PCDATA)>
-]>
-<doc></doc>
diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/099.xml.ref b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/099.xml.ref
deleted file mode 100644
index 21cd9bced2..0000000000
--- a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/099.xml.ref
+++ /dev/null
@@ -1,8 +0,0 @@
-setDocumentLocator(locator={columnNumber=1, lineNumber=1})
-startDocument()
-   processingInstruction(target="xml", data="version='1.0' encoding='utf-8'")
-   startDTD(name="doc", publicId="", systemId="")
-   endDTD()
-   startElement(namespaceURI="", localName="doc", qName="doc", atts=[])
-   endElement(namespaceURI="", localName="doc", qName="doc")
-endDocument()
diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/100.xml b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/100.xml
deleted file mode 100644
index 5b839e76bc..0000000000
--- a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/100.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<!DOCTYPE doc [
-<!ENTITY e PUBLIC ";!*#@$_%" "100.xml">
-<!ELEMENT doc (#PCDATA)>
-]>
-<doc></doc>
diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/100.xml.ref b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/100.xml.ref
deleted file mode 100644
index aaeec27038..0000000000
--- a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/100.xml.ref
+++ /dev/null
@@ -1,8 +0,0 @@
-setDocumentLocator(locator={columnNumber=1, lineNumber=1})
-startDocument()
-   startDTD(name="doc", publicId="", systemId="")
-      externalEntityDecl(name="e", publicId=";!*#@$_%", systemId="100.xml")
-   endDTD()
-   startElement(namespaceURI="", localName="doc", qName="doc", atts=[])
-   endElement(namespaceURI="", localName="doc", qName="doc")
-endDocument()
diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/101.xml b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/101.xml
deleted file mode 100644
index f464484bf5..0000000000
--- a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/101.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<!DOCTYPE doc [
-<!ELEMENT doc (#PCDATA)>
-<!ENTITY e "&#34;">
-]>
-<doc></doc>
diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/101.xml.ref b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/101.xml.ref
deleted file mode 100644
index 5b7646c82f..0000000000
--- a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/101.xml.ref
+++ /dev/null
@@ -1,8 +0,0 @@
-setDocumentLocator(locator={columnNumber=1, lineNumber=1})
-startDocument()
-   startDTD(name="doc", publicId="", systemId="")
-      internatlEntityDecl(name="e", value="\"")
-   endDTD()
-   startElement(namespaceURI="", localName="doc", qName="doc", atts=[])
-   endElement(namespaceURI="", localName="doc", qName="doc")
-endDocument()
diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/102.xml b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/102.xml
deleted file mode 100644
index f239ff5fee..0000000000
--- a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/102.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<!DOCTYPE doc [
-<!ELEMENT doc (#PCDATA)>
-<!ATTLIST doc a CDATA #IMPLIED>
-]>
-<doc a="&#34;"></doc>
diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/102.xml.ref b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/102.xml.ref
deleted file mode 100644
index 75b25052de..0000000000
--- a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/102.xml.ref
+++ /dev/null
@@ -1,8 +0,0 @@
-setDocumentLocator(locator={columnNumber=1, lineNumber=1})
-startDocument()
-   startDTD(name="doc", publicId="", systemId="")
-      attributeDecl(eName="doc", aName="a", type="", valueDefault="", value="")
-   endDTD()
-   startElement(namespaceURI="", localName="doc", qName="doc", atts=[{localName="a", qName="a", uri="", type="CDATA", value="\""}])
-   endElement(namespaceURI="", localName="doc", qName="doc")
-endDocument()
diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/103.xml b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/103.xml
deleted file mode 100644
index 1dbbd5bb7c..0000000000
--- a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/103.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<!DOCTYPE doc [
-<!ELEMENT doc (#PCDATA)>
-]>
-<doc>&#60;doc></doc>
diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/103.xml.ref b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/103.xml.ref
deleted file mode 100644
index 63526243dc..0000000000
--- a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/103.xml.ref
+++ /dev/null
@@ -1,8 +0,0 @@
-setDocumentLocator(locator={columnNumber=1, lineNumber=1})
-startDocument()
-   startDTD(name="doc", publicId="", systemId="")
-   endDTD()
-   startElement(namespaceURI="", localName="doc", qName="doc", atts=[])
-      characters(ch="<doc>")
-   endElement(namespaceURI="", localName="doc", qName="doc")
-endDocument()
diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/104.xml b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/104.xml
deleted file mode 100644
index 666f43de0f..0000000000
--- a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/104.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<!DOCTYPE doc [
-<!ELEMENT doc (#PCDATA)>
-<!ATTLIST doc a CDATA #IMPLIED>
-]>
-<doc a="x	y"></doc>
diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/104.xml.ref b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/104.xml.ref
deleted file mode 100644
index 2bccd0e3c7..0000000000
--- a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/104.xml.ref
+++ /dev/null
@@ -1,8 +0,0 @@
-setDocumentLocator(locator={columnNumber=1, lineNumber=1})
-startDocument()
-   startDTD(name="doc", publicId="", systemId="")
-      attributeDecl(eName="doc", aName="a", type="", valueDefault="", value="")
-   endDTD()
-   startElement(namespaceURI="", localName="doc", qName="doc", atts=[{localName="a", qName="a", uri="", type="CDATA", value="x\ty"}])
-   endElement(namespaceURI="", localName="doc", qName="doc")
-endDocument()
diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/105.xml b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/105.xml
deleted file mode 100644
index 6b3af2b847..0000000000
--- a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/105.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<!DOCTYPE doc [
-<!ELEMENT doc (#PCDATA)>
-<!ATTLIST doc a CDATA #IMPLIED>
-]>
-<doc a="x&#9;y"></doc>
diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/105.xml.ref b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/105.xml.ref
deleted file mode 100644
index 2bccd0e3c7..0000000000
--- a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/105.xml.ref
+++ /dev/null
@@ -1,8 +0,0 @@
-setDocumentLocator(locator={columnNumber=1, lineNumber=1})
-startDocument()
-   startDTD(name="doc", publicId="", systemId="")
-      attributeDecl(eName="doc", aName="a", type="", valueDefault="", value="")
-   endDTD()
-   startElement(namespaceURI="", localName="doc", qName="doc", atts=[{localName="a", qName="a", uri="", type="CDATA", value="x\ty"}])
-   endElement(namespaceURI="", localName="doc", qName="doc")
-endDocument()
diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/106.xml b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/106.xml
deleted file mode 100644
index 8757c0a5ae..0000000000
--- a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/106.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<!DOCTYPE doc [
-<!ELEMENT doc (#PCDATA)>
-<!ATTLIST doc a CDATA #IMPLIED>
-]>
-<doc a="x&#10;y"></doc>
diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/106.xml.ref b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/106.xml.ref
deleted file mode 100644
index 1e9cc0949b..0000000000
--- a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/106.xml.ref
+++ /dev/null
@@ -1,8 +0,0 @@
-setDocumentLocator(locator={columnNumber=1, lineNumber=1})
-startDocument()
-   startDTD(name="doc", publicId="", systemId="")
-      attributeDecl(eName="doc", aName="a", type="", valueDefault="", value="")
-   endDTD()
-   startElement(namespaceURI="", localName="doc", qName="doc", atts=[{localName="a", qName="a", uri="", type="CDATA", value="x\ny"}])
-   endElement(namespaceURI="", localName="doc", qName="doc")
-endDocument()
diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/107.xml b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/107.xml
deleted file mode 100644
index 3d2c2566a7..0000000000
--- a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/107.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<!DOCTYPE doc [
-<!ELEMENT doc (#PCDATA)>
-<!ATTLIST doc a CDATA #IMPLIED>
-]>
-<doc a="x&#13;y"></doc>
diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/107.xml.ref b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/107.xml.ref
deleted file mode 100644
index 803dbc297b..0000000000
--- a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/107.xml.ref
+++ /dev/null
@@ -1,8 +0,0 @@
-setDocumentLocator(locator={columnNumber=1, lineNumber=1})
-startDocument()
-   startDTD(name="doc", publicId="", systemId="")
-      attributeDecl(eName="doc", aName="a", type="", valueDefault="", value="")
-   endDTD()
-   startElement(namespaceURI="", localName="doc", qName="doc", atts=[{localName="a", qName="a", uri="", type="CDATA", value="x\ry"}])
-   endElement(namespaceURI="", localName="doc", qName="doc")
-endDocument()
diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/108.xml b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/108.xml
deleted file mode 100644
index e919bf229a..0000000000
--- a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/108.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<!DOCTYPE doc [
-<!ELEMENT doc (#PCDATA)>
-<!ENTITY e "
-">
-<!ATTLIST doc a CDATA #IMPLIED>
-]>
-<doc a="x&e;y"></doc>
diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/108.xml.ref b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/108.xml.ref
deleted file mode 100644
index 2199bd8fb3..0000000000
--- a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/108.xml.ref
+++ /dev/null
@@ -1,9 +0,0 @@
-setDocumentLocator(locator={columnNumber=1, lineNumber=1})
-startDocument()
-   startDTD(name="doc", publicId="", systemId="")
-      internatlEntityDecl(name="e", value="\r\n")
-      attributeDecl(eName="doc", aName="a", type="", valueDefault="", value="")
-   endDTD()
-   startElement(namespaceURI="", localName="doc", qName="doc", atts=[{localName="a", qName="a", uri="", type="CDATA", value="x\r\ny"}])
-   endElement(namespaceURI="", localName="doc", qName="doc")
-endDocument()
diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/109.xml b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/109.xml
deleted file mode 100644
index 33fa38e13b..0000000000
--- a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/109.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<!DOCTYPE doc [
-<!ELEMENT doc (#PCDATA)>
-<!ATTLIST doc a CDATA #IMPLIED>
-]>
-<doc a=""></doc>
diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/109.xml.ref b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/109.xml.ref
deleted file mode 100644
index 789cb33821..0000000000
--- a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/109.xml.ref
+++ /dev/null
@@ -1,8 +0,0 @@
-setDocumentLocator(locator={columnNumber=1, lineNumber=1})
-startDocument()
-   startDTD(name="doc", publicId="", systemId="")
-      attributeDecl(eName="doc", aName="a", type="", valueDefault="", value="")
-   endDTD()
-   startElement(namespaceURI="", localName="doc", qName="doc", atts=[{localName="a", qName="a", uri="", type="CDATA", value=""}])
-   endElement(namespaceURI="", localName="doc", qName="doc")
-endDocument()
diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/110.xml b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/110.xml
deleted file mode 100644
index 0c61c65119..0000000000
--- a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/110.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<!DOCTYPE doc [
-<!ELEMENT doc (#PCDATA)>
-<!ENTITY e "&#13;&#10;">
-<!ATTLIST doc a CDATA #IMPLIED>
-]>
-<doc a="x&e;y"></doc>
diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/110.xml.ref b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/110.xml.ref
deleted file mode 100644
index 2199bd8fb3..0000000000
--- a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/110.xml.ref
+++ /dev/null
@@ -1,9 +0,0 @@
-setDocumentLocator(locator={columnNumber=1, lineNumber=1})
-startDocument()
-   startDTD(name="doc", publicId="", systemId="")
-      internatlEntityDecl(name="e", value="\r\n")
-      attributeDecl(eName="doc", aName="a", type="", valueDefault="", value="")
-   endDTD()
-   startElement(namespaceURI="", localName="doc", qName="doc", atts=[{localName="a", qName="a", uri="", type="CDATA", value="x\r\ny"}])
-   endElement(namespaceURI="", localName="doc", qName="doc")
-endDocument()
diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/111.xml b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/111.xml
deleted file mode 100644
index cb56f264b0..0000000000
--- a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/111.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<!DOCTYPE doc [
-<!ELEMENT doc (#PCDATA)>
-<!ATTLIST doc a NMTOKENS #IMPLIED>
-]>
-<doc a="&#32;x&#32;&#32;y&#32;"></doc>
diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/111.xml.ref b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/111.xml.ref
deleted file mode 100644
index 152e284e58..0000000000
--- a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/111.xml.ref
+++ /dev/null
@@ -1,8 +0,0 @@
-setDocumentLocator(locator={columnNumber=1, lineNumber=1})
-startDocument()
-   startDTD(name="doc", publicId="", systemId="")
-      attributeDecl(eName="doc", aName="a", type="", valueDefault="", value="")
-   endDTD()
-   startElement(namespaceURI="", localName="doc", qName="doc", atts=[{localName="a", qName="a", uri="", type="CDATA", value=" x  y "}])
-   endElement(namespaceURI="", localName="doc", qName="doc")
-endDocument()
diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/112.xml b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/112.xml
deleted file mode 100644
index 27b6a4c793..0000000000
--- a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/112.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<!DOCTYPE doc [
-<!ELEMENT doc (a | b)>
-<!ELEMENT a (#PCDATA)>
-]>
-<doc><a></a></doc>
diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/112.xml.ref b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/112.xml.ref
deleted file mode 100644
index f82c6dca3f..0000000000
--- a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/112.xml.ref
+++ /dev/null
@@ -1,9 +0,0 @@
-setDocumentLocator(locator={columnNumber=1, lineNumber=1})
-startDocument()
-   startDTD(name="doc", publicId="", systemId="")
-   endDTD()
-   startElement(namespaceURI="", localName="doc", qName="doc", atts=[])
-      startElement(namespaceURI="", localName="a", qName="a", atts=[])
-      endElement(namespaceURI="", localName="a", qName="a")
-   endElement(namespaceURI="", localName="doc", qName="doc")
-endDocument()
diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/113.xml b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/113.xml
deleted file mode 100644
index d2edd0f01d..0000000000
--- a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/113.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<!DOCTYPE doc [
-<!ELEMENT doc (#PCDATA)>
-<!ATTLIST e a CDATA #IMPLIED>
-]>
-<doc></doc>
diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/113.xml.ref b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/113.xml.ref
deleted file mode 100644
index 6342ccc536..0000000000
--- a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/113.xml.ref
+++ /dev/null
@@ -1,8 +0,0 @@
-setDocumentLocator(locator={columnNumber=1, lineNumber=1})
-startDocument()
-   startDTD(name="doc", publicId="", systemId="")
-      attributeDecl(eName="e", aName="a", type="", valueDefault="", value="")
-   endDTD()
-   startElement(namespaceURI="", localName="doc", qName="doc", atts=[])
-   endElement(namespaceURI="", localName="doc", qName="doc")
-endDocument()
diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/114.xml b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/114.xml
deleted file mode 100644
index 52e207096d..0000000000
--- a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/114.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<!DOCTYPE doc [
-<!ELEMENT doc (#PCDATA)>
-<!ENTITY e "<![CDATA[&foo;]]>">
-]>
-<doc>&e;</doc>
diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/114.xml.ref b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/114.xml.ref
deleted file mode 100644
index b11750e4b0..0000000000
--- a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/114.xml.ref
+++ /dev/null
@@ -1,11 +0,0 @@
-setDocumentLocator(locator={columnNumber=1, lineNumber=1})
-startDocument()
-   startDTD(name="doc", publicId="", systemId="")
-      internatlEntityDecl(name="e", value="<![CDATA[&foo;]]>")
-   endDTD()
-   startElement(namespaceURI="", localName="doc", qName="doc", atts=[])
-      startCDATA()
-         characters(ch="&foo;")
-      endCDATA()
-   endElement(namespaceURI="", localName="doc", qName="doc")
-endDocument()
diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/115.xml b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/115.xml
deleted file mode 100644
index d939a67010..0000000000
--- a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/115.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<!DOCTYPE doc [
-<!ELEMENT doc (#PCDATA)>
-<!ENTITY e1 "&e2;">
-<!ENTITY e2 "v">
-]>
-<doc>&e1;</doc>
diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/115.xml.ref b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/115.xml.ref
deleted file mode 100644
index 5b09ebd425..0000000000
--- a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/115.xml.ref
+++ /dev/null
@@ -1,10 +0,0 @@
-setDocumentLocator(locator={columnNumber=1, lineNumber=1})
-startDocument()
-   startDTD(name="doc", publicId="", systemId="")
-      internatlEntityDecl(name="e1", value="&e2;")
-      internatlEntityDecl(name="e2", value="v")
-   endDTD()
-   startElement(namespaceURI="", localName="doc", qName="doc", atts=[])
-      characters(ch="v")
-   endElement(namespaceURI="", localName="doc", qName="doc")
-endDocument()
diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/116.xml b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/116.xml
deleted file mode 100644
index 55ab49620b..0000000000
--- a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/116.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<!DOCTYPE doc [
-<!ELEMENT doc (#PCDATA)>
-]>
-<doc><![CDATA[
-]]></doc>
diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/116.xml.ref b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/116.xml.ref
deleted file mode 100644
index 9bdec9e5cc..0000000000
--- a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/116.xml.ref
+++ /dev/null
@@ -1,10 +0,0 @@
-setDocumentLocator(locator={columnNumber=1, lineNumber=1})
-startDocument()
-   startDTD(name="doc", publicId="", systemId="")
-   endDTD()
-   startElement(namespaceURI="", localName="doc", qName="doc", atts=[])
-      startCDATA()
-         characters(ch="\r\n")
-      endCDATA()
-   endElement(namespaceURI="", localName="doc", qName="doc")
-endDocument()
diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/117.xml b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/117.xml
deleted file mode 100644
index e4f02b14c8..0000000000
--- a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/117.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<!DOCTYPE doc [
-<!ELEMENT doc (#PCDATA)>
-<!ENTITY rsqb "]">
-]>
-<doc>&rsqb;</doc>
diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/117.xml.ref b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/117.xml.ref
deleted file mode 100644
index 78dd11416a..0000000000
--- a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/117.xml.ref
+++ /dev/null
@@ -1,9 +0,0 @@
-setDocumentLocator(locator={columnNumber=1, lineNumber=1})
-startDocument()
-   startDTD(name="doc", publicId="", systemId="")
-      internatlEntityDecl(name="rsqb", value="]")
-   endDTD()
-   startElement(namespaceURI="", localName="doc", qName="doc", atts=[])
-      characters(ch="]")
-   endElement(namespaceURI="", localName="doc", qName="doc")
-endDocument()
diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/118.xml b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/118.xml
deleted file mode 100644
index fba6c44668..0000000000
--- a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/118.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<!DOCTYPE doc [
-<!ELEMENT doc (#PCDATA)>
-<!ENTITY rsqb "]]">
-]>
-<doc>&rsqb;</doc>
diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/118.xml.ref b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/118.xml.ref
deleted file mode 100644
index c84da55fe0..0000000000
--- a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/118.xml.ref
+++ /dev/null
@@ -1,9 +0,0 @@
-setDocumentLocator(locator={columnNumber=1, lineNumber=1})
-startDocument()
-   startDTD(name="doc", publicId="", systemId="")
-      internatlEntityDecl(name="rsqb", value="]]")
-   endDTD()
-   startElement(namespaceURI="", localName="doc", qName="doc", atts=[])
-      characters(ch="]]")
-   endElement(namespaceURI="", localName="doc", qName="doc")
-endDocument()
diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/119.xml b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/119.xml
deleted file mode 100644
index 876e74730c..0000000000
--- a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/119.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<!DOCTYPE doc [
-<!ELEMENT doc ANY>
-]>
-<doc><!-- -á --></doc>
diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/119.xml.ref b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/119.xml.ref
deleted file mode 100644
index d1c643ee03..0000000000
--- a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/119.xml.ref
+++ /dev/null
@@ -1,8 +0,0 @@
-setDocumentLocator(locator={columnNumber=1, lineNumber=1})
-startDocument()
-   startDTD(name="doc", publicId="", systemId="")
-   endDTD()
-   startElement(namespaceURI="", localName="doc", qName="doc", atts=[])
-      comment(ch=" -á ")
-   endElement(namespaceURI="", localName="doc", qName="doc")
-endDocument()