Moved xml autotests into new directory structure

Task-number: QTBUG-21260

Change-Id: I7bc30227d4e71e8783f274dbfa758399dca546d4
Reviewed-on: http://codereview.qt.nokia.com/4146
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Jason McDonald <jason.mcdonald@nokia.com>

802 files changed, 16 insertions, 7 deletions

diff --git a/tests/auto/auto.pro b/tests/auto/auto.pro
index 955c80eb1b..b0372acaf3 100644
--- a/tests/auto/auto.pro
+++ b/tests/auto/auto.pro
@@ -5,7 +5,7 @@ SUBDIRS += \
     gui.pro \
     network.pro \
     sql \
-    xml.pro \
+    xml \
     other.pro
 
 !cross_compile:                             SUBDIRS += host.pro
diff --git a/tests/auto/xml.pro b/tests/auto/xml.pro
deleted file mode 100644
index 9a48ce3829..0000000000
--- a/tests/auto/xml.pro
+++ /dev/null
@@ -1,6 +0,0 @@
-TEMPLATE=subdirs
-SUBDIRS=\
-           qdom \
-           qxml \
-           qxmlinputsource \
-           qxmlsimplereader
diff --git a/tests/auto/xml/dom/dom.pro b/tests/auto/xml/dom/dom.pro
new file mode 100644
index 0000000000..17cfafcea7
--- /dev/null
+++ b/tests/auto/xml/dom/dom.pro
@@ -0,0 +1,4 @@
+TEMPLATE=subdirs
+SUBDIRS=\
+   qdom \
+
diff --git a/tests/auto/qdom/.gitattributes b/tests/auto/xml/dom/qdom/.gitattributes
index 68f316ef6f..68f316ef6f 100644
--- a/tests/auto/qdom/.gitattributes
+++ b/tests/auto/xml/dom/qdom/.gitattributes
diff --git a/tests/auto/qdom/.gitignore b/tests/auto/xml/dom/qdom/.gitignore
index 79b84c36bb..79b84c36bb 100644
--- a/tests/auto/qdom/.gitignore
+++ b/tests/auto/xml/dom/qdom/.gitignore
diff --git a/tests/auto/qdom/doubleNamespaces.xml b/tests/auto/xml/dom/qdom/doubleNamespaces.xml
index c809aa17d3..c809aa17d3 100644
--- a/tests/auto/qdom/doubleNamespaces.xml
+++ b/tests/auto/xml/dom/qdom/doubleNamespaces.xml
diff --git a/tests/auto/qdom/qdom.pro b/tests/auto/xml/dom/qdom/qdom.pro
index 0a3c167a4b..0a3c167a4b 100644
--- a/tests/auto/qdom/qdom.pro
+++ b/tests/auto/xml/dom/qdom/qdom.pro
diff --git a/tests/auto/qdom/testdata/excludedCodecs.txt b/tests/auto/xml/dom/qdom/testdata/excludedCodecs.txt
index 1f0d871563..1f0d871563 100644
--- a/tests/auto/qdom/testdata/excludedCodecs.txt
+++ b/tests/auto/xml/dom/qdom/testdata/excludedCodecs.txt
diff --git a/tests/auto/qdom/testdata/toString_01/doc01.xml b/tests/auto/xml/dom/qdom/testdata/toString_01/doc01.xml
index 1ac45429fb..1ac45429fb 100644
--- a/tests/auto/qdom/testdata/toString_01/doc01.xml
+++ b/tests/auto/xml/dom/qdom/testdata/toString_01/doc01.xml
diff --git a/tests/auto/qdom/testdata/toString_01/doc02.xml b/tests/auto/xml/dom/qdom/testdata/toString_01/doc02.xml
index 3fb9aff884..3fb9aff884 100644
--- a/tests/auto/qdom/testdata/toString_01/doc02.xml
+++ b/tests/auto/xml/dom/qdom/testdata/toString_01/doc02.xml
diff --git a/tests/auto/qdom/testdata/toString_01/doc03.xml b/tests/auto/xml/dom/qdom/testdata/toString_01/doc03.xml
index 6121f70e25..6121f70e25 100644
--- a/tests/auto/qdom/testdata/toString_01/doc03.xml
+++ b/tests/auto/xml/dom/qdom/testdata/toString_01/doc03.xml
diff --git a/tests/auto/qdom/testdata/toString_01/doc04.xml b/tests/auto/xml/dom/qdom/testdata/toString_01/doc04.xml
index 541c44e31b..541c44e31b 100644
--- a/tests/auto/qdom/testdata/toString_01/doc04.xml
+++ b/tests/auto/xml/dom/qdom/testdata/toString_01/doc04.xml
diff --git a/tests/auto/qdom/testdata/toString_01/doc05.xml b/tests/auto/xml/dom/qdom/testdata/toString_01/doc05.xml
index 76fce8b0ab..76fce8b0ab 100644
--- a/tests/auto/qdom/testdata/toString_01/doc05.xml
+++ b/tests/auto/xml/dom/qdom/testdata/toString_01/doc05.xml
diff --git a/tests/auto/qdom/testdata/toString_01/doc_euc-jp.xml b/tests/auto/xml/dom/qdom/testdata/toString_01/doc_euc-jp.xml
index 887ab5ec30..887ab5ec30 100644
--- a/tests/auto/qdom/testdata/toString_01/doc_euc-jp.xml
+++ b/tests/auto/xml/dom/qdom/testdata/toString_01/doc_euc-jp.xml
diff --git a/tests/auto/qdom/testdata/toString_01/doc_iso-2022-jp.xml b/tests/auto/xml/dom/qdom/testdata/toString_01/doc_iso-2022-jp.xml
index 9a8e8545ac..9a8e8545ac 100644
--- a/tests/auto/qdom/testdata/toString_01/doc_iso-2022-jp.xml
+++ b/tests/auto/xml/dom/qdom/testdata/toString_01/doc_iso-2022-jp.xml
diff --git a/tests/auto/qdom/testdata/toString_01/doc_little-endian.xml b/tests/auto/xml/dom/qdom/testdata/toString_01/doc_little-endian.xml
index 81f72e59e8..81f72e59e8 100644
--- a/tests/auto/qdom/testdata/toString_01/doc_little-endian.xml
+++ b/tests/auto/xml/dom/qdom/testdata/toString_01/doc_little-endian.xml
diff --git a/tests/auto/qdom/testdata/toString_01/doc_utf-16.xml b/tests/auto/xml/dom/qdom/testdata/toString_01/doc_utf-16.xml
index 6c8622aa43..6c8622aa43 100644
--- a/tests/auto/qdom/testdata/toString_01/doc_utf-16.xml
+++ b/tests/auto/xml/dom/qdom/testdata/toString_01/doc_utf-16.xml
diff --git a/tests/auto/qdom/testdata/toString_01/doc_utf-8.xml b/tests/auto/xml/dom/qdom/testdata/toString_01/doc_utf-8.xml
index 402c163c5f..402c163c5f 100644
--- a/tests/auto/qdom/testdata/toString_01/doc_utf-8.xml
+++ b/tests/auto/xml/dom/qdom/testdata/toString_01/doc_utf-8.xml
diff --git a/tests/auto/qdom/tst_qdom.cpp b/tests/auto/xml/dom/qdom/tst_qdom.cpp
index 4093010855..4093010855 100644
--- a/tests/auto/qdom/tst_qdom.cpp
+++ b/tests/auto/xml/dom/qdom/tst_qdom.cpp
diff --git a/tests/auto/qdom/umlaut.xml b/tests/auto/xml/dom/qdom/umlaut.xml
index 4b1dbe43ab..4b1dbe43ab 100644
--- a/tests/auto/qdom/umlaut.xml
+++ b/tests/auto/xml/dom/qdom/umlaut.xml
diff --git a/tests/auto/qxml/.gitignore b/tests/auto/xml/sax/qxml/.gitignore
index 6506151df0..6506151df0 100644
--- a/tests/auto/qxml/.gitignore
+++ b/tests/auto/xml/sax/qxml/.gitignore
diff --git a/tests/auto/qxml/0x010D.xml b/tests/auto/xml/sax/qxml/0x010D.xml
index 5f2fe4d940..5f2fe4d940 100644
--- a/tests/auto/qxml/0x010D.xml
+++ b/tests/auto/xml/sax/qxml/0x010D.xml
diff --git a/tests/auto/qxml/qxml.pro b/tests/auto/xml/sax/qxml/qxml.pro
index c87518a7ff..c87518a7ff 100644
--- a/tests/auto/qxml/qxml.pro
+++ b/tests/auto/xml/sax/qxml/qxml.pro
diff --git a/tests/auto/qxml/tst_qxml.cpp b/tests/auto/xml/sax/qxml/tst_qxml.cpp
index 7b62b3deb8..7b62b3deb8 100644
--- a/tests/auto/qxml/tst_qxml.cpp
+++ b/tests/auto/xml/sax/qxml/tst_qxml.cpp
diff --git a/tests/auto/qxmlinputsource/.gitignore b/tests/auto/xml/sax/qxmlinputsource/.gitignore
index 09ea68aa90..09ea68aa90 100644
--- a/tests/auto/qxmlinputsource/.gitignore
+++ b/tests/auto/xml/sax/qxmlinputsource/.gitignore
diff --git a/tests/auto/qxmlinputsource/qxmlinputsource.pro b/tests/auto/xml/sax/qxmlinputsource/qxmlinputsource.pro
index ec83f4729a..ec83f4729a 100644
--- a/tests/auto/qxmlinputsource/qxmlinputsource.pro
+++ b/tests/auto/xml/sax/qxmlinputsource/qxmlinputsource.pro
diff --git a/tests/auto/qxmlinputsource/tst_qxmlinputsource.cpp b/tests/auto/xml/sax/qxmlinputsource/tst_qxmlinputsource.cpp
index 9d31b34772..9d31b34772 100644
--- a/tests/auto/qxmlinputsource/tst_qxmlinputsource.cpp
+++ b/tests/auto/xml/sax/qxmlinputsource/tst_qxmlinputsource.cpp
diff --git a/tests/auto/qxmlsimplereader/.gitattributes b/tests/auto/xml/sax/qxmlsimplereader/.gitattributes
index 5521239fbe..5521239fbe 100644
--- a/tests/auto/qxmlsimplereader/.gitattributes
+++ b/tests/auto/xml/sax/qxmlsimplereader/.gitattributes
diff --git a/tests/auto/qxmlsimplereader/.gitignore b/tests/auto/xml/sax/qxmlsimplereader/.gitignore
index 31b604faaf..31b604faaf 100644
--- a/tests/auto/qxmlsimplereader/.gitignore
+++ b/tests/auto/xml/sax/qxmlsimplereader/.gitignore
diff --git a/tests/auto/qxmlsimplereader/encodings/doc_euc-jp.xml b/tests/auto/xml/sax/qxmlsimplereader/encodings/doc_euc-jp.xml
index 887ab5ec30..887ab5ec30 100644
--- a/tests/auto/qxmlsimplereader/encodings/doc_euc-jp.xml
+++ b/tests/auto/xml/sax/qxmlsimplereader/encodings/doc_euc-jp.xml
diff --git a/tests/auto/qxmlsimplereader/encodings/doc_iso-2022-jp.xml.ref b/tests/auto/xml/sax/qxmlsimplereader/encodings/doc_iso-2022-jp.xml.ref
index 28dcdd98c4..28dcdd98c4 100644
--- a/tests/auto/qxmlsimplereader/encodings/doc_iso-2022-jp.xml.ref
+++ b/tests/auto/xml/sax/qxmlsimplereader/encodings/doc_iso-2022-jp.xml.ref
diff --git a/tests/auto/qxmlsimplereader/encodings/doc_little-endian.xml b/tests/auto/xml/sax/qxmlsimplereader/encodings/doc_little-endian.xml
index 81f72e59e8..81f72e59e8 100644
--- a/tests/auto/qxmlsimplereader/encodings/doc_little-endian.xml
+++ b/tests/auto/xml/sax/qxmlsimplereader/encodings/doc_little-endian.xml
diff --git a/tests/auto/qxmlsimplereader/encodings/doc_utf-16.xml b/tests/auto/xml/sax/qxmlsimplereader/encodings/doc_utf-16.xml
index 6c8622aa43..6c8622aa43 100644
--- a/tests/auto/qxmlsimplereader/encodings/doc_utf-16.xml
+++ b/tests/auto/xml/sax/qxmlsimplereader/encodings/doc_utf-16.xml
diff --git a/tests/auto/qxmlsimplereader/encodings/doc_utf-8.xml b/tests/auto/xml/sax/qxmlsimplereader/encodings/doc_utf-8.xml
index 402c163c5f..402c163c5f 100644
--- a/tests/auto/qxmlsimplereader/encodings/doc_utf-8.xml
+++ b/tests/auto/xml/sax/qxmlsimplereader/encodings/doc_utf-8.xml
diff --git a/tests/auto/qxmlsimplereader/generate_ref_files.sh b/tests/auto/xml/sax/qxmlsimplereader/generate_ref_files.sh
index ae2a5ffb5c..ae2a5ffb5c 100755
--- a/tests/auto/qxmlsimplereader/generate_ref_files.sh
+++ b/tests/auto/xml/sax/qxmlsimplereader/generate_ref_files.sh
diff --git a/tests/auto/qxmlsimplereader/parser/main.cpp b/tests/auto/xml/sax/qxmlsimplereader/parser/main.cpp
index 05d9ce6754..05d9ce6754 100644
--- a/tests/auto/qxmlsimplereader/parser/main.cpp
+++ b/tests/auto/xml/sax/qxmlsimplereader/parser/main.cpp
diff --git a/tests/auto/qxmlsimplereader/parser/parser.cpp b/tests/auto/xml/sax/qxmlsimplereader/parser/parser.cpp
index d1f1c3cfda..d1f1c3cfda 100644
--- a/tests/auto/qxmlsimplereader/parser/parser.cpp
+++ b/tests/auto/xml/sax/qxmlsimplereader/parser/parser.cpp
diff --git a/tests/auto/qxmlsimplereader/parser/parser.h b/tests/auto/xml/sax/qxmlsimplereader/parser/parser.h
index e3d95ce811..e3d95ce811 100644
--- a/tests/auto/qxmlsimplereader/parser/parser.h
+++ b/tests/auto/xml/sax/qxmlsimplereader/parser/parser.h
diff --git a/tests/auto/qxmlsimplereader/parser/parser.pro b/tests/auto/xml/sax/qxmlsimplereader/parser/parser.pro
index 93167f81c8..93167f81c8 100644
--- a/tests/auto/qxmlsimplereader/parser/parser.pro
+++ b/tests/auto/xml/sax/qxmlsimplereader/parser/parser.pro
diff --git a/tests/auto/qxmlsimplereader/qxmlsimplereader.pro b/tests/auto/xml/sax/qxmlsimplereader/qxmlsimplereader.pro
index bc3cbd2dfd..bc3cbd2dfd 100644
--- a/tests/auto/qxmlsimplereader/qxmlsimplereader.pro
+++ b/tests/auto/xml/sax/qxmlsimplereader/qxmlsimplereader.pro
diff --git a/tests/auto/qxmlsimplereader/tst_qxmlsimplereader.cpp b/tests/auto/xml/sax/qxmlsimplereader/tst_qxmlsimplereader.cpp
index f2a973c78e..f2a973c78e 100644
--- a/tests/auto/qxmlsimplereader/tst_qxmlsimplereader.cpp
+++ b/tests/auto/xml/sax/qxmlsimplereader/tst_qxmlsimplereader.cpp
diff --git a/tests/auto/qxmlsimplereader/xmldocs/not-wf/sa/001.xml b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/001.xml
index d33ec68dcd..d33ec68dcd 100644
--- a/tests/auto/qxmlsimplereader/xmldocs/not-wf/sa/001.xml
+++ b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/001.xml
diff --git a/tests/auto/qxmlsimplereader/xmldocs/not-wf/sa/001.xml.ref b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/001.xml.ref
index e0fa20f83d..e0fa20f83d 100644
--- a/tests/auto/qxmlsimplereader/xmldocs/not-wf/sa/001.xml.ref
+++ b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/001.xml.ref
diff --git a/tests/auto/qxmlsimplereader/xmldocs/not-wf/sa/002.xml b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/002.xml
index 0a64d52428..0a64d52428 100644
--- a/tests/auto/qxmlsimplereader/xmldocs/not-wf/sa/002.xml
+++ b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/002.xml
diff --git a/tests/auto/qxmlsimplereader/xmldocs/not-wf/sa/002.xml.ref b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/002.xml.ref
index 8ebfac2a80..8ebfac2a80 100644
--- a/tests/auto/qxmlsimplereader/xmldocs/not-wf/sa/002.xml.ref
+++ b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/002.xml.ref
diff --git a/tests/auto/qxmlsimplereader/xmldocs/not-wf/sa/003.xml b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/003.xml
index e0b8bae4a4..e0b8bae4a4 100644
--- a/tests/auto/qxmlsimplereader/xmldocs/not-wf/sa/003.xml
+++ b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/003.xml
diff --git a/tests/auto/qxmlsimplereader/xmldocs/not-wf/sa/003.xml.ref b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/003.xml.ref
index 988690b883..988690b883 100644
--- a/tests/auto/qxmlsimplereader/xmldocs/not-wf/sa/003.xml.ref
+++ b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/003.xml.ref
diff --git a/tests/auto/qxmlsimplereader/xmldocs/not-wf/sa/004.xml b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/004.xml
index e85bc96e56..e85bc96e56 100644
--- a/tests/auto/qxmlsimplereader/xmldocs/not-wf/sa/004.xml
+++ b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/004.xml
diff --git a/tests/auto/qxmlsimplereader/xmldocs/not-wf/sa/004.xml.ref b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/004.xml.ref
index 0085dfefe6..0085dfefe6 100644
--- a/tests/auto/qxmlsimplereader/xmldocs/not-wf/sa/004.xml.ref
+++ b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/004.xml.ref
diff --git a/tests/auto/qxmlsimplereader/xmldocs/not-wf/sa/005.xml b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/005.xml
index 7cd44ef10c..7cd44ef10c 100644
--- a/tests/auto/qxmlsimplereader/xmldocs/not-wf/sa/005.xml
+++ b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/005.xml
diff --git a/tests/auto/qxmlsimplereader/xmldocs/not-wf/sa/005.xml.ref b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/005.xml.ref
index 0085dfefe6..0085dfefe6 100644
--- a/tests/auto/qxmlsimplereader/xmldocs/not-wf/sa/005.xml.ref
+++ b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/005.xml.ref
diff --git a/tests/auto/qxmlsimplereader/xmldocs/not-wf/sa/006.xml b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/006.xml
index 8594c35cc7..8594c35cc7 100644
--- a/tests/auto/qxmlsimplereader/xmldocs/not-wf/sa/006.xml
+++ b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/006.xml
diff --git a/tests/auto/qxmlsimplereader/xmldocs/not-wf/sa/006.xml.ref b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/006.xml.ref
index 3d07b93d8e..3d07b93d8e 100644
--- a/tests/auto/qxmlsimplereader/xmldocs/not-wf/sa/006.xml.ref
+++ b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/006.xml.ref
diff --git a/tests/auto/qxmlsimplereader/xmldocs/not-wf/sa/007.xml b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/007.xml
index 286756fdd5..286756fdd5 100644
--- a/tests/auto/qxmlsimplereader/xmldocs/not-wf/sa/007.xml
+++ b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/007.xml
diff --git a/tests/auto/qxmlsimplereader/xmldocs/not-wf/sa/007.xml.ref b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/007.xml.ref
index bbd182b7f7..bbd182b7f7 100644
--- a/tests/auto/qxmlsimplereader/xmldocs/not-wf/sa/007.xml.ref
+++ b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/007.xml.ref
diff --git a/tests/auto/qxmlsimplereader/xmldocs/not-wf/sa/008.xml b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/008.xml
index 29ef40306b..29ef40306b 100644
--- a/tests/auto/qxmlsimplereader/xmldocs/not-wf/sa/008.xml
+++ b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/008.xml
diff --git a/tests/auto/qxmlsimplereader/xmldocs/not-wf/sa/008.xml.ref b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/008.xml.ref
index 19d21b4b3e..19d21b4b3e 100644
--- a/tests/auto/qxmlsimplereader/xmldocs/not-wf/sa/008.xml.ref
+++ b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/008.xml.ref
diff --git a/tests/auto/qxmlsimplereader/xmldocs/not-wf/sa/009.xml b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/009.xml
index 8e3ff7de10..8e3ff7de10 100644
--- a/tests/auto/qxmlsimplereader/xmldocs/not-wf/sa/009.xml
+++ b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/009.xml
diff --git a/tests/auto/qxmlsimplereader/xmldocs/not-wf/sa/009.xml.ref b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/009.xml.ref
index a885634000..a885634000 100644
--- a/tests/auto/qxmlsimplereader/xmldocs/not-wf/sa/009.xml.ref
+++ b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/009.xml.ref
diff --git a/tests/auto/qxmlsimplereader/xmldocs/not-wf/sa/010.xml b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/010.xml
index a6790846c9..a6790846c9 100644
--- a/tests/auto/qxmlsimplereader/xmldocs/not-wf/sa/010.xml
+++ b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/010.xml
diff --git a/tests/auto/qxmlsimplereader/xmldocs/not-wf/sa/010.xml.ref b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/010.xml.ref
index 7db0ddb551..7db0ddb551 100644
--- a/tests/auto/qxmlsimplereader/xmldocs/not-wf/sa/010.xml.ref
+++ b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/010.xml.ref
diff --git a/tests/auto/qxmlsimplereader/xmldocs/not-wf/sa/011.xml b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/011.xml
index 57eaf9fc48..57eaf9fc48 100644
--- a/tests/auto/qxmlsimplereader/xmldocs/not-wf/sa/011.xml
+++ b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/011.xml
diff --git a/tests/auto/qxmlsimplereader/xmldocs/not-wf/sa/011.xml.ref b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/011.xml.ref
index bb837957be..bb837957be 100644
--- a/tests/auto/qxmlsimplereader/xmldocs/not-wf/sa/011.xml.ref
+++ b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/011.xml.ref
diff --git a/tests/auto/qxmlsimplereader/xmldocs/not-wf/sa/012.xml b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/012.xml
index 1b2539ffa6..1b2539ffa6 100644
--- a/tests/auto/qxmlsimplereader/xmldocs/not-wf/sa/012.xml
+++ b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/012.xml
diff --git a/tests/auto/qxmlsimplereader/xmldocs/not-wf/sa/012.xml.ref b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/012.xml.ref
index 333fb0db76..333fb0db76 100644
--- a/tests/auto/qxmlsimplereader/xmldocs/not-wf/sa/012.xml.ref
+++ b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/012.xml.ref
diff --git a/tests/auto/qxmlsimplereader/xmldocs/not-wf/sa/013.xml b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/013.xml
index 3540df9143..3540df9143 100644
--- a/tests/auto/qxmlsimplereader/xmldocs/not-wf/sa/013.xml
+++ b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/013.xml
diff --git a/tests/auto/qxmlsimplereader/xmldocs/not-wf/sa/013.xml.ref b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/013.xml.ref
index 1fececc438..1fececc438 100644
--- a/tests/auto/qxmlsimplereader/xmldocs/not-wf/sa/013.xml.ref
+++ b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/013.xml.ref
diff --git a/tests/auto/qxmlsimplereader/xmldocs/not-wf/sa/014.xml b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/014.xml
index a613115609..a613115609 100644
--- a/tests/auto/qxmlsimplereader/xmldocs/not-wf/sa/014.xml
+++ b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/014.xml
diff --git a/tests/auto/qxmlsimplereader/xmldocs/not-wf/sa/014.xml.ref b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/014.xml.ref
index a9230f2d7c..a9230f2d7c 100644
--- a/tests/auto/qxmlsimplereader/xmldocs/not-wf/sa/014.xml.ref
+++ b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/014.xml.ref
diff --git a/tests/auto/qxmlsimplereader/xmldocs/not-wf/sa/015.xml b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/015.xml
index f2baf947b5..f2baf947b5 100644
--- a/tests/auto/qxmlsimplereader/xmldocs/not-wf/sa/015.xml
+++ b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/015.xml
diff --git a/tests/auto/qxmlsimplereader/xmldocs/not-wf/sa/015.xml.ref b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/015.xml.ref
index 333fb0db76..333fb0db76 100644
--- a/tests/auto/qxmlsimplereader/xmldocs/not-wf/sa/015.xml.ref
+++ b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/015.xml.ref
diff --git a/tests/auto/qxmlsimplereader/xmldocs/not-wf/sa/016.xml b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/016.xml
index 22d4b2e265..22d4b2e265 100644
--- a/tests/auto/qxmlsimplereader/xmldocs/not-wf/sa/016.xml
+++ b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/016.xml
diff --git a/tests/auto/qxmlsimplereader/xmldocs/not-wf/sa/016.xml.ref b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/016.xml.ref
index e47a79ca68..e47a79ca68 100644
--- a/tests/auto/qxmlsimplereader/xmldocs/not-wf/sa/016.xml.ref
+++ b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/016.xml.ref
diff --git a/tests/auto/qxmlsimplereader/xmldocs/not-wf/sa/017.xml b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/017.xml
index a76f5929e9..a76f5929e9 100644
--- a/tests/auto/qxmlsimplereader/xmldocs/not-wf/sa/017.xml
+++ b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/017.xml
diff --git a/tests/auto/qxmlsimplereader/xmldocs/not-wf/sa/017.xml.ref b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/017.xml.ref
index 0085dfefe6..0085dfefe6 100644
--- a/tests/auto/qxmlsimplereader/xmldocs/not-wf/sa/017.xml.ref
+++ b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/017.xml.ref
diff --git a/tests/auto/qxmlsimplereader/xmldocs/not-wf/sa/018.xml b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/018.xml
index 66e204acc4..66e204acc4 100644
--- a/tests/auto/qxmlsimplereader/xmldocs/not-wf/sa/018.xml
+++ b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/018.xml
diff --git a/tests/auto/qxmlsimplereader/xmldocs/not-wf/sa/018.xml.ref b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/018.xml.ref
index 651fa05573..651fa05573 100644
--- a/tests/auto/qxmlsimplereader/xmldocs/not-wf/sa/018.xml.ref
+++ b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/018.xml.ref
diff --git a/tests/auto/qxmlsimplereader/xmldocs/not-wf/sa/019.xml b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/019.xml
index b835c2d752..b835c2d752 100644
--- a/tests/auto/qxmlsimplereader/xmldocs/not-wf/sa/019.xml
+++ b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/019.xml
diff --git a/tests/auto/qxmlsimplereader/xmldocs/not-wf/sa/019.xml.ref b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/019.xml.ref
index 9196faad6d..9196faad6d 100644
--- a/tests/auto/qxmlsimplereader/xmldocs/not-wf/sa/019.xml.ref
+++ b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/019.xml.ref
diff --git a/tests/auto/qxmlsimplereader/xmldocs/not-wf/sa/020.xml b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/020.xml
index b30cfcfc10..b30cfcfc10 100644
--- a/tests/auto/qxmlsimplereader/xmldocs/not-wf/sa/020.xml
+++ b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/020.xml
diff --git a/tests/auto/qxmlsimplereader/xmldocs/not-wf/sa/020.xml.ref b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/020.xml.ref
index f52f775f12..f52f775f12 100644
--- a/tests/auto/qxmlsimplereader/xmldocs/not-wf/sa/020.xml.ref
+++ b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/020.xml.ref
diff --git a/tests/auto/qxmlsimplereader/xmldocs/not-wf/sa/021.xml b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/021.xml
index 1bfa84aa64..1bfa84aa64 100644
--- a/tests/auto/qxmlsimplereader/xmldocs/not-wf/sa/021.xml
+++ b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/021.xml
diff --git a/tests/auto/qxmlsimplereader/xmldocs/not-wf/sa/021.xml.ref b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/021.xml.ref
index 02ae4699b6..02ae4699b6 100644
--- a/tests/auto/qxmlsimplereader/xmldocs/not-wf/sa/021.xml.ref
+++ b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/021.xml.ref
diff --git a/tests/auto/qxmlsimplereader/xmldocs/not-wf/sa/022.xml b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/022.xml
index 44c803bf1b..44c803bf1b 100644
--- a/tests/auto/qxmlsimplereader/xmldocs/not-wf/sa/022.xml
+++ b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/022.xml
diff --git a/tests/auto/qxmlsimplereader/xmldocs/not-wf/sa/022.xml.ref b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/022.xml.ref
index 42bf38f488..42bf38f488 100644
--- a/tests/auto/qxmlsimplereader/xmldocs/not-wf/sa/022.xml.ref
+++ b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/022.xml.ref
diff --git a/tests/auto/qxmlsimplereader/xmldocs/not-wf/sa/023.xml b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/023.xml
index b877ae2a6b..b877ae2a6b 100644
--- a/tests/auto/qxmlsimplereader/xmldocs/not-wf/sa/023.xml
+++ b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/023.xml
diff --git a/tests/auto/qxmlsimplereader/xmldocs/not-wf/sa/023.xml.ref b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/023.xml.ref
index 94f5cfa68c..94f5cfa68c 100644
--- a/tests/auto/qxmlsimplereader/xmldocs/not-wf/sa/023.xml.ref
+++ b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/023.xml.ref
diff --git a/tests/auto/qxmlsimplereader/xmldocs/not-wf/sa/024.xml b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/024.xml
index cf68f2c073..cf68f2c073 100644
--- a/tests/auto/qxmlsimplereader/xmldocs/not-wf/sa/024.xml
+++ b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/024.xml
diff --git a/tests/auto/qxmlsimplereader/xmldocs/not-wf/sa/024.xml.ref b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/024.xml.ref
index 8ebfac2a80..8ebfac2a80 100644
--- a/tests/auto/qxmlsimplereader/xmldocs/not-wf/sa/024.xml.ref
+++ b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/024.xml.ref
diff --git a/tests/auto/qxmlsimplereader/xmldocs/not-wf/sa/025.xml b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/025.xml
index 6cba95cd78..6cba95cd78 100644
--- a/tests/auto/qxmlsimplereader/xmldocs/not-wf/sa/025.xml
+++ b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/025.xml
diff --git a/tests/auto/qxmlsimplereader/xmldocs/not-wf/sa/025.xml.ref b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/025.xml.ref
index 8f5d812e49..8f5d812e49 100644
--- a/tests/auto/qxmlsimplereader/xmldocs/not-wf/sa/025.xml.ref
+++ b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/025.xml.ref
diff --git a/tests/auto/qxmlsimplereader/xmldocs/not-wf/sa/026.xml b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/026.xml
index 347984fa73..347984fa73 100644
--- a/tests/auto/qxmlsimplereader/xmldocs/not-wf/sa/026.xml
+++ b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/026.xml
diff --git a/tests/auto/qxmlsimplereader/xmldocs/not-wf/sa/026.xml.ref b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/026.xml.ref
index 3d0c743f13..3d0c743f13 100644
--- a/tests/auto/qxmlsimplereader/xmldocs/not-wf/sa/026.xml.ref
+++ b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/026.xml.ref
diff --git a/tests/auto/qxmlsimplereader/xmldocs/not-wf/sa/027.xml b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/027.xml
index cfafaf0d70..cfafaf0d70 100644
--- a/tests/auto/qxmlsimplereader/xmldocs/not-wf/sa/027.xml
+++ b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/027.xml
diff --git a/tests/auto/qxmlsimplereader/xmldocs/not-wf/sa/027.xml.ref b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/027.xml.ref
index 178563e3d9..178563e3d9 100644
--- a/tests/auto/qxmlsimplereader/xmldocs/not-wf/sa/027.xml.ref
+++ b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/027.xml.ref
diff --git a/tests/auto/qxmlsimplereader/xmldocs/not-wf/sa/028.xml b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/028.xml
index 522714993a..522714993a 100644
--- a/tests/auto/qxmlsimplereader/xmldocs/not-wf/sa/028.xml
+++ b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/028.xml
diff --git a/tests/auto/qxmlsimplereader/xmldocs/not-wf/sa/028.xml.ref b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/028.xml.ref
index 45a61328b0..45a61328b0 100644
--- a/tests/auto/qxmlsimplereader/xmldocs/not-wf/sa/028.xml.ref
+++ b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/028.xml.ref
diff --git a/tests/auto/qxmlsimplereader/xmldocs/not-wf/sa/029.xml b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/029.xml
index 9a8008bc9f..9a8008bc9f 100644
--- a/tests/auto/qxmlsimplereader/xmldocs/not-wf/sa/029.xml
+++ b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/029.xml
diff --git a/tests/auto/qxmlsimplereader/xmldocs/not-wf/sa/029.xml.ref b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/029.xml.ref
index da043096c0..da043096c0 100644
--- a/tests/auto/qxmlsimplereader/xmldocs/not-wf/sa/029.xml.ref
+++ b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/029.xml.ref
diff --git a/tests/auto/qxmlsimplereader/xmldocs/not-wf/sa/030.xml b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/030.xml
index 25861fa19b..25861fa19b 100644
--- a/tests/auto/qxmlsimplereader/xmldocs/not-wf/sa/030.xml
+++ b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/030.xml
diff --git a/tests/auto/qxmlsimplereader/xmldocs/not-wf/sa/030.xml.ref b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/030.xml.ref
index 3d7b2fd5f0..3d7b2fd5f0 100644
--- a/tests/auto/qxmlsimplereader/xmldocs/not-wf/sa/030.xml.ref
+++ b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/030.xml.ref
diff --git a/tests/auto/qxmlsimplereader/xmldocs/not-wf/sa/031.xml b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/031.xml
index f946536f39..f946536f39 100644
--- a/tests/auto/qxmlsimplereader/xmldocs/not-wf/sa/031.xml
+++ b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/031.xml
diff --git a/tests/auto/qxmlsimplereader/xmldocs/not-wf/sa/031.xml.ref b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/031.xml.ref
index 240d633529..240d633529 100644
--- a/tests/auto/qxmlsimplereader/xmldocs/not-wf/sa/031.xml.ref
+++ b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/031.xml.ref
diff --git a/tests/auto/qxmlsimplereader/xmldocs/not-wf/sa/032.xml b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/032.xml
index 75952017ca..75952017ca 100644
--- a/tests/auto/qxmlsimplereader/xmldocs/not-wf/sa/032.xml
+++ b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/032.xml
diff --git a/tests/auto/qxmlsimplereader/xmldocs/not-wf/sa/032.xml.ref b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/032.xml.ref
index a85cab71f0..a85cab71f0 100644
--- a/tests/auto/qxmlsimplereader/xmldocs/not-wf/sa/032.xml.ref
+++ b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/032.xml.ref
diff --git a/tests/auto/qxmlsimplereader/xmldocs/not-wf/sa/033.xml b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/033.xml
index afd2328402..afd2328402 100644
--- a/tests/auto/qxmlsimplereader/xmldocs/not-wf/sa/033.xml
+++ b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/033.xml
diff --git a/tests/auto/qxmlsimplereader/xmldocs/not-wf/sa/033.xml.ref b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/033.xml.ref
index a059f8e0b2..a059f8e0b2 100644
--- a/tests/auto/qxmlsimplereader/xmldocs/not-wf/sa/033.xml.ref
+++ b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/033.xml.ref
diff --git a/tests/auto/qxmlsimplereader/xmldocs/not-wf/sa/034.xml b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/034.xml
index d74a77719b..d74a77719b 100644
--- a/tests/auto/qxmlsimplereader/xmldocs/not-wf/sa/034.xml
+++ b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/034.xml
diff --git a/tests/auto/qxmlsimplereader/xmldocs/not-wf/sa/034.xml.ref b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/034.xml.ref
index 723dc1aa00..723dc1aa00 100644
--- a/tests/auto/qxmlsimplereader/xmldocs/not-wf/sa/034.xml.ref
+++ b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/034.xml.ref
diff --git a/tests/auto/qxmlsimplereader/xmldocs/not-wf/sa/035.xml b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/035.xml
index e1fc920522..e1fc920522 100644
--- a/tests/auto/qxmlsimplereader/xmldocs/not-wf/sa/035.xml
+++ b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/035.xml
diff --git a/tests/auto/qxmlsimplereader/xmldocs/not-wf/sa/035.xml.ref b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/035.xml.ref
index 6ca9412864..6ca9412864 100644
--- a/tests/auto/qxmlsimplereader/xmldocs/not-wf/sa/035.xml.ref
+++ b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/035.xml.ref
diff --git a/tests/auto/qxmlsimplereader/xmldocs/not-wf/sa/036.xml b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/036.xml
index b8ecb21ba1..b8ecb21ba1 100644
--- a/tests/auto/qxmlsimplereader/xmldocs/not-wf/sa/036.xml
+++ b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/036.xml
diff --git a/tests/auto/qxmlsimplereader/xmldocs/not-wf/sa/036.xml.ref b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/036.xml.ref
index 5341fe5c8a..5341fe5c8a 100644
--- a/tests/auto/qxmlsimplereader/xmldocs/not-wf/sa/036.xml.ref
+++ b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/036.xml.ref
diff --git a/tests/auto/qxmlsimplereader/xmldocs/not-wf/sa/037.xml b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/037.xml
index 2e02662926..2e02662926 100644
--- a/tests/auto/qxmlsimplereader/xmldocs/not-wf/sa/037.xml
+++ b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/037.xml
diff --git a/tests/auto/qxmlsimplereader/xmldocs/not-wf/sa/037.xml.ref b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/037.xml.ref
index 5341fe5c8a..5341fe5c8a 100644
--- a/tests/auto/qxmlsimplereader/xmldocs/not-wf/sa/037.xml.ref
+++ b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/037.xml.ref
diff --git a/tests/auto/qxmlsimplereader/xmldocs/not-wf/sa/038.xml b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/038.xml
index 68b2803f82..68b2803f82 100644
--- a/tests/auto/qxmlsimplereader/xmldocs/not-wf/sa/038.xml
+++ b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/038.xml
diff --git a/tests/auto/qxmlsimplereader/xmldocs/not-wf/sa/038.xml.ref b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/038.xml.ref
index 914f7edc6a..914f7edc6a 100644
--- a/tests/auto/qxmlsimplereader/xmldocs/not-wf/sa/038.xml.ref
+++ b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/038.xml.ref
diff --git a/tests/auto/qxmlsimplereader/xmldocs/not-wf/sa/039.xml b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/039.xml
index 80429e3e40..80429e3e40 100644
--- a/tests/auto/qxmlsimplereader/xmldocs/not-wf/sa/039.xml
+++ b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/039.xml
diff --git a/tests/auto/qxmlsimplereader/xmldocs/not-wf/sa/039.xml.ref b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/039.xml.ref
index 82a67116c1..82a67116c1 100644
--- a/tests/auto/qxmlsimplereader/xmldocs/not-wf/sa/039.xml.ref
+++ b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/039.xml.ref
diff --git a/tests/auto/qxmlsimplereader/xmldocs/not-wf/sa/040.xml b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/040.xml
index dc8ba5a434..dc8ba5a434 100644
--- a/tests/auto/qxmlsimplereader/xmldocs/not-wf/sa/040.xml
+++ b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/040.xml
diff --git a/tests/auto/qxmlsimplereader/xmldocs/not-wf/sa/040.xml.ref b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/040.xml.ref
index a28c24ab56..a28c24ab56 100644
--- a/tests/auto/qxmlsimplereader/xmldocs/not-wf/sa/040.xml.ref
+++ b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/040.xml.ref
diff --git a/tests/auto/qxmlsimplereader/xmldocs/not-wf/sa/041.xml b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/041.xml
index 30bcdd6bfe..30bcdd6bfe 100644
--- a/tests/auto/qxmlsimplereader/xmldocs/not-wf/sa/041.xml
+++ b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/041.xml
diff --git a/tests/auto/qxmlsimplereader/xmldocs/not-wf/sa/041.xml.ref b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/041.xml.ref
index a28c24ab56..a28c24ab56 100644
--- a/tests/auto/qxmlsimplereader/xmldocs/not-wf/sa/041.xml.ref
+++ b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/041.xml.ref
diff --git a/tests/auto/qxmlsimplereader/xmldocs/not-wf/sa/042.xml b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/042.xml
index 4ae50efc7b..4ae50efc7b 100644
--- a/tests/auto/qxmlsimplereader/xmldocs/not-wf/sa/042.xml
+++ b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/042.xml
diff --git a/tests/auto/qxmlsimplereader/xmldocs/not-wf/sa/042.xml.ref b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/042.xml.ref
index 493c67a337..493c67a337 100644
--- a/tests/auto/qxmlsimplereader/xmldocs/not-wf/sa/042.xml.ref
+++ b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/042.xml.ref
diff --git a/tests/auto/qxmlsimplereader/xmldocs/not-wf/sa/043.xml b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/043.xml
index 41824eee4b..41824eee4b 100644
--- a/tests/auto/qxmlsimplereader/xmldocs/not-wf/sa/043.xml
+++ b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/043.xml
diff --git a/tests/auto/qxmlsimplereader/xmldocs/not-wf/sa/043.xml.ref b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/043.xml.ref
index 5341fe5c8a..5341fe5c8a 100644
--- a/tests/auto/qxmlsimplereader/xmldocs/not-wf/sa/043.xml.ref
+++ b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/043.xml.ref
diff --git a/tests/auto/qxmlsimplereader/xmldocs/not-wf/sa/044.xml b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/044.xml
index 3fc232dc37..3fc232dc37 100644
--- a/tests/auto/qxmlsimplereader/xmldocs/not-wf/sa/044.xml
+++ b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/044.xml
diff --git a/tests/auto/qxmlsimplereader/xmldocs/not-wf/sa/044.xml.ref b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/044.xml.ref
index 493c67a337..493c67a337 100644
--- a/tests/auto/qxmlsimplereader/xmldocs/not-wf/sa/044.xml.ref
+++ b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/044.xml.ref
diff --git a/tests/auto/qxmlsimplereader/xmldocs/not-wf/sa/045.xml b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/045.xml
index 00c10f00bf..00c10f00bf 100644
--- a/tests/auto/qxmlsimplereader/xmldocs/not-wf/sa/045.xml
+++ b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/045.xml
diff --git a/tests/auto/qxmlsimplereader/xmldocs/not-wf/sa/045.xml.ref b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/045.xml.ref
index d030deb272..d030deb272 100644
--- a/tests/auto/qxmlsimplereader/xmldocs/not-wf/sa/045.xml.ref
+++ b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/045.xml.ref
diff --git a/tests/auto/qxmlsimplereader/xmldocs/not-wf/sa/046.xml b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/046.xml
index 265cb15301..265cb15301 100644
--- a/tests/auto/qxmlsimplereader/xmldocs/not-wf/sa/046.xml
+++ b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/046.xml
diff --git a/tests/auto/qxmlsimplereader/xmldocs/not-wf/sa/046.xml.ref b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/046.xml.ref
index d030deb272..d030deb272 100644
--- a/tests/auto/qxmlsimplereader/xmldocs/not-wf/sa/046.xml.ref
+++ b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/046.xml.ref
diff --git a/tests/auto/qxmlsimplereader/xmldocs/not-wf/sa/047.xml b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/047.xml
index d18a4a4440..d18a4a4440 100644
--- a/tests/auto/qxmlsimplereader/xmldocs/not-wf/sa/047.xml
+++ b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/047.xml
diff --git a/tests/auto/qxmlsimplereader/xmldocs/not-wf/sa/047.xml.ref b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/047.xml.ref
index 4693ac42c3..4693ac42c3 100644
--- a/tests/auto/qxmlsimplereader/xmldocs/not-wf/sa/047.xml.ref
+++ b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/047.xml.ref
diff --git a/tests/auto/qxmlsimplereader/xmldocs/not-wf/sa/048.xml b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/048.xml
index 67419c1ed5..67419c1ed5 100644
--- a/tests/auto/qxmlsimplereader/xmldocs/not-wf/sa/048.xml
+++ b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/048.xml
diff --git a/tests/auto/qxmlsimplereader/xmldocs/not-wf/sa/048.xml.ref b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/048.xml.ref
index f8e19b6108..f8e19b6108 100644
--- a/tests/auto/qxmlsimplereader/xmldocs/not-wf/sa/048.xml.ref
+++ b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/048.xml.ref
diff --git a/tests/auto/qxmlsimplereader/xmldocs/not-wf/sa/049.xml b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/049.xml
index 3cf0e79422..3cf0e79422 100644
--- a/tests/auto/qxmlsimplereader/xmldocs/not-wf/sa/049.xml
+++ b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/049.xml
diff --git a/tests/auto/qxmlsimplereader/xmldocs/not-wf/sa/049.xml.ref b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/049.xml.ref
index 1d89054d77..1d89054d77 100644
--- a/tests/auto/qxmlsimplereader/xmldocs/not-wf/sa/049.xml.ref
+++ b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/049.xml.ref
diff --git a/tests/auto/qxmlsimplereader/xmldocs/not-wf/sa/050.xml b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/050.xml
index e69de29bb2..e69de29bb2 100644
--- a/tests/auto/qxmlsimplereader/xmldocs/not-wf/sa/050.xml
+++ b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/050.xml
diff --git a/tests/auto/qxmlsimplereader/xmldocs/not-wf/sa/050.xml.ref b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/050.xml.ref
index 2a3b59e093..2a3b59e093 100644
--- a/tests/auto/qxmlsimplereader/xmldocs/not-wf/sa/050.xml.ref
+++ b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/050.xml.ref
diff --git a/tests/auto/qxmlsimplereader/xmldocs/not-wf/sa/051.xml b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/051.xml
index b52df12cc4..b52df12cc4 100644
--- a/tests/auto/qxmlsimplereader/xmldocs/not-wf/sa/051.xml
+++ b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/051.xml
diff --git a/tests/auto/qxmlsimplereader/xmldocs/not-wf/sa/051.xml.ref b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/051.xml.ref
index 71c3e0d2f9..71c3e0d2f9 100644
--- a/tests/auto/qxmlsimplereader/xmldocs/not-wf/sa/051.xml.ref
+++ b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/051.xml.ref
diff --git a/tests/auto/qxmlsimplereader/xmldocs/not-wf/sa/052.xml b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/052.xml
index 8283895990..8283895990 100644
--- a/tests/auto/qxmlsimplereader/xmldocs/not-wf/sa/052.xml
+++ b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/052.xml
diff --git a/tests/auto/qxmlsimplereader/xmldocs/not-wf/sa/052.xml.ref b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/052.xml.ref
index 42126fdb25..42126fdb25 100644
--- a/tests/auto/qxmlsimplereader/xmldocs/not-wf/sa/052.xml.ref
+++ b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/052.xml.ref
diff --git a/tests/auto/qxmlsimplereader/xmldocs/not-wf/sa/053.xml b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/053.xml
index 9d7f36920f..9d7f36920f 100644
--- a/tests/auto/qxmlsimplereader/xmldocs/not-wf/sa/053.xml
+++ b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/053.xml
diff --git a/tests/auto/qxmlsimplereader/xmldocs/not-wf/sa/053.xml.ref b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/053.xml.ref
index 515dd0b446..515dd0b446 100644
--- a/tests/auto/qxmlsimplereader/xmldocs/not-wf/sa/053.xml.ref
+++ b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/053.xml.ref
diff --git a/tests/auto/qxmlsimplereader/xmldocs/not-wf/sa/054.xml b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/054.xml
index eda553c6d3..eda553c6d3 100644
--- a/tests/auto/qxmlsimplereader/xmldocs/not-wf/sa/054.xml
+++ b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/054.xml
diff --git a/tests/auto/qxmlsimplereader/xmldocs/not-wf/sa/054.xml.ref b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/054.xml.ref
index 18412e39b2..18412e39b2 100644
--- a/tests/auto/qxmlsimplereader/xmldocs/not-wf/sa/054.xml.ref
+++ b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/054.xml.ref
diff --git a/tests/auto/qxmlsimplereader/xmldocs/not-wf/sa/055.xml b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/055.xml
index cbb3683a9d..cbb3683a9d 100644
--- a/tests/auto/qxmlsimplereader/xmldocs/not-wf/sa/055.xml
+++ b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/055.xml
diff --git a/tests/auto/qxmlsimplereader/xmldocs/not-wf/sa/055.xml.ref b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/055.xml.ref
index 3e1e132b5e..3e1e132b5e 100644
--- a/tests/auto/qxmlsimplereader/xmldocs/not-wf/sa/055.xml.ref
+++ b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/055.xml.ref
diff --git a/tests/auto/qxmlsimplereader/xmldocs/not-wf/sa/056.xml b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/056.xml
index a681684c58..a681684c58 100644
--- a/tests/auto/qxmlsimplereader/xmldocs/not-wf/sa/056.xml
+++ b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/056.xml
diff --git a/tests/auto/qxmlsimplereader/xmldocs/not-wf/sa/056.xml.ref b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/056.xml.ref
index 938a47c172..938a47c172 100644
--- a/tests/auto/qxmlsimplereader/xmldocs/not-wf/sa/056.xml.ref
+++ b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/056.xml.ref
diff --git a/tests/auto/qxmlsimplereader/xmldocs/not-wf/sa/057.xml b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/057.xml
index 848d347120..848d347120 100644
--- a/tests/auto/qxmlsimplereader/xmldocs/not-wf/sa/057.xml
+++ b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/057.xml
diff --git a/tests/auto/qxmlsimplereader/xmldocs/not-wf/sa/057.xml.ref b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/057.xml.ref
index 28576a7fdf..28576a7fdf 100644
--- a/tests/auto/qxmlsimplereader/xmldocs/not-wf/sa/057.xml.ref
+++ b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/057.xml.ref
diff --git a/tests/auto/qxmlsimplereader/xmldocs/not-wf/sa/058.xml b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/058.xml
index daba266af2..daba266af2 100644
--- a/tests/auto/qxmlsimplereader/xmldocs/not-wf/sa/058.xml
+++ b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/058.xml
diff --git a/tests/auto/qxmlsimplereader/xmldocs/not-wf/sa/058.xml.ref b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/058.xml.ref
index aa3101b7ef..aa3101b7ef 100644
--- a/tests/auto/qxmlsimplereader/xmldocs/not-wf/sa/058.xml.ref
+++ b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/058.xml.ref
diff --git a/tests/auto/qxmlsimplereader/xmldocs/not-wf/sa/059.xml b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/059.xml
index 316083dc25..316083dc25 100644
--- a/tests/auto/qxmlsimplereader/xmldocs/not-wf/sa/059.xml
+++ b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/059.xml
diff --git a/tests/auto/qxmlsimplereader/xmldocs/not-wf/sa/059.xml.ref b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/059.xml.ref
index d0c60b2bf5..d0c60b2bf5 100644
--- a/tests/auto/qxmlsimplereader/xmldocs/not-wf/sa/059.xml.ref
+++ b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/059.xml.ref
diff --git a/tests/auto/qxmlsimplereader/xmldocs/not-wf/sa/060.xml b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/060.xml
index 9a610fd38f..9a610fd38f 100644
--- a/tests/auto/qxmlsimplereader/xmldocs/not-wf/sa/060.xml
+++ b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/060.xml
diff --git a/tests/auto/qxmlsimplereader/xmldocs/not-wf/sa/060.xml.ref b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/060.xml.ref
index 22f1636205..22f1636205 100644
--- a/tests/auto/qxmlsimplereader/xmldocs/not-wf/sa/060.xml.ref
+++ b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/060.xml.ref
diff --git a/tests/auto/qxmlsimplereader/xmldocs/not-wf/sa/061.xml b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/061.xml
index 59181e706f..59181e706f 100644
--- a/tests/auto/qxmlsimplereader/xmldocs/not-wf/sa/061.xml
+++ b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/061.xml
diff --git a/tests/auto/qxmlsimplereader/xmldocs/not-wf/sa/061.xml.ref b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/061.xml.ref
index d49ec689aa..d49ec689aa 100644
--- a/tests/auto/qxmlsimplereader/xmldocs/not-wf/sa/061.xml.ref
+++ b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/061.xml.ref
diff --git a/tests/auto/qxmlsimplereader/xmldocs/not-wf/sa/062.xml b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/062.xml
index e62e9cd370..e62e9cd370 100644
--- a/tests/auto/qxmlsimplereader/xmldocs/not-wf/sa/062.xml
+++ b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/062.xml
diff --git a/tests/auto/qxmlsimplereader/xmldocs/not-wf/sa/062.xml.ref b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/062.xml.ref
index 2388c50c2b..2388c50c2b 100644
--- a/tests/auto/qxmlsimplereader/xmldocs/not-wf/sa/062.xml.ref
+++ b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/062.xml.ref
diff --git a/tests/auto/qxmlsimplereader/xmldocs/not-wf/sa/063.xml b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/063.xml
index 98675b9040..98675b9040 100644
--- a/tests/auto/qxmlsimplereader/xmldocs/not-wf/sa/063.xml
+++ b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/063.xml
diff --git a/tests/auto/qxmlsimplereader/xmldocs/not-wf/sa/063.xml.ref b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/063.xml.ref
index c0c9152f3e..c0c9152f3e 100644
--- a/tests/auto/qxmlsimplereader/xmldocs/not-wf/sa/063.xml.ref
+++ b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/063.xml.ref
diff --git a/tests/auto/qxmlsimplereader/xmldocs/not-wf/sa/064.xml b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/064.xml
index 3888c46b8b..3888c46b8b 100644
--- a/tests/auto/qxmlsimplereader/xmldocs/not-wf/sa/064.xml
+++ b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/064.xml
diff --git a/tests/auto/qxmlsimplereader/xmldocs/not-wf/sa/064.xml.ref b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/064.xml.ref
index 11ba2bdc47..11ba2bdc47 100644
--- a/tests/auto/qxmlsimplereader/xmldocs/not-wf/sa/064.xml.ref
+++ b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/064.xml.ref
diff --git a/tests/auto/qxmlsimplereader/xmldocs/not-wf/sa/065.xml b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/065.xml
index da9cafd137..da9cafd137 100644
--- a/tests/auto/qxmlsimplereader/xmldocs/not-wf/sa/065.xml
+++ b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/065.xml
diff --git a/tests/auto/qxmlsimplereader/xmldocs/not-wf/sa/065.xml.ref b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/065.xml.ref
index c91f8597df..c91f8597df 100644
--- a/tests/auto/qxmlsimplereader/xmldocs/not-wf/sa/065.xml.ref
+++ b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/065.xml.ref
diff --git a/tests/auto/qxmlsimplereader/xmldocs/not-wf/sa/066.xml b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/066.xml
index 9c09eb4e5d..9c09eb4e5d 100644
--- a/tests/auto/qxmlsimplereader/xmldocs/not-wf/sa/066.xml
+++ b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/066.xml
diff --git a/tests/auto/qxmlsimplereader/xmldocs/not-wf/sa/066.xml.ref b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/066.xml.ref
index f044a71dd9..f044a71dd9 100644
--- a/tests/auto/qxmlsimplereader/xmldocs/not-wf/sa/066.xml.ref
+++ b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/066.xml.ref
diff --git a/tests/auto/qxmlsimplereader/xmldocs/not-wf/sa/067.xml b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/067.xml
index 7e0809bd34..7e0809bd34 100644
--- a/tests/auto/qxmlsimplereader/xmldocs/not-wf/sa/067.xml
+++ b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/067.xml
diff --git a/tests/auto/qxmlsimplereader/xmldocs/not-wf/sa/067.xml.ref b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/067.xml.ref
index 519e67fc02..519e67fc02 100644
--- a/tests/auto/qxmlsimplereader/xmldocs/not-wf/sa/067.xml.ref
+++ b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/067.xml.ref
diff --git a/tests/auto/qxmlsimplereader/xmldocs/not-wf/sa/068.xml b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/068.xml
index 53a80a83a8..53a80a83a8 100644
--- a/tests/auto/qxmlsimplereader/xmldocs/not-wf/sa/068.xml
+++ b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/068.xml
diff --git a/tests/auto/qxmlsimplereader/xmldocs/not-wf/sa/068.xml.ref b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/068.xml.ref
index aa7a9e3957..aa7a9e3957 100644
--- a/tests/auto/qxmlsimplereader/xmldocs/not-wf/sa/068.xml.ref
+++ b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/068.xml.ref
diff --git a/tests/auto/qxmlsimplereader/xmldocs/not-wf/sa/069.xml b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/069.xml
index 6f891dd5e1..6f891dd5e1 100644
--- a/tests/auto/qxmlsimplereader/xmldocs/not-wf/sa/069.xml
+++ b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/069.xml
diff --git a/tests/auto/qxmlsimplereader/xmldocs/not-wf/sa/069.xml.ref b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/069.xml.ref
index 4d729c5075..4d729c5075 100644
--- a/tests/auto/qxmlsimplereader/xmldocs/not-wf/sa/069.xml.ref
+++ b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/069.xml.ref
diff --git a/tests/auto/qxmlsimplereader/xmldocs/not-wf/sa/070.xml b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/070.xml
index faf4b0ae4c..faf4b0ae4c 100644
--- a/tests/auto/qxmlsimplereader/xmldocs/not-wf/sa/070.xml
+++ b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/070.xml
diff --git a/tests/auto/qxmlsimplereader/xmldocs/not-wf/sa/070.xml.ref b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/070.xml.ref
index f24226f8e5..f24226f8e5 100644
--- a/tests/auto/qxmlsimplereader/xmldocs/not-wf/sa/070.xml.ref
+++ b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/070.xml.ref
diff --git a/tests/auto/qxmlsimplereader/xmldocs/not-wf/sa/071.xml b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/071.xml
index 5bd3908968..5bd3908968 100644
--- a/tests/auto/qxmlsimplereader/xmldocs/not-wf/sa/071.xml
+++ b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/071.xml
diff --git a/tests/auto/qxmlsimplereader/xmldocs/not-wf/sa/071.xml.ref b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/071.xml.ref
index da8c9347b2..da8c9347b2 100644
--- a/tests/auto/qxmlsimplereader/xmldocs/not-wf/sa/071.xml.ref
+++ b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/071.xml.ref
diff --git a/tests/auto/qxmlsimplereader/xmldocs/not-wf/sa/072.xml b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/072.xml
index 743ba79429..743ba79429 100644
--- a/tests/auto/qxmlsimplereader/xmldocs/not-wf/sa/072.xml
+++ b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/072.xml
diff --git a/tests/auto/qxmlsimplereader/xmldocs/not-wf/sa/072.xml.ref b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/072.xml.ref
index 48fd72baf3..48fd72baf3 100644
--- a/tests/auto/qxmlsimplereader/xmldocs/not-wf/sa/072.xml.ref
+++ b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/072.xml.ref
diff --git a/tests/auto/qxmlsimplereader/xmldocs/not-wf/sa/073.xml b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/073.xml
index 2578af42ec..2578af42ec 100644
--- a/tests/auto/qxmlsimplereader/xmldocs/not-wf/sa/073.xml
+++ b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/073.xml
diff --git a/tests/auto/qxmlsimplereader/xmldocs/not-wf/sa/073.xml.ref b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/073.xml.ref
index b60c7d49ac..b60c7d49ac 100644
--- a/tests/auto/qxmlsimplereader/xmldocs/not-wf/sa/073.xml.ref
+++ b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/073.xml.ref
diff --git a/tests/auto/qxmlsimplereader/xmldocs/not-wf/sa/074.xml b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/074.xml
index f8abaeb22c..f8abaeb22c 100644
--- a/tests/auto/qxmlsimplereader/xmldocs/not-wf/sa/074.xml
+++ b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/074.xml
diff --git a/tests/auto/qxmlsimplereader/xmldocs/not-wf/sa/074.xml.ref b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/074.xml.ref
index df8552d646..df8552d646 100644
--- a/tests/auto/qxmlsimplereader/xmldocs/not-wf/sa/074.xml.ref
+++ b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/074.xml.ref
diff --git a/tests/auto/qxmlsimplereader/xmldocs/not-wf/sa/075.xml b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/075.xml
index d3dbf50ed6..d3dbf50ed6 100644
--- a/tests/auto/qxmlsimplereader/xmldocs/not-wf/sa/075.xml
+++ b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/075.xml
diff --git a/tests/auto/qxmlsimplereader/xmldocs/not-wf/sa/075.xml.ref b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/075.xml.ref
index 5d8b1797b5..5d8b1797b5 100644
--- a/tests/auto/qxmlsimplereader/xmldocs/not-wf/sa/075.xml.ref
+++ b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/075.xml.ref
diff --git a/tests/auto/qxmlsimplereader/xmldocs/not-wf/sa/076.xml b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/076.xml
index 60546720e7..60546720e7 100644
--- a/tests/auto/qxmlsimplereader/xmldocs/not-wf/sa/076.xml
+++ b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/076.xml
diff --git a/tests/auto/qxmlsimplereader/xmldocs/not-wf/sa/076.xml.ref b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/076.xml.ref
index 6a8b31965b..6a8b31965b 100644
--- a/tests/auto/qxmlsimplereader/xmldocs/not-wf/sa/076.xml.ref
+++ b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/076.xml.ref
diff --git a/tests/auto/qxmlsimplereader/xmldocs/not-wf/sa/077.xml b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/077.xml
index f8ac23a5a2..f8ac23a5a2 100644
--- a/tests/auto/qxmlsimplereader/xmldocs/not-wf/sa/077.xml
+++ b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/077.xml
diff --git a/tests/auto/qxmlsimplereader/xmldocs/not-wf/sa/077.xml.ref b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/077.xml.ref
index 4458152467..4458152467 100644
--- a/tests/auto/qxmlsimplereader/xmldocs/not-wf/sa/077.xml.ref
+++ b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/077.xml.ref
diff --git a/tests/auto/qxmlsimplereader/xmldocs/not-wf/sa/078.xml b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/078.xml
index 446cd85ef9..446cd85ef9 100644
--- a/tests/auto/qxmlsimplereader/xmldocs/not-wf/sa/078.xml
+++ b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/078.xml
diff --git a/tests/auto/qxmlsimplereader/xmldocs/not-wf/sa/078.xml.ref b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/078.xml.ref
index 985f71ca2b..985f71ca2b 100644
--- a/tests/auto/qxmlsimplereader/xmldocs/not-wf/sa/078.xml.ref
+++ b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/078.xml.ref
diff --git a/tests/auto/qxmlsimplereader/xmldocs/not-wf/sa/079.xml b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/079.xml
index da016fd3b2..da016fd3b2 100644
--- a/tests/auto/qxmlsimplereader/xmldocs/not-wf/sa/079.xml
+++ b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/079.xml
diff --git a/tests/auto/qxmlsimplereader/xmldocs/not-wf/sa/079.xml.ref b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/079.xml.ref
index a59833714d..a59833714d 100644
--- a/tests/auto/qxmlsimplereader/xmldocs/not-wf/sa/079.xml.ref
+++ b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/079.xml.ref
diff --git a/tests/auto/qxmlsimplereader/xmldocs/not-wf/sa/080.xml b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/080.xml
index fa4b9e428d..fa4b9e428d 100644
--- a/tests/auto/qxmlsimplereader/xmldocs/not-wf/sa/080.xml
+++ b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/080.xml
diff --git a/tests/auto/qxmlsimplereader/xmldocs/not-wf/sa/080.xml.ref b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/080.xml.ref
index 13ee47bdf4..13ee47bdf4 100644
--- a/tests/auto/qxmlsimplereader/xmldocs/not-wf/sa/080.xml.ref
+++ b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/080.xml.ref
diff --git a/tests/auto/qxmlsimplereader/xmldocs/not-wf/sa/081.xml b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/081.xml
index d676100e8a..d676100e8a 100644
--- a/tests/auto/qxmlsimplereader/xmldocs/not-wf/sa/081.xml
+++ b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/081.xml
diff --git a/tests/auto/qxmlsimplereader/xmldocs/not-wf/sa/081.xml.ref b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/081.xml.ref
index 4d386e4f34..4d386e4f34 100644
--- a/tests/auto/qxmlsimplereader/xmldocs/not-wf/sa/081.xml.ref
+++ b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/081.xml.ref
diff --git a/tests/auto/qxmlsimplereader/xmldocs/not-wf/sa/082.xml b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/082.xml
index 3217d6f8b4..3217d6f8b4 100644
--- a/tests/auto/qxmlsimplereader/xmldocs/not-wf/sa/082.xml
+++ b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/082.xml
diff --git a/tests/auto/qxmlsimplereader/xmldocs/not-wf/sa/082.xml.ref b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/082.xml.ref
index eb81754e50..eb81754e50 100644
--- a/tests/auto/qxmlsimplereader/xmldocs/not-wf/sa/082.xml.ref
+++ b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/082.xml.ref
diff --git a/tests/auto/qxmlsimplereader/xmldocs/not-wf/sa/083.xml b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/083.xml
index 469d43fd42..469d43fd42 100644
--- a/tests/auto/qxmlsimplereader/xmldocs/not-wf/sa/083.xml
+++ b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/083.xml
diff --git a/tests/auto/qxmlsimplereader/xmldocs/not-wf/sa/083.xml.ref b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/083.xml.ref
index ac1caa8f9c..ac1caa8f9c 100644
--- a/tests/auto/qxmlsimplereader/xmldocs/not-wf/sa/083.xml.ref
+++ b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/083.xml.ref
diff --git a/tests/auto/qxmlsimplereader/xmldocs/not-wf/sa/084.xml b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/084.xml
index abbbcdea69..abbbcdea69 100644
--- a/tests/auto/qxmlsimplereader/xmldocs/not-wf/sa/084.xml
+++ b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/084.xml
diff --git a/tests/auto/qxmlsimplereader/xmldocs/not-wf/sa/084.xml.ref b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/084.xml.ref
index 9f69b94ccf..9f69b94ccf 100644
--- a/tests/auto/qxmlsimplereader/xmldocs/not-wf/sa/084.xml.ref
+++ b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/084.xml.ref
diff --git a/tests/auto/qxmlsimplereader/xmldocs/not-wf/sa/085.xml b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/085.xml
index ac0aeca3e4..ac0aeca3e4 100644
--- a/tests/auto/qxmlsimplereader/xmldocs/not-wf/sa/085.xml
+++ b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/085.xml
diff --git a/tests/auto/qxmlsimplereader/xmldocs/not-wf/sa/085.xml.ref b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/085.xml.ref
index 4db671e035..4db671e035 100644
--- a/tests/auto/qxmlsimplereader/xmldocs/not-wf/sa/085.xml.ref
+++ b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/085.xml.ref
diff --git a/tests/auto/qxmlsimplereader/xmldocs/not-wf/sa/086.xml b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/086.xml
index df6adfd884..df6adfd884 100644
--- a/tests/auto/qxmlsimplereader/xmldocs/not-wf/sa/086.xml
+++ b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/086.xml
diff --git a/tests/auto/qxmlsimplereader/xmldocs/not-wf/sa/086.xml.ref b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/086.xml.ref
index 6254d59e0f..6254d59e0f 100644
--- a/tests/auto/qxmlsimplereader/xmldocs/not-wf/sa/086.xml.ref
+++ b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/086.xml.ref
diff --git a/tests/auto/qxmlsimplereader/xmldocs/not-wf/sa/087.xml b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/087.xml
index ed49492a7a..ed49492a7a 100644
--- a/tests/auto/qxmlsimplereader/xmldocs/not-wf/sa/087.xml
+++ b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/087.xml
diff --git a/tests/auto/qxmlsimplereader/xmldocs/not-wf/sa/087.xml.ref b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/087.xml.ref
index 8ec0ab3a12..8ec0ab3a12 100644
--- a/tests/auto/qxmlsimplereader/xmldocs/not-wf/sa/087.xml.ref
+++ b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/087.xml.ref
diff --git a/tests/auto/qxmlsimplereader/xmldocs/not-wf/sa/088.xml b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/088.xml
index da0a68c401..da0a68c401 100644
--- a/tests/auto/qxmlsimplereader/xmldocs/not-wf/sa/088.xml
+++ b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/088.xml
diff --git a/tests/auto/qxmlsimplereader/xmldocs/not-wf/sa/088.xml.ref b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/088.xml.ref
index 27ed4e589d..27ed4e589d 100644
--- a/tests/auto/qxmlsimplereader/xmldocs/not-wf/sa/088.xml.ref
+++ b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/088.xml.ref
diff --git a/tests/auto/qxmlsimplereader/xmldocs/not-wf/sa/089.xml b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/089.xml
index 0c6cf404c2..0c6cf404c2 100644
--- a/tests/auto/qxmlsimplereader/xmldocs/not-wf/sa/089.xml
+++ b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/089.xml
diff --git a/tests/auto/qxmlsimplereader/xmldocs/not-wf/sa/089.xml.ref b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/089.xml.ref
index 910213bf13..910213bf13 100644
--- a/tests/auto/qxmlsimplereader/xmldocs/not-wf/sa/089.xml.ref
+++ b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/089.xml.ref
diff --git a/tests/auto/qxmlsimplereader/xmldocs/not-wf/sa/090.xml b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/090.xml
index 3fb72f3cc0..3fb72f3cc0 100644
--- a/tests/auto/qxmlsimplereader/xmldocs/not-wf/sa/090.xml
+++ b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/090.xml
diff --git a/tests/auto/qxmlsimplereader/xmldocs/not-wf/sa/090.xml.ref b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/090.xml.ref
index bc4280aa82..bc4280aa82 100644
--- a/tests/auto/qxmlsimplereader/xmldocs/not-wf/sa/090.xml.ref
+++ b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/090.xml.ref
diff --git a/tests/auto/qxmlsimplereader/xmldocs/not-wf/sa/091.xml b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/091.xml
index a61d0914f8..a61d0914f8 100644
--- a/tests/auto/qxmlsimplereader/xmldocs/not-wf/sa/091.xml
+++ b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/091.xml
diff --git a/tests/auto/qxmlsimplereader/xmldocs/not-wf/sa/091.xml.ref b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/091.xml.ref
index c89444077e..c89444077e 100644
--- a/tests/auto/qxmlsimplereader/xmldocs/not-wf/sa/091.xml.ref
+++ b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/091.xml.ref
diff --git a/tests/auto/qxmlsimplereader/xmldocs/not-wf/sa/092.xml b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/092.xml
index be5266dada..be5266dada 100644
--- a/tests/auto/qxmlsimplereader/xmldocs/not-wf/sa/092.xml
+++ b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/092.xml
diff --git a/tests/auto/qxmlsimplereader/xmldocs/not-wf/sa/092.xml.ref b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/092.xml.ref
index 4469beb325..4469beb325 100644
--- a/tests/auto/qxmlsimplereader/xmldocs/not-wf/sa/092.xml.ref
+++ b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/092.xml.ref
diff --git a/tests/auto/qxmlsimplereader/xmldocs/not-wf/sa/093.xml b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/093.xml
index 4af61bc645..4af61bc645 100644
--- a/tests/auto/qxmlsimplereader/xmldocs/not-wf/sa/093.xml
+++ b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/093.xml
diff --git a/tests/auto/qxmlsimplereader/xmldocs/not-wf/sa/093.xml.ref b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/093.xml.ref
index a885634000..a885634000 100644
--- a/tests/auto/qxmlsimplereader/xmldocs/not-wf/sa/093.xml.ref
+++ b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/093.xml.ref
diff --git a/tests/auto/qxmlsimplereader/xmldocs/not-wf/sa/094.xml b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/094.xml
index bdec7a4660..bdec7a4660 100644
--- a/tests/auto/qxmlsimplereader/xmldocs/not-wf/sa/094.xml
+++ b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/094.xml
diff --git a/tests/auto/qxmlsimplereader/xmldocs/not-wf/sa/094.xml.ref b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/094.xml.ref
index f37fb5877f..f37fb5877f 100644
--- a/tests/auto/qxmlsimplereader/xmldocs/not-wf/sa/094.xml.ref
+++ b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/094.xml.ref
diff --git a/tests/auto/qxmlsimplereader/xmldocs/not-wf/sa/095.xml b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/095.xml
index 090b8b4eec..090b8b4eec 100644
--- a/tests/auto/qxmlsimplereader/xmldocs/not-wf/sa/095.xml
+++ b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/095.xml
diff --git a/tests/auto/qxmlsimplereader/xmldocs/not-wf/sa/095.xml.ref b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/095.xml.ref
index 8852f79579..8852f79579 100644
--- a/tests/auto/qxmlsimplereader/xmldocs/not-wf/sa/095.xml.ref
+++ b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/095.xml.ref
diff --git a/tests/auto/qxmlsimplereader/xmldocs/not-wf/sa/096.xml b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/096.xml
index d806c3b952..d806c3b952 100644
--- a/tests/auto/qxmlsimplereader/xmldocs/not-wf/sa/096.xml
+++ b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/096.xml
diff --git a/tests/auto/qxmlsimplereader/xmldocs/not-wf/sa/096.xml.ref b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/096.xml.ref
index ddca718431..ddca718431 100644
--- a/tests/auto/qxmlsimplereader/xmldocs/not-wf/sa/096.xml.ref
+++ b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/096.xml.ref
diff --git a/tests/auto/qxmlsimplereader/xmldocs/not-wf/sa/097.xml b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/097.xml
index d4def544b0..d4def544b0 100644
--- a/tests/auto/qxmlsimplereader/xmldocs/not-wf/sa/097.xml
+++ b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/097.xml
diff --git a/tests/auto/qxmlsimplereader/xmldocs/not-wf/sa/097.xml.ref b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/097.xml.ref
index 962de94d11..962de94d11 100644
--- a/tests/auto/qxmlsimplereader/xmldocs/not-wf/sa/097.xml.ref
+++ b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/097.xml.ref
diff --git a/tests/auto/qxmlsimplereader/xmldocs/not-wf/sa/098.xml b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/098.xml
index 9798496aa3..9798496aa3 100644
--- a/tests/auto/qxmlsimplereader/xmldocs/not-wf/sa/098.xml
+++ b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/098.xml
diff --git a/tests/auto/qxmlsimplereader/xmldocs/not-wf/sa/098.xml.ref b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/098.xml.ref
index c1665a4f03..c1665a4f03 100644
--- a/tests/auto/qxmlsimplereader/xmldocs/not-wf/sa/098.xml.ref
+++ b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/098.xml.ref
diff --git a/tests/auto/qxmlsimplereader/xmldocs/not-wf/sa/099.xml b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/099.xml
index d5be08eff0..d5be08eff0 100644
--- a/tests/auto/qxmlsimplereader/xmldocs/not-wf/sa/099.xml
+++ b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/099.xml
diff --git a/tests/auto/qxmlsimplereader/xmldocs/not-wf/sa/099.xml.ref b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/099.xml.ref
index 2d4e8516bc..2d4e8516bc 100644
--- a/tests/auto/qxmlsimplereader/xmldocs/not-wf/sa/099.xml.ref
+++ b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/099.xml.ref
diff --git a/tests/auto/qxmlsimplereader/xmldocs/not-wf/sa/100.xml b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/100.xml
index 51e06231c2..51e06231c2 100644
--- a/tests/auto/qxmlsimplereader/xmldocs/not-wf/sa/100.xml
+++ b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/100.xml
diff --git a/tests/auto/qxmlsimplereader/xmldocs/not-wf/sa/100.xml.ref b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/100.xml.ref
index eba06f283c..eba06f283c 100644
--- a/tests/auto/qxmlsimplereader/xmldocs/not-wf/sa/100.xml.ref
+++ b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/100.xml.ref
diff --git a/tests/auto/qxmlsimplereader/xmldocs/not-wf/sa/101.xml b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/101.xml
index afa5a455fc..afa5a455fc 100644
--- a/tests/auto/qxmlsimplereader/xmldocs/not-wf/sa/101.xml
+++ b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/101.xml
diff --git a/tests/auto/qxmlsimplereader/xmldocs/not-wf/sa/101.xml.ref b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/101.xml.ref
index 068a6ae657..068a6ae657 100644
--- a/tests/auto/qxmlsimplereader/xmldocs/not-wf/sa/101.xml.ref
+++ b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/101.xml.ref
diff --git a/tests/auto/qxmlsimplereader/xmldocs/not-wf/sa/102.xml b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/102.xml
index 8734adaa6e..8734adaa6e 100644
--- a/tests/auto/qxmlsimplereader/xmldocs/not-wf/sa/102.xml
+++ b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/102.xml
diff --git a/tests/auto/qxmlsimplereader/xmldocs/not-wf/sa/102.xml.ref b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/102.xml.ref
index 86b6ce0d3a..86b6ce0d3a 100644
--- a/tests/auto/qxmlsimplereader/xmldocs/not-wf/sa/102.xml.ref
+++ b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/102.xml.ref
diff --git a/tests/auto/qxmlsimplereader/xmldocs/not-wf/sa/103.xml b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/103.xml
index 6c4716798f..6c4716798f 100644
--- a/tests/auto/qxmlsimplereader/xmldocs/not-wf/sa/103.xml
+++ b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/103.xml
diff --git a/tests/auto/qxmlsimplereader/xmldocs/not-wf/sa/103.xml.ref b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/103.xml.ref
index 7a82f96305..7a82f96305 100644
--- a/tests/auto/qxmlsimplereader/xmldocs/not-wf/sa/103.xml.ref
+++ b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/103.xml.ref
diff --git a/tests/auto/qxmlsimplereader/xmldocs/not-wf/sa/104.xml b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/104.xml
index dd57396239..dd57396239 100644
--- a/tests/auto/qxmlsimplereader/xmldocs/not-wf/sa/104.xml
+++ b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/104.xml
diff --git a/tests/auto/qxmlsimplereader/xmldocs/not-wf/sa/104.xml.ref b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/104.xml.ref
index 8059be12c8..8059be12c8 100644
--- a/tests/auto/qxmlsimplereader/xmldocs/not-wf/sa/104.xml.ref
+++ b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/104.xml.ref
diff --git a/tests/auto/qxmlsimplereader/xmldocs/not-wf/sa/105.xml b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/105.xml
index 809e705870..809e705870 100644
--- a/tests/auto/qxmlsimplereader/xmldocs/not-wf/sa/105.xml
+++ b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/105.xml
diff --git a/tests/auto/qxmlsimplereader/xmldocs/not-wf/sa/105.xml.ref b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/105.xml.ref
index ff94b32716..ff94b32716 100644
--- a/tests/auto/qxmlsimplereader/xmldocs/not-wf/sa/105.xml.ref
+++ b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/105.xml.ref
diff --git a/tests/auto/qxmlsimplereader/xmldocs/not-wf/sa/106.xml b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/106.xml
index d32319ef09..d32319ef09 100644
--- a/tests/auto/qxmlsimplereader/xmldocs/not-wf/sa/106.xml
+++ b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/106.xml
diff --git a/tests/auto/qxmlsimplereader/xmldocs/not-wf/sa/106.xml.ref b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/106.xml.ref
index e5c6c6b6a7..e5c6c6b6a7 100644
--- a/tests/auto/qxmlsimplereader/xmldocs/not-wf/sa/106.xml.ref
+++ b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/106.xml.ref
diff --git a/tests/auto/qxmlsimplereader/xmldocs/not-wf/sa/107.xml b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/107.xml
index 3dfd8200e2..3dfd8200e2 100644
--- a/tests/auto/qxmlsimplereader/xmldocs/not-wf/sa/107.xml
+++ b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/107.xml
diff --git a/tests/auto/qxmlsimplereader/xmldocs/not-wf/sa/107.xml.ref b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/107.xml.ref
index c0c9152f3e..c0c9152f3e 100644
--- a/tests/auto/qxmlsimplereader/xmldocs/not-wf/sa/107.xml.ref
+++ b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/107.xml.ref
diff --git a/tests/auto/qxmlsimplereader/xmldocs/not-wf/sa/108.xml b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/108.xml
index af5cf50d48..af5cf50d48 100644
--- a/tests/auto/qxmlsimplereader/xmldocs/not-wf/sa/108.xml
+++ b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/108.xml
diff --git a/tests/auto/qxmlsimplereader/xmldocs/not-wf/sa/108.xml.ref b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/108.xml.ref
index 3be3623019..3be3623019 100644
--- a/tests/auto/qxmlsimplereader/xmldocs/not-wf/sa/108.xml.ref
+++ b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/108.xml.ref
diff --git a/tests/auto/qxmlsimplereader/xmldocs/not-wf/sa/109.xml b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/109.xml
index 5afc03e8db..5afc03e8db 100644
--- a/tests/auto/qxmlsimplereader/xmldocs/not-wf/sa/109.xml
+++ b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/109.xml
diff --git a/tests/auto/qxmlsimplereader/xmldocs/not-wf/sa/109.xml.ref b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/109.xml.ref
index 13140d8022..13140d8022 100644
--- a/tests/auto/qxmlsimplereader/xmldocs/not-wf/sa/109.xml.ref
+++ b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/109.xml.ref
diff --git a/tests/auto/qxmlsimplereader/xmldocs/not-wf/sa/110.xml b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/110.xml
index cf54ebe5c0..cf54ebe5c0 100644
--- a/tests/auto/qxmlsimplereader/xmldocs/not-wf/sa/110.xml
+++ b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/110.xml
diff --git a/tests/auto/qxmlsimplereader/xmldocs/not-wf/sa/110.xml.ref b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/110.xml.ref
index aa5b66c13f..aa5b66c13f 100644
--- a/tests/auto/qxmlsimplereader/xmldocs/not-wf/sa/110.xml.ref
+++ b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/110.xml.ref
diff --git a/tests/auto/qxmlsimplereader/xmldocs/not-wf/sa/111.xml b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/111.xml
index 84a469f5d1..84a469f5d1 100644
--- a/tests/auto/qxmlsimplereader/xmldocs/not-wf/sa/111.xml
+++ b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/111.xml
diff --git a/tests/auto/qxmlsimplereader/xmldocs/not-wf/sa/111.xml.ref b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/111.xml.ref
index d611ecd0df..d611ecd0df 100644
--- a/tests/auto/qxmlsimplereader/xmldocs/not-wf/sa/111.xml.ref
+++ b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/111.xml.ref
diff --git a/tests/auto/qxmlsimplereader/xmldocs/not-wf/sa/112.xml b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/112.xml
index 0c5c1a4341..0c5c1a4341 100644
--- a/tests/auto/qxmlsimplereader/xmldocs/not-wf/sa/112.xml
+++ b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/112.xml
diff --git a/tests/auto/qxmlsimplereader/xmldocs/not-wf/sa/112.xml.ref b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/112.xml.ref
index db6c1f3fe7..db6c1f3fe7 100644
--- a/tests/auto/qxmlsimplereader/xmldocs/not-wf/sa/112.xml.ref
+++ b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/112.xml.ref
diff --git a/tests/auto/qxmlsimplereader/xmldocs/not-wf/sa/113.xml b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/113.xml
index 04fc9d2318..04fc9d2318 100644
--- a/tests/auto/qxmlsimplereader/xmldocs/not-wf/sa/113.xml
+++ b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/113.xml
diff --git a/tests/auto/qxmlsimplereader/xmldocs/not-wf/sa/113.xml.ref b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/113.xml.ref
index af3a1378d1..af3a1378d1 100644
--- a/tests/auto/qxmlsimplereader/xmldocs/not-wf/sa/113.xml.ref
+++ b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/113.xml.ref
diff --git a/tests/auto/qxmlsimplereader/xmldocs/not-wf/sa/114.xml b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/114.xml
index 1261ee49e1..1261ee49e1 100644
--- a/tests/auto/qxmlsimplereader/xmldocs/not-wf/sa/114.xml
+++ b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/114.xml
diff --git a/tests/auto/qxmlsimplereader/xmldocs/not-wf/sa/114.xml.ref b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/114.xml.ref
index 611a07b6a7..611a07b6a7 100644
--- a/tests/auto/qxmlsimplereader/xmldocs/not-wf/sa/114.xml.ref
+++ b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/114.xml.ref
diff --git a/tests/auto/qxmlsimplereader/xmldocs/not-wf/sa/115.xml b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/115.xml
index f111dbe153..f111dbe153 100644
--- a/tests/auto/qxmlsimplereader/xmldocs/not-wf/sa/115.xml
+++ b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/115.xml
diff --git a/tests/auto/qxmlsimplereader/xmldocs/not-wf/sa/115.xml.ref b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/115.xml.ref
index d4a1b97e12..d4a1b97e12 100644
--- a/tests/auto/qxmlsimplereader/xmldocs/not-wf/sa/115.xml.ref
+++ b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/115.xml.ref
diff --git a/tests/auto/qxmlsimplereader/xmldocs/not-wf/sa/116.xml b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/116.xml
index 84bb762fdf..84bb762fdf 100644
--- a/tests/auto/qxmlsimplereader/xmldocs/not-wf/sa/116.xml
+++ b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/116.xml
diff --git a/tests/auto/qxmlsimplereader/xmldocs/not-wf/sa/116.xml.ref b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/116.xml.ref
index f69ee0b24e..f69ee0b24e 100644
--- a/tests/auto/qxmlsimplereader/xmldocs/not-wf/sa/116.xml.ref
+++ b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/116.xml.ref
diff --git a/tests/auto/qxmlsimplereader/xmldocs/not-wf/sa/117.xml b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/117.xml
index e4a5e572ef..e4a5e572ef 100644
--- a/tests/auto/qxmlsimplereader/xmldocs/not-wf/sa/117.xml
+++ b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/117.xml
diff --git a/tests/auto/qxmlsimplereader/xmldocs/not-wf/sa/117.xml.ref b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/117.xml.ref
index 9c54b53b28..9c54b53b28 100644
--- a/tests/auto/qxmlsimplereader/xmldocs/not-wf/sa/117.xml.ref
+++ b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/117.xml.ref
diff --git a/tests/auto/qxmlsimplereader/xmldocs/not-wf/sa/118.xml b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/118.xml
index 494d53d208..494d53d208 100644
--- a/tests/auto/qxmlsimplereader/xmldocs/not-wf/sa/118.xml
+++ b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/118.xml
diff --git a/tests/auto/qxmlsimplereader/xmldocs/not-wf/sa/118.xml.ref b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/118.xml.ref
index 714b497120..714b497120 100644
--- a/tests/auto/qxmlsimplereader/xmldocs/not-wf/sa/118.xml.ref
+++ b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/118.xml.ref
diff --git a/tests/auto/qxmlsimplereader/xmldocs/not-wf/sa/119.xml b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/119.xml
index aefaa44a1c..aefaa44a1c 100644
--- a/tests/auto/qxmlsimplereader/xmldocs/not-wf/sa/119.xml
+++ b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/119.xml
diff --git a/tests/auto/qxmlsimplereader/xmldocs/not-wf/sa/119.xml.ref b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/119.xml.ref
index 625f318be6..625f318be6 100644
--- a/tests/auto/qxmlsimplereader/xmldocs/not-wf/sa/119.xml.ref
+++ b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/119.xml.ref
diff --git a/tests/auto/qxmlsimplereader/xmldocs/not-wf/sa/120.xml b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/120.xml
index b7d6ff9ce9..b7d6ff9ce9 100644
--- a/tests/auto/qxmlsimplereader/xmldocs/not-wf/sa/120.xml
+++ b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/120.xml
diff --git a/tests/auto/qxmlsimplereader/xmldocs/not-wf/sa/120.xml.ref b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/120.xml.ref
index 56edb37c66..56edb37c66 100644
--- a/tests/auto/qxmlsimplereader/xmldocs/not-wf/sa/120.xml.ref
+++ b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/120.xml.ref
diff --git a/tests/auto/qxmlsimplereader/xmldocs/not-wf/sa/121.xml b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/121.xml
index 2b4adcc6b4..2b4adcc6b4 100644
--- a/tests/auto/qxmlsimplereader/xmldocs/not-wf/sa/121.xml
+++ b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/121.xml
diff --git a/tests/auto/qxmlsimplereader/xmldocs/not-wf/sa/121.xml.ref b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/121.xml.ref
index a9f2c8f68d..a9f2c8f68d 100644
--- a/tests/auto/qxmlsimplereader/xmldocs/not-wf/sa/121.xml.ref
+++ b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/121.xml.ref
diff --git a/tests/auto/qxmlsimplereader/xmldocs/not-wf/sa/122.xml b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/122.xml
index ef0b057cee..ef0b057cee 100644
--- a/tests/auto/qxmlsimplereader/xmldocs/not-wf/sa/122.xml
+++ b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/122.xml
diff --git a/tests/auto/qxmlsimplereader/xmldocs/not-wf/sa/122.xml.ref b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/122.xml.ref
index 37b53fc0b3..37b53fc0b3 100644
--- a/tests/auto/qxmlsimplereader/xmldocs/not-wf/sa/122.xml.ref
+++ b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/122.xml.ref
diff --git a/tests/auto/qxmlsimplereader/xmldocs/not-wf/sa/123.xml b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/123.xml
index 06d65f045b..06d65f045b 100644
--- a/tests/auto/qxmlsimplereader/xmldocs/not-wf/sa/123.xml
+++ b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/123.xml
diff --git a/tests/auto/qxmlsimplereader/xmldocs/not-wf/sa/123.xml.ref b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/123.xml.ref
index 66978b93a8..66978b93a8 100644
--- a/tests/auto/qxmlsimplereader/xmldocs/not-wf/sa/123.xml.ref
+++ b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/123.xml.ref
diff --git a/tests/auto/qxmlsimplereader/xmldocs/not-wf/sa/124.xml b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/124.xml
index 3bbe0f91a6..3bbe0f91a6 100644
--- a/tests/auto/qxmlsimplereader/xmldocs/not-wf/sa/124.xml
+++ b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/124.xml
diff --git a/tests/auto/qxmlsimplereader/xmldocs/not-wf/sa/124.xml.ref b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/124.xml.ref
index dc05a44ce5..dc05a44ce5 100644
--- a/tests/auto/qxmlsimplereader/xmldocs/not-wf/sa/124.xml.ref
+++ b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/124.xml.ref
diff --git a/tests/auto/qxmlsimplereader/xmldocs/not-wf/sa/125.xml b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/125.xml
index 5f9c22c0c6..5f9c22c0c6 100644
--- a/tests/auto/qxmlsimplereader/xmldocs/not-wf/sa/125.xml
+++ b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/125.xml
diff --git a/tests/auto/qxmlsimplereader/xmldocs/not-wf/sa/125.xml.ref b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/125.xml.ref
index b60c5515b1..b60c5515b1 100644
--- a/tests/auto/qxmlsimplereader/xmldocs/not-wf/sa/125.xml.ref
+++ b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/125.xml.ref
diff --git a/tests/auto/qxmlsimplereader/xmldocs/not-wf/sa/126.xml b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/126.xml
index 13e74d6d5e..13e74d6d5e 100644
--- a/tests/auto/qxmlsimplereader/xmldocs/not-wf/sa/126.xml
+++ b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/126.xml
diff --git a/tests/auto/qxmlsimplereader/xmldocs/not-wf/sa/126.xml.ref b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/126.xml.ref
index 03465a21d5..03465a21d5 100644
--- a/tests/auto/qxmlsimplereader/xmldocs/not-wf/sa/126.xml.ref
+++ b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/126.xml.ref
diff --git a/tests/auto/qxmlsimplereader/xmldocs/not-wf/sa/127.xml b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/127.xml
index a379b9e539..a379b9e539 100644
--- a/tests/auto/qxmlsimplereader/xmldocs/not-wf/sa/127.xml
+++ b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/127.xml
diff --git a/tests/auto/qxmlsimplereader/xmldocs/not-wf/sa/127.xml.ref b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/127.xml.ref
index 03465a21d5..03465a21d5 100644
--- a/tests/auto/qxmlsimplereader/xmldocs/not-wf/sa/127.xml.ref
+++ b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/127.xml.ref
diff --git a/tests/auto/qxmlsimplereader/xmldocs/not-wf/sa/128.xml b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/128.xml
index dd706bb21f..dd706bb21f 100644
--- a/tests/auto/qxmlsimplereader/xmldocs/not-wf/sa/128.xml
+++ b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/128.xml
diff --git a/tests/auto/qxmlsimplereader/xmldocs/not-wf/sa/128.xml.ref b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/128.xml.ref
index 45764a1653..45764a1653 100644
--- a/tests/auto/qxmlsimplereader/xmldocs/not-wf/sa/128.xml.ref
+++ b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/128.xml.ref
diff --git a/tests/auto/qxmlsimplereader/xmldocs/not-wf/sa/129.xml b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/129.xml
index d4e4461a6d..d4e4461a6d 100644
--- a/tests/auto/qxmlsimplereader/xmldocs/not-wf/sa/129.xml
+++ b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/129.xml
diff --git a/tests/auto/qxmlsimplereader/xmldocs/not-wf/sa/129.xml.ref b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/129.xml.ref
index 45764a1653..45764a1653 100644
--- a/tests/auto/qxmlsimplereader/xmldocs/not-wf/sa/129.xml.ref
+++ b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/129.xml.ref
diff --git a/tests/auto/qxmlsimplereader/xmldocs/not-wf/sa/130.xml b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/130.xml
index fa7be641f1..fa7be641f1 100644
--- a/tests/auto/qxmlsimplereader/xmldocs/not-wf/sa/130.xml
+++ b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/130.xml
diff --git a/tests/auto/qxmlsimplereader/xmldocs/not-wf/sa/130.xml.ref b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/130.xml.ref
index ad943c6e9e..ad943c6e9e 100644
--- a/tests/auto/qxmlsimplereader/xmldocs/not-wf/sa/130.xml.ref
+++ b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/130.xml.ref
diff --git a/tests/auto/qxmlsimplereader/xmldocs/not-wf/sa/131.xml b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/131.xml
index f34ed453b5..f34ed453b5 100644
--- a/tests/auto/qxmlsimplereader/xmldocs/not-wf/sa/131.xml
+++ b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/131.xml
diff --git a/tests/auto/qxmlsimplereader/xmldocs/not-wf/sa/131.xml.ref b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/131.xml.ref
index ad943c6e9e..ad943c6e9e 100644
--- a/tests/auto/qxmlsimplereader/xmldocs/not-wf/sa/131.xml.ref
+++ b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/131.xml.ref
diff --git a/tests/auto/qxmlsimplereader/xmldocs/not-wf/sa/132.xml b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/132.xml
index ab6cc416e9..ab6cc416e9 100644
--- a/tests/auto/qxmlsimplereader/xmldocs/not-wf/sa/132.xml
+++ b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/132.xml
diff --git a/tests/auto/qxmlsimplereader/xmldocs/not-wf/sa/132.xml.ref b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/132.xml.ref
index 37b53fc0b3..37b53fc0b3 100644
--- a/tests/auto/qxmlsimplereader/xmldocs/not-wf/sa/132.xml.ref
+++ b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/132.xml.ref
diff --git a/tests/auto/qxmlsimplereader/xmldocs/not-wf/sa/133.xml b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/133.xml
index d2aa604e9f..d2aa604e9f 100644
--- a/tests/auto/qxmlsimplereader/xmldocs/not-wf/sa/133.xml
+++ b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/133.xml
diff --git a/tests/auto/qxmlsimplereader/xmldocs/not-wf/sa/133.xml.ref b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/133.xml.ref
index d0b59c54cc..d0b59c54cc 100644
--- a/tests/auto/qxmlsimplereader/xmldocs/not-wf/sa/133.xml.ref
+++ b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/133.xml.ref
diff --git a/tests/auto/qxmlsimplereader/xmldocs/not-wf/sa/134.xml b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/134.xml
index c8919c5ef8..c8919c5ef8 100644
--- a/tests/auto/qxmlsimplereader/xmldocs/not-wf/sa/134.xml
+++ b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/134.xml
diff --git a/tests/auto/qxmlsimplereader/xmldocs/not-wf/sa/134.xml.ref b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/134.xml.ref
index 9da787c53b..9da787c53b 100644
--- a/tests/auto/qxmlsimplereader/xmldocs/not-wf/sa/134.xml.ref
+++ b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/134.xml.ref
diff --git a/tests/auto/qxmlsimplereader/xmldocs/not-wf/sa/135.xml b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/135.xml
index e639e8b6ea..e639e8b6ea 100644
--- a/tests/auto/qxmlsimplereader/xmldocs/not-wf/sa/135.xml
+++ b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/135.xml
diff --git a/tests/auto/qxmlsimplereader/xmldocs/not-wf/sa/135.xml.ref b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/135.xml.ref
index d0b59c54cc..d0b59c54cc 100644
--- a/tests/auto/qxmlsimplereader/xmldocs/not-wf/sa/135.xml.ref
+++ b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/135.xml.ref
diff --git a/tests/auto/qxmlsimplereader/xmldocs/not-wf/sa/136.xml b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/136.xml
index 499e68bcea..499e68bcea 100644
--- a/tests/auto/qxmlsimplereader/xmldocs/not-wf/sa/136.xml
+++ b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/136.xml
diff --git a/tests/auto/qxmlsimplereader/xmldocs/not-wf/sa/136.xml.ref b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/136.xml.ref
index 45764a1653..45764a1653 100644
--- a/tests/auto/qxmlsimplereader/xmldocs/not-wf/sa/136.xml.ref
+++ b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/136.xml.ref
diff --git a/tests/auto/qxmlsimplereader/xmldocs/not-wf/sa/137.xml b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/137.xml
index 723b77f776..723b77f776 100644
--- a/tests/auto/qxmlsimplereader/xmldocs/not-wf/sa/137.xml
+++ b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/137.xml
diff --git a/tests/auto/qxmlsimplereader/xmldocs/not-wf/sa/137.xml.ref b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/137.xml.ref
index 58b922aec8..58b922aec8 100644
--- a/tests/auto/qxmlsimplereader/xmldocs/not-wf/sa/137.xml.ref
+++ b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/137.xml.ref
diff --git a/tests/auto/qxmlsimplereader/xmldocs/not-wf/sa/138.xml b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/138.xml
index 16934cc88e..16934cc88e 100644
--- a/tests/auto/qxmlsimplereader/xmldocs/not-wf/sa/138.xml
+++ b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/138.xml
diff --git a/tests/auto/qxmlsimplereader/xmldocs/not-wf/sa/138.xml.ref b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/138.xml.ref
index 51b93a743e..51b93a743e 100644
--- a/tests/auto/qxmlsimplereader/xmldocs/not-wf/sa/138.xml.ref
+++ b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/138.xml.ref
diff --git a/tests/auto/qxmlsimplereader/xmldocs/not-wf/sa/139.xml b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/139.xml
index 34df52ed93..34df52ed93 100644
--- a/tests/auto/qxmlsimplereader/xmldocs/not-wf/sa/139.xml
+++ b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/139.xml
diff --git a/tests/auto/qxmlsimplereader/xmldocs/not-wf/sa/139.xml.ref b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/139.xml.ref
index 5344a45ef8..5344a45ef8 100644
--- a/tests/auto/qxmlsimplereader/xmldocs/not-wf/sa/139.xml.ref
+++ b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/139.xml.ref
diff --git a/tests/auto/qxmlsimplereader/xmldocs/not-wf/sa/140.xml b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/140.xml
index 467d5ed301..467d5ed301 100644
--- a/tests/auto/qxmlsimplereader/xmldocs/not-wf/sa/140.xml
+++ b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/140.xml
diff --git a/tests/auto/qxmlsimplereader/xmldocs/not-wf/sa/140.xml.ref b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/140.xml.ref
index 123df1a99c..123df1a99c 100644
--- a/tests/auto/qxmlsimplereader/xmldocs/not-wf/sa/140.xml.ref
+++ b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/140.xml.ref
diff --git a/tests/auto/qxmlsimplereader/xmldocs/not-wf/sa/141.xml b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/141.xml
index 409d0a7568..409d0a7568 100644
--- a/tests/auto/qxmlsimplereader/xmldocs/not-wf/sa/141.xml
+++ b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/141.xml
diff --git a/tests/auto/qxmlsimplereader/xmldocs/not-wf/sa/141.xml.ref b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/141.xml.ref
index 1b6d92115a..1b6d92115a 100644
--- a/tests/auto/qxmlsimplereader/xmldocs/not-wf/sa/141.xml.ref
+++ b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/141.xml.ref
diff --git a/tests/auto/qxmlsimplereader/xmldocs/not-wf/sa/142.xml b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/142.xml
index 20e88f88b3..20e88f88b3 100644
--- a/tests/auto/qxmlsimplereader/xmldocs/not-wf/sa/142.xml
+++ b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/142.xml
diff --git a/tests/auto/qxmlsimplereader/xmldocs/not-wf/sa/142.xml.ref b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/142.xml.ref
index 7ce4da6a06..7ce4da6a06 100644
--- a/tests/auto/qxmlsimplereader/xmldocs/not-wf/sa/142.xml.ref
+++ b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/142.xml.ref
diff --git a/tests/auto/qxmlsimplereader/xmldocs/not-wf/sa/143.xml b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/143.xml
index 0ee1c614f8..0ee1c614f8 100644
--- a/tests/auto/qxmlsimplereader/xmldocs/not-wf/sa/143.xml
+++ b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/143.xml
diff --git a/tests/auto/qxmlsimplereader/xmldocs/not-wf/sa/143.xml.ref b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/143.xml.ref
index 664bfb7111..664bfb7111 100644
--- a/tests/auto/qxmlsimplereader/xmldocs/not-wf/sa/143.xml.ref
+++ b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/143.xml.ref
diff --git a/tests/auto/qxmlsimplereader/xmldocs/not-wf/sa/144.xml b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/144.xml
index 437548c0ba..437548c0ba 100644
--- a/tests/auto/qxmlsimplereader/xmldocs/not-wf/sa/144.xml
+++ b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/144.xml
diff --git a/tests/auto/qxmlsimplereader/xmldocs/not-wf/sa/144.xml.ref b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/144.xml.ref
index 8d3143070d..8d3143070d 100644
--- a/tests/auto/qxmlsimplereader/xmldocs/not-wf/sa/144.xml.ref
+++ b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/144.xml.ref
diff --git a/tests/auto/qxmlsimplereader/xmldocs/not-wf/sa/145.xml b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/145.xml
index 71b187a933..71b187a933 100644
--- a/tests/auto/qxmlsimplereader/xmldocs/not-wf/sa/145.xml
+++ b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/145.xml
diff --git a/tests/auto/qxmlsimplereader/xmldocs/not-wf/sa/145.xml.ref b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/145.xml.ref
index 279ece7657..279ece7657 100644
--- a/tests/auto/qxmlsimplereader/xmldocs/not-wf/sa/145.xml.ref
+++ b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/145.xml.ref
diff --git a/tests/auto/qxmlsimplereader/xmldocs/not-wf/sa/146.xml b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/146.xml
index d0bfbca723..d0bfbca723 100644
--- a/tests/auto/qxmlsimplereader/xmldocs/not-wf/sa/146.xml
+++ b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/146.xml
diff --git a/tests/auto/qxmlsimplereader/xmldocs/not-wf/sa/146.xml.ref b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/146.xml.ref
index 7ce4da6a06..7ce4da6a06 100644
--- a/tests/auto/qxmlsimplereader/xmldocs/not-wf/sa/146.xml.ref
+++ b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/146.xml.ref
diff --git a/tests/auto/qxmlsimplereader/xmldocs/not-wf/sa/147.xml b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/147.xml
index 3b6145615f..3b6145615f 100644
--- a/tests/auto/qxmlsimplereader/xmldocs/not-wf/sa/147.xml
+++ b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/147.xml
diff --git a/tests/auto/qxmlsimplereader/xmldocs/not-wf/sa/147.xml.ref b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/147.xml.ref
index dd85a80374..dd85a80374 100644
--- a/tests/auto/qxmlsimplereader/xmldocs/not-wf/sa/147.xml.ref
+++ b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/147.xml.ref
diff --git a/tests/auto/qxmlsimplereader/xmldocs/not-wf/sa/148.xml b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/148.xml
index 774dce18fd..774dce18fd 100644
--- a/tests/auto/qxmlsimplereader/xmldocs/not-wf/sa/148.xml
+++ b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/148.xml
diff --git a/tests/auto/qxmlsimplereader/xmldocs/not-wf/sa/148.xml.ref b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/148.xml.ref
index 9b58eb0b49..9b58eb0b49 100644
--- a/tests/auto/qxmlsimplereader/xmldocs/not-wf/sa/148.xml.ref
+++ b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/148.xml.ref
diff --git a/tests/auto/qxmlsimplereader/xmldocs/not-wf/sa/149.xml b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/149.xml
index 725eea0dec..725eea0dec 100644
--- a/tests/auto/qxmlsimplereader/xmldocs/not-wf/sa/149.xml
+++ b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/149.xml
diff --git a/tests/auto/qxmlsimplereader/xmldocs/not-wf/sa/149.xml.ref b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/149.xml.ref
index aa73988e09..aa73988e09 100644
--- a/tests/auto/qxmlsimplereader/xmldocs/not-wf/sa/149.xml.ref
+++ b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/149.xml.ref
diff --git a/tests/auto/qxmlsimplereader/xmldocs/not-wf/sa/150.xml b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/150.xml
index 44f6b6df92..44f6b6df92 100644
--- a/tests/auto/qxmlsimplereader/xmldocs/not-wf/sa/150.xml
+++ b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/150.xml
diff --git a/tests/auto/qxmlsimplereader/xmldocs/not-wf/sa/150.xml.ref b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/150.xml.ref
index 2bc5abe271..2bc5abe271 100644
--- a/tests/auto/qxmlsimplereader/xmldocs/not-wf/sa/150.xml.ref
+++ b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/150.xml.ref
diff --git a/tests/auto/qxmlsimplereader/xmldocs/not-wf/sa/151.xml b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/151.xml
index fecc4f24e3..fecc4f24e3 100644
--- a/tests/auto/qxmlsimplereader/xmldocs/not-wf/sa/151.xml
+++ b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/151.xml
diff --git a/tests/auto/qxmlsimplereader/xmldocs/not-wf/sa/151.xml.ref b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/151.xml.ref
index e5d98b1232..e5d98b1232 100644
--- a/tests/auto/qxmlsimplereader/xmldocs/not-wf/sa/151.xml.ref
+++ b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/151.xml.ref
diff --git a/tests/auto/qxmlsimplereader/xmldocs/not-wf/sa/152.xml b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/152.xml
index b5c5cb26ae..b5c5cb26ae 100644
--- a/tests/auto/qxmlsimplereader/xmldocs/not-wf/sa/152.xml
+++ b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/152.xml
diff --git a/tests/auto/qxmlsimplereader/xmldocs/not-wf/sa/152.xml.ref b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/152.xml.ref
index 8852f79579..8852f79579 100644
--- a/tests/auto/qxmlsimplereader/xmldocs/not-wf/sa/152.xml.ref
+++ b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/152.xml.ref
diff --git a/tests/auto/qxmlsimplereader/xmldocs/not-wf/sa/153.xml b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/153.xml
index 5e2973707e..5e2973707e 100644
--- a/tests/auto/qxmlsimplereader/xmldocs/not-wf/sa/153.xml
+++ b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/153.xml
diff --git a/tests/auto/qxmlsimplereader/xmldocs/not-wf/sa/153.xml.ref b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/153.xml.ref
index 1198fe07c6..1198fe07c6 100644
--- a/tests/auto/qxmlsimplereader/xmldocs/not-wf/sa/153.xml.ref
+++ b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/153.xml.ref
diff --git a/tests/auto/qxmlsimplereader/xmldocs/not-wf/sa/154.xml b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/154.xml
index 96e01d63f5..96e01d63f5 100644
--- a/tests/auto/qxmlsimplereader/xmldocs/not-wf/sa/154.xml
+++ b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/154.xml
diff --git a/tests/auto/qxmlsimplereader/xmldocs/not-wf/sa/154.xml.ref b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/154.xml.ref
index 74a9eb1488..74a9eb1488 100644
--- a/tests/auto/qxmlsimplereader/xmldocs/not-wf/sa/154.xml.ref
+++ b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/154.xml.ref
diff --git a/tests/auto/qxmlsimplereader/xmldocs/not-wf/sa/155.xml b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/155.xml
index 4f16d0f163..4f16d0f163 100644
--- a/tests/auto/qxmlsimplereader/xmldocs/not-wf/sa/155.xml
+++ b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/155.xml
diff --git a/tests/auto/qxmlsimplereader/xmldocs/not-wf/sa/155.xml.ref b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/155.xml.ref
index 74a9eb1488..74a9eb1488 100644
--- a/tests/auto/qxmlsimplereader/xmldocs/not-wf/sa/155.xml.ref
+++ b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/155.xml.ref
diff --git a/tests/auto/qxmlsimplereader/xmldocs/not-wf/sa/156.xml b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/156.xml
index c6d93fd312..c6d93fd312 100644
--- a/tests/auto/qxmlsimplereader/xmldocs/not-wf/sa/156.xml
+++ b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/156.xml
diff --git a/tests/auto/qxmlsimplereader/xmldocs/not-wf/sa/156.xml.ref b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/156.xml.ref
index 2bc5abe271..2bc5abe271 100644
--- a/tests/auto/qxmlsimplereader/xmldocs/not-wf/sa/156.xml.ref
+++ b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/156.xml.ref
diff --git a/tests/auto/qxmlsimplereader/xmldocs/not-wf/sa/157.xml b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/157.xml
index 2f058dac3e..2f058dac3e 100644
--- a/tests/auto/qxmlsimplereader/xmldocs/not-wf/sa/157.xml
+++ b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/157.xml
diff --git a/tests/auto/qxmlsimplereader/xmldocs/not-wf/sa/157.xml.ref b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/157.xml.ref
index 2bc5abe271..2bc5abe271 100644
--- a/tests/auto/qxmlsimplereader/xmldocs/not-wf/sa/157.xml.ref
+++ b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/157.xml.ref
diff --git a/tests/auto/qxmlsimplereader/xmldocs/not-wf/sa/158.xml b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/158.xml
index 32b90b722d..32b90b722d 100644
--- a/tests/auto/qxmlsimplereader/xmldocs/not-wf/sa/158.xml
+++ b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/158.xml
diff --git a/tests/auto/qxmlsimplereader/xmldocs/not-wf/sa/158.xml.ref b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/158.xml.ref
index 38210c24da..38210c24da 100644
--- a/tests/auto/qxmlsimplereader/xmldocs/not-wf/sa/158.xml.ref
+++ b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/158.xml.ref
diff --git a/tests/auto/qxmlsimplereader/xmldocs/not-wf/sa/159.xml b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/159.xml
index 066244cb91..066244cb91 100644
--- a/tests/auto/qxmlsimplereader/xmldocs/not-wf/sa/159.xml
+++ b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/159.xml
diff --git a/tests/auto/qxmlsimplereader/xmldocs/not-wf/sa/159.xml.ref b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/159.xml.ref
index f044a71dd9..f044a71dd9 100644
--- a/tests/auto/qxmlsimplereader/xmldocs/not-wf/sa/159.xml.ref
+++ b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/159.xml.ref
diff --git a/tests/auto/qxmlsimplereader/xmldocs/not-wf/sa/160.xml b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/160.xml
index 85424acb1b..85424acb1b 100644
--- a/tests/auto/qxmlsimplereader/xmldocs/not-wf/sa/160.xml
+++ b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/160.xml
diff --git a/tests/auto/qxmlsimplereader/xmldocs/not-wf/sa/160.xml.ref b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/160.xml.ref
index 0c1afe80b8..0c1afe80b8 100644
--- a/tests/auto/qxmlsimplereader/xmldocs/not-wf/sa/160.xml.ref
+++ b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/160.xml.ref
diff --git a/tests/auto/qxmlsimplereader/xmldocs/not-wf/sa/161.xml b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/161.xml
index 4f8a5b7b6b..4f8a5b7b6b 100644
--- a/tests/auto/qxmlsimplereader/xmldocs/not-wf/sa/161.xml
+++ b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/161.xml
diff --git a/tests/auto/qxmlsimplereader/xmldocs/not-wf/sa/161.xml.ref b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/161.xml.ref
index 35ee5e8c6c..35ee5e8c6c 100644
--- a/tests/auto/qxmlsimplereader/xmldocs/not-wf/sa/161.xml.ref
+++ b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/161.xml.ref
diff --git a/tests/auto/qxmlsimplereader/xmldocs/not-wf/sa/162.xml b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/162.xml
index efae4b190e..efae4b190e 100644
--- a/tests/auto/qxmlsimplereader/xmldocs/not-wf/sa/162.xml
+++ b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/162.xml
diff --git a/tests/auto/qxmlsimplereader/xmldocs/not-wf/sa/162.xml.ref b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/162.xml.ref
index a802c74aed..a802c74aed 100644
--- a/tests/auto/qxmlsimplereader/xmldocs/not-wf/sa/162.xml.ref
+++ b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/162.xml.ref
diff --git a/tests/auto/qxmlsimplereader/xmldocs/not-wf/sa/163.xml b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/163.xml
index e14fb76c31..e14fb76c31 100644
--- a/tests/auto/qxmlsimplereader/xmldocs/not-wf/sa/163.xml
+++ b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/163.xml
diff --git a/tests/auto/qxmlsimplereader/xmldocs/not-wf/sa/163.xml.ref b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/163.xml.ref
index e4c32252dd..e4c32252dd 100644
--- a/tests/auto/qxmlsimplereader/xmldocs/not-wf/sa/163.xml.ref
+++ b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/163.xml.ref
diff --git a/tests/auto/qxmlsimplereader/xmldocs/not-wf/sa/164.xml b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/164.xml
index 98dd267c21..98dd267c21 100644
--- a/tests/auto/qxmlsimplereader/xmldocs/not-wf/sa/164.xml
+++ b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/164.xml
diff --git a/tests/auto/qxmlsimplereader/xmldocs/not-wf/sa/164.xml.ref b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/164.xml.ref
index 80314341d6..80314341d6 100644
--- a/tests/auto/qxmlsimplereader/xmldocs/not-wf/sa/164.xml.ref
+++ b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/164.xml.ref
diff --git a/tests/auto/qxmlsimplereader/xmldocs/not-wf/sa/165.xml b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/165.xml
index 36c04618ef..36c04618ef 100644
--- a/tests/auto/qxmlsimplereader/xmldocs/not-wf/sa/165.xml
+++ b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/165.xml
diff --git a/tests/auto/qxmlsimplereader/xmldocs/not-wf/sa/165.xml.ref b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/165.xml.ref
index 64fd8b4d0d..64fd8b4d0d 100644
--- a/tests/auto/qxmlsimplereader/xmldocs/not-wf/sa/165.xml.ref
+++ b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/165.xml.ref
diff --git a/tests/auto/qxmlsimplereader/xmldocs/not-wf/sa/166.xml b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/166.xml
index ee2ce28630..ee2ce28630 100644
--- a/tests/auto/qxmlsimplereader/xmldocs/not-wf/sa/166.xml
+++ b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/166.xml
diff --git a/tests/auto/qxmlsimplereader/xmldocs/not-wf/sa/166.xml.ref b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/166.xml.ref
index dca4f7b1cd..dca4f7b1cd 100644
--- a/tests/auto/qxmlsimplereader/xmldocs/not-wf/sa/166.xml.ref
+++ b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/166.xml.ref
diff --git a/tests/auto/qxmlsimplereader/xmldocs/not-wf/sa/167.xml b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/167.xml
index 9bdc6c1278..9bdc6c1278 100644
--- a/tests/auto/qxmlsimplereader/xmldocs/not-wf/sa/167.xml
+++ b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/167.xml
diff --git a/tests/auto/qxmlsimplereader/xmldocs/not-wf/sa/167.xml.ref b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/167.xml.ref
index dca4f7b1cd..dca4f7b1cd 100644
--- a/tests/auto/qxmlsimplereader/xmldocs/not-wf/sa/167.xml.ref
+++ b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/167.xml.ref
diff --git a/tests/auto/qxmlsimplereader/xmldocs/not-wf/sa/168.xml b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/168.xml
index f83221a3ad..f83221a3ad 100644
--- a/tests/auto/qxmlsimplereader/xmldocs/not-wf/sa/168.xml
+++ b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/168.xml
diff --git a/tests/auto/qxmlsimplereader/xmldocs/not-wf/sa/168.xml.ref b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/168.xml.ref
index 61659843c1..61659843c1 100644
--- a/tests/auto/qxmlsimplereader/xmldocs/not-wf/sa/168.xml.ref
+++ b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/168.xml.ref
diff --git a/tests/auto/qxmlsimplereader/xmldocs/not-wf/sa/169.xml b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/169.xml
index 310029b976..310029b976 100644
--- a/tests/auto/qxmlsimplereader/xmldocs/not-wf/sa/169.xml
+++ b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/169.xml
diff --git a/tests/auto/qxmlsimplereader/xmldocs/not-wf/sa/169.xml.ref b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/169.xml.ref
index 78385bd8bc..78385bd8bc 100644
--- a/tests/auto/qxmlsimplereader/xmldocs/not-wf/sa/169.xml.ref
+++ b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/169.xml.ref
diff --git a/tests/auto/qxmlsimplereader/xmldocs/not-wf/sa/170.xml b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/170.xml
index cfa0aee155..cfa0aee155 100644
--- a/tests/auto/qxmlsimplereader/xmldocs/not-wf/sa/170.xml
+++ b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/170.xml
diff --git a/tests/auto/qxmlsimplereader/xmldocs/not-wf/sa/170.xml.ref b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/170.xml.ref
index 0508ee88c7..0508ee88c7 100644
--- a/tests/auto/qxmlsimplereader/xmldocs/not-wf/sa/170.xml.ref
+++ b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/170.xml.ref
diff --git a/tests/auto/qxmlsimplereader/xmldocs/not-wf/sa/171.xml b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/171.xml
index 48b5c7d3bc..48b5c7d3bc 100644
--- a/tests/auto/qxmlsimplereader/xmldocs/not-wf/sa/171.xml
+++ b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/171.xml
diff --git a/tests/auto/qxmlsimplereader/xmldocs/not-wf/sa/171.xml.ref b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/171.xml.ref
index f729ad3da3..f729ad3da3 100644
--- a/tests/auto/qxmlsimplereader/xmldocs/not-wf/sa/171.xml.ref
+++ b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/171.xml.ref
diff --git a/tests/auto/qxmlsimplereader/xmldocs/not-wf/sa/172.xml b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/172.xml
index 6651d4d299..6651d4d299 100644
--- a/tests/auto/qxmlsimplereader/xmldocs/not-wf/sa/172.xml
+++ b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/172.xml
diff --git a/tests/auto/qxmlsimplereader/xmldocs/not-wf/sa/172.xml.ref b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/172.xml.ref
index f729ad3da3..f729ad3da3 100644
--- a/tests/auto/qxmlsimplereader/xmldocs/not-wf/sa/172.xml.ref
+++ b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/172.xml.ref
diff --git a/tests/auto/qxmlsimplereader/xmldocs/not-wf/sa/173.xml b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/173.xml
index f9f9f42023..f9f9f42023 100644
--- a/tests/auto/qxmlsimplereader/xmldocs/not-wf/sa/173.xml
+++ b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/173.xml
diff --git a/tests/auto/qxmlsimplereader/xmldocs/not-wf/sa/173.xml.ref b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/173.xml.ref
index cda5d63d26..cda5d63d26 100644
--- a/tests/auto/qxmlsimplereader/xmldocs/not-wf/sa/173.xml.ref
+++ b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/173.xml.ref
diff --git a/tests/auto/qxmlsimplereader/xmldocs/not-wf/sa/174.xml b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/174.xml
index 42bef861c6..42bef861c6 100644
--- a/tests/auto/qxmlsimplereader/xmldocs/not-wf/sa/174.xml
+++ b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/174.xml
diff --git a/tests/auto/qxmlsimplereader/xmldocs/not-wf/sa/174.xml.ref b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/174.xml.ref
index 5f23fbdcdb..5f23fbdcdb 100644
--- a/tests/auto/qxmlsimplereader/xmldocs/not-wf/sa/174.xml.ref
+++ b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/174.xml.ref
diff --git a/tests/auto/qxmlsimplereader/xmldocs/not-wf/sa/175.xml b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/175.xml
index 69912f36d2..69912f36d2 100644
--- a/tests/auto/qxmlsimplereader/xmldocs/not-wf/sa/175.xml
+++ b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/175.xml
diff --git a/tests/auto/qxmlsimplereader/xmldocs/not-wf/sa/175.xml.ref b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/175.xml.ref
index 27549bc7de..27549bc7de 100644
--- a/tests/auto/qxmlsimplereader/xmldocs/not-wf/sa/175.xml.ref
+++ b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/175.xml.ref
diff --git a/tests/auto/qxmlsimplereader/xmldocs/not-wf/sa/176.xml b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/176.xml
index 39153ad5a8..39153ad5a8 100644
--- a/tests/auto/qxmlsimplereader/xmldocs/not-wf/sa/176.xml
+++ b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/176.xml
diff --git a/tests/auto/qxmlsimplereader/xmldocs/not-wf/sa/176.xml.ref b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/176.xml.ref
index 4348506993..4348506993 100644
--- a/tests/auto/qxmlsimplereader/xmldocs/not-wf/sa/176.xml.ref
+++ b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/176.xml.ref
diff --git a/tests/auto/qxmlsimplereader/xmldocs/not-wf/sa/177.xml b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/177.xml
index 6bc8228879..6bc8228879 100644
--- a/tests/auto/qxmlsimplereader/xmldocs/not-wf/sa/177.xml
+++ b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/177.xml
diff --git a/tests/auto/qxmlsimplereader/xmldocs/not-wf/sa/177.xml.ref b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/177.xml.ref
index 94f3c3b9e5..94f3c3b9e5 100644
--- a/tests/auto/qxmlsimplereader/xmldocs/not-wf/sa/177.xml.ref
+++ b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/177.xml.ref
diff --git a/tests/auto/qxmlsimplereader/xmldocs/not-wf/sa/178.xml b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/178.xml
index e8f2d18eed..e8f2d18eed 100644
--- a/tests/auto/qxmlsimplereader/xmldocs/not-wf/sa/178.xml
+++ b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/178.xml
diff --git a/tests/auto/qxmlsimplereader/xmldocs/not-wf/sa/178.xml.ref b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/178.xml.ref
index 5aae44a1bf..5aae44a1bf 100644
--- a/tests/auto/qxmlsimplereader/xmldocs/not-wf/sa/178.xml.ref
+++ b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/178.xml.ref
diff --git a/tests/auto/qxmlsimplereader/xmldocs/not-wf/sa/179.xml b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/179.xml
index e8f1f419db..e8f1f419db 100644
--- a/tests/auto/qxmlsimplereader/xmldocs/not-wf/sa/179.xml
+++ b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/179.xml
diff --git a/tests/auto/qxmlsimplereader/xmldocs/not-wf/sa/179.xml.ref b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/179.xml.ref
index a4c6cffd5d..a4c6cffd5d 100644
--- a/tests/auto/qxmlsimplereader/xmldocs/not-wf/sa/179.xml.ref
+++ b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/179.xml.ref
diff --git a/tests/auto/qxmlsimplereader/xmldocs/not-wf/sa/180.xml b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/180.xml
index 569d553a8c..569d553a8c 100644
--- a/tests/auto/qxmlsimplereader/xmldocs/not-wf/sa/180.xml
+++ b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/180.xml
diff --git a/tests/auto/qxmlsimplereader/xmldocs/not-wf/sa/180.xml.ref b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/180.xml.ref
index 42542d990e..42542d990e 100644
--- a/tests/auto/qxmlsimplereader/xmldocs/not-wf/sa/180.xml.ref
+++ b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/180.xml.ref
diff --git a/tests/auto/qxmlsimplereader/xmldocs/not-wf/sa/181.xml b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/181.xml
index 4341d99ee2..4341d99ee2 100644
--- a/tests/auto/qxmlsimplereader/xmldocs/not-wf/sa/181.xml
+++ b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/181.xml
diff --git a/tests/auto/qxmlsimplereader/xmldocs/not-wf/sa/181.xml.ref b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/181.xml.ref
index 8e1b4457fc..8e1b4457fc 100644
--- a/tests/auto/qxmlsimplereader/xmldocs/not-wf/sa/181.xml.ref
+++ b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/181.xml.ref
diff --git a/tests/auto/qxmlsimplereader/xmldocs/not-wf/sa/182.xml b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/182.xml
index 920f431666..920f431666 100644
--- a/tests/auto/qxmlsimplereader/xmldocs/not-wf/sa/182.xml
+++ b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/182.xml
diff --git a/tests/auto/qxmlsimplereader/xmldocs/not-wf/sa/182.xml.ref b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/182.xml.ref
index abb11afa92..abb11afa92 100644
--- a/tests/auto/qxmlsimplereader/xmldocs/not-wf/sa/182.xml.ref
+++ b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/182.xml.ref
diff --git a/tests/auto/qxmlsimplereader/xmldocs/not-wf/sa/183.xml b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/183.xml
index 7a5677de54..7a5677de54 100644
--- a/tests/auto/qxmlsimplereader/xmldocs/not-wf/sa/183.xml
+++ b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/183.xml
diff --git a/tests/auto/qxmlsimplereader/xmldocs/not-wf/sa/183.xml.ref b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/183.xml.ref
index d49ec689aa..d49ec689aa 100644
--- a/tests/auto/qxmlsimplereader/xmldocs/not-wf/sa/183.xml.ref
+++ b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/183.xml.ref
diff --git a/tests/auto/qxmlsimplereader/xmldocs/not-wf/sa/184.xml b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/184.xml
index 103384a06e..103384a06e 100644
--- a/tests/auto/qxmlsimplereader/xmldocs/not-wf/sa/184.xml
+++ b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/184.xml
diff --git a/tests/auto/qxmlsimplereader/xmldocs/not-wf/sa/184.xml.ref b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/184.xml.ref
index 8d879bf2e6..8d879bf2e6 100644
--- a/tests/auto/qxmlsimplereader/xmldocs/not-wf/sa/184.xml.ref
+++ b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/184.xml.ref
diff --git a/tests/auto/qxmlsimplereader/xmldocs/not-wf/sa/185.ent b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/185.ent
index e557426454..e557426454 100644
--- a/tests/auto/qxmlsimplereader/xmldocs/not-wf/sa/185.ent
+++ b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/185.ent
diff --git a/tests/auto/qxmlsimplereader/xmldocs/not-wf/sa/185.xml b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/185.xml
index 81d5ef4bcd..81d5ef4bcd 100644
--- a/tests/auto/qxmlsimplereader/xmldocs/not-wf/sa/185.xml
+++ b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/185.xml
diff --git a/tests/auto/qxmlsimplereader/xmldocs/not-wf/sa/185.xml.ref b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/185.xml.ref
index 7f5838399b..7f5838399b 100644
--- a/tests/auto/qxmlsimplereader/xmldocs/not-wf/sa/185.xml.ref
+++ b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/185.xml.ref
diff --git a/tests/auto/qxmlsimplereader/xmldocs/not-wf/sa/186.xml b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/186.xml
index 85b26ec0a2..85b26ec0a2 100644
--- a/tests/auto/qxmlsimplereader/xmldocs/not-wf/sa/186.xml
+++ b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/186.xml
diff --git a/tests/auto/qxmlsimplereader/xmldocs/not-wf/sa/186.xml.ref b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/186.xml.ref
index 63d0d3e3f6..63d0d3e3f6 100644
--- a/tests/auto/qxmlsimplereader/xmldocs/not-wf/sa/186.xml.ref
+++ b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/186.xml.ref
diff --git a/tests/auto/qxmlsimplereader/xmldocs/not-wf/sa/null.ent b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/null.ent
index e69de29bb2..e69de29bb2 100644
--- a/tests/auto/qxmlsimplereader/xmldocs/not-wf/sa/null.ent
+++ b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/null.ent
diff --git a/tests/auto/qxmlsimplereader/xmldocs/valid/ext-sa/001.ent b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/ext-sa/001.ent
index 1cff3fd44f..1cff3fd44f 100755
--- a/tests/auto/qxmlsimplereader/xmldocs/valid/ext-sa/001.ent
+++ b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/ext-sa/001.ent
diff --git a/tests/auto/qxmlsimplereader/xmldocs/valid/ext-sa/001.xml b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/ext-sa/001.xml
index 147d70d2d1..147d70d2d1 100644
--- a/tests/auto/qxmlsimplereader/xmldocs/valid/ext-sa/001.xml
+++ b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/ext-sa/001.xml
diff --git a/tests/auto/qxmlsimplereader/xmldocs/valid/ext-sa/001.xml.ref b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/ext-sa/001.xml.ref
index 355c937e11..355c937e11 100644
--- a/tests/auto/qxmlsimplereader/xmldocs/valid/ext-sa/001.xml.ref
+++ b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/ext-sa/001.xml.ref
diff --git a/tests/auto/qxmlsimplereader/xmldocs/valid/ext-sa/002.ent b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/ext-sa/002.ent
index 45f6d8e74e..45f6d8e74e 100755
--- a/tests/auto/qxmlsimplereader/xmldocs/valid/ext-sa/002.ent
+++ b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/ext-sa/002.ent
diff --git a/tests/auto/qxmlsimplereader/xmldocs/valid/ext-sa/002.xml b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/ext-sa/002.xml
index 9eaf91724f..9eaf91724f 100644
--- a/tests/auto/qxmlsimplereader/xmldocs/valid/ext-sa/002.xml
+++ b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/ext-sa/002.xml
diff --git a/tests/auto/qxmlsimplereader/xmldocs/valid/ext-sa/002.xml.ref b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/ext-sa/002.xml.ref
index f843995646..f843995646 100644
--- a/tests/auto/qxmlsimplereader/xmldocs/valid/ext-sa/002.xml.ref
+++ b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/ext-sa/002.xml.ref
diff --git a/tests/auto/qxmlsimplereader/xmldocs/valid/ext-sa/003.ent b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/ext-sa/003.ent
index e69de29bb2..e69de29bb2 100644
--- a/tests/auto/qxmlsimplereader/xmldocs/valid/ext-sa/003.ent
+++ b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/ext-sa/003.ent
diff --git a/tests/auto/qxmlsimplereader/xmldocs/valid/ext-sa/003.xml b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/ext-sa/003.xml
index bb60b663ef..bb60b663ef 100644
--- a/tests/auto/qxmlsimplereader/xmldocs/valid/ext-sa/003.xml
+++ b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/ext-sa/003.xml
diff --git a/tests/auto/qxmlsimplereader/xmldocs/valid/ext-sa/003.xml.ref b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/ext-sa/003.xml.ref
index 79d3531637..79d3531637 100644
--- a/tests/auto/qxmlsimplereader/xmldocs/valid/ext-sa/003.xml.ref
+++ b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/ext-sa/003.xml.ref
diff --git a/tests/auto/qxmlsimplereader/xmldocs/valid/ext-sa/004.ent b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/ext-sa/004.ent
index 3436f20001..3436f20001 100755
--- a/tests/auto/qxmlsimplereader/xmldocs/valid/ext-sa/004.ent
+++ b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/ext-sa/004.ent
diff --git a/tests/auto/qxmlsimplereader/xmldocs/valid/ext-sa/004.xml b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/ext-sa/004.xml
index 074498ce19..074498ce19 100644
--- a/tests/auto/qxmlsimplereader/xmldocs/valid/ext-sa/004.xml
+++ b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/ext-sa/004.xml
diff --git a/tests/auto/qxmlsimplereader/xmldocs/valid/ext-sa/004.xml.ref b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/ext-sa/004.xml.ref
index 38abcb2fc6..38abcb2fc6 100644
--- a/tests/auto/qxmlsimplereader/xmldocs/valid/ext-sa/004.xml.ref
+++ b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/ext-sa/004.xml.ref
diff --git a/tests/auto/qxmlsimplereader/xmldocs/valid/ext-sa/005.ent b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/ext-sa/005.ent
index c6e97f821f..c6e97f821f 100755
--- a/tests/auto/qxmlsimplereader/xmldocs/valid/ext-sa/005.ent
+++ b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/ext-sa/005.ent
diff --git a/tests/auto/qxmlsimplereader/xmldocs/valid/ext-sa/005.xml b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/ext-sa/005.xml
index 82a6228205..82a6228205 100644
--- a/tests/auto/qxmlsimplereader/xmldocs/valid/ext-sa/005.xml
+++ b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/ext-sa/005.xml
diff --git a/tests/auto/qxmlsimplereader/xmldocs/valid/ext-sa/005.xml.ref b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/ext-sa/005.xml.ref
index 2601030f2a..2601030f2a 100644
--- a/tests/auto/qxmlsimplereader/xmldocs/valid/ext-sa/005.xml.ref
+++ b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/ext-sa/005.xml.ref
diff --git a/tests/auto/qxmlsimplereader/xmldocs/valid/ext-sa/006.ent b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/ext-sa/006.ent
index 4df2f0c2ac..4df2f0c2ac 100755
--- a/tests/auto/qxmlsimplereader/xmldocs/valid/ext-sa/006.ent
+++ b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/ext-sa/006.ent
diff --git a/tests/auto/qxmlsimplereader/xmldocs/valid/ext-sa/006.xml b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/ext-sa/006.xml
index 0b326cad4c..0b326cad4c 100644
--- a/tests/auto/qxmlsimplereader/xmldocs/valid/ext-sa/006.xml
+++ b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/ext-sa/006.xml
diff --git a/tests/auto/qxmlsimplereader/xmldocs/valid/ext-sa/006.xml.ref b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/ext-sa/006.xml.ref
index 17fd238b67..17fd238b67 100644
--- a/tests/auto/qxmlsimplereader/xmldocs/valid/ext-sa/006.xml.ref
+++ b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/ext-sa/006.xml.ref
diff --git a/tests/auto/qxmlsimplereader/xmldocs/valid/ext-sa/007.ent b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/ext-sa/007.ent
index ab1d696dd7..ab1d696dd7 100755
--- a/tests/auto/qxmlsimplereader/xmldocs/valid/ext-sa/007.ent
+++ b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/ext-sa/007.ent
diff --git a/tests/auto/qxmlsimplereader/xmldocs/valid/ext-sa/007.xml b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/ext-sa/007.xml
index 825e3b286a..825e3b286a 100644
--- a/tests/auto/qxmlsimplereader/xmldocs/valid/ext-sa/007.xml
+++ b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/ext-sa/007.xml
diff --git a/tests/auto/qxmlsimplereader/xmldocs/valid/ext-sa/007.xml.ref b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/ext-sa/007.xml.ref
index 81e7ccdaf3..81e7ccdaf3 100644
--- a/tests/auto/qxmlsimplereader/xmldocs/valid/ext-sa/007.xml.ref
+++ b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/ext-sa/007.xml.ref
diff --git a/tests/auto/qxmlsimplereader/xmldocs/valid/ext-sa/008.ent b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/ext-sa/008.ent
index c6ca61f9c8..c6ca61f9c8 100755
--- a/tests/auto/qxmlsimplereader/xmldocs/valid/ext-sa/008.ent
+++ b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/ext-sa/008.ent
diff --git a/tests/auto/qxmlsimplereader/xmldocs/valid/ext-sa/008.xml b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/ext-sa/008.xml
index 3c001b6cb3..3c001b6cb3 100644
--- a/tests/auto/qxmlsimplereader/xmldocs/valid/ext-sa/008.xml
+++ b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/ext-sa/008.xml
diff --git a/tests/auto/qxmlsimplereader/xmldocs/valid/ext-sa/008.xml.ref b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/ext-sa/008.xml.ref
index eb7f1086e1..eb7f1086e1 100644
--- a/tests/auto/qxmlsimplereader/xmldocs/valid/ext-sa/008.xml.ref
+++ b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/ext-sa/008.xml.ref
diff --git a/tests/auto/qxmlsimplereader/xmldocs/valid/ext-sa/009.ent b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/ext-sa/009.ent
index 67c3297611..67c3297611 100755
--- a/tests/auto/qxmlsimplereader/xmldocs/valid/ext-sa/009.ent
+++ b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/ext-sa/009.ent
diff --git a/tests/auto/qxmlsimplereader/xmldocs/valid/ext-sa/009.xml b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/ext-sa/009.xml
index a5866e5a77..a5866e5a77 100644
--- a/tests/auto/qxmlsimplereader/xmldocs/valid/ext-sa/009.xml
+++ b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/ext-sa/009.xml
diff --git a/tests/auto/qxmlsimplereader/xmldocs/valid/ext-sa/009.xml.ref b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/ext-sa/009.xml.ref
index 5c294de017..5c294de017 100644
--- a/tests/auto/qxmlsimplereader/xmldocs/valid/ext-sa/009.xml.ref
+++ b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/ext-sa/009.xml.ref
diff --git a/tests/auto/qxmlsimplereader/xmldocs/valid/ext-sa/010.ent b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/ext-sa/010.ent
index e69de29bb2..e69de29bb2 100644
--- a/tests/auto/qxmlsimplereader/xmldocs/valid/ext-sa/010.ent
+++ b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/ext-sa/010.ent
diff --git a/tests/auto/qxmlsimplereader/xmldocs/valid/ext-sa/010.xml b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/ext-sa/010.xml
index 418e9b0141..418e9b0141 100644
--- a/tests/auto/qxmlsimplereader/xmldocs/valid/ext-sa/010.xml
+++ b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/ext-sa/010.xml
diff --git a/tests/auto/qxmlsimplereader/xmldocs/valid/ext-sa/010.xml.ref b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/ext-sa/010.xml.ref
index 4dc03c6dba..4dc03c6dba 100644
--- a/tests/auto/qxmlsimplereader/xmldocs/valid/ext-sa/010.xml.ref
+++ b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/ext-sa/010.xml.ref
diff --git a/tests/auto/qxmlsimplereader/xmldocs/valid/ext-sa/011.ent b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/ext-sa/011.ent
index b19be3a497..b19be3a497 100755
--- a/tests/auto/qxmlsimplereader/xmldocs/valid/ext-sa/011.ent
+++ b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/ext-sa/011.ent
diff --git a/tests/auto/qxmlsimplereader/xmldocs/valid/ext-sa/011.xml b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/ext-sa/011.xml
index 2ceefa1d21..2ceefa1d21 100644
--- a/tests/auto/qxmlsimplereader/xmldocs/valid/ext-sa/011.xml
+++ b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/ext-sa/011.xml
diff --git a/tests/auto/qxmlsimplereader/xmldocs/valid/ext-sa/011.xml.ref b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/ext-sa/011.xml.ref
index c078139d84..c078139d84 100644
--- a/tests/auto/qxmlsimplereader/xmldocs/valid/ext-sa/011.xml.ref
+++ b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/ext-sa/011.xml.ref
diff --git a/tests/auto/qxmlsimplereader/xmldocs/valid/ext-sa/012.ent b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/ext-sa/012.ent
index 8eb1fb9c41..8eb1fb9c41 100755
--- a/tests/auto/qxmlsimplereader/xmldocs/valid/ext-sa/012.ent
+++ b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/ext-sa/012.ent
diff --git a/tests/auto/qxmlsimplereader/xmldocs/valid/ext-sa/012.xml b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/ext-sa/012.xml
index 5a8f009b4a..5a8f009b4a 100644
--- a/tests/auto/qxmlsimplereader/xmldocs/valid/ext-sa/012.xml
+++ b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/ext-sa/012.xml
diff --git a/tests/auto/qxmlsimplereader/xmldocs/valid/ext-sa/012.xml.ref b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/ext-sa/012.xml.ref
index 2af77a3b99..2af77a3b99 100644
--- a/tests/auto/qxmlsimplereader/xmldocs/valid/ext-sa/012.xml.ref
+++ b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/ext-sa/012.xml.ref
diff --git a/tests/auto/qxmlsimplereader/xmldocs/valid/ext-sa/013.ent b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/ext-sa/013.ent
index 7f25c502dd..7f25c502dd 100755
--- a/tests/auto/qxmlsimplereader/xmldocs/valid/ext-sa/013.ent
+++ b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/ext-sa/013.ent
diff --git a/tests/auto/qxmlsimplereader/xmldocs/valid/ext-sa/013.xml b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/ext-sa/013.xml
index 7717c97afe..7717c97afe 100644
--- a/tests/auto/qxmlsimplereader/xmldocs/valid/ext-sa/013.xml
+++ b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/ext-sa/013.xml
diff --git a/tests/auto/qxmlsimplereader/xmldocs/valid/ext-sa/013.xml.ref b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/ext-sa/013.xml.ref
index 92fb65a2d2..92fb65a2d2 100644
--- a/tests/auto/qxmlsimplereader/xmldocs/valid/ext-sa/013.xml.ref
+++ b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/ext-sa/013.xml.ref
diff --git a/tests/auto/qxmlsimplereader/xmldocs/valid/ext-sa/014.ent b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/ext-sa/014.ent
index 470fd6fe44..470fd6fe44 100755
--- a/tests/auto/qxmlsimplereader/xmldocs/valid/ext-sa/014.ent
+++ b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/ext-sa/014.ent
diff --git a/tests/auto/qxmlsimplereader/xmldocs/valid/ext-sa/014.xml b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/ext-sa/014.xml
index 816fd1e796..816fd1e796 100644
--- a/tests/auto/qxmlsimplereader/xmldocs/valid/ext-sa/014.xml
+++ b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/ext-sa/014.xml
diff --git a/tests/auto/qxmlsimplereader/xmldocs/valid/ext-sa/014.xml.ref b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/ext-sa/014.xml.ref
index a087786e69..a087786e69 100644
--- a/tests/auto/qxmlsimplereader/xmldocs/valid/ext-sa/014.xml.ref
+++ b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/ext-sa/014.xml.ref
diff --git a/tests/auto/qxmlsimplereader/xmldocs/valid/ext-sa/undef_entity_1.xml b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/ext-sa/undef_entity_1.xml
index e91a10895e..e91a10895e 100644
--- a/tests/auto/qxmlsimplereader/xmldocs/valid/ext-sa/undef_entity_1.xml
+++ b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/ext-sa/undef_entity_1.xml
diff --git a/tests/auto/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
index 67f1fbe808..67f1fbe808 100644
--- a/tests/auto/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
diff --git a/tests/auto/qxmlsimplereader/xmldocs/valid/ext-sa/undef_entity_2.xml b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/ext-sa/undef_entity_2.xml
index a1fb393371..a1fb393371 100644
--- a/tests/auto/qxmlsimplereader/xmldocs/valid/ext-sa/undef_entity_2.xml
+++ b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/ext-sa/undef_entity_2.xml
diff --git a/tests/auto/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
index a7ed3a2848..a7ed3a2848 100644
--- a/tests/auto/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
diff --git a/tests/auto/qxmlsimplereader/xmldocs/valid/ext-sa/undef_entity_3.xml b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/ext-sa/undef_entity_3.xml
index ae745d4da1..ae745d4da1 100644
--- a/tests/auto/qxmlsimplereader/xmldocs/valid/ext-sa/undef_entity_3.xml
+++ b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/ext-sa/undef_entity_3.xml
diff --git a/tests/auto/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
index 09f8e96b9c..09f8e96b9c 100644
--- a/tests/auto/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
diff --git a/tests/auto/qxmlsimplereader/xmldocs/valid/not-sa/001.ent b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/not-sa/001.ent
index e69de29bb2..e69de29bb2 100644
--- a/tests/auto/qxmlsimplereader/xmldocs/valid/not-sa/001.ent
+++ b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/not-sa/001.ent
diff --git a/tests/auto/qxmlsimplereader/xmldocs/valid/not-sa/001.xml b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/not-sa/001.xml
index 2d6f41a137..2d6f41a137 100644
--- a/tests/auto/qxmlsimplereader/xmldocs/valid/not-sa/001.xml
+++ b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/not-sa/001.xml
diff --git a/tests/auto/qxmlsimplereader/xmldocs/valid/not-sa/001.xml.ref b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/not-sa/001.xml.ref
index eea47ce41b..eea47ce41b 100644
--- a/tests/auto/qxmlsimplereader/xmldocs/valid/not-sa/001.xml.ref
+++ b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/not-sa/001.xml.ref
diff --git a/tests/auto/qxmlsimplereader/xmldocs/valid/not-sa/002.ent b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/not-sa/002.ent
index 67c3297611..67c3297611 100755
--- a/tests/auto/qxmlsimplereader/xmldocs/valid/not-sa/002.ent
+++ b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/not-sa/002.ent
diff --git a/tests/auto/qxmlsimplereader/xmldocs/valid/not-sa/002.xml b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/not-sa/002.xml
index 023fce8499..023fce8499 100644
--- a/tests/auto/qxmlsimplereader/xmldocs/valid/not-sa/002.xml
+++ b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/not-sa/002.xml
diff --git a/tests/auto/qxmlsimplereader/xmldocs/valid/not-sa/002.xml.ref b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/not-sa/002.xml.ref
index cbaf6dc22d..cbaf6dc22d 100644
--- a/tests/auto/qxmlsimplereader/xmldocs/valid/not-sa/002.xml.ref
+++ b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/not-sa/002.xml.ref
diff --git a/tests/auto/qxmlsimplereader/xmldocs/valid/not-sa/003-1.ent b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/not-sa/003-1.ent
index 931f3ad6d8..931f3ad6d8 100755
--- a/tests/auto/qxmlsimplereader/xmldocs/valid/not-sa/003-1.ent
+++ b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/not-sa/003-1.ent
diff --git a/tests/auto/qxmlsimplereader/xmldocs/valid/not-sa/003-2.ent b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/not-sa/003-2.ent
index e69de29bb2..e69de29bb2 100644
--- a/tests/auto/qxmlsimplereader/xmldocs/valid/not-sa/003-2.ent
+++ b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/not-sa/003-2.ent
diff --git a/tests/auto/qxmlsimplereader/xmldocs/valid/not-sa/003.xml b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/not-sa/003.xml
index 63a5e8bdfc..63a5e8bdfc 100644
--- a/tests/auto/qxmlsimplereader/xmldocs/valid/not-sa/003.xml
+++ b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/not-sa/003.xml
diff --git a/tests/auto/qxmlsimplereader/xmldocs/valid/not-sa/003.xml.ref b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/not-sa/003.xml.ref
index 4f83c741fb..4f83c741fb 100644
--- a/tests/auto/qxmlsimplereader/xmldocs/valid/not-sa/003.xml.ref
+++ b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/not-sa/003.xml.ref
diff --git a/tests/auto/qxmlsimplereader/xmldocs/valid/not-sa/004-1.ent b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/not-sa/004-1.ent
index 40f7ff58a2..40f7ff58a2 100755
--- a/tests/auto/qxmlsimplereader/xmldocs/valid/not-sa/004-1.ent
+++ b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/not-sa/004-1.ent
diff --git a/tests/auto/qxmlsimplereader/xmldocs/valid/not-sa/004-2.ent b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/not-sa/004-2.ent
index 61def75cb7..61def75cb7 100755
--- a/tests/auto/qxmlsimplereader/xmldocs/valid/not-sa/004-2.ent
+++ b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/not-sa/004-2.ent
diff --git a/tests/auto/qxmlsimplereader/xmldocs/valid/not-sa/004.xml b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/not-sa/004.xml
index adc9201496..adc9201496 100644
--- a/tests/auto/qxmlsimplereader/xmldocs/valid/not-sa/004.xml
+++ b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/not-sa/004.xml
diff --git a/tests/auto/qxmlsimplereader/xmldocs/valid/not-sa/004.xml.ref b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/not-sa/004.xml.ref
index e2d3af888e..e2d3af888e 100644
--- a/tests/auto/qxmlsimplereader/xmldocs/valid/not-sa/004.xml.ref
+++ b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/not-sa/004.xml.ref
diff --git a/tests/auto/qxmlsimplereader/xmldocs/valid/not-sa/005-1.ent b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/not-sa/005-1.ent
index ade9599032..ade9599032 100755
--- a/tests/auto/qxmlsimplereader/xmldocs/valid/not-sa/005-1.ent
+++ b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/not-sa/005-1.ent
diff --git a/tests/auto/qxmlsimplereader/xmldocs/valid/not-sa/005-2.ent b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/not-sa/005-2.ent
index bef50b1f38..bef50b1f38 100755
--- a/tests/auto/qxmlsimplereader/xmldocs/valid/not-sa/005-2.ent
+++ b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/not-sa/005-2.ent
diff --git a/tests/auto/qxmlsimplereader/xmldocs/valid/not-sa/005.xml b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/not-sa/005.xml
index 6bd44cfee0..6bd44cfee0 100644
--- a/tests/auto/qxmlsimplereader/xmldocs/valid/not-sa/005.xml
+++ b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/not-sa/005.xml
diff --git a/tests/auto/qxmlsimplereader/xmldocs/valid/not-sa/005.xml.ref b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/not-sa/005.xml.ref
index 8057322cf2..8057322cf2 100644
--- a/tests/auto/qxmlsimplereader/xmldocs/valid/not-sa/005.xml.ref
+++ b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/not-sa/005.xml.ref
diff --git a/tests/auto/qxmlsimplereader/xmldocs/valid/not-sa/006.ent b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/not-sa/006.ent
index 8f305a82bd..8f305a82bd 100755
--- a/tests/auto/qxmlsimplereader/xmldocs/valid/not-sa/006.ent
+++ b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/not-sa/006.ent
diff --git a/tests/auto/qxmlsimplereader/xmldocs/valid/not-sa/006.xml b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/not-sa/006.xml
index eb80bb7409..eb80bb7409 100644
--- a/tests/auto/qxmlsimplereader/xmldocs/valid/not-sa/006.xml
+++ b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/not-sa/006.xml
diff --git a/tests/auto/qxmlsimplereader/xmldocs/valid/not-sa/006.xml.ref b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/not-sa/006.xml.ref
index e2e2584353..e2e2584353 100644
--- a/tests/auto/qxmlsimplereader/xmldocs/valid/not-sa/006.xml.ref
+++ b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/not-sa/006.xml.ref
diff --git a/tests/auto/qxmlsimplereader/xmldocs/valid/not-sa/007.ent b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/not-sa/007.ent
index fbf4ca4947..fbf4ca4947 100755
--- a/tests/auto/qxmlsimplereader/xmldocs/valid/not-sa/007.ent
+++ b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/not-sa/007.ent
diff --git a/tests/auto/qxmlsimplereader/xmldocs/valid/not-sa/007.xml b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/not-sa/007.xml
index 38897e34ea..38897e34ea 100644
--- a/tests/auto/qxmlsimplereader/xmldocs/valid/not-sa/007.xml
+++ b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/not-sa/007.xml
diff --git a/tests/auto/qxmlsimplereader/xmldocs/valid/not-sa/007.xml.ref b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/not-sa/007.xml.ref
index d96790fb37..d96790fb37 100644
--- a/tests/auto/qxmlsimplereader/xmldocs/valid/not-sa/007.xml.ref
+++ b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/not-sa/007.xml.ref
diff --git a/tests/auto/qxmlsimplereader/xmldocs/valid/not-sa/008.ent b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/not-sa/008.ent
index fbf4ca4947..fbf4ca4947 100755
--- a/tests/auto/qxmlsimplereader/xmldocs/valid/not-sa/008.ent
+++ b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/not-sa/008.ent
diff --git a/tests/auto/qxmlsimplereader/xmldocs/valid/not-sa/008.xml b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/not-sa/008.xml
index bf777a7ff2..bf777a7ff2 100644
--- a/tests/auto/qxmlsimplereader/xmldocs/valid/not-sa/008.xml
+++ b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/not-sa/008.xml
diff --git a/tests/auto/qxmlsimplereader/xmldocs/valid/not-sa/008.xml.ref b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/not-sa/008.xml.ref
index 08ba9c035b..08ba9c035b 100644
--- a/tests/auto/qxmlsimplereader/xmldocs/valid/not-sa/008.xml.ref
+++ b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/not-sa/008.xml.ref
diff --git a/tests/auto/qxmlsimplereader/xmldocs/valid/not-sa/009.ent b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/not-sa/009.ent
index fbf4ca4947..fbf4ca4947 100755
--- a/tests/auto/qxmlsimplereader/xmldocs/valid/not-sa/009.ent
+++ b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/not-sa/009.ent
diff --git a/tests/auto/qxmlsimplereader/xmldocs/valid/not-sa/009.xml b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/not-sa/009.xml
index c17562fe68..c17562fe68 100644
--- a/tests/auto/qxmlsimplereader/xmldocs/valid/not-sa/009.xml
+++ b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/not-sa/009.xml
diff --git a/tests/auto/qxmlsimplereader/xmldocs/valid/not-sa/009.xml.ref b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/not-sa/009.xml.ref
index d789785173..d789785173 100644
--- a/tests/auto/qxmlsimplereader/xmldocs/valid/not-sa/009.xml.ref
+++ b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/not-sa/009.xml.ref
diff --git a/tests/auto/qxmlsimplereader/xmldocs/valid/not-sa/010.ent b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/not-sa/010.ent
index 52a28f5deb..52a28f5deb 100755
--- a/tests/auto/qxmlsimplereader/xmldocs/valid/not-sa/010.ent
+++ b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/not-sa/010.ent
diff --git a/tests/auto/qxmlsimplereader/xmldocs/valid/not-sa/010.xml b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/not-sa/010.xml
index 2786b328f3..2786b328f3 100644
--- a/tests/auto/qxmlsimplereader/xmldocs/valid/not-sa/010.xml
+++ b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/not-sa/010.xml
diff --git a/tests/auto/qxmlsimplereader/xmldocs/valid/not-sa/010.xml.ref b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/not-sa/010.xml.ref
index 6045d46296..6045d46296 100644
--- a/tests/auto/qxmlsimplereader/xmldocs/valid/not-sa/010.xml.ref
+++ b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/not-sa/010.xml.ref
diff --git a/tests/auto/qxmlsimplereader/xmldocs/valid/not-sa/011.ent b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/not-sa/011.ent
index fbf4ca4947..fbf4ca4947 100755
--- a/tests/auto/qxmlsimplereader/xmldocs/valid/not-sa/011.ent
+++ b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/not-sa/011.ent
diff --git a/tests/auto/qxmlsimplereader/xmldocs/valid/not-sa/011.xml b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/not-sa/011.xml
index 03b482bbb6..03b482bbb6 100644
--- a/tests/auto/qxmlsimplereader/xmldocs/valid/not-sa/011.xml
+++ b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/not-sa/011.xml
diff --git a/tests/auto/qxmlsimplereader/xmldocs/valid/not-sa/011.xml.ref b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/not-sa/011.xml.ref
index 09fd89bd38..09fd89bd38 100644
--- a/tests/auto/qxmlsimplereader/xmldocs/valid/not-sa/011.xml.ref
+++ b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/not-sa/011.xml.ref
diff --git a/tests/auto/qxmlsimplereader/xmldocs/valid/not-sa/012.ent b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/not-sa/012.ent
index 7e372e65e9..7e372e65e9 100755
--- a/tests/auto/qxmlsimplereader/xmldocs/valid/not-sa/012.ent
+++ b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/not-sa/012.ent
diff --git a/tests/auto/qxmlsimplereader/xmldocs/valid/not-sa/012.xml b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/not-sa/012.xml
index 1967edbba7..1967edbba7 100644
--- a/tests/auto/qxmlsimplereader/xmldocs/valid/not-sa/012.xml
+++ b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/not-sa/012.xml
diff --git a/tests/auto/qxmlsimplereader/xmldocs/valid/not-sa/012.xml.ref b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/not-sa/012.xml.ref
index 8d90b187dd..8d90b187dd 100644
--- a/tests/auto/qxmlsimplereader/xmldocs/valid/not-sa/012.xml.ref
+++ b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/not-sa/012.xml.ref
diff --git a/tests/auto/qxmlsimplereader/xmldocs/valid/not-sa/013.ent b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/not-sa/013.ent
index a3691d9f08..a3691d9f08 100755
--- a/tests/auto/qxmlsimplereader/xmldocs/valid/not-sa/013.ent
+++ b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/not-sa/013.ent
diff --git a/tests/auto/qxmlsimplereader/xmldocs/valid/not-sa/013.xml b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/not-sa/013.xml
index cf44f2600a..cf44f2600a 100644
--- a/tests/auto/qxmlsimplereader/xmldocs/valid/not-sa/013.xml
+++ b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/not-sa/013.xml
diff --git a/tests/auto/qxmlsimplereader/xmldocs/valid/not-sa/013.xml.ref b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/not-sa/013.xml.ref
index d84839e625..d84839e625 100644
--- a/tests/auto/qxmlsimplereader/xmldocs/valid/not-sa/013.xml.ref
+++ b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/not-sa/013.xml.ref
diff --git a/tests/auto/qxmlsimplereader/xmldocs/valid/not-sa/014.ent b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/not-sa/014.ent
index 6eaf779329..6eaf779329 100755
--- a/tests/auto/qxmlsimplereader/xmldocs/valid/not-sa/014.ent
+++ b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/not-sa/014.ent
diff --git a/tests/auto/qxmlsimplereader/xmldocs/valid/not-sa/014.xml b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/not-sa/014.xml
index bd08502489..bd08502489 100644
--- a/tests/auto/qxmlsimplereader/xmldocs/valid/not-sa/014.xml
+++ b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/not-sa/014.xml
diff --git a/tests/auto/qxmlsimplereader/xmldocs/valid/not-sa/014.xml.ref b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/not-sa/014.xml.ref
index f9c8220bbb..f9c8220bbb 100644
--- a/tests/auto/qxmlsimplereader/xmldocs/valid/not-sa/014.xml.ref
+++ b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/not-sa/014.xml.ref
diff --git a/tests/auto/qxmlsimplereader/xmldocs/valid/not-sa/015.ent b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/not-sa/015.ent
index 00d2f30e1d..00d2f30e1d 100755
--- a/tests/auto/qxmlsimplereader/xmldocs/valid/not-sa/015.ent
+++ b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/not-sa/015.ent
diff --git a/tests/auto/qxmlsimplereader/xmldocs/valid/not-sa/015.xml b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/not-sa/015.xml
index e04e75ffca..e04e75ffca 100644
--- a/tests/auto/qxmlsimplereader/xmldocs/valid/not-sa/015.xml
+++ b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/not-sa/015.xml
diff --git a/tests/auto/qxmlsimplereader/xmldocs/valid/not-sa/015.xml.ref b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/not-sa/015.xml.ref
index de94a45356..de94a45356 100644
--- a/tests/auto/qxmlsimplereader/xmldocs/valid/not-sa/015.xml.ref
+++ b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/not-sa/015.xml.ref
diff --git a/tests/auto/qxmlsimplereader/xmldocs/valid/not-sa/016.ent b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/not-sa/016.ent
index bf77ef8336..bf77ef8336 100755
--- a/tests/auto/qxmlsimplereader/xmldocs/valid/not-sa/016.ent
+++ b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/not-sa/016.ent
diff --git a/tests/auto/qxmlsimplereader/xmldocs/valid/not-sa/016.xml b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/not-sa/016.xml
index 4ccf4af350..4ccf4af350 100644
--- a/tests/auto/qxmlsimplereader/xmldocs/valid/not-sa/016.xml
+++ b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/not-sa/016.xml
diff --git a/tests/auto/qxmlsimplereader/xmldocs/valid/not-sa/016.xml.ref b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/not-sa/016.xml.ref
index 7c234cfc5f..7c234cfc5f 100644
--- a/tests/auto/qxmlsimplereader/xmldocs/valid/not-sa/016.xml.ref
+++ b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/not-sa/016.xml.ref
diff --git a/tests/auto/qxmlsimplereader/xmldocs/valid/not-sa/017.ent b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/not-sa/017.ent
index ffd9adde61..ffd9adde61 100755
--- a/tests/auto/qxmlsimplereader/xmldocs/valid/not-sa/017.ent
+++ b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/not-sa/017.ent
diff --git a/tests/auto/qxmlsimplereader/xmldocs/valid/not-sa/017.xml b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/not-sa/017.xml
index 7fe18f4c7a..7fe18f4c7a 100644
--- a/tests/auto/qxmlsimplereader/xmldocs/valid/not-sa/017.xml
+++ b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/not-sa/017.xml
diff --git a/tests/auto/qxmlsimplereader/xmldocs/valid/not-sa/017.xml.ref b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/not-sa/017.xml.ref
index 25cc198610..25cc198610 100644
--- a/tests/auto/qxmlsimplereader/xmldocs/valid/not-sa/017.xml.ref
+++ b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/not-sa/017.xml.ref
diff --git a/tests/auto/qxmlsimplereader/xmldocs/valid/not-sa/018.ent b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/not-sa/018.ent
index 2d46f76fc3..2d46f76fc3 100755
--- a/tests/auto/qxmlsimplereader/xmldocs/valid/not-sa/018.ent
+++ b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/not-sa/018.ent
diff --git a/tests/auto/qxmlsimplereader/xmldocs/valid/not-sa/018.xml b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/not-sa/018.xml
index 31e90f2405..31e90f2405 100644
--- a/tests/auto/qxmlsimplereader/xmldocs/valid/not-sa/018.xml
+++ b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/not-sa/018.xml
diff --git a/tests/auto/qxmlsimplereader/xmldocs/valid/not-sa/018.xml.ref b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/not-sa/018.xml.ref
index 3db7bc846b..3db7bc846b 100644
--- a/tests/auto/qxmlsimplereader/xmldocs/valid/not-sa/018.xml.ref
+++ b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/not-sa/018.xml.ref
diff --git a/tests/auto/qxmlsimplereader/xmldocs/valid/not-sa/019.ent b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/not-sa/019.ent
index d18201a98b..d18201a98b 100755
--- a/tests/auto/qxmlsimplereader/xmldocs/valid/not-sa/019.ent
+++ b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/not-sa/019.ent
diff --git a/tests/auto/qxmlsimplereader/xmldocs/valid/not-sa/019.xml b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/not-sa/019.xml
index b7a18faba0..b7a18faba0 100644
--- a/tests/auto/qxmlsimplereader/xmldocs/valid/not-sa/019.xml
+++ b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/not-sa/019.xml
diff --git a/tests/auto/qxmlsimplereader/xmldocs/valid/not-sa/019.xml.ref b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/not-sa/019.xml.ref
index 9961aa93b4..9961aa93b4 100644
--- a/tests/auto/qxmlsimplereader/xmldocs/valid/not-sa/019.xml.ref
+++ b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/not-sa/019.xml.ref
diff --git a/tests/auto/qxmlsimplereader/xmldocs/valid/not-sa/020.ent b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/not-sa/020.ent
index 815291c6d2..815291c6d2 100755
--- a/tests/auto/qxmlsimplereader/xmldocs/valid/not-sa/020.ent
+++ b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/not-sa/020.ent
diff --git a/tests/auto/qxmlsimplereader/xmldocs/valid/not-sa/020.xml b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/not-sa/020.xml
index d70892f7ad..d70892f7ad 100644
--- a/tests/auto/qxmlsimplereader/xmldocs/valid/not-sa/020.xml
+++ b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/not-sa/020.xml
diff --git a/tests/auto/qxmlsimplereader/xmldocs/valid/not-sa/020.xml.ref b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/not-sa/020.xml.ref
index fc9a0535c1..fc9a0535c1 100644
--- a/tests/auto/qxmlsimplereader/xmldocs/valid/not-sa/020.xml.ref
+++ b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/not-sa/020.xml.ref
diff --git a/tests/auto/qxmlsimplereader/xmldocs/valid/not-sa/021.ent b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/not-sa/021.ent
index 9f8f2afd2b..9f8f2afd2b 100755
--- a/tests/auto/qxmlsimplereader/xmldocs/valid/not-sa/021.ent
+++ b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/not-sa/021.ent
diff --git a/tests/auto/qxmlsimplereader/xmldocs/valid/not-sa/021.xml b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/not-sa/021.xml
index 70c28730db..70c28730db 100644
--- a/tests/auto/qxmlsimplereader/xmldocs/valid/not-sa/021.xml
+++ b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/not-sa/021.xml
diff --git a/tests/auto/qxmlsimplereader/xmldocs/valid/not-sa/021.xml.ref b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/not-sa/021.xml.ref
index e6d91722d3..e6d91722d3 100644
--- a/tests/auto/qxmlsimplereader/xmldocs/valid/not-sa/021.xml.ref
+++ b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/not-sa/021.xml.ref
diff --git a/tests/auto/qxmlsimplereader/xmldocs/valid/not-sa/022.ent b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/not-sa/022.ent
index 26f2d8beb2..26f2d8beb2 100755
--- a/tests/auto/qxmlsimplereader/xmldocs/valid/not-sa/022.ent
+++ b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/not-sa/022.ent
diff --git a/tests/auto/qxmlsimplereader/xmldocs/valid/not-sa/022.xml b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/not-sa/022.xml
index b639f2551c..b639f2551c 100644
--- a/tests/auto/qxmlsimplereader/xmldocs/valid/not-sa/022.xml
+++ b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/not-sa/022.xml
diff --git a/tests/auto/qxmlsimplereader/xmldocs/valid/not-sa/022.xml.ref b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/not-sa/022.xml.ref
index de3ddf732f..de3ddf732f 100644
--- a/tests/auto/qxmlsimplereader/xmldocs/valid/not-sa/022.xml.ref
+++ b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/not-sa/022.xml.ref
diff --git a/tests/auto/qxmlsimplereader/xmldocs/valid/not-sa/023.ent b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/not-sa/023.ent
index e3268819f7..e3268819f7 100755
--- a/tests/auto/qxmlsimplereader/xmldocs/valid/not-sa/023.ent
+++ b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/not-sa/023.ent
diff --git a/tests/auto/qxmlsimplereader/xmldocs/valid/not-sa/023.xml b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/not-sa/023.xml
index 1c2484b70b..1c2484b70b 100644
--- a/tests/auto/qxmlsimplereader/xmldocs/valid/not-sa/023.xml
+++ b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/not-sa/023.xml
diff --git a/tests/auto/qxmlsimplereader/xmldocs/valid/not-sa/023.xml.ref b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/not-sa/023.xml.ref
index a150bde52a..a150bde52a 100644
--- a/tests/auto/qxmlsimplereader/xmldocs/valid/not-sa/023.xml.ref
+++ b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/not-sa/023.xml.ref
diff --git a/tests/auto/qxmlsimplereader/xmldocs/valid/not-sa/024.ent b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/not-sa/024.ent
index aa6d0eccac..aa6d0eccac 100755
--- a/tests/auto/qxmlsimplereader/xmldocs/valid/not-sa/024.ent
+++ b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/not-sa/024.ent
diff --git a/tests/auto/qxmlsimplereader/xmldocs/valid/not-sa/024.xml b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/not-sa/024.xml
index 96e1ecb61b..96e1ecb61b 100644
--- a/tests/auto/qxmlsimplereader/xmldocs/valid/not-sa/024.xml
+++ b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/not-sa/024.xml
diff --git a/tests/auto/qxmlsimplereader/xmldocs/valid/not-sa/024.xml.ref b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/not-sa/024.xml.ref
index e97c61bd94..e97c61bd94 100644
--- a/tests/auto/qxmlsimplereader/xmldocs/valid/not-sa/024.xml.ref
+++ b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/not-sa/024.xml.ref
diff --git a/tests/auto/qxmlsimplereader/xmldocs/valid/not-sa/025.ent b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/not-sa/025.ent
index 389d259eb1..389d259eb1 100755
--- a/tests/auto/qxmlsimplereader/xmldocs/valid/not-sa/025.ent
+++ b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/not-sa/025.ent
diff --git a/tests/auto/qxmlsimplereader/xmldocs/valid/not-sa/025.xml b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/not-sa/025.xml
index 8fdbc14c47..8fdbc14c47 100644
--- a/tests/auto/qxmlsimplereader/xmldocs/valid/not-sa/025.xml
+++ b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/not-sa/025.xml
diff --git a/tests/auto/qxmlsimplereader/xmldocs/valid/not-sa/025.xml.ref b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/not-sa/025.xml.ref
index 1eca607181..1eca607181 100644
--- a/tests/auto/qxmlsimplereader/xmldocs/valid/not-sa/025.xml.ref
+++ b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/not-sa/025.xml.ref
diff --git a/tests/auto/qxmlsimplereader/xmldocs/valid/not-sa/026.ent b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/not-sa/026.ent
index bdc93af639..bdc93af639 100755
--- a/tests/auto/qxmlsimplereader/xmldocs/valid/not-sa/026.ent
+++ b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/not-sa/026.ent
diff --git a/tests/auto/qxmlsimplereader/xmldocs/valid/not-sa/026.xml b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/not-sa/026.xml
index 7b109c0913..7b109c0913 100644
--- a/tests/auto/qxmlsimplereader/xmldocs/valid/not-sa/026.xml
+++ b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/not-sa/026.xml
diff --git a/tests/auto/qxmlsimplereader/xmldocs/valid/not-sa/026.xml.ref b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/not-sa/026.xml.ref
index 1bea883d9c..1bea883d9c 100644
--- a/tests/auto/qxmlsimplereader/xmldocs/valid/not-sa/026.xml.ref
+++ b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/not-sa/026.xml.ref
diff --git a/tests/auto/qxmlsimplereader/xmldocs/valid/not-sa/027.ent b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/not-sa/027.ent
index 712cce3700..712cce3700 100755
--- a/tests/auto/qxmlsimplereader/xmldocs/valid/not-sa/027.ent
+++ b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/not-sa/027.ent
diff --git a/tests/auto/qxmlsimplereader/xmldocs/valid/not-sa/027.xml b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/not-sa/027.xml
index d0c8c7abb5..d0c8c7abb5 100644
--- a/tests/auto/qxmlsimplereader/xmldocs/valid/not-sa/027.xml
+++ b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/not-sa/027.xml
diff --git a/tests/auto/qxmlsimplereader/xmldocs/valid/not-sa/027.xml.ref b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/not-sa/027.xml.ref
index d010327624..d010327624 100644
--- a/tests/auto/qxmlsimplereader/xmldocs/valid/not-sa/027.xml.ref
+++ b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/not-sa/027.xml.ref
diff --git a/tests/auto/qxmlsimplereader/xmldocs/valid/not-sa/028.ent b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/not-sa/028.ent
index ac249d7b2c..ac249d7b2c 100755
--- a/tests/auto/qxmlsimplereader/xmldocs/valid/not-sa/028.ent
+++ b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/not-sa/028.ent
diff --git a/tests/auto/qxmlsimplereader/xmldocs/valid/not-sa/028.xml b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/not-sa/028.xml
index 50e5248cbf..50e5248cbf 100644
--- a/tests/auto/qxmlsimplereader/xmldocs/valid/not-sa/028.xml
+++ b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/not-sa/028.xml
diff --git a/tests/auto/qxmlsimplereader/xmldocs/valid/not-sa/028.xml.ref b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/not-sa/028.xml.ref
index 8466141897..8466141897 100644
--- a/tests/auto/qxmlsimplereader/xmldocs/valid/not-sa/028.xml.ref
+++ b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/not-sa/028.xml.ref
diff --git a/tests/auto/qxmlsimplereader/xmldocs/valid/not-sa/029.ent b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/not-sa/029.ent
index df94df5560..df94df5560 100755
--- a/tests/auto/qxmlsimplereader/xmldocs/valid/not-sa/029.ent
+++ b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/not-sa/029.ent
diff --git a/tests/auto/qxmlsimplereader/xmldocs/valid/not-sa/029.xml b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/not-sa/029.xml
index 07e226c1d7..07e226c1d7 100644
--- a/tests/auto/qxmlsimplereader/xmldocs/valid/not-sa/029.xml
+++ b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/not-sa/029.xml
diff --git a/tests/auto/qxmlsimplereader/xmldocs/valid/not-sa/029.xml.ref b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/not-sa/029.xml.ref
index 0bffc4aaa7..0bffc4aaa7 100644
--- a/tests/auto/qxmlsimplereader/xmldocs/valid/not-sa/029.xml.ref
+++ b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/not-sa/029.xml.ref
diff --git a/tests/auto/qxmlsimplereader/xmldocs/valid/not-sa/030.ent b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/not-sa/030.ent
index e3864460df..e3864460df 100755
--- a/tests/auto/qxmlsimplereader/xmldocs/valid/not-sa/030.ent
+++ b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/not-sa/030.ent
diff --git a/tests/auto/qxmlsimplereader/xmldocs/valid/not-sa/030.xml b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/not-sa/030.xml
index 01fc2be4ca..01fc2be4ca 100644
--- a/tests/auto/qxmlsimplereader/xmldocs/valid/not-sa/030.xml
+++ b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/not-sa/030.xml
diff --git a/tests/auto/qxmlsimplereader/xmldocs/valid/not-sa/030.xml.ref b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/not-sa/030.xml.ref
index 51e7f033f9..51e7f033f9 100644
--- a/tests/auto/qxmlsimplereader/xmldocs/valid/not-sa/030.xml.ref
+++ b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/not-sa/030.xml.ref
diff --git a/tests/auto/qxmlsimplereader/xmldocs/valid/not-sa/031-1.ent b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/not-sa/031-1.ent
index f7f94ab152..f7f94ab152 100755
--- a/tests/auto/qxmlsimplereader/xmldocs/valid/not-sa/031-1.ent
+++ b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/not-sa/031-1.ent
diff --git a/tests/auto/qxmlsimplereader/xmldocs/valid/not-sa/031-2.ent b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/not-sa/031-2.ent
index bef50b1f38..bef50b1f38 100755
--- a/tests/auto/qxmlsimplereader/xmldocs/valid/not-sa/031-2.ent
+++ b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/not-sa/031-2.ent
diff --git a/tests/auto/qxmlsimplereader/xmldocs/valid/not-sa/031.xml b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/not-sa/031.xml
index c3fe5fca71..c3fe5fca71 100644
--- a/tests/auto/qxmlsimplereader/xmldocs/valid/not-sa/031.xml
+++ b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/not-sa/031.xml
diff --git a/tests/auto/qxmlsimplereader/xmldocs/valid/not-sa/031.xml.ref b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/not-sa/031.xml.ref
index 72ab9d974f..72ab9d974f 100644
--- a/tests/auto/qxmlsimplereader/xmldocs/valid/not-sa/031.xml.ref
+++ b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/not-sa/031.xml.ref
diff --git a/tests/auto/qxmlsimplereader/xmldocs/valid/sa/001.xml b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/001.xml
index 7fbef49502..7fbef49502 100644
--- a/tests/auto/qxmlsimplereader/xmldocs/valid/sa/001.xml
+++ b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/001.xml
diff --git a/tests/auto/qxmlsimplereader/xmldocs/valid/sa/001.xml.ref b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/001.xml.ref
index 37b53fc0b3..37b53fc0b3 100644
--- a/tests/auto/qxmlsimplereader/xmldocs/valid/sa/001.xml.ref
+++ b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/001.xml.ref
diff --git a/tests/auto/qxmlsimplereader/xmldocs/valid/sa/002.xml b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/002.xml
index 2e3f1d81dd..2e3f1d81dd 100644
--- a/tests/auto/qxmlsimplereader/xmldocs/valid/sa/002.xml
+++ b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/002.xml
diff --git a/tests/auto/qxmlsimplereader/xmldocs/valid/sa/002.xml.ref b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/002.xml.ref
index 37b53fc0b3..37b53fc0b3 100644
--- a/tests/auto/qxmlsimplereader/xmldocs/valid/sa/002.xml.ref
+++ b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/002.xml.ref
diff --git a/tests/auto/qxmlsimplereader/xmldocs/valid/sa/003.xml b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/003.xml
index c841b81784..c841b81784 100644
--- a/tests/auto/qxmlsimplereader/xmldocs/valid/sa/003.xml
+++ b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/003.xml
diff --git a/tests/auto/qxmlsimplereader/xmldocs/valid/sa/003.xml.ref b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/003.xml.ref
index 37b53fc0b3..37b53fc0b3 100644
--- a/tests/auto/qxmlsimplereader/xmldocs/valid/sa/003.xml.ref
+++ b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/003.xml.ref
diff --git a/tests/auto/qxmlsimplereader/xmldocs/valid/sa/004.xml b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/004.xml
index a9c5756933..a9c5756933 100644
--- a/tests/auto/qxmlsimplereader/xmldocs/valid/sa/004.xml
+++ b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/004.xml
diff --git a/tests/auto/qxmlsimplereader/xmldocs/valid/sa/004.xml.ref b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/004.xml.ref
index 2d7bfdfd73..2d7bfdfd73 100644
--- a/tests/auto/qxmlsimplereader/xmldocs/valid/sa/004.xml.ref
+++ b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/004.xml.ref
diff --git a/tests/auto/qxmlsimplereader/xmldocs/valid/sa/005.xml b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/005.xml
index b069efe727..b069efe727 100644
--- a/tests/auto/qxmlsimplereader/xmldocs/valid/sa/005.xml
+++ b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/005.xml
diff --git a/tests/auto/qxmlsimplereader/xmldocs/valid/sa/005.xml.ref b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/005.xml.ref
index 2d7bfdfd73..2d7bfdfd73 100644
--- a/tests/auto/qxmlsimplereader/xmldocs/valid/sa/005.xml.ref
+++ b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/005.xml.ref
diff --git a/tests/auto/qxmlsimplereader/xmldocs/valid/sa/006.xml b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/006.xml
index 39a346342f..39a346342f 100644
--- a/tests/auto/qxmlsimplereader/xmldocs/valid/sa/006.xml
+++ b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/006.xml
diff --git a/tests/auto/qxmlsimplereader/xmldocs/valid/sa/006.xml.ref b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/006.xml.ref
index 2d7bfdfd73..2d7bfdfd73 100644
--- a/tests/auto/qxmlsimplereader/xmldocs/valid/sa/006.xml.ref
+++ b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/006.xml.ref
diff --git a/tests/auto/qxmlsimplereader/xmldocs/valid/sa/007.xml b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/007.xml
index cc3dc53166..cc3dc53166 100644
--- a/tests/auto/qxmlsimplereader/xmldocs/valid/sa/007.xml
+++ b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/007.xml
diff --git a/tests/auto/qxmlsimplereader/xmldocs/valid/sa/007.xml.ref b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/007.xml.ref
index 016a577ded..016a577ded 100644
--- a/tests/auto/qxmlsimplereader/xmldocs/valid/sa/007.xml.ref
+++ b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/007.xml.ref
diff --git a/tests/auto/qxmlsimplereader/xmldocs/valid/sa/008.xml b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/008.xml
index b3370eb1cc..b3370eb1cc 100644
--- a/tests/auto/qxmlsimplereader/xmldocs/valid/sa/008.xml
+++ b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/008.xml
diff --git a/tests/auto/qxmlsimplereader/xmldocs/valid/sa/008.xml.ref b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/008.xml.ref
index 2c879a43a9..2c879a43a9 100644
--- a/tests/auto/qxmlsimplereader/xmldocs/valid/sa/008.xml.ref
+++ b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/008.xml.ref
diff --git a/tests/auto/qxmlsimplereader/xmldocs/valid/sa/009.xml b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/009.xml
index 0fa183eccf..0fa183eccf 100644
--- a/tests/auto/qxmlsimplereader/xmldocs/valid/sa/009.xml
+++ b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/009.xml
diff --git a/tests/auto/qxmlsimplereader/xmldocs/valid/sa/009.xml.ref b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/009.xml.ref
index 016a577ded..016a577ded 100644
--- a/tests/auto/qxmlsimplereader/xmldocs/valid/sa/009.xml.ref
+++ b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/009.xml.ref
diff --git a/tests/auto/qxmlsimplereader/xmldocs/valid/sa/010.xml b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/010.xml
index eb64d18590..eb64d18590 100644
--- a/tests/auto/qxmlsimplereader/xmldocs/valid/sa/010.xml
+++ b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/010.xml
diff --git a/tests/auto/qxmlsimplereader/xmldocs/valid/sa/010.xml.ref b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/010.xml.ref
index 2d7bfdfd73..2d7bfdfd73 100644
--- a/tests/auto/qxmlsimplereader/xmldocs/valid/sa/010.xml.ref
+++ b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/010.xml.ref
diff --git a/tests/auto/qxmlsimplereader/xmldocs/valid/sa/011.xml b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/011.xml
index 4cac44b4e4..4cac44b4e4 100644
--- a/tests/auto/qxmlsimplereader/xmldocs/valid/sa/011.xml
+++ b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/011.xml
diff --git a/tests/auto/qxmlsimplereader/xmldocs/valid/sa/011.xml.ref b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/011.xml.ref
index 9fc96fdb80..9fc96fdb80 100644
--- a/tests/auto/qxmlsimplereader/xmldocs/valid/sa/011.xml.ref
+++ b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/011.xml.ref
diff --git a/tests/auto/qxmlsimplereader/xmldocs/valid/sa/012.xml b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/012.xml
index 6ce2a3eae2..6ce2a3eae2 100644
--- a/tests/auto/qxmlsimplereader/xmldocs/valid/sa/012.xml
+++ b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/012.xml
diff --git a/tests/auto/qxmlsimplereader/xmldocs/valid/sa/012.xml.ref b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/012.xml.ref
index 00c76deaf9..00c76deaf9 100644
--- a/tests/auto/qxmlsimplereader/xmldocs/valid/sa/012.xml.ref
+++ b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/012.xml.ref
diff --git a/tests/auto/qxmlsimplereader/xmldocs/valid/sa/013.xml b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/013.xml
index 2f4aae4e28..2f4aae4e28 100644
--- a/tests/auto/qxmlsimplereader/xmldocs/valid/sa/013.xml
+++ b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/013.xml
diff --git a/tests/auto/qxmlsimplereader/xmldocs/valid/sa/013.xml.ref b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/013.xml.ref
index ef2903d87a..ef2903d87a 100644
--- a/tests/auto/qxmlsimplereader/xmldocs/valid/sa/013.xml.ref
+++ b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/013.xml.ref
diff --git a/tests/auto/qxmlsimplereader/xmldocs/valid/sa/014.xml b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/014.xml
index 47f1f723e3..47f1f723e3 100644
--- a/tests/auto/qxmlsimplereader/xmldocs/valid/sa/014.xml
+++ b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/014.xml
diff --git a/tests/auto/qxmlsimplereader/xmldocs/valid/sa/014.xml.ref b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/014.xml.ref
index bbf1ff75e7..bbf1ff75e7 100644
--- a/tests/auto/qxmlsimplereader/xmldocs/valid/sa/014.xml.ref
+++ b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/014.xml.ref
diff --git a/tests/auto/qxmlsimplereader/xmldocs/valid/sa/015.xml b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/015.xml
index 861df8a610..861df8a610 100644
--- a/tests/auto/qxmlsimplereader/xmldocs/valid/sa/015.xml
+++ b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/015.xml
diff --git a/tests/auto/qxmlsimplereader/xmldocs/valid/sa/015.xml.ref b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/015.xml.ref
index 882da5a6fd..882da5a6fd 100644
--- a/tests/auto/qxmlsimplereader/xmldocs/valid/sa/015.xml.ref
+++ b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/015.xml.ref
diff --git a/tests/auto/qxmlsimplereader/xmldocs/valid/sa/016.xml b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/016.xml
index 66b1973c5d..66b1973c5d 100644
--- a/tests/auto/qxmlsimplereader/xmldocs/valid/sa/016.xml
+++ b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/016.xml
diff --git a/tests/auto/qxmlsimplereader/xmldocs/valid/sa/016.xml.ref b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/016.xml.ref
index 32c60b28a7..32c60b28a7 100644
--- a/tests/auto/qxmlsimplereader/xmldocs/valid/sa/016.xml.ref
+++ b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/016.xml.ref
diff --git a/tests/auto/qxmlsimplereader/xmldocs/valid/sa/017.xml b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/017.xml
index 827ba963bf..827ba963bf 100644
--- a/tests/auto/qxmlsimplereader/xmldocs/valid/sa/017.xml
+++ b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/017.xml
diff --git a/tests/auto/qxmlsimplereader/xmldocs/valid/sa/017.xml.ref b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/017.xml.ref
index 604d975e15..604d975e15 100644
--- a/tests/auto/qxmlsimplereader/xmldocs/valid/sa/017.xml.ref
+++ b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/017.xml.ref
diff --git a/tests/auto/qxmlsimplereader/xmldocs/valid/sa/018.xml b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/018.xml
index 4570903fee..4570903fee 100644
--- a/tests/auto/qxmlsimplereader/xmldocs/valid/sa/018.xml
+++ b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/018.xml
diff --git a/tests/auto/qxmlsimplereader/xmldocs/valid/sa/018.xml.ref b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/018.xml.ref
index 21117d22b4..21117d22b4 100644
--- a/tests/auto/qxmlsimplereader/xmldocs/valid/sa/018.xml.ref
+++ b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/018.xml.ref
diff --git a/tests/auto/qxmlsimplereader/xmldocs/valid/sa/019.xml b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/019.xml
index 3e6b74cbf2..3e6b74cbf2 100644
--- a/tests/auto/qxmlsimplereader/xmldocs/valid/sa/019.xml
+++ b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/019.xml
diff --git a/tests/auto/qxmlsimplereader/xmldocs/valid/sa/019.xml.ref b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/019.xml.ref
index f95f625b33..f95f625b33 100644
--- a/tests/auto/qxmlsimplereader/xmldocs/valid/sa/019.xml.ref
+++ b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/019.xml.ref
diff --git a/tests/auto/qxmlsimplereader/xmldocs/valid/sa/020.xml b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/020.xml
index f749551a1b..f749551a1b 100644
--- a/tests/auto/qxmlsimplereader/xmldocs/valid/sa/020.xml
+++ b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/020.xml
diff --git a/tests/auto/qxmlsimplereader/xmldocs/valid/sa/020.xml.ref b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/020.xml.ref
index ff6ff3683c..ff6ff3683c 100644
--- a/tests/auto/qxmlsimplereader/xmldocs/valid/sa/020.xml.ref
+++ b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/020.xml.ref
diff --git a/tests/auto/qxmlsimplereader/xmldocs/valid/sa/021.xml b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/021.xml
index 13dda8c8a5..13dda8c8a5 100644
--- a/tests/auto/qxmlsimplereader/xmldocs/valid/sa/021.xml
+++ b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/021.xml
diff --git a/tests/auto/qxmlsimplereader/xmldocs/valid/sa/021.xml.ref b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/021.xml.ref
index 52bf68a717..52bf68a717 100644
--- a/tests/auto/qxmlsimplereader/xmldocs/valid/sa/021.xml.ref
+++ b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/021.xml.ref
diff --git a/tests/auto/qxmlsimplereader/xmldocs/valid/sa/022.xml b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/022.xml
index 41d300e950..41d300e950 100644
--- a/tests/auto/qxmlsimplereader/xmldocs/valid/sa/022.xml
+++ b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/022.xml
diff --git a/tests/auto/qxmlsimplereader/xmldocs/valid/sa/022.xml.ref b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/022.xml.ref
index b299ce71ee..b299ce71ee 100644
--- a/tests/auto/qxmlsimplereader/xmldocs/valid/sa/022.xml.ref
+++ b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/022.xml.ref
diff --git a/tests/auto/qxmlsimplereader/xmldocs/valid/sa/023.xml b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/023.xml
index 3837b831ad..3837b831ad 100644
--- a/tests/auto/qxmlsimplereader/xmldocs/valid/sa/023.xml
+++ b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/023.xml
diff --git a/tests/auto/qxmlsimplereader/xmldocs/valid/sa/023.xml.ref b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/023.xml.ref
index b59c216593..b59c216593 100644
--- a/tests/auto/qxmlsimplereader/xmldocs/valid/sa/023.xml.ref
+++ b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/023.xml.ref
diff --git a/tests/auto/qxmlsimplereader/xmldocs/valid/sa/024.xml b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/024.xml
index b0655c634c..b0655c634c 100644
--- a/tests/auto/qxmlsimplereader/xmldocs/valid/sa/024.xml
+++ b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/024.xml
diff --git a/tests/auto/qxmlsimplereader/xmldocs/valid/sa/024.xml.ref b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/024.xml.ref
index 00f7fce160..00f7fce160 100644
--- a/tests/auto/qxmlsimplereader/xmldocs/valid/sa/024.xml.ref
+++ b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/024.xml.ref
diff --git a/tests/auto/qxmlsimplereader/xmldocs/valid/sa/025.xml b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/025.xml
index ed01f36d89..ed01f36d89 100644
--- a/tests/auto/qxmlsimplereader/xmldocs/valid/sa/025.xml
+++ b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/025.xml
diff --git a/tests/auto/qxmlsimplereader/xmldocs/valid/sa/025.xml.ref b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/025.xml.ref
index 6a7605c082..6a7605c082 100644
--- a/tests/auto/qxmlsimplereader/xmldocs/valid/sa/025.xml.ref
+++ b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/025.xml.ref
diff --git a/tests/auto/qxmlsimplereader/xmldocs/valid/sa/026.xml b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/026.xml
index 1ba033c1a7..1ba033c1a7 100644
--- a/tests/auto/qxmlsimplereader/xmldocs/valid/sa/026.xml
+++ b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/026.xml
diff --git a/tests/auto/qxmlsimplereader/xmldocs/valid/sa/026.xml.ref b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/026.xml.ref
index 6a7605c082..6a7605c082 100644
--- a/tests/auto/qxmlsimplereader/xmldocs/valid/sa/026.xml.ref
+++ b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/026.xml.ref
diff --git a/tests/auto/qxmlsimplereader/xmldocs/valid/sa/027.xml b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/027.xml
index ee02439051..ee02439051 100644
--- a/tests/auto/qxmlsimplereader/xmldocs/valid/sa/027.xml
+++ b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/027.xml
diff --git a/tests/auto/qxmlsimplereader/xmldocs/valid/sa/027.xml.ref b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/027.xml.ref
index 6a7605c082..6a7605c082 100644
--- a/tests/auto/qxmlsimplereader/xmldocs/valid/sa/027.xml.ref
+++ b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/027.xml.ref
diff --git a/tests/auto/qxmlsimplereader/xmldocs/valid/sa/028.xml b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/028.xml
index 3d95747913..3d95747913 100644
--- a/tests/auto/qxmlsimplereader/xmldocs/valid/sa/028.xml
+++ b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/028.xml
diff --git a/tests/auto/qxmlsimplereader/xmldocs/valid/sa/028.xml.ref b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/028.xml.ref
index dcda37de1e..dcda37de1e 100644
--- a/tests/auto/qxmlsimplereader/xmldocs/valid/sa/028.xml.ref
+++ b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/028.xml.ref
diff --git a/tests/auto/qxmlsimplereader/xmldocs/valid/sa/029.xml b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/029.xml
index 909f6ff712..909f6ff712 100644
--- a/tests/auto/qxmlsimplereader/xmldocs/valid/sa/029.xml
+++ b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/029.xml
diff --git a/tests/auto/qxmlsimplereader/xmldocs/valid/sa/029.xml.ref b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/029.xml.ref
index dcda37de1e..dcda37de1e 100644
--- a/tests/auto/qxmlsimplereader/xmldocs/valid/sa/029.xml.ref
+++ b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/029.xml.ref
diff --git a/tests/auto/qxmlsimplereader/xmldocs/valid/sa/030.xml b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/030.xml
index 3a7ddaa716..3a7ddaa716 100644
--- a/tests/auto/qxmlsimplereader/xmldocs/valid/sa/030.xml
+++ b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/030.xml
diff --git a/tests/auto/qxmlsimplereader/xmldocs/valid/sa/030.xml.ref b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/030.xml.ref
index dcda37de1e..dcda37de1e 100644
--- a/tests/auto/qxmlsimplereader/xmldocs/valid/sa/030.xml.ref
+++ b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/030.xml.ref
diff --git a/tests/auto/qxmlsimplereader/xmldocs/valid/sa/031.xml b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/031.xml
index a58e05867f..a58e05867f 100644
--- a/tests/auto/qxmlsimplereader/xmldocs/valid/sa/031.xml
+++ b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/031.xml
diff --git a/tests/auto/qxmlsimplereader/xmldocs/valid/sa/031.xml.ref b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/031.xml.ref
index 7d81068e24..7d81068e24 100644
--- a/tests/auto/qxmlsimplereader/xmldocs/valid/sa/031.xml.ref
+++ b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/031.xml.ref
diff --git a/tests/auto/qxmlsimplereader/xmldocs/valid/sa/032.xml b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/032.xml
index be55c8d721..be55c8d721 100644
--- a/tests/auto/qxmlsimplereader/xmldocs/valid/sa/032.xml
+++ b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/032.xml
diff --git a/tests/auto/qxmlsimplereader/xmldocs/valid/sa/032.xml.ref b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/032.xml.ref
index 96d8f1014d..96d8f1014d 100644
--- a/tests/auto/qxmlsimplereader/xmldocs/valid/sa/032.xml.ref
+++ b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/032.xml.ref
diff --git a/tests/auto/qxmlsimplereader/xmldocs/valid/sa/033.xml b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/033.xml
index a3f9053868..a3f9053868 100644
--- a/tests/auto/qxmlsimplereader/xmldocs/valid/sa/033.xml
+++ b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/033.xml
diff --git a/tests/auto/qxmlsimplereader/xmldocs/valid/sa/033.xml.ref b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/033.xml.ref
index d56d96d584..d56d96d584 100644
--- a/tests/auto/qxmlsimplereader/xmldocs/valid/sa/033.xml.ref
+++ b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/033.xml.ref
diff --git a/tests/auto/qxmlsimplereader/xmldocs/valid/sa/034.xml b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/034.xml
index 7d52f31c0e..7d52f31c0e 100644
--- a/tests/auto/qxmlsimplereader/xmldocs/valid/sa/034.xml
+++ b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/034.xml
diff --git a/tests/auto/qxmlsimplereader/xmldocs/valid/sa/034.xml.ref b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/034.xml.ref
index 37b53fc0b3..37b53fc0b3 100644
--- a/tests/auto/qxmlsimplereader/xmldocs/valid/sa/034.xml.ref
+++ b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/034.xml.ref
diff --git a/tests/auto/qxmlsimplereader/xmldocs/valid/sa/035.xml b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/035.xml
index f109a8b782..f109a8b782 100644
--- a/tests/auto/qxmlsimplereader/xmldocs/valid/sa/035.xml
+++ b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/035.xml
diff --git a/tests/auto/qxmlsimplereader/xmldocs/valid/sa/035.xml.ref b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/035.xml.ref
index 37b53fc0b3..37b53fc0b3 100644
--- a/tests/auto/qxmlsimplereader/xmldocs/valid/sa/035.xml.ref
+++ b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/035.xml.ref
diff --git a/tests/auto/qxmlsimplereader/xmldocs/valid/sa/036.xml b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/036.xml
index 8ab2b3fb16..8ab2b3fb16 100644
--- a/tests/auto/qxmlsimplereader/xmldocs/valid/sa/036.xml
+++ b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/036.xml
diff --git a/tests/auto/qxmlsimplereader/xmldocs/valid/sa/036.xml.ref b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/036.xml.ref
index db2cbb1e8d..db2cbb1e8d 100644
--- a/tests/auto/qxmlsimplereader/xmldocs/valid/sa/036.xml.ref
+++ b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/036.xml.ref
diff --git a/tests/auto/qxmlsimplereader/xmldocs/valid/sa/037.xml b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/037.xml
index f9b2113940..f9b2113940 100644
--- a/tests/auto/qxmlsimplereader/xmldocs/valid/sa/037.xml
+++ b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/037.xml
diff --git a/tests/auto/qxmlsimplereader/xmldocs/valid/sa/037.xml.ref b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/037.xml.ref
index 12d6a77cad..12d6a77cad 100644
--- a/tests/auto/qxmlsimplereader/xmldocs/valid/sa/037.xml.ref
+++ b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/037.xml.ref
diff --git a/tests/auto/qxmlsimplereader/xmldocs/valid/sa/038.xml b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/038.xml
index d14f41bfe2..d14f41bfe2 100644
--- a/tests/auto/qxmlsimplereader/xmldocs/valid/sa/038.xml
+++ b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/038.xml
diff --git a/tests/auto/qxmlsimplereader/xmldocs/valid/sa/038.xml.ref b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/038.xml.ref
index d24c10b495..d24c10b495 100644
--- a/tests/auto/qxmlsimplereader/xmldocs/valid/sa/038.xml.ref
+++ b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/038.xml.ref
diff --git a/tests/auto/qxmlsimplereader/xmldocs/valid/sa/039.xml b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/039.xml
index 0897316e46..0897316e46 100644
--- a/tests/auto/qxmlsimplereader/xmldocs/valid/sa/039.xml
+++ b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/039.xml
diff --git a/tests/auto/qxmlsimplereader/xmldocs/valid/sa/039.xml.ref b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/039.xml.ref
index 9eb38b42bb..9eb38b42bb 100644
--- a/tests/auto/qxmlsimplereader/xmldocs/valid/sa/039.xml.ref
+++ b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/039.xml.ref
diff --git a/tests/auto/qxmlsimplereader/xmldocs/valid/sa/040.xml b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/040.xml
index 12c419b65b..12c419b65b 100644
--- a/tests/auto/qxmlsimplereader/xmldocs/valid/sa/040.xml
+++ b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/040.xml
diff --git a/tests/auto/qxmlsimplereader/xmldocs/valid/sa/040.xml.ref b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/040.xml.ref
index 81409bdc13..81409bdc13 100644
--- a/tests/auto/qxmlsimplereader/xmldocs/valid/sa/040.xml.ref
+++ b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/040.xml.ref
diff --git a/tests/auto/qxmlsimplereader/xmldocs/valid/sa/041.xml b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/041.xml
index a59f536277..a59f536277 100644
--- a/tests/auto/qxmlsimplereader/xmldocs/valid/sa/041.xml
+++ b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/041.xml
diff --git a/tests/auto/qxmlsimplereader/xmldocs/valid/sa/041.xml.ref b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/041.xml.ref
index 13f83dffcf..13f83dffcf 100644
--- a/tests/auto/qxmlsimplereader/xmldocs/valid/sa/041.xml.ref
+++ b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/041.xml.ref
diff --git a/tests/auto/qxmlsimplereader/xmldocs/valid/sa/042.xml b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/042.xml
index 5d7c650944..5d7c650944 100644
--- a/tests/auto/qxmlsimplereader/xmldocs/valid/sa/042.xml
+++ b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/042.xml
diff --git a/tests/auto/qxmlsimplereader/xmldocs/valid/sa/042.xml.ref b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/042.xml.ref
index ed02b8c709..ed02b8c709 100644
--- a/tests/auto/qxmlsimplereader/xmldocs/valid/sa/042.xml.ref
+++ b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/042.xml.ref
diff --git a/tests/auto/qxmlsimplereader/xmldocs/valid/sa/043.xml b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/043.xml
index a8095dfe28..a8095dfe28 100644
--- a/tests/auto/qxmlsimplereader/xmldocs/valid/sa/043.xml
+++ b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/043.xml
diff --git a/tests/auto/qxmlsimplereader/xmldocs/valid/sa/043.xml.ref b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/043.xml.ref
index 3f898a182a..3f898a182a 100644
--- a/tests/auto/qxmlsimplereader/xmldocs/valid/sa/043.xml.ref
+++ b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/043.xml.ref
diff --git a/tests/auto/qxmlsimplereader/xmldocs/valid/sa/044.xml b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/044.xml
index bee1d23e1a..bee1d23e1a 100644
--- a/tests/auto/qxmlsimplereader/xmldocs/valid/sa/044.xml
+++ b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/044.xml
diff --git a/tests/auto/qxmlsimplereader/xmldocs/valid/sa/044.xml.ref b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/044.xml.ref
index daab693b31..daab693b31 100644
--- a/tests/auto/qxmlsimplereader/xmldocs/valid/sa/044.xml.ref
+++ b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/044.xml.ref
diff --git a/tests/auto/qxmlsimplereader/xmldocs/valid/sa/045.xml b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/045.xml
index e2567f532d..e2567f532d 100644
--- a/tests/auto/qxmlsimplereader/xmldocs/valid/sa/045.xml
+++ b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/045.xml
diff --git a/tests/auto/qxmlsimplereader/xmldocs/valid/sa/045.xml.ref b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/045.xml.ref
index 566221ae0d..566221ae0d 100644
--- a/tests/auto/qxmlsimplereader/xmldocs/valid/sa/045.xml.ref
+++ b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/045.xml.ref
diff --git a/tests/auto/qxmlsimplereader/xmldocs/valid/sa/046.xml b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/046.xml
index c50a2846f9..c50a2846f9 100644
--- a/tests/auto/qxmlsimplereader/xmldocs/valid/sa/046.xml
+++ b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/046.xml
diff --git a/tests/auto/qxmlsimplereader/xmldocs/valid/sa/046.xml.ref b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/046.xml.ref
index 7b1a28d90c..7b1a28d90c 100644
--- a/tests/auto/qxmlsimplereader/xmldocs/valid/sa/046.xml.ref
+++ b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/046.xml.ref
diff --git a/tests/auto/qxmlsimplereader/xmldocs/valid/sa/047.xml b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/047.xml
index a4c688cf1a..a4c688cf1a 100644
--- a/tests/auto/qxmlsimplereader/xmldocs/valid/sa/047.xml
+++ b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/047.xml
diff --git a/tests/auto/qxmlsimplereader/xmldocs/valid/sa/047.xml.ref b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/047.xml.ref
index 3af5bf2d74..3af5bf2d74 100644
--- a/tests/auto/qxmlsimplereader/xmldocs/valid/sa/047.xml.ref
+++ b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/047.xml.ref
diff --git a/tests/auto/qxmlsimplereader/xmldocs/valid/sa/048.xml b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/048.xml
index c6b2dedbba..c6b2dedbba 100644
--- a/tests/auto/qxmlsimplereader/xmldocs/valid/sa/048.xml
+++ b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/048.xml
diff --git a/tests/auto/qxmlsimplereader/xmldocs/valid/sa/048.xml.ref b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/048.xml.ref
index 0e8482350f..0e8482350f 100644
--- a/tests/auto/qxmlsimplereader/xmldocs/valid/sa/048.xml.ref
+++ b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/048.xml.ref
diff --git a/tests/auto/qxmlsimplereader/xmldocs/valid/sa/049.xml b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/049.xml
index c3cc797b59..c3cc797b59 100644
--- a/tests/auto/qxmlsimplereader/xmldocs/valid/sa/049.xml
+++ b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/049.xml
diff --git a/tests/auto/qxmlsimplereader/xmldocs/valid/sa/049.xml.ref b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/049.xml.ref
index 72897d1943..72897d1943 100644
--- a/tests/auto/qxmlsimplereader/xmldocs/valid/sa/049.xml.ref
+++ b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/049.xml.ref
diff --git a/tests/auto/qxmlsimplereader/xmldocs/valid/sa/050.xml b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/050.xml
index 12303b1af2..12303b1af2 100644
--- a/tests/auto/qxmlsimplereader/xmldocs/valid/sa/050.xml
+++ b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/050.xml
diff --git a/tests/auto/qxmlsimplereader/xmldocs/valid/sa/050.xml.ref b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/050.xml.ref
index 8f39355258..8f39355258 100644
--- a/tests/auto/qxmlsimplereader/xmldocs/valid/sa/050.xml.ref
+++ b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/050.xml.ref
diff --git a/tests/auto/qxmlsimplereader/xmldocs/valid/sa/051.xml b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/051.xml
index 7ae8f6c73a..7ae8f6c73a 100644
--- a/tests/auto/qxmlsimplereader/xmldocs/valid/sa/051.xml
+++ b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/051.xml
diff --git a/tests/auto/qxmlsimplereader/xmldocs/valid/sa/051.xml.ref b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/051.xml.ref
index 71a89a922c..71a89a922c 100644
--- a/tests/auto/qxmlsimplereader/xmldocs/valid/sa/051.xml.ref
+++ b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/051.xml.ref
diff --git a/tests/auto/qxmlsimplereader/xmldocs/valid/sa/052.xml b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/052.xml
index 3f33a4c760..3f33a4c760 100644
--- a/tests/auto/qxmlsimplereader/xmldocs/valid/sa/052.xml
+++ b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/052.xml
diff --git a/tests/auto/qxmlsimplereader/xmldocs/valid/sa/052.xml.ref b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/052.xml.ref
index 0b806c96a8..0b806c96a8 100644
--- a/tests/auto/qxmlsimplereader/xmldocs/valid/sa/052.xml.ref
+++ b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/052.xml.ref
diff --git a/tests/auto/qxmlsimplereader/xmldocs/valid/sa/053.xml b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/053.xml
index 0d88f28718..0d88f28718 100644
--- a/tests/auto/qxmlsimplereader/xmldocs/valid/sa/053.xml
+++ b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/053.xml
diff --git a/tests/auto/qxmlsimplereader/xmldocs/valid/sa/053.xml.ref b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/053.xml.ref
index 2aa90a79d0..2aa90a79d0 100644
--- a/tests/auto/qxmlsimplereader/xmldocs/valid/sa/053.xml.ref
+++ b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/053.xml.ref
diff --git a/tests/auto/qxmlsimplereader/xmldocs/valid/sa/054.xml b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/054.xml
index 5d1c88b946..5d1c88b946 100644
--- a/tests/auto/qxmlsimplereader/xmldocs/valid/sa/054.xml
+++ b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/054.xml
diff --git a/tests/auto/qxmlsimplereader/xmldocs/valid/sa/054.xml.ref b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/054.xml.ref
index 37b53fc0b3..37b53fc0b3 100644
--- a/tests/auto/qxmlsimplereader/xmldocs/valid/sa/054.xml.ref
+++ b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/054.xml.ref
diff --git a/tests/auto/qxmlsimplereader/xmldocs/valid/sa/055.xml b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/055.xml
index da0292c5bc..da0292c5bc 100644
--- a/tests/auto/qxmlsimplereader/xmldocs/valid/sa/055.xml
+++ b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/055.xml
diff --git a/tests/auto/qxmlsimplereader/xmldocs/valid/sa/055.xml.ref b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/055.xml.ref
index dc3312be38..dc3312be38 100644
--- a/tests/auto/qxmlsimplereader/xmldocs/valid/sa/055.xml.ref
+++ b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/055.xml.ref
diff --git a/tests/auto/qxmlsimplereader/xmldocs/valid/sa/056.xml b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/056.xml
index 144871b2a3..144871b2a3 100644
--- a/tests/auto/qxmlsimplereader/xmldocs/valid/sa/056.xml
+++ b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/056.xml
diff --git a/tests/auto/qxmlsimplereader/xmldocs/valid/sa/056.xml.ref b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/056.xml.ref
index ed02b8c709..ed02b8c709 100644
--- a/tests/auto/qxmlsimplereader/xmldocs/valid/sa/056.xml.ref
+++ b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/056.xml.ref
diff --git a/tests/auto/qxmlsimplereader/xmldocs/valid/sa/057.xml b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/057.xml
index c1ac849ed1..c1ac849ed1 100644
--- a/tests/auto/qxmlsimplereader/xmldocs/valid/sa/057.xml
+++ b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/057.xml
diff --git a/tests/auto/qxmlsimplereader/xmldocs/valid/sa/057.xml.ref b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/057.xml.ref
index 37b53fc0b3..37b53fc0b3 100644
--- a/tests/auto/qxmlsimplereader/xmldocs/valid/sa/057.xml.ref
+++ b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/057.xml.ref
diff --git a/tests/auto/qxmlsimplereader/xmldocs/valid/sa/058.xml b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/058.xml
index 2ff23b233f..2ff23b233f 100644
--- a/tests/auto/qxmlsimplereader/xmldocs/valid/sa/058.xml
+++ b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/058.xml
diff --git a/tests/auto/qxmlsimplereader/xmldocs/valid/sa/058.xml.ref b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/058.xml.ref
index 0acf5f4acd..0acf5f4acd 100644
--- a/tests/auto/qxmlsimplereader/xmldocs/valid/sa/058.xml.ref
+++ b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/058.xml.ref
diff --git a/tests/auto/qxmlsimplereader/xmldocs/valid/sa/059.xml b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/059.xml
index 2171480ecf..2171480ecf 100644
--- a/tests/auto/qxmlsimplereader/xmldocs/valid/sa/059.xml
+++ b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/059.xml
diff --git a/tests/auto/qxmlsimplereader/xmldocs/valid/sa/059.xml.ref b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/059.xml.ref
index 8a73895f0d..8a73895f0d 100644
--- a/tests/auto/qxmlsimplereader/xmldocs/valid/sa/059.xml.ref
+++ b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/059.xml.ref
diff --git a/tests/auto/qxmlsimplereader/xmldocs/valid/sa/060.xml b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/060.xml
index 6cd6b4386b..6cd6b4386b 100644
--- a/tests/auto/qxmlsimplereader/xmldocs/valid/sa/060.xml
+++ b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/060.xml
diff --git a/tests/auto/qxmlsimplereader/xmldocs/valid/sa/060.xml.ref b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/060.xml.ref
index ea1cbd40c0..ea1cbd40c0 100644
--- a/tests/auto/qxmlsimplereader/xmldocs/valid/sa/060.xml.ref
+++ b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/060.xml.ref
diff --git a/tests/auto/qxmlsimplereader/xmldocs/valid/sa/061.xml b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/061.xml
index bbdc152492..bbdc152492 100644
--- a/tests/auto/qxmlsimplereader/xmldocs/valid/sa/061.xml
+++ b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/061.xml
diff --git a/tests/auto/qxmlsimplereader/xmldocs/valid/sa/061.xml.ref b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/061.xml.ref
index 72897d1943..72897d1943 100644
--- a/tests/auto/qxmlsimplereader/xmldocs/valid/sa/061.xml.ref
+++ b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/061.xml.ref
diff --git a/tests/auto/qxmlsimplereader/xmldocs/valid/sa/062.xml b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/062.xml
index f4ba53090a..f4ba53090a 100644
--- a/tests/auto/qxmlsimplereader/xmldocs/valid/sa/062.xml
+++ b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/062.xml
diff --git a/tests/auto/qxmlsimplereader/xmldocs/valid/sa/062.xml.ref b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/062.xml.ref
index 8f39355258..8f39355258 100644
--- a/tests/auto/qxmlsimplereader/xmldocs/valid/sa/062.xml.ref
+++ b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/062.xml.ref
diff --git a/tests/auto/qxmlsimplereader/xmldocs/valid/sa/063.xml b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/063.xml
index 9668f2da73..9668f2da73 100644
--- a/tests/auto/qxmlsimplereader/xmldocs/valid/sa/063.xml
+++ b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/063.xml
diff --git a/tests/auto/qxmlsimplereader/xmldocs/valid/sa/063.xml.ref b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/063.xml.ref
index 71a89a922c..71a89a922c 100644
--- a/tests/auto/qxmlsimplereader/xmldocs/valid/sa/063.xml.ref
+++ b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/063.xml.ref
diff --git a/tests/auto/qxmlsimplereader/xmldocs/valid/sa/064.xml b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/064.xml
index 74a97aa431..74a97aa431 100644
--- a/tests/auto/qxmlsimplereader/xmldocs/valid/sa/064.xml
+++ b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/064.xml
diff --git a/tests/auto/qxmlsimplereader/xmldocs/valid/sa/064.xml.ref b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/064.xml.ref
index 579aeb52f6..579aeb52f6 100644
--- a/tests/auto/qxmlsimplereader/xmldocs/valid/sa/064.xml.ref
+++ b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/064.xml.ref
diff --git a/tests/auto/qxmlsimplereader/xmldocs/valid/sa/065.xml b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/065.xml
index f708f2bc17..f708f2bc17 100644
--- a/tests/auto/qxmlsimplereader/xmldocs/valid/sa/065.xml
+++ b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/065.xml
diff --git a/tests/auto/qxmlsimplereader/xmldocs/valid/sa/065.xml.ref b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/065.xml.ref
index ba31414499..ba31414499 100644
--- a/tests/auto/qxmlsimplereader/xmldocs/valid/sa/065.xml.ref
+++ b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/065.xml.ref
diff --git a/tests/auto/qxmlsimplereader/xmldocs/valid/sa/066.xml b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/066.xml
index a27340b9a7..a27340b9a7 100644
--- a/tests/auto/qxmlsimplereader/xmldocs/valid/sa/066.xml
+++ b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/066.xml
diff --git a/tests/auto/qxmlsimplereader/xmldocs/valid/sa/066.xml.ref b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/066.xml.ref
index d650af13d3..d650af13d3 100644
--- a/tests/auto/qxmlsimplereader/xmldocs/valid/sa/066.xml.ref
+++ b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/066.xml.ref
diff --git a/tests/auto/qxmlsimplereader/xmldocs/valid/sa/067.xml b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/067.xml
index a0ccf772a5..a0ccf772a5 100644
--- a/tests/auto/qxmlsimplereader/xmldocs/valid/sa/067.xml
+++ b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/067.xml
diff --git a/tests/auto/qxmlsimplereader/xmldocs/valid/sa/067.xml.ref b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/067.xml.ref
index 9a2358d700..9a2358d700 100644
--- a/tests/auto/qxmlsimplereader/xmldocs/valid/sa/067.xml.ref
+++ b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/067.xml.ref
diff --git a/tests/auto/qxmlsimplereader/xmldocs/valid/sa/068.xml b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/068.xml
index 8ed806b9a3..8ed806b9a3 100644
--- a/tests/auto/qxmlsimplereader/xmldocs/valid/sa/068.xml
+++ b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/068.xml
diff --git a/tests/auto/qxmlsimplereader/xmldocs/valid/sa/068.xml.ref b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/068.xml.ref
index 8ebf150e48..8ebf150e48 100644
--- a/tests/auto/qxmlsimplereader/xmldocs/valid/sa/068.xml.ref
+++ b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/068.xml.ref
diff --git a/tests/auto/qxmlsimplereader/xmldocs/valid/sa/069.xml b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/069.xml
index 2437f60530..2437f60530 100644
--- a/tests/auto/qxmlsimplereader/xmldocs/valid/sa/069.xml
+++ b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/069.xml
diff --git a/tests/auto/qxmlsimplereader/xmldocs/valid/sa/069.xml.ref b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/069.xml.ref
index c5685c6d7a..c5685c6d7a 100644
--- a/tests/auto/qxmlsimplereader/xmldocs/valid/sa/069.xml.ref
+++ b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/069.xml.ref
diff --git a/tests/auto/qxmlsimplereader/xmldocs/valid/sa/070.xml b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/070.xml
index eef097df76..eef097df76 100644
--- a/tests/auto/qxmlsimplereader/xmldocs/valid/sa/070.xml
+++ b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/070.xml
diff --git a/tests/auto/qxmlsimplereader/xmldocs/valid/sa/070.xml.ref b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/070.xml.ref
index 2525ef6ae3..2525ef6ae3 100644
--- a/tests/auto/qxmlsimplereader/xmldocs/valid/sa/070.xml.ref
+++ b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/070.xml.ref
diff --git a/tests/auto/qxmlsimplereader/xmldocs/valid/sa/071.xml b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/071.xml
index ebfba230a4..ebfba230a4 100644
--- a/tests/auto/qxmlsimplereader/xmldocs/valid/sa/071.xml
+++ b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/071.xml
diff --git a/tests/auto/qxmlsimplereader/xmldocs/valid/sa/071.xml.ref b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/071.xml.ref
index 0b8e512b33..0b8e512b33 100644
--- a/tests/auto/qxmlsimplereader/xmldocs/valid/sa/071.xml.ref
+++ b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/071.xml.ref
diff --git a/tests/auto/qxmlsimplereader/xmldocs/valid/sa/072.xml b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/072.xml
index 6ef39dc49e..6ef39dc49e 100644
--- a/tests/auto/qxmlsimplereader/xmldocs/valid/sa/072.xml
+++ b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/072.xml
diff --git a/tests/auto/qxmlsimplereader/xmldocs/valid/sa/072.xml.ref b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/072.xml.ref
index 0b8e512b33..0b8e512b33 100644
--- a/tests/auto/qxmlsimplereader/xmldocs/valid/sa/072.xml.ref
+++ b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/072.xml.ref
diff --git a/tests/auto/qxmlsimplereader/xmldocs/valid/sa/073.xml b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/073.xml
index 217476d9a9..217476d9a9 100644
--- a/tests/auto/qxmlsimplereader/xmldocs/valid/sa/073.xml
+++ b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/073.xml
diff --git a/tests/auto/qxmlsimplereader/xmldocs/valid/sa/073.xml.ref b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/073.xml.ref
index 0b8e512b33..0b8e512b33 100644
--- a/tests/auto/qxmlsimplereader/xmldocs/valid/sa/073.xml.ref
+++ b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/073.xml.ref
diff --git a/tests/auto/qxmlsimplereader/xmldocs/valid/sa/074.xml b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/074.xml
index 8b2354ff73..8b2354ff73 100644
--- a/tests/auto/qxmlsimplereader/xmldocs/valid/sa/074.xml
+++ b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/074.xml
diff --git a/tests/auto/qxmlsimplereader/xmldocs/valid/sa/074.xml.ref b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/074.xml.ref
index 0b8e512b33..0b8e512b33 100644
--- a/tests/auto/qxmlsimplereader/xmldocs/valid/sa/074.xml.ref
+++ b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/074.xml.ref
diff --git a/tests/auto/qxmlsimplereader/xmldocs/valid/sa/075.xml b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/075.xml
index 33c012441a..33c012441a 100644
--- a/tests/auto/qxmlsimplereader/xmldocs/valid/sa/075.xml
+++ b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/075.xml
diff --git a/tests/auto/qxmlsimplereader/xmldocs/valid/sa/075.xml.ref b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/075.xml.ref
index 0b8e512b33..0b8e512b33 100644
--- a/tests/auto/qxmlsimplereader/xmldocs/valid/sa/075.xml.ref
+++ b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/075.xml.ref
diff --git a/tests/auto/qxmlsimplereader/xmldocs/valid/sa/076.xml b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/076.xml
index 65b731cf6d..65b731cf6d 100644
--- a/tests/auto/qxmlsimplereader/xmldocs/valid/sa/076.xml
+++ b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/076.xml
diff --git a/tests/auto/qxmlsimplereader/xmldocs/valid/sa/076.xml.ref b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/076.xml.ref
index 3145f641b2..3145f641b2 100644
--- a/tests/auto/qxmlsimplereader/xmldocs/valid/sa/076.xml.ref
+++ b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/076.xml.ref
diff --git a/tests/auto/qxmlsimplereader/xmldocs/valid/sa/077.xml b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/077.xml
index e5f301eac8..e5f301eac8 100644
--- a/tests/auto/qxmlsimplereader/xmldocs/valid/sa/077.xml
+++ b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/077.xml
diff --git a/tests/auto/qxmlsimplereader/xmldocs/valid/sa/077.xml.ref b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/077.xml.ref
index 0b8e512b33..0b8e512b33 100644
--- a/tests/auto/qxmlsimplereader/xmldocs/valid/sa/077.xml.ref
+++ b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/077.xml.ref
diff --git a/tests/auto/qxmlsimplereader/xmldocs/valid/sa/078.xml b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/078.xml
index b31f40f94e..b31f40f94e 100644
--- a/tests/auto/qxmlsimplereader/xmldocs/valid/sa/078.xml
+++ b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/078.xml
diff --git a/tests/auto/qxmlsimplereader/xmldocs/valid/sa/078.xml.ref b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/078.xml.ref
index 6b4e3c4f31..6b4e3c4f31 100644
--- a/tests/auto/qxmlsimplereader/xmldocs/valid/sa/078.xml.ref
+++ b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/078.xml.ref
diff --git a/tests/auto/qxmlsimplereader/xmldocs/valid/sa/079.xml b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/079.xml
index a3290d6cbb..a3290d6cbb 100644
--- a/tests/auto/qxmlsimplereader/xmldocs/valid/sa/079.xml
+++ b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/079.xml
diff --git a/tests/auto/qxmlsimplereader/xmldocs/valid/sa/079.xml.ref b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/079.xml.ref
index 6b4e3c4f31..6b4e3c4f31 100644
--- a/tests/auto/qxmlsimplereader/xmldocs/valid/sa/079.xml.ref
+++ b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/079.xml.ref
diff --git a/tests/auto/qxmlsimplereader/xmldocs/valid/sa/080.xml b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/080.xml
index 3208fa9aa5..3208fa9aa5 100644
--- a/tests/auto/qxmlsimplereader/xmldocs/valid/sa/080.xml
+++ b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/080.xml
diff --git a/tests/auto/qxmlsimplereader/xmldocs/valid/sa/080.xml.ref b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/080.xml.ref
index 0b8e512b33..0b8e512b33 100644
--- a/tests/auto/qxmlsimplereader/xmldocs/valid/sa/080.xml.ref
+++ b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/080.xml.ref
diff --git a/tests/auto/qxmlsimplereader/xmldocs/valid/sa/081.xml b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/081.xml
index 51ee1a375c..51ee1a375c 100644
--- a/tests/auto/qxmlsimplereader/xmldocs/valid/sa/081.xml
+++ b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/081.xml
diff --git a/tests/auto/qxmlsimplereader/xmldocs/valid/sa/081.xml.ref b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/081.xml.ref
index 1bc73000f8..1bc73000f8 100644
--- a/tests/auto/qxmlsimplereader/xmldocs/valid/sa/081.xml.ref
+++ b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/081.xml.ref
diff --git a/tests/auto/qxmlsimplereader/xmldocs/valid/sa/082.xml b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/082.xml
index d5245ac51a..d5245ac51a 100644
--- a/tests/auto/qxmlsimplereader/xmldocs/valid/sa/082.xml
+++ b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/082.xml
diff --git a/tests/auto/qxmlsimplereader/xmldocs/valid/sa/082.xml.ref b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/082.xml.ref
index a333feb826..a333feb826 100644
--- a/tests/auto/qxmlsimplereader/xmldocs/valid/sa/082.xml.ref
+++ b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/082.xml.ref
diff --git a/tests/auto/qxmlsimplereader/xmldocs/valid/sa/083.xml b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/083.xml
index 937cfc0bdd..937cfc0bdd 100644
--- a/tests/auto/qxmlsimplereader/xmldocs/valid/sa/083.xml
+++ b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/083.xml
diff --git a/tests/auto/qxmlsimplereader/xmldocs/valid/sa/083.xml.ref b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/083.xml.ref
index d52b5aa8b9..d52b5aa8b9 100644
--- a/tests/auto/qxmlsimplereader/xmldocs/valid/sa/083.xml.ref
+++ b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/083.xml.ref
diff --git a/tests/auto/qxmlsimplereader/xmldocs/valid/sa/084.xml b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/084.xml
index 82760767aa..82760767aa 100644
--- a/tests/auto/qxmlsimplereader/xmldocs/valid/sa/084.xml
+++ b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/084.xml
diff --git a/tests/auto/qxmlsimplereader/xmldocs/valid/sa/084.xml.ref b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/084.xml.ref
index 37b53fc0b3..37b53fc0b3 100644
--- a/tests/auto/qxmlsimplereader/xmldocs/valid/sa/084.xml.ref
+++ b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/084.xml.ref
diff --git a/tests/auto/qxmlsimplereader/xmldocs/valid/sa/085.xml b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/085.xml
index cf5834f2a5..cf5834f2a5 100644
--- a/tests/auto/qxmlsimplereader/xmldocs/valid/sa/085.xml
+++ b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/085.xml
diff --git a/tests/auto/qxmlsimplereader/xmldocs/valid/sa/085.xml.ref b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/085.xml.ref
index 8f9cdcc6d0..8f9cdcc6d0 100644
--- a/tests/auto/qxmlsimplereader/xmldocs/valid/sa/085.xml.ref
+++ b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/085.xml.ref
diff --git a/tests/auto/qxmlsimplereader/xmldocs/valid/sa/086.xml b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/086.xml
index bbc3080db6..bbc3080db6 100644
--- a/tests/auto/qxmlsimplereader/xmldocs/valid/sa/086.xml
+++ b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/086.xml
diff --git a/tests/auto/qxmlsimplereader/xmldocs/valid/sa/086.xml.ref b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/086.xml.ref
index b59c216593..b59c216593 100644
--- a/tests/auto/qxmlsimplereader/xmldocs/valid/sa/086.xml.ref
+++ b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/086.xml.ref
diff --git a/tests/auto/qxmlsimplereader/xmldocs/valid/sa/087.xml b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/087.xml
index 34797a67d7..34797a67d7 100644
--- a/tests/auto/qxmlsimplereader/xmldocs/valid/sa/087.xml
+++ b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/087.xml
diff --git a/tests/auto/qxmlsimplereader/xmldocs/valid/sa/087.xml.ref b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/087.xml.ref
index 33d23092ef..33d23092ef 100644
--- a/tests/auto/qxmlsimplereader/xmldocs/valid/sa/087.xml.ref
+++ b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/087.xml.ref
diff --git a/tests/auto/qxmlsimplereader/xmldocs/valid/sa/088.xml b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/088.xml
index f97d96848d..f97d96848d 100644
--- a/tests/auto/qxmlsimplereader/xmldocs/valid/sa/088.xml
+++ b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/088.xml
diff --git a/tests/auto/qxmlsimplereader/xmldocs/valid/sa/088.xml.ref b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/088.xml.ref
index db24f3408f..db24f3408f 100644
--- a/tests/auto/qxmlsimplereader/xmldocs/valid/sa/088.xml.ref
+++ b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/088.xml.ref
diff --git a/tests/auto/qxmlsimplereader/xmldocs/valid/sa/089.xml b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/089.xml
index 2d80c8f3fb..2d80c8f3fb 100644
--- a/tests/auto/qxmlsimplereader/xmldocs/valid/sa/089.xml
+++ b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/089.xml
diff --git a/tests/auto/qxmlsimplereader/xmldocs/valid/sa/089.xml.bak b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/089.xml.bak
index 2d80c8f3fb..2d80c8f3fb 100644
--- a/tests/auto/qxmlsimplereader/xmldocs/valid/sa/089.xml.bak
+++ b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/089.xml.bak
diff --git a/tests/auto/qxmlsimplereader/xmldocs/valid/sa/089.xml.ref b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/089.xml.ref
index 7c68c32286..7c68c32286 100644
--- a/tests/auto/qxmlsimplereader/xmldocs/valid/sa/089.xml.ref
+++ b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/089.xml.ref
diff --git a/tests/auto/qxmlsimplereader/xmldocs/valid/sa/090.xml b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/090.xml
index c392c96084..c392c96084 100644
--- a/tests/auto/qxmlsimplereader/xmldocs/valid/sa/090.xml
+++ b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/090.xml
diff --git a/tests/auto/qxmlsimplereader/xmldocs/valid/sa/090.xml.ref b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/090.xml.ref
index 1cc0f1e082..1cc0f1e082 100644
--- a/tests/auto/qxmlsimplereader/xmldocs/valid/sa/090.xml.ref
+++ b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/090.xml.ref
diff --git a/tests/auto/qxmlsimplereader/xmldocs/valid/sa/091.xml b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/091.xml
index 7343d0f795..7343d0f795 100644
--- a/tests/auto/qxmlsimplereader/xmldocs/valid/sa/091.xml
+++ b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/091.xml
diff --git a/tests/auto/qxmlsimplereader/xmldocs/valid/sa/091.xml.ref b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/091.xml.ref
index da92a9d906..da92a9d906 100644
--- a/tests/auto/qxmlsimplereader/xmldocs/valid/sa/091.xml.ref
+++ b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/091.xml.ref
diff --git a/tests/auto/qxmlsimplereader/xmldocs/valid/sa/092.xml b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/092.xml
index 627b74ecdf..627b74ecdf 100644
--- a/tests/auto/qxmlsimplereader/xmldocs/valid/sa/092.xml
+++ b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/092.xml
diff --git a/tests/auto/qxmlsimplereader/xmldocs/valid/sa/092.xml.ref b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/092.xml.ref
index 3b9e06dc9e..3b9e06dc9e 100644
--- a/tests/auto/qxmlsimplereader/xmldocs/valid/sa/092.xml.ref
+++ b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/092.xml.ref
diff --git a/tests/auto/qxmlsimplereader/xmldocs/valid/sa/093.xml b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/093.xml
index 968acb628f..968acb628f 100644
--- a/tests/auto/qxmlsimplereader/xmldocs/valid/sa/093.xml
+++ b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/093.xml
diff --git a/tests/auto/qxmlsimplereader/xmldocs/valid/sa/093.xml.ref b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/093.xml.ref
index 2e8bee6814..2e8bee6814 100644
--- a/tests/auto/qxmlsimplereader/xmldocs/valid/sa/093.xml.ref
+++ b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/093.xml.ref
diff --git a/tests/auto/qxmlsimplereader/xmldocs/valid/sa/094.xml b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/094.xml
index 5726e7db6f..5726e7db6f 100644
--- a/tests/auto/qxmlsimplereader/xmldocs/valid/sa/094.xml
+++ b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/094.xml
diff --git a/tests/auto/qxmlsimplereader/xmldocs/valid/sa/094.xml.ref b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/094.xml.ref
index 4f42980c0b..4f42980c0b 100644
--- a/tests/auto/qxmlsimplereader/xmldocs/valid/sa/094.xml.ref
+++ b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/094.xml.ref
diff --git a/tests/auto/qxmlsimplereader/xmldocs/valid/sa/095.xml b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/095.xml
index 1fe69596da..1fe69596da 100644
--- a/tests/auto/qxmlsimplereader/xmldocs/valid/sa/095.xml
+++ b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/095.xml
diff --git a/tests/auto/qxmlsimplereader/xmldocs/valid/sa/095.xml.ref b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/095.xml.ref
index 567feee5ad..567feee5ad 100644
--- a/tests/auto/qxmlsimplereader/xmldocs/valid/sa/095.xml.ref
+++ b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/095.xml.ref
diff --git a/tests/auto/qxmlsimplereader/xmldocs/valid/sa/096.xml b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/096.xml
index a6f8f43620..a6f8f43620 100644
--- a/tests/auto/qxmlsimplereader/xmldocs/valid/sa/096.xml
+++ b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/096.xml
diff --git a/tests/auto/qxmlsimplereader/xmldocs/valid/sa/096.xml.ref b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/096.xml.ref
index 1e3200f48c..1e3200f48c 100644
--- a/tests/auto/qxmlsimplereader/xmldocs/valid/sa/096.xml.ref
+++ b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/096.xml.ref
diff --git a/tests/auto/qxmlsimplereader/xmldocs/valid/sa/097.ent b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/097.ent
index e06554ace2..e06554ace2 100644
--- a/tests/auto/qxmlsimplereader/xmldocs/valid/sa/097.ent
+++ b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/097.ent
diff --git a/tests/auto/qxmlsimplereader/xmldocs/valid/sa/097.xml b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/097.xml
index c606afa97f..c606afa97f 100644
--- a/tests/auto/qxmlsimplereader/xmldocs/valid/sa/097.xml
+++ b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/097.xml
diff --git a/tests/auto/qxmlsimplereader/xmldocs/valid/sa/097.xml.ref b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/097.xml.ref
index b211a094ed..b211a094ed 100644
--- a/tests/auto/qxmlsimplereader/xmldocs/valid/sa/097.xml.ref
+++ b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/097.xml.ref
diff --git a/tests/auto/qxmlsimplereader/xmldocs/valid/sa/098.xml b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/098.xml
index 33a64ce5ae..33a64ce5ae 100644
--- a/tests/auto/qxmlsimplereader/xmldocs/valid/sa/098.xml
+++ b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/098.xml
diff --git a/tests/auto/qxmlsimplereader/xmldocs/valid/sa/098.xml.ref b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/098.xml.ref
index 5108be0763..5108be0763 100644
--- a/tests/auto/qxmlsimplereader/xmldocs/valid/sa/098.xml.ref
+++ b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/098.xml.ref
diff --git a/tests/auto/qxmlsimplereader/xmldocs/valid/sa/099.xml b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/099.xml
index 1b7214a137..1b7214a137 100644
--- a/tests/auto/qxmlsimplereader/xmldocs/valid/sa/099.xml
+++ b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/099.xml
diff --git a/tests/auto/qxmlsimplereader/xmldocs/valid/sa/099.xml.ref b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/099.xml.ref
index 21cd9bced2..21cd9bced2 100644
--- a/tests/auto/qxmlsimplereader/xmldocs/valid/sa/099.xml.ref
+++ b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/099.xml.ref
diff --git a/tests/auto/qxmlsimplereader/xmldocs/valid/sa/100.xml b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/100.xml
index 5b839e76bc..5b839e76bc 100644
--- a/tests/auto/qxmlsimplereader/xmldocs/valid/sa/100.xml
+++ b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/100.xml
diff --git a/tests/auto/qxmlsimplereader/xmldocs/valid/sa/100.xml.ref b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/100.xml.ref
index aaeec27038..aaeec27038 100644
--- a/tests/auto/qxmlsimplereader/xmldocs/valid/sa/100.xml.ref
+++ b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/100.xml.ref
diff --git a/tests/auto/qxmlsimplereader/xmldocs/valid/sa/101.xml b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/101.xml
index f464484bf5..f464484bf5 100644
--- a/tests/auto/qxmlsimplereader/xmldocs/valid/sa/101.xml
+++ b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/101.xml
diff --git a/tests/auto/qxmlsimplereader/xmldocs/valid/sa/101.xml.ref b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/101.xml.ref
index 5b7646c82f..5b7646c82f 100644
--- a/tests/auto/qxmlsimplereader/xmldocs/valid/sa/101.xml.ref
+++ b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/101.xml.ref
diff --git a/tests/auto/qxmlsimplereader/xmldocs/valid/sa/102.xml b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/102.xml
index f239ff5fee..f239ff5fee 100644
--- a/tests/auto/qxmlsimplereader/xmldocs/valid/sa/102.xml
+++ b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/102.xml
diff --git a/tests/auto/qxmlsimplereader/xmldocs/valid/sa/102.xml.ref b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/102.xml.ref
index 75b25052de..75b25052de 100644
--- a/tests/auto/qxmlsimplereader/xmldocs/valid/sa/102.xml.ref
+++ b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/102.xml.ref
diff --git a/tests/auto/qxmlsimplereader/xmldocs/valid/sa/103.xml b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/103.xml
index 1dbbd5bb7c..1dbbd5bb7c 100644
--- a/tests/auto/qxmlsimplereader/xmldocs/valid/sa/103.xml
+++ b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/103.xml
diff --git a/tests/auto/qxmlsimplereader/xmldocs/valid/sa/103.xml.ref b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/103.xml.ref
index 63526243dc..63526243dc 100644
--- a/tests/auto/qxmlsimplereader/xmldocs/valid/sa/103.xml.ref
+++ b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/103.xml.ref
diff --git a/tests/auto/qxmlsimplereader/xmldocs/valid/sa/104.xml b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/104.xml
index 666f43de0f..666f43de0f 100644
--- a/tests/auto/qxmlsimplereader/xmldocs/valid/sa/104.xml
+++ b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/104.xml
diff --git a/tests/auto/qxmlsimplereader/xmldocs/valid/sa/104.xml.ref b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/104.xml.ref
index 2bccd0e3c7..2bccd0e3c7 100644
--- a/tests/auto/qxmlsimplereader/xmldocs/valid/sa/104.xml.ref
+++ b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/104.xml.ref
diff --git a/tests/auto/qxmlsimplereader/xmldocs/valid/sa/105.xml b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/105.xml
index 6b3af2b847..6b3af2b847 100644
--- a/tests/auto/qxmlsimplereader/xmldocs/valid/sa/105.xml
+++ b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/105.xml
diff --git a/tests/auto/qxmlsimplereader/xmldocs/valid/sa/105.xml.ref b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/105.xml.ref
index 2bccd0e3c7..2bccd0e3c7 100644
--- a/tests/auto/qxmlsimplereader/xmldocs/valid/sa/105.xml.ref
+++ b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/105.xml.ref
diff --git a/tests/auto/qxmlsimplereader/xmldocs/valid/sa/106.xml b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/106.xml
index 8757c0a5ae..8757c0a5ae 100644
--- a/tests/auto/qxmlsimplereader/xmldocs/valid/sa/106.xml
+++ b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/106.xml
diff --git a/tests/auto/qxmlsimplereader/xmldocs/valid/sa/106.xml.ref b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/106.xml.ref
index 1e9cc0949b..1e9cc0949b 100644
--- a/tests/auto/qxmlsimplereader/xmldocs/valid/sa/106.xml.ref
+++ b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/106.xml.ref
diff --git a/tests/auto/qxmlsimplereader/xmldocs/valid/sa/107.xml b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/107.xml
index 3d2c2566a7..3d2c2566a7 100644
--- a/tests/auto/qxmlsimplereader/xmldocs/valid/sa/107.xml
+++ b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/107.xml
diff --git a/tests/auto/qxmlsimplereader/xmldocs/valid/sa/107.xml.ref b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/107.xml.ref
index 803dbc297b..803dbc297b 100644
--- a/tests/auto/qxmlsimplereader/xmldocs/valid/sa/107.xml.ref
+++ b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/107.xml.ref
diff --git a/tests/auto/qxmlsimplereader/xmldocs/valid/sa/108.xml b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/108.xml
index e919bf229a..e919bf229a 100644
--- a/tests/auto/qxmlsimplereader/xmldocs/valid/sa/108.xml
+++ b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/108.xml
diff --git a/tests/auto/qxmlsimplereader/xmldocs/valid/sa/108.xml.ref b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/108.xml.ref
index 2199bd8fb3..2199bd8fb3 100644
--- a/tests/auto/qxmlsimplereader/xmldocs/valid/sa/108.xml.ref
+++ b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/108.xml.ref
diff --git a/tests/auto/qxmlsimplereader/xmldocs/valid/sa/109.xml b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/109.xml
index 33fa38e13b..33fa38e13b 100644
--- a/tests/auto/qxmlsimplereader/xmldocs/valid/sa/109.xml
+++ b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/109.xml
diff --git a/tests/auto/qxmlsimplereader/xmldocs/valid/sa/109.xml.ref b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/109.xml.ref
index 789cb33821..789cb33821 100644
--- a/tests/auto/qxmlsimplereader/xmldocs/valid/sa/109.xml.ref
+++ b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/109.xml.ref
diff --git a/tests/auto/qxmlsimplereader/xmldocs/valid/sa/110.xml b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/110.xml
index 0c61c65119..0c61c65119 100644
--- a/tests/auto/qxmlsimplereader/xmldocs/valid/sa/110.xml
+++ b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/110.xml
diff --git a/tests/auto/qxmlsimplereader/xmldocs/valid/sa/110.xml.ref b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/110.xml.ref
index 2199bd8fb3..2199bd8fb3 100644
--- a/tests/auto/qxmlsimplereader/xmldocs/valid/sa/110.xml.ref
+++ b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/110.xml.ref
diff --git a/tests/auto/qxmlsimplereader/xmldocs/valid/sa/111.xml b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/111.xml
index cb56f264b0..cb56f264b0 100644
--- a/tests/auto/qxmlsimplereader/xmldocs/valid/sa/111.xml
+++ b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/111.xml
diff --git a/tests/auto/qxmlsimplereader/xmldocs/valid/sa/111.xml.ref b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/111.xml.ref
index 152e284e58..152e284e58 100644
--- a/tests/auto/qxmlsimplereader/xmldocs/valid/sa/111.xml.ref
+++ b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/111.xml.ref
diff --git a/tests/auto/qxmlsimplereader/xmldocs/valid/sa/112.xml b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/112.xml
index 27b6a4c793..27b6a4c793 100644
--- a/tests/auto/qxmlsimplereader/xmldocs/valid/sa/112.xml
+++ b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/112.xml
diff --git a/tests/auto/qxmlsimplereader/xmldocs/valid/sa/112.xml.ref b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/112.xml.ref
index f82c6dca3f..f82c6dca3f 100644
--- a/tests/auto/qxmlsimplereader/xmldocs/valid/sa/112.xml.ref
+++ b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/112.xml.ref
diff --git a/tests/auto/qxmlsimplereader/xmldocs/valid/sa/113.xml b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/113.xml
index d2edd0f01d..d2edd0f01d 100644
--- a/tests/auto/qxmlsimplereader/xmldocs/valid/sa/113.xml
+++ b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/113.xml
diff --git a/tests/auto/qxmlsimplereader/xmldocs/valid/sa/113.xml.ref b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/113.xml.ref
index 6342ccc536..6342ccc536 100644
--- a/tests/auto/qxmlsimplereader/xmldocs/valid/sa/113.xml.ref
+++ b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/113.xml.ref
diff --git a/tests/auto/qxmlsimplereader/xmldocs/valid/sa/114.xml b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/114.xml
index 52e207096d..52e207096d 100644
--- a/tests/auto/qxmlsimplereader/xmldocs/valid/sa/114.xml
+++ b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/114.xml
diff --git a/tests/auto/qxmlsimplereader/xmldocs/valid/sa/114.xml.ref b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/114.xml.ref
index b11750e4b0..b11750e4b0 100644
--- a/tests/auto/qxmlsimplereader/xmldocs/valid/sa/114.xml.ref
+++ b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/114.xml.ref
diff --git a/tests/auto/qxmlsimplereader/xmldocs/valid/sa/115.xml b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/115.xml
index d939a67010..d939a67010 100644
--- a/tests/auto/qxmlsimplereader/xmldocs/valid/sa/115.xml
+++ b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/115.xml
diff --git a/tests/auto/qxmlsimplereader/xmldocs/valid/sa/115.xml.ref b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/115.xml.ref
index 5b09ebd425..5b09ebd425 100644
--- a/tests/auto/qxmlsimplereader/xmldocs/valid/sa/115.xml.ref
+++ b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/115.xml.ref
diff --git a/tests/auto/qxmlsimplereader/xmldocs/valid/sa/116.xml b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/116.xml
index 55ab49620b..55ab49620b 100644
--- a/tests/auto/qxmlsimplereader/xmldocs/valid/sa/116.xml
+++ b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/116.xml
diff --git a/tests/auto/qxmlsimplereader/xmldocs/valid/sa/116.xml.ref b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/116.xml.ref
index 9bdec9e5cc..9bdec9e5cc 100644
--- a/tests/auto/qxmlsimplereader/xmldocs/valid/sa/116.xml.ref
+++ b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/116.xml.ref
diff --git a/tests/auto/qxmlsimplereader/xmldocs/valid/sa/117.xml b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/117.xml
index e4f02b14c8..e4f02b14c8 100644
--- a/tests/auto/qxmlsimplereader/xmldocs/valid/sa/117.xml
+++ b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/117.xml
diff --git a/tests/auto/qxmlsimplereader/xmldocs/valid/sa/117.xml.ref b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/117.xml.ref
index 78dd11416a..78dd11416a 100644
--- a/tests/auto/qxmlsimplereader/xmldocs/valid/sa/117.xml.ref
+++ b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/117.xml.ref
diff --git a/tests/auto/qxmlsimplereader/xmldocs/valid/sa/118.xml b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/118.xml
index fba6c44668..fba6c44668 100644
--- a/tests/auto/qxmlsimplereader/xmldocs/valid/sa/118.xml
+++ b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/118.xml
diff --git a/tests/auto/qxmlsimplereader/xmldocs/valid/sa/118.xml.ref b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/118.xml.ref
index c84da55fe0..c84da55fe0 100644
--- a/tests/auto/qxmlsimplereader/xmldocs/valid/sa/118.xml.ref
+++ b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/118.xml.ref
diff --git a/tests/auto/qxmlsimplereader/xmldocs/valid/sa/119.xml b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/119.xml
index 876e74730c..876e74730c 100644
--- a/tests/auto/qxmlsimplereader/xmldocs/valid/sa/119.xml
+++ b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/119.xml
diff --git a/tests/auto/qxmlsimplereader/xmldocs/valid/sa/119.xml.ref b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/119.xml.ref
index d1c643ee03..d1c643ee03 100644
--- a/tests/auto/qxmlsimplereader/xmldocs/valid/sa/119.xml.ref
+++ b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/119.xml.ref
diff --git a/tests/auto/xml/sax/sax.pro b/tests/auto/xml/sax/sax.pro
new file mode 100644
index 0000000000..13aeb21d07
--- /dev/null
+++ b/tests/auto/xml/sax/sax.pro
@@ -0,0 +1,6 @@
+TEMPLATE=subdirs
+SUBDIRS=\
+   qxmlinputsource \
+   qxml \
+   qxmlsimplereader \
+
diff --git a/tests/auto/xml/xml.pro b/tests/auto/xml/xml.pro
new file mode 100644
index 0000000000..4b90ffbe13
--- /dev/null
+++ b/tests/auto/xml/xml.pro
@@ -0,0 +1,5 @@
+TEMPLATE=subdirs
+SUBDIRS=\
+   dom \
+   sax \
+