Remove the SAX parser from QtXml

It has been deprecated and will live in qt5compat from now on.

Fixes: QTBUG-86480
Change-Id: I3744c7cee058d51d0fce633a174ab1a0f9235d2c
Reviewed-by: Karsten Heimrich <karsten.heimrich@qt.io>

788 files changed, 0 insertions, 6262 deletions

diff --git a/tests/auto/xml/CMakeLists.txt b/tests/auto/xml/CMakeLists.txt
index 703cba344d..fe747649a7 100644
--- a/tests/auto/xml/CMakeLists.txt
+++ b/tests/auto/xml/CMakeLists.txt
@@ -1,4 +1,3 @@
 # Generated from xml.pro.
 
 add_subdirectory(dom)
-add_subdirectory(sax)
diff --git a/tests/auto/xml/sax/CMakeLists.txt b/tests/auto/xml/sax/CMakeLists.txt
deleted file mode 100644
index dd826d5e4f..0000000000
--- a/tests/auto/xml/sax/CMakeLists.txt
+++ /dev/null
@@ -1,7 +0,0 @@
-# Generated from sax.pro.
-
-add_subdirectory(qxml)
-if(TARGET Qt::Network)
-    add_subdirectory(qxmlinputsource)
-    add_subdirectory(qxmlsimplereader)
-endif()
diff --git a/tests/auto/xml/sax/qxml/.gitignore b/tests/auto/xml/sax/qxml/.gitignore
deleted file mode 100644
index 6506151df0..0000000000
--- a/tests/auto/xml/sax/qxml/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-tst_qxml
diff --git a/tests/auto/xml/sax/qxml/0x010D.xml b/tests/auto/xml/sax/qxml/0x010D.xml
deleted file mode 100644
index 5f2fe4d940..0000000000
--- a/tests/auto/xml/sax/qxml/0x010D.xml
+++ /dev/null
@@ -1 +0,0 @@
-<project čreated-by="{{build_number}}"/>
\ No newline at end of file
diff --git a/tests/auto/xml/sax/qxml/CMakeLists.txt b/tests/auto/xml/sax/qxml/CMakeLists.txt
deleted file mode 100644
index cca9b95a2f..0000000000
--- a/tests/auto/xml/sax/qxml/CMakeLists.txt
+++ /dev/null
@@ -1,16 +0,0 @@
-# Generated from qxml.pro.
-
-#####################################################################
-## tst_qxml Test:
-#####################################################################
-
-# Collect test data
-list(APPEND test_data "0x010D.xml")
-
-qt_add_test(tst_qxml
-    SOURCES
-        tst_qxml.cpp
-    PUBLIC_LIBRARIES
-        Qt::Xml
-    TESTDATA ${test_data}
-)
diff --git a/tests/auto/xml/sax/qxml/qxml.pro b/tests/auto/xml/sax/qxml/qxml.pro
deleted file mode 100644
index e0b48ad9f5..0000000000
--- a/tests/auto/xml/sax/qxml/qxml.pro
+++ /dev/null
@@ -1,7 +0,0 @@
-CONFIG += testcase
-TARGET = tst_qxml
-
-SOURCES += tst_qxml.cpp
-QT = core xml testlib
-
-TESTDATA += 0x010D.xml
diff --git a/tests/auto/xml/sax/qxml/tst_qxml.cpp b/tests/auto/xml/sax/qxml/tst_qxml.cpp
deleted file mode 100644
index 2f00a08fef..0000000000
--- a/tests/auto/xml/sax/qxml/tst_qxml.cpp
+++ /dev/null
@@ -1,236 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2016 The Qt Company Ltd.
-** Contact: https://www.qt.io/licensing/
-**
-** This file is part of the test suite of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:GPL-EXCEPT$
-** Commercial License Usage
-** Licensees holding valid commercial Qt licenses may use this file in
-** accordance with the commercial license agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and The Qt Company. For licensing terms
-** and conditions see https://www.qt.io/terms-conditions. For further
-** information use the contact form at https://www.qt.io/contact-us.
-**
-** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU
-** General Public License version 3 as published by the Free Software
-** Foundation with exceptions as appearing in the file LICENSE.GPL3-EXCEPT
-** included in the packaging of this file. Please review the following
-** information to ensure the GNU General Public License requirements will
-** be met: https://www.gnu.org/licenses/gpl-3.0.html.
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-#include <QtTest/QtTest>
-
-QT_WARNING_DISABLE_DEPRECATED
-
-#include <qcoreapplication.h>
-#include <qdebug.h>
-#include <qxml.h>
-
-class tst_QXml : public QObject
-{
-Q_OBJECT
-
-private slots:
-#if QT_DEPRECATED_SINCE(5, 15)
-    void getSetCheck();
-    void interpretedAs0D() const;
-#ifndef QT_NO_EXCEPTIONS
-    void exception();
-#endif
-#endif // QT_DEPRECATED_SINCE(5, 15)
-};
-
-#if QT_DEPRECATED_SINCE(5, 15)
-
-class MyXmlEntityResolver : public QXmlEntityResolver
-{
-public:
-    MyXmlEntityResolver() : QXmlEntityResolver() {}
-    QString errorString() const { return QString(); }
-    bool resolveEntity(const QString &, const QString &, QXmlInputSource *&) { return false; }
-};
-
-class MyXmlContentHandler : public QXmlContentHandler
-{
-public:
-    MyXmlContentHandler() : QXmlContentHandler() {}
-    bool characters(const QString &) { return false; }
-    bool endDocument() { return false; }
-    bool endElement(const QString &, const QString &, const QString &) { return false; }
-    bool endPrefixMapping(const QString &) { return false; }
-    QString errorString() const { return QString(); }
-    bool ignorableWhitespace(const QString &) { return false; }
-    bool processingInstruction(const QString &, const QString &) { return false; }
-    void setDocumentLocator(QXmlLocator *) { }
-    bool skippedEntity(const QString &) { return false; }
-    bool startDocument() { return false; }
-    bool startElement(const QString &, const QString &, const QString &, const QXmlAttributes &) { return false; }
-    bool startPrefixMapping(const QString &, const QString &) { return false; }
-};
-
-class MyXmlErrorHandler : public QXmlErrorHandler
-{
-public:
-    MyXmlErrorHandler() : QXmlErrorHandler() {}
-    QString errorString() const { return QString(); }
-    bool error(const QXmlParseException &) { return false; }
-    bool fatalError(const QXmlParseException &) { return false; }
-    bool warning(const QXmlParseException &) { return false; }
-};
-
-class MyXmlLexicalHandler : public QXmlLexicalHandler
-{
-public:
-    MyXmlLexicalHandler() : QXmlLexicalHandler() {}
-    bool comment(const QString &) { return false; }
-    bool endCDATA() { return false; }
-    bool endDTD() { return false; }
-    bool endEntity(const QString &) { return false; }
-    QString errorString() const { return QString(); }
-    bool startCDATA() { return false; }
-    bool startDTD(const QString &, const QString &, const QString &) { return false; }
-    bool startEntity(const QString &) { return false; }
-};
-
-class MyXmlDeclHandler : public QXmlDeclHandler
-{
-public:
-    MyXmlDeclHandler() : QXmlDeclHandler() {}
-    bool attributeDecl(const QString &, const QString &, const QString &, const QString &, const QString &) { return false; }
-    QString errorString() const { return QString(); }
-    bool externalEntityDecl(const QString &, const QString &, const QString &) { return false; }
-    bool internalEntityDecl(const QString &, const QString &) { return false; }
-};
-
-// Testing get/set functions
-void tst_QXml::getSetCheck()
-{
-    QXmlSimpleReader obj1;
-    // QXmlEntityResolver* QXmlSimpleReader::entityResolver()
-    // void QXmlSimpleReader::setEntityResolver(QXmlEntityResolver*)
-    MyXmlEntityResolver *var1 = new MyXmlEntityResolver;
-    obj1.setEntityResolver(var1);
-    QCOMPARE(static_cast<QXmlEntityResolver *>(var1), obj1.entityResolver());
-    obj1.setEntityResolver((QXmlEntityResolver *)0);
-    QCOMPARE((QXmlEntityResolver *)0, obj1.entityResolver());
-    delete var1;
-
-    // QXmlContentHandler* QXmlSimpleReader::contentHandler()
-    // void QXmlSimpleReader::setContentHandler(QXmlContentHandler*)
-    MyXmlContentHandler *var2 = new MyXmlContentHandler;
-    obj1.setContentHandler(var2);
-    QCOMPARE(static_cast<QXmlContentHandler *>(var2), obj1.contentHandler());
-    obj1.setContentHandler((QXmlContentHandler *)0);
-    QCOMPARE((QXmlContentHandler *)0, obj1.contentHandler());
-    delete var2;
-
-    // QXmlErrorHandler* QXmlSimpleReader::errorHandler()
-    // void QXmlSimpleReader::setErrorHandler(QXmlErrorHandler*)
-    MyXmlErrorHandler *var3 = new MyXmlErrorHandler;
-    obj1.setErrorHandler(var3);
-    QCOMPARE(static_cast<QXmlErrorHandler *>(var3), obj1.errorHandler());
-    obj1.setErrorHandler((QXmlErrorHandler *)0);
-    QCOMPARE((QXmlErrorHandler *)0, obj1.errorHandler());
-    delete var3;
-
-    // QXmlLexicalHandler* QXmlSimpleReader::lexicalHandler()
-    // void QXmlSimpleReader::setLexicalHandler(QXmlLexicalHandler*)
-    MyXmlLexicalHandler *var4 = new MyXmlLexicalHandler;
-    obj1.setLexicalHandler(var4);
-    QCOMPARE(static_cast<QXmlLexicalHandler *>(var4), obj1.lexicalHandler());
-    obj1.setLexicalHandler((QXmlLexicalHandler *)0);
-    QCOMPARE((QXmlLexicalHandler *)0, obj1.lexicalHandler());
-    delete var4;
-
-    // QXmlDeclHandler* QXmlSimpleReader::declHandler()
-    // void QXmlSimpleReader::setDeclHandler(QXmlDeclHandler*)
-    MyXmlDeclHandler *var5 = new MyXmlDeclHandler;
-    obj1.setDeclHandler(var5);
-    QCOMPARE(static_cast<QXmlDeclHandler *>(var5), obj1.declHandler());
-    obj1.setDeclHandler((QXmlDeclHandler *)0);
-    QCOMPARE((QXmlDeclHandler *)0, obj1.declHandler());
-    delete var5;
-}
-
-void tst_QXml::interpretedAs0D() const
-{
-    /* See task 172632. */
-
-    class MyHandler : public QXmlDefaultHandler
-    {
-    public:
-        virtual bool startElement(const QString &namespaceURI,
-                                  const QString &localName,
-                                  const QString &qName,
-                                  const QXmlAttributes &atts)
-        {
-            Q_UNUSED(namespaceURI);
-            Q_UNUSED(localName);
-            Q_UNUSED(qName);
-            attrName = atts.qName(0);
-            attrCount = atts.count();
-            return true;
-        }
-
-        QString attrName;
-        int     attrCount;
-    };
-
-    const QString document(QLatin1String("<element ") +
-                           QChar(0x010D) +
-                           QLatin1String("reated-by=\"an attr value\"/>"));
-
-    QString testFile = QFINDTESTDATA("0x010D.xml");
-    if (testFile.isEmpty())
-        QFAIL("Cannot find test file 0x010D.xml!");
-    QFile f(testFile);
-    QVERIFY(f.open(QIODevice::ReadOnly));
-    QXmlInputSource data(&f);
-
-    QXmlSimpleReader reader;
-
-    MyHandler myHandler;
-    reader.setContentHandler(&myHandler);
-    reader.setErrorHandler(&myHandler);
-
-    QVERIFY(reader.parse(&data));
-
-    QCOMPARE(myHandler.attrCount, 1);
-    QCOMPARE(myHandler.attrName, QChar(0x010D) + QString::fromLatin1("reated-by"));
-}
-
-#ifndef QT_NO_EXCEPTIONS
-void tst_QXml::exception()
-{
-    QString message = QString::fromLatin1("message");
-    int column = 3;
-    int line = 2;
-    QString publicId = QString::fromLatin1("publicId");
-    QString systemId = QString::fromLatin1("systemId");
-
-    try {
-        QXmlParseException e(message, column, line, publicId, systemId);
-        throw e;
-    }
-    catch (QXmlParseException e) {
-        QCOMPARE(e.message(), message);
-        QCOMPARE(e.columnNumber(), column);
-        QCOMPARE(e.lineNumber(), line);
-        QCOMPARE(e.publicId(), publicId);
-        QCOMPARE(e.systemId(), systemId);
-    }
-}
-#endif
-
-#endif // QT_DEPRECATED_SINCE(5, 15)
-
-QTEST_MAIN(tst_QXml)
-#include "tst_qxml.moc"
diff --git a/tests/auto/xml/sax/qxmlinputsource/.gitignore b/tests/auto/xml/sax/qxmlinputsource/.gitignore
deleted file mode 100644
index 09ea68aa90..0000000000
--- a/tests/auto/xml/sax/qxmlinputsource/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-tst_qxmlinputsource
diff --git a/tests/auto/xml/sax/qxmlinputsource/CMakeLists.txt b/tests/auto/xml/sax/qxmlinputsource/CMakeLists.txt
deleted file mode 100644
index 5da96c6863..0000000000
--- a/tests/auto/xml/sax/qxmlinputsource/CMakeLists.txt
+++ /dev/null
@@ -1,13 +0,0 @@
-# Generated from qxmlinputsource.pro.
-
-#####################################################################
-## tst_qxmlinputsource Test:
-#####################################################################
-
-qt_add_test(tst_qxmlinputsource
-    SOURCES
-        tst_qxmlinputsource.cpp
-    PUBLIC_LIBRARIES
-        Qt::Network
-        Qt::Xml
-)
diff --git a/tests/auto/xml/sax/qxmlinputsource/qxmlinputsource.pro b/tests/auto/xml/sax/qxmlinputsource/qxmlinputsource.pro
deleted file mode 100644
index 8846ae5e4a..0000000000
--- a/tests/auto/xml/sax/qxmlinputsource/qxmlinputsource.pro
+++ /dev/null
@@ -1,4 +0,0 @@
-CONFIG += testcase
-TARGET = tst_qxmlinputsource
-SOURCES  += tst_qxmlinputsource.cpp
-QT = core xml network testlib
diff --git a/tests/auto/xml/sax/qxmlinputsource/tst_qxmlinputsource.cpp b/tests/auto/xml/sax/qxmlinputsource/tst_qxmlinputsource.cpp
deleted file mode 100644
index 8b437103de..0000000000
--- a/tests/auto/xml/sax/qxmlinputsource/tst_qxmlinputsource.cpp
+++ /dev/null
@@ -1,304 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2016 The Qt Company Ltd.
-** Contact: https://www.qt.io/licensing/
-**
-** This file is part of the test suite of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:GPL-EXCEPT$
-** Commercial License Usage
-** Licensees holding valid commercial Qt licenses may use this file in
-** accordance with the commercial license agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and The Qt Company. For licensing terms
-** and conditions see https://www.qt.io/terms-conditions. For further
-** information use the contact form at https://www.qt.io/contact-us.
-**
-** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU
-** General Public License version 3 as published by the Free Software
-** Foundation with exceptions as appearing in the file LICENSE.GPL3-EXCEPT
-** included in the packaging of this file. Please review the following
-** information to ensure the GNU General Public License requirements will
-** be met: https://www.gnu.org/licenses/gpl-3.0.html.
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-
-#include <QDomDocument>
-#include <QNetworkAccessManager>
-#include <QNetworkReply>
-#include <QNetworkRequest>
-#include <QTcpServer>
-#include <QTcpSocket>
-#include <QTimer>
-#include <QElapsedTimer>
-#include <QtDebug>
-#include <QtTest/QtTest>
-#include <QXmlDefaultHandler>
-#include <QXmlInputSource>
-#include <QXmlSimpleReader>
-
-class tst_QXmlInputSource : public QObject
-{
-    Q_OBJECT
-
-#if QT_DEPRECATED_SINCE(5, 15)
-private slots:
-    void reset() const;
-    void resetSimplified() const;
-    void waitForReadyIODevice() const;
-    void inputFromSlowDevice() const;
-#endif // QT_DEPRECATED_SINCE(5, 15)
-};
-
-#if QT_DEPRECATED_SINCE(5, 15)
-QT_WARNING_PUSH
-QT_WARNING_DISABLE_DEPRECATED
-/*!
-  \internal
-  \since 4.4
-
-  See task 166278.
- */
-void tst_QXmlInputSource::reset() const
-{
-    const QString input(QString::fromLatin1("<element attribute1='value1' attribute2='value2'/>"));
-
-    QXmlSimpleReader reader;
-    QXmlDefaultHandler handler;
-    reader.setContentHandler(&handler);
-
-    QXmlInputSource source;
-    source.setData(input);
-
-    QCOMPARE(source.data(), input);
-
-    source.reset();
-    QCOMPARE(source.data(), input);
-
-    source.reset();
-    QVERIFY(reader.parse(source));
-    source.reset();
-    QCOMPARE(source.data(), input);
-}
-
-/*!
-  \internal
-  \since 4.4
-
-  See task 166278.
- */
-void tst_QXmlInputSource::resetSimplified() const
-{
-    const QString input(QString::fromLatin1("<element/>"));
-
-    QXmlSimpleReader reader;
-
-    QXmlInputSource source;
-    source.setData(input);
-
-    QVERIFY(reader.parse(source));
-    source.reset();
-    QCOMPARE(source.data(), input);
-}
-
-class ServerAndClient : public QObject
-{
-    Q_OBJECT
-
-public:
-    ServerAndClient(QEventLoop &ev) : success(false)
-                                    , eventLoop(ev)
-                                    , bodyBytesRead(0)
-                                    , bodyLength(-1)
-                                    , isBody(false)
-    {
-        setObjectName("serverAndClient");
-        tcpServer = new QTcpServer(this);
-        connect(tcpServer, SIGNAL(newConnection()), this, SLOT(newConnection()));
-        tcpServer->listen(QHostAddress::LocalHost, 1088);
-        httpClient = new QNetworkAccessManager(this);
-        connect(httpClient, SIGNAL(finished(QNetworkReply*)), SLOT(requestFinished(QNetworkReply*)));
-    }
-
-    bool success;
-    QEventLoop &eventLoop;
-
-public slots:
-    void doIt()
-    {
-        QUrl url("http://127.0.0.1:1088");
-        QNetworkRequest req(url);
-        req.setRawHeader("POST", url.path().toLatin1());
-        req.setRawHeader("user-agent", "xml-test");
-        req.setRawHeader("keep-alive", "false");
-        req.setRawHeader("host", url.host().toLatin1());
-
-        QByteArray xmlrpc("<methodCall>\r\n\
-                <methodName>SFD.GetVersion</methodName>\r\n\
-                <params/>\r\n\
-                </methodCall>");
-        req.setHeader(QNetworkRequest::ContentLengthHeader, xmlrpc.size());
-        req.setHeader(QNetworkRequest::ContentTypeHeader, "text/xml");
-
-        httpClient->post(req, xmlrpc);
-    }
-
-    void requestFinished(QNetworkReply *reply)
-    {
-        QCOMPARE(reply->error(), QNetworkReply::NoError);
-        reply->deleteLater();
-    }
-
-private slots:
-    void newConnection()
-    {
-        QTcpSocket *const s = tcpServer->nextPendingConnection();
-
-        if(s)
-            connect(s, SIGNAL(readyRead()), this, SLOT(readyRead()));
-    }
-
-    void readyRead()
-    {
-        QTcpSocket *const s = static_cast<QTcpSocket *>(sender());
-
-        while (s->bytesAvailable())
-        {
-            const QString line(s->readLine());
-
-            if (line.startsWith("Content-Length:"))
-                bodyLength = line.mid(15).toInt();
-
-            if (isBody)
-            {
-                body.append(line.toUtf8());
-                bodyBytesRead += line.length();
-            }
-            else if (line == "\r\n")
-            {
-                isBody = true;
-                if (bodyLength == -1)
-                {
-                    qFatal("No length was specified in the header.");
-                }
-            }
-        }
-
-        if (bodyBytesRead == bodyLength)
-        {
-            QDomDocument domDoc;
-            success = domDoc.setContent(body);
-            eventLoop.exit();
-        }
-    }
-
-private:
-    QByteArray body;
-    int bodyBytesRead, bodyLength;
-    bool isBody;
-    QTcpServer *tcpServer;
-    QNetworkAccessManager* httpClient;
-};
-
-void tst_QXmlInputSource::waitForReadyIODevice() const
-{
-    QEventLoop el;
-    ServerAndClient sv(el);
-    QTimer::singleShot(1, &sv, SLOT(doIt()));
-
-    el.exec();
-    QVERIFY(sv.success);
-}
-
-// This class is used to emulate a case where less than 4 bytes are sent in
-// a single packet to ensure it is still parsed correctly
-class SlowIODevice : public QIODevice
-{
-public:
-    SlowIODevice(const QString &expectedData, QObject *parent = 0)
-        : QIODevice(parent), currentPos(0), readyToSend(true)
-    {
-        stringData = expectedData.toUtf8();
-        dataTimer = new QTimer(this);
-        connect(dataTimer, &QTimer::timeout, [=]() {
-            readyToSend = true;
-            emit readyRead();
-            dataTimer->stop();
-        });
-        dataTimer->start(1000);
-    }
-    bool open(SlowIODevice::OpenMode) override
-    {
-        setOpenMode(ReadOnly);
-        return true;
-    }
-    bool isSequential() const override
-    {
-        return true;
-    }
-    qint64 bytesAvailable() const override
-    {
-        if (readyToSend && stringData.size() != currentPos)
-            return qMax(3, stringData.size() - currentPos);
-        return 0;
-    }
-    qint64 readData(char *data, qint64 maxSize) override
-    {
-        if (!readyToSend)
-            return 0;
-        const qint64 readSize = qMin(qMin((qint64)3, maxSize), (qint64)(stringData.size() - currentPos));
-        if (readSize > 0)
-            memcpy(data, &stringData.constData()[currentPos], readSize);
-        currentPos += readSize;
-        readyToSend = false;
-        if (currentPos != stringData.size())
-            dataTimer->start(1000);
-        return readSize;
-    }
-    qint64 writeData(const char *, qint64) override { return 0; }
-    bool waitForReadyRead(int msecs) override
-    {
-        // Delibrately wait a maximum of 10 seconds for the sake
-        // of the test, so it doesn't unduly hang
-        const int waitTime = qMax(10000, msecs);
-        QElapsedTimer t;
-        t.start();
-        while (t.elapsed() < waitTime) {
-            QCoreApplication::processEvents();
-            if (readyToSend)
-                return true;
-        }
-        return false;
-    }
-private:
-    QByteArray stringData;
-    int currentPos;
-    bool readyToSend;
-    QTimer *dataTimer;
-};
-
-void tst_QXmlInputSource::inputFromSlowDevice() const
-{
-    QString expectedData = QStringLiteral("<foo><bar>kake</bar><bar>ja</bar></foo>");
-    SlowIODevice slowDevice(expectedData);
-    QXmlInputSource source(&slowDevice);
-    QString data;
-    while (true) {
-        const QChar nextChar = source.next();
-        if (nextChar == QXmlInputSource::EndOfDocument)
-            break;
-        else if (nextChar != QXmlInputSource::EndOfData)
-            data += nextChar;
-    }
-    QCOMPARE(data, expectedData);
-}
-
-QT_WARNING_POP
-#endif // QT_DEPRECATED_SINCE(5, 15)
-
-QTEST_MAIN(tst_QXmlInputSource)
-#include "tst_qxmlinputsource.moc"
diff --git a/tests/auto/xml/sax/qxmlsimplereader/.gitattributes b/tests/auto/xml/sax/qxmlsimplereader/.gitattributes
deleted file mode 100644
index 5521239fbe..0000000000
--- a/tests/auto/xml/sax/qxmlsimplereader/.gitattributes
+++ /dev/null
@@ -1,8 +0,0 @@
-encodings/doc_euc-jp.xml     -crlf
-encodings/doc_utf-8.xml      -crlf
-xmldocs/*                    -crlf
-xmldocs/*/*                  -crlf
-xmldocs/*/*/*                -crlf
-xmldocs/*/*/*/*              -crlf
-xmldocs/*/*/*/*/*            -crlf
-xmldocs/*/*/*/*/*/*          -crlf
diff --git a/tests/auto/xml/sax/qxmlsimplereader/.gitignore b/tests/auto/xml/sax/qxmlsimplereader/.gitignore
deleted file mode 100644
index 31b604faaf..0000000000
--- a/tests/auto/xml/sax/qxmlsimplereader/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-tst_qxmlsimplereader
diff --git a/tests/auto/xml/sax/qxmlsimplereader/CMakeLists.txt b/tests/auto/xml/sax/qxmlsimplereader/CMakeLists.txt
deleted file mode 100644
index 504dc67ecd..0000000000
--- a/tests/auto/xml/sax/qxmlsimplereader/CMakeLists.txt
+++ /dev/null
@@ -1,27 +0,0 @@
-# Generated from qxmlsimplereader.pro.
-
-#####################################################################
-## tst_qxmlsimplereader Test:
-#####################################################################
-
-# Collect test data
-file(GLOB_RECURSE test_data_glob
-    RELATIVE ${CMAKE_CURRENT_SOURCE_DIR}
-    encodings/*)
-list(APPEND test_data ${test_data_glob})
-file(GLOB_RECURSE test_data_glob
-    RELATIVE ${CMAKE_CURRENT_SOURCE_DIR}
-    xmldocs/*)
-list(APPEND test_data ${test_data_glob})
-
-qt_add_test(tst_qxmlsimplereader
-    SOURCES
-        parser/parser.cpp parser/parser.h
-        tst_qxmlsimplereader.cpp
-    INCLUDE_DIRECTORIES
-        parser
-    PUBLIC_LIBRARIES
-        Qt::Network
-        Qt::Xml
-    TESTDATA ${test_data}
-)
diff --git a/tests/auto/xml/sax/qxmlsimplereader/encodings/doc_little-endian.xml b/tests/auto/xml/sax/qxmlsimplereader/encodings/doc_little-endian.xml
deleted file mode 100644
index 81f72e59e8..0000000000
--- a/tests/auto/xml/sax/qxmlsimplereader/encodings/doc_little-endian.xml
+++ /dev/null
diff --git a/tests/auto/xml/sax/qxmlsimplereader/encodings/doc_utf-16.xml b/tests/auto/xml/sax/qxmlsimplereader/encodings/doc_utf-16.xml
deleted file mode 100644
index 6c8622aa43..0000000000
--- a/tests/auto/xml/sax/qxmlsimplereader/encodings/doc_utf-16.xml
+++ /dev/null
diff --git a/tests/auto/xml/sax/qxmlsimplereader/encodings/doc_utf-8.xml b/tests/auto/xml/sax/qxmlsimplereader/encodings/doc_utf-8.xml
deleted file mode 100644
index 402c163c5f..0000000000
--- a/tests/auto/xml/sax/qxmlsimplereader/encodings/doc_utf-8.xml
+++ /dev/null
@@ -1,77 +0,0 @@
-<?xml version="1.0"?>

-<!-- 週報サンプル -->

-<週報>

-  <年月週>

-    <年度>1997</年度>

-    <月度>1</月度>

-    <週>1</週>

-  </年月週>

-

-  <氏名>

-    <氏>山田</氏>

-    <名>太郎</名>

-  </氏名>

-

-  <業務報告リスト>

-    <業務報告>

-      <業務名>XMLエディターの作成</業務名>

-      <業務コード>X3355-23</業務コード>

-      <工数管理>

-        <見積もり工数>1600</見積もり工数>

-        <実績工数>320</実績工数>

-        <当月見積もり工数>160</当月見積もり工数>

-        <当月実績工数>24</当月実績工数>

-      </工数管理>

-      <予定項目リスト>

-        <予定項目>

-          <P>XMLエディターの基本仕様の作成</P>

-        </予定項目>

-      </予定項目リスト>

-      <実施事項リスト>

-        <実施事項>

-          <P>XMLエディターの基本仕様の作成</P>

-        </実施事項>

-        <実施事項>

-          <P>競合他社製品の機能調査</P>

-        </実施事項>

-      </実施事項リスト>

-      <上長への要請事項リスト>

-        <上長への要請事項>

-          <P>特になし</P>

-        </上長への要請事項>

-      </上長への要請事項リスト>

-      <問題点対策>

-        <P>XMLとは何かわからない。</P>

-      </問題点対策>

-    </業務報告>

-

-    <業務報告>

-      <業務名>検索エンジンの開発</業務名>

-      <業務コード>S8821-76</業務コード>

-      <工数管理>

-        <見積もり工数>120</見積もり工数>

-        <実績工数>6</実績工数>

-        <当月見積もり工数>32</当月見積もり工数>

-        <当月実績工数>2</当月実績工数>

-      </工数管理>

-      <予定項目リスト>

-        <予定項目>

-          <P><A href="http://www.goo.ne.jp">goo</A>の機能を調べてみる</P>

-        </予定項目>

-      </予定項目リスト>

-      <実施事項リスト>

-        <実施事項>

-          <P>更に、どういう検索エンジンがあるか調査する</P>

-        </実施事項>

-      </実施事項リスト>

-      <上長への要請事項リスト>

-        <上長への要請事項>

-          <P>開発をするのはめんどうなので、Yahoo!を買収して下さい。</P>

-        </上長への要請事項>

-      </上長への要請事項リスト>

-      <問題点対策>

-        <P>検索エンジンで車を走らせることができない。（要調査）</P>

-      </問題点対策>

-    </業務報告>

-  </業務報告リスト>

-</週報>

diff --git a/tests/auto/xml/sax/qxmlsimplereader/generate_ref_files.sh b/tests/auto/xml/sax/qxmlsimplereader/generate_ref_files.sh
deleted file mode 100755
index 9e7ca0a659..0000000000
--- a/tests/auto/xml/sax/qxmlsimplereader/generate_ref_files.sh
+++ /dev/null
@@ -1,30 +0,0 @@
-#!/bin/bash
-#############################################################################
-##
-## Copyright (C) 2016 The Qt Company Ltd.
-## Contact: https://www.qt.io/licensing/
-##
-## This file is the build configuration utility of the Qt Toolkit.
-##
-## $QT_BEGIN_LICENSE:GPL-EXCEPT$
-## Commercial License Usage
-## Licensees holding valid commercial Qt licenses may use this file in
-## accordance with the commercial license agreement provided with the
-## Software or, alternatively, in accordance with the terms contained in
-## a written agreement between you and The Qt Company. For licensing terms
-## and conditions see https://www.qt.io/terms-conditions. For further
-## information use the contact form at https://www.qt.io/contact-us.
-##
-## GNU General Public License Usage
-## Alternatively, this file may be used under the terms of the GNU
-## General Public License version 3 as published by the Free Software
-## Foundation with exceptions as appearing in the file LICENSE.GPL3-EXCEPT
-## included in the packaging of this file. Please review the following
-## information to ensure the GNU General Public License requirements will
-## be met: https://www.gnu.org/licenses/gpl-3.0.html.
-##
-## $QT_END_LICENSE$
-##
-#############################################################################
-
-for k in `find xmldocs -name \*.xml`; do echo $k...; ./parser/parser $k; done
diff --git a/tests/auto/xml/sax/qxmlsimplereader/parser/CMakeLists.txt b/tests/auto/xml/sax/qxmlsimplereader/parser/CMakeLists.txt
deleted file mode 100644
index 6ffb17ac0f..0000000000
--- a/tests/auto/xml/sax/qxmlsimplereader/parser/CMakeLists.txt
+++ /dev/null
@@ -1,19 +0,0 @@
-# special case skip regeneration
-
-cmake_minimum_required(VERSION 3.14.0)
-
-project(Parser CXX)
-find_package(Qt6 REQUIRED COMPONENTS Core Gui Xml)
-
-add_executable(parser)
-
-target_sources(parser PRIVATE
-    main.cpp
-    parser.cpp
-    parser.h
-)
-
-target_link_libraries(parser PRIVATE
-    Qt::Gui
-    Qt::Xml
-)
diff --git a/tests/auto/xml/sax/qxmlsimplereader/parser/main.cpp b/tests/auto/xml/sax/qxmlsimplereader/parser/main.cpp
deleted file mode 100644
index c5597c6f8e..0000000000
--- a/tests/auto/xml/sax/qxmlsimplereader/parser/main.cpp
+++ /dev/null
@@ -1,103 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2016 The Qt Company Ltd.
-** Contact: https://www.qt.io/licensing/
-**
-** This file is part of the test suite of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:GPL-EXCEPT$
-** Commercial License Usage
-** Licensees holding valid commercial Qt licenses may use this file in
-** accordance with the commercial license agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and The Qt Company. For licensing terms
-** and conditions see https://www.qt.io/terms-conditions. For further
-** information use the contact form at https://www.qt.io/contact-us.
-**
-** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU
-** General Public License version 3 as published by the Free Software
-** Foundation with exceptions as appearing in the file LICENSE.GPL3-EXCEPT
-** included in the packaging of this file. Please review the following
-** information to ensure the GNU General Public License requirements will
-** be met: https://www.gnu.org/licenses/gpl-3.0.html.
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-
-#include <string.h>
-#include <errno.h>
-#include <stdlib.h>
-
-#include <qfile.h>
-#include <qstring.h>
-#include <qtextstream.h>
-
-#include "parser.h"
-
-static QTextStream qerr(stderr, QIODevice::WriteOnly);
-
-static void usage()
-{
-    qerr << "Usage: parse [-report-whitespace-only-chardata] [-report-start-end-entity] <in-file> [<out-file>]\n";
-    exit(1);
-}
-
-int main(int argc, const char *argv[])
-{
-    QString file_name;
-    QString out_file_name;
-    bool report_start_end_entity = false;
-    bool report_whitespace_only_chardata = false;
-
-    for (int i = 1 ; i < argc; ++i) {
-        QString arg = QString::fromLocal8Bit(argv[i]);
-        if (arg == QLatin1String("-report-whitespace-only-chardata"))
-            report_whitespace_only_chardata = true;
-        else if (arg == QLatin1String("-report-start-end-entity"))
-            report_start_end_entity = true;
-        else if (file_name.isEmpty())
-            file_name = arg;
-        else if (out_file_name.isEmpty())
-            out_file_name = arg;
-        else
-            usage();
-    }
-
-    if (file_name.isEmpty())
-        usage();
-
-    QFile in_file(file_name);
-    if (!in_file.open(QIODevice::ReadOnly)) {
-        qerr << "Could not open " << file_name << ": " << strerror(errno) << Qt::endl;
-        return 1;
-    }
-
-    if (out_file_name.isEmpty())
-        out_file_name = file_name + ".ref";
-
-    QFile out_file;
-    if (out_file_name == "-") {
-        out_file.open(stdout, QFile::WriteOnly);
-    } else {
-        out_file.setFileName(out_file_name);
-        if (!out_file.open(QIODevice::WriteOnly | QIODevice::Truncate)) {
-            qerr << "Could not open " << out_file_name << ": " << strerror(errno) << Qt::endl;
-            return 1;
-        }
-    }
-
-    Parser parser;
-    if (report_start_end_entity)
-        parser.setFeature("http://trolltech.com/xml/features/report-start-end-entity", true);
-    if (report_whitespace_only_chardata)
-        parser.setFeature("http://trolltech.com/xml/features/report-whitespace-only-CharData", true);
-
-    parser.parseFile(&in_file);
-
-    out_file.write(parser.result().toUtf8());
-
-    return 0;
-}
diff --git a/tests/auto/xml/sax/qxmlsimplereader/parser/parser.cpp b/tests/auto/xml/sax/qxmlsimplereader/parser/parser.cpp
deleted file mode 100644
index 24aa9376da..0000000000
--- a/tests/auto/xml/sax/qxmlsimplereader/parser/parser.cpp
+++ /dev/null
@@ -1,449 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2016 The Qt Company Ltd.
-** Contact: https://www.qt.io/licensing/
-**
-** This file is part of the test suite of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:GPL-EXCEPT$
-** Commercial License Usage
-** Licensees holding valid commercial Qt licenses may use this file in
-** accordance with the commercial license agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and The Qt Company. For licensing terms
-** and conditions see https://www.qt.io/terms-conditions. For further
-** information use the contact form at https://www.qt.io/contact-us.
-**
-** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU
-** General Public License version 3 as published by the Free Software
-** Foundation with exceptions as appearing in the file LICENSE.GPL3-EXCEPT
-** included in the packaging of this file. Please review the following
-** information to ensure the GNU General Public License requirements will
-** be met: https://www.gnu.org/licenses/gpl-3.0.html.
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-#include "parser.h"
-
-#if QT_DEPRECATED_SINCE(5, 15)
-
-#include <qxml.h>
-#include <qregularexpression.h>
-
-QT_WARNING_PUSH
-QT_WARNING_DISABLE_DEPRECATED
-class ContentHandler : public QXmlDefaultHandler
-{
-public:
-    ContentHandler();
-
-    // QXmlContentHandler methods
-    bool startDocument();
-    bool endDocument();
-    bool startElement(const QString &namespaceURI,
-                      const QString &localName,
-                      const QString &qName,
-                      const QXmlAttributes &atts);
-    bool endElement(const QString &namespaceURI,
-                    const QString &localName,
-                    const QString &qName);
-    bool characters(const QString &ch);
-    void setDocumentLocator(QXmlLocator *locator);
-    bool startPrefixMapping(const QString &prefix, const QString &uri);
-    bool endPrefixMapping(const QString &prefix);
-    bool ignorableWhitespace(const QString &ch);
-    bool processingInstruction(const QString &target, const QString &data);
-    bool skippedEntity(const QString &name);
-
-    // QXmlErrorHandler methods
-    bool warning(const QXmlParseException &exception);
-    bool error(const QXmlParseException &exception);
-    bool fatalError(const QXmlParseException &exception);
-
-    // QXmlDTDHandler methods
-    bool notationDecl(const QString &name, const QString &publicId,
-                      const QString &systemId);
-    bool unparsedEntityDecl(const QString &name,
-                            const QString &publicId,
-                            const QString &systemId,
-                            const QString &notationName);
-
-    // QXmlEntityResolver methods
-    bool resolveEntity(const QString &publicId,
-                       const QString &systemId,
-                       QXmlInputSource *&);
-
-    // QXmlLexicalHandler methods
-    bool startDTD (const QString &name, const QString &publicId, const QString &systemId);
-    bool endDTD();
-    bool startEntity(const QString &name);
-    bool endEntity(const QString &name);
-    bool startCDATA();
-    bool endCDATA();
-    bool comment(const QString &ch);
-
-    // QXmlDeclHandler methods
-    bool attributeDecl(const QString &eName, const QString &aName, const QString &type, const QString &valueDefault, const QString &value);
-    bool internalEntityDecl(const QString &name, const QString &value);
-    bool externalEntityDecl(const QString &name, const QString &publicId, const QString &systemId);
-
-
-    const QString &result() const { return m_result; }
-    const QString &errorMsg() const { return m_error_msg; }
-
-private:
-    QString nestPrefix() const { return QString().fill(' ', 3*m_nest); }
-    QString formatAttributes(const QXmlAttributes & atts);
-    QString escapeStr(const QString &s);
-
-    unsigned m_nest;
-    QString m_result, m_error_msg;
-};
-
-ContentHandler::ContentHandler()
-{
-    m_nest = 0;
-}
-
-
-bool ContentHandler::startDocument()
-{
-    m_result += nestPrefix();
-    m_result += "startDocument()\n";
-    ++m_nest;
-    return true;
-}
-
-bool ContentHandler::endDocument()
-{
-    --m_nest;
-    m_result += nestPrefix();
-    m_result += "endDocument()\n";
-    return true;
-}
-
-bool ContentHandler::startElement(const QString &namespaceURI,
-                                  const QString &localName,
-                                  const QString &qName,
-                                  const QXmlAttributes &atts)
-{
-    m_result += nestPrefix();
-    m_result += "startElement(namespaceURI=\"" + escapeStr(namespaceURI)
-                + "\", localName=\"" + escapeStr(localName)
-                + "\", qName=\"" + escapeStr(qName)
-                + "\", atts=[" + formatAttributes(atts) + "])\n";
-    ++m_nest;
-    return true;
-}
-
-QString ContentHandler::escapeStr(const QString &s)
-{
-    QString result = s;
-    result.replace(QChar(0), "\\0");
-    result.replace("\\", "\\\\");
-    result.replace("\"", "\\\"");
-    result.replace("\n", "\\n");
-    result.replace("\r", "\\r");
-    result.replace("\t", "\\t");
-    return result;
-}
-
-QString ContentHandler::formatAttributes(const QXmlAttributes &atts)
-{
-    QString result;
-    for (int i = 0, cnt = atts.count(); i < cnt; ++i) {
-        if (i != 0) result += ", ";
-        result += "{localName=\"" + escapeStr(atts.localName(i))
-                    + "\", qName=\"" + escapeStr(atts.qName(i))
-                    + "\", uri=\"" + escapeStr(atts.uri(i))
-                    + "\", type=\"" + escapeStr(atts.type(i))
-                    + "\", value=\"" + escapeStr(atts.value(i)) + "\"}";
-    }
-    return result;
-}
-
-bool ContentHandler::endElement(const QString &namespaceURI,
-                                const QString &localName,
-                                const QString &qName)
-{
-    --m_nest;
-    m_result += nestPrefix();
-    m_result += "endElement(namespaceURI=\"" + escapeStr(namespaceURI)
-                + "\", localName=\"" + escapeStr(localName)
-                + "\", qName=\"" + escapeStr(qName) + "\")\n";
-    return true;
-}
-
-bool ContentHandler::characters(const QString &ch)
-{
-    m_result += nestPrefix();
-    m_result += "characters(ch=\"" + escapeStr(ch) + "\")\n";
-    return true;
-}
-
-void ContentHandler::setDocumentLocator(QXmlLocator *locator)
-{
-    m_result += nestPrefix();
-    m_result += "setDocumentLocator(locator={columnNumber="
-                + QString::number(locator->columnNumber())
-                + ", lineNumber=" + QString::number(locator->lineNumber())
-                + "})\n";
-}
-
-bool ContentHandler::startPrefixMapping (const QString &prefix, const QString & uri)
-{
-    m_result += nestPrefix();
-    m_result += "startPrefixMapping(prefix=\"" + escapeStr(prefix)
-                    + "\", uri=\"" + escapeStr(uri) + "\")\n";
-    ++m_nest;
-    return true;
-}
-
-bool ContentHandler::endPrefixMapping(const QString &prefix)
-{
-    --m_nest;
-    m_result += nestPrefix();
-    m_result += "endPrefixMapping(prefix=\"" + escapeStr(prefix) + "\")\n";
-    return true;
-}
-
-bool ContentHandler::ignorableWhitespace(const QString & ch)
-{
-    m_result += nestPrefix();
-    m_result += "ignorableWhitespace(ch=\"" + escapeStr(ch) + "\")\n";
-    return true;
-}
-
-bool ContentHandler::processingInstruction(const QString &target, const QString &data)
-{
-    m_result += nestPrefix();
-    m_result += "processingInstruction(target=\"" + escapeStr(target)
-                + "\", data=\"" + escapeStr(data) + "\")\n";
-    return true;
-}
-
-bool ContentHandler::skippedEntity (const QString & name)
-{
-    m_result += nestPrefix();
-    m_result += "skippedEntity(name=\"" + escapeStr(name) + "\")\n";
-    return true;
-}
-
-bool ContentHandler::warning(const QXmlParseException & exception)
-{
-    m_error_msg = QString("Warning %1:%2: %3")
-                    .arg(exception.columnNumber())
-                    .arg(exception.lineNumber())
-                    .arg(exception.message());
-    m_result += nestPrefix();
-    m_result += "warning(exception={columnNumber="
-                    + QString::number(exception.columnNumber())
-                    + ", lineNumber="
-                    + QString::number(exception.lineNumber())
-                    + ", publicId=\"" + escapeStr(exception.publicId())
-                    + "\", systemId=\"" + escapeStr(exception.systemId())
-                    + "\", message=\"" + escapeStr(exception.message())
-                    + "\"})\n";
-    return true;
-}
-
-bool ContentHandler::error(const QXmlParseException & exception)
-{
-    m_error_msg = QString("Error %1:%2: %3")
-                    .arg(exception.columnNumber())
-                    .arg(exception.lineNumber())
-                    .arg(exception.message());
-    m_result += nestPrefix();
-    m_result += "error(exception={columnNumber="
-                    + QString::number(exception.columnNumber())
-                    + ", lineNumber="
-                    + QString::number(exception.lineNumber())
-                    + ", publicId=\"" + escapeStr(exception.publicId())
-                    + "\", systemId=\"" + escapeStr(exception.systemId())
-                    + "\", message=\"" + escapeStr(exception.message())
-                    + "\"})\n";
-    return true;
-}
-
-bool ContentHandler::fatalError(const QXmlParseException & exception)
-{
-    m_error_msg = QString("Fatal error %1:%2: %3")
-                    .arg(exception.columnNumber())
-                    .arg(exception.lineNumber())
-                    .arg(exception.message());
-    m_result += nestPrefix();
-    m_result += "fatalError(exception={columnNumber="
-                    + QString::number(exception.columnNumber())
-                    + ", lineNumber="
-                    + QString::number(exception.lineNumber())
-                    + ", publicId=\"" + escapeStr(exception.publicId())
-                    + "\", systemId=\"" + escapeStr(exception.systemId())
-                    + "\", message=\"" + escapeStr(exception.message())
-                    + "\"})\n";
-    return true;
-}
-
-bool ContentHandler::notationDecl(const QString &name,
-                                  const QString &publicId,
-                                  const QString &systemId )
-{
-    m_result += nestPrefix();
-    m_result += "notationDecl(name=\"" + escapeStr(name) + "\", publicId=\""
-                    + escapeStr(publicId) + "\", systemId=\""
-                    + escapeStr(systemId) + "\")\n";
-    return true;
-}
-
-bool ContentHandler::unparsedEntityDecl(const QString &name,
-                                        const QString &publicId,
-                                        const QString &systemId,
-                                        const QString &notationName )
-{
-    m_result += nestPrefix();
-    m_result += "unparsedEntityDecl(name=\"" + escapeStr(name)
-                    + "\", publicId=\"" + escapeStr(publicId)
-                    + "\", systemId=\"" + escapeStr(systemId)
-                    + "\", notationName=\"" + escapeStr(notationName)
-                    + "\")\n";
-    return true;
-}
-
-bool ContentHandler::resolveEntity(const QString &publicId,
-                                   const QString &systemId,
-                                   QXmlInputSource *&)
-{
-    m_result += nestPrefix();
-    m_result += "resolveEntity(publicId=\"" + escapeStr(publicId)
-                    + "\", systemId=\"" + escapeStr(systemId)
-                    + "\", ret={})\n";
-    return true;
-}
-
-bool ContentHandler::startDTD ( const QString & name, const QString & publicId, const QString & systemId )
-{
-    m_result += nestPrefix();
-    m_result += "startDTD(name=\"" + escapeStr(name)
-                    + "\", publicId=\"" + escapeStr(publicId)
-                    + "\", systemId=\"" + escapeStr(systemId) + "\")\n";
-    ++m_nest;
-    return true;
-}
-
-bool ContentHandler::endDTD ()
-{
-    --m_nest;
-    m_result += nestPrefix();
-    m_result += "endDTD()\n";
-    return true;
-}
-
-bool ContentHandler::startEntity ( const QString & name )
-{
-    m_result += nestPrefix();
-    m_result += "startEntity(name=\"" + escapeStr(name) + "\")\n";
-    ++m_nest;
-    return true;
-}
-
-bool ContentHandler::endEntity ( const QString & name )
-{
-    --m_nest;
-    m_result += nestPrefix();
-    m_result += "endEntity(name=\"" + escapeStr(name) + "\")\n";
-    return true;
-}
-
-bool ContentHandler::startCDATA ()
-{
-    m_result += nestPrefix();
-    m_result += "startCDATA()\n";
-    ++m_nest;
-    return true;
-}
-
-bool ContentHandler::endCDATA ()
-{
-    --m_nest;
-    m_result += nestPrefix();
-    m_result += "endCDATA()\n";
-    return true;
-}
-
-bool ContentHandler::comment ( const QString & ch )
-{
-    m_result += nestPrefix();
-    m_result += "comment(ch=\"" + escapeStr(ch) + "\")\n";
-    return true;
-}
-
-bool ContentHandler::attributeDecl(const QString &eName,
-                                   const QString &aName,
-                                   const QString &type,
-                                   const QString &valueDefault,
-                                   const QString &value)
-{
-    m_result += nestPrefix();
-    m_result += "attributeDecl(eName=\"" + escapeStr(eName) + "\", aName=\""
-                + escapeStr(aName) + "\", type=\"" + escapeStr(type)
-                + "\", valueDefault=\"" + escapeStr(valueDefault)
-                + "\", value=\"" + escapeStr(value) + "\")\n";
-    return true;
-}
-
-bool ContentHandler::internalEntityDecl(const QString &name,
-                                        const QString &value)
-{
-    m_result += nestPrefix();
-    m_result += "internatlEntityDecl(name=\"" + escapeStr(name)
-                    + "\", value=\"" + escapeStr(value) + "\")\n";
-    return true;
-}
-
-bool ContentHandler::externalEntityDecl(const QString &name,
-                                        const QString &publicId,
-                                        const QString &systemId)
-{
-    m_result += nestPrefix();
-    m_result += "externalEntityDecl(name=\"" + escapeStr(name)
-                    + "\", publicId=\"" + escapeStr(publicId)
-                    + "\", systemId=\"" + escapeStr(systemId) + "\")\n";
-    return true;
-}
-
-Parser::Parser()
-{
-    handler = new ContentHandler;
-    setContentHandler(handler);
-    setDTDHandler(handler);
-    setDeclHandler(handler);
-    setEntityResolver(handler);
-    setErrorHandler(handler);
-    setLexicalHandler(handler);
-}
-
-Parser::~Parser()
-{
-    delete handler;
-}
-
-bool Parser::parseFile(QFile *file)
-{
-    QXmlInputSource source(file);
-    return parse(source);
-}
-
-QString Parser::result() const
-{
-    return handler->result();
-}
-
-QString Parser::errorMsg() const
-{
-    return handler->errorMsg();
-}
-
-QT_WARNING_POP
-#endif // QT_DEPRECATED_SINCE(5, 15)
diff --git a/tests/auto/xml/sax/qxmlsimplereader/parser/parser.h b/tests/auto/xml/sax/qxmlsimplereader/parser/parser.h
deleted file mode 100644
index eed4c7517e..0000000000
--- a/tests/auto/xml/sax/qxmlsimplereader/parser/parser.h
+++ /dev/null
@@ -1,59 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2016 The Qt Company Ltd.
-** Contact: https://www.qt.io/licensing/
-**
-** This file is part of the test suite of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:GPL-EXCEPT$
-** Commercial License Usage
-** Licensees holding valid commercial Qt licenses may use this file in
-** accordance with the commercial license agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and The Qt Company. For licensing terms
-** and conditions see https://www.qt.io/terms-conditions. For further
-** information use the contact form at https://www.qt.io/contact-us.
-**
-** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU
-** General Public License version 3 as published by the Free Software
-** Foundation with exceptions as appearing in the file LICENSE.GPL3-EXCEPT
-** included in the packaging of this file. Please review the following
-** information to ensure the GNU General Public License requirements will
-** be met: https://www.gnu.org/licenses/gpl-3.0.html.
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-#ifndef PARSER_H
-#define PARSER_H
-
-#include <qglobal.h>
-
-QT_WARNING_DISABLE_DEPRECATED
-
-#if QT_DEPRECATED_SINCE(5, 15)
-
-#include <qfile.h>
-#include <qstring.h>
-#include <qxml.h>
-
-class ContentHandler;
-
-class Parser : public QXmlSimpleReader
-{
-public:
-    Parser();
-    ~Parser();
-
-    bool parseFile(QFile *file);
-    QString result() const;
-    QString errorMsg() const;
-
-private:
-    ContentHandler *handler;
-};
-
-#endif // QT_DEPRECATED_SINCE(5, 15)
-
-#endif
diff --git a/tests/auto/xml/sax/qxmlsimplereader/parser/parser.pro b/tests/auto/xml/sax/qxmlsimplereader/parser/parser.pro
deleted file mode 100644
index f801200942..0000000000
--- a/tests/auto/xml/sax/qxmlsimplereader/parser/parser.pro
+++ /dev/null
@@ -1,4 +0,0 @@
-QT += xml
-
-HEADERS += parser.h
-SOURCES += main.cpp parser.cpp
diff --git a/tests/auto/xml/sax/qxmlsimplereader/qxmlsimplereader.pro b/tests/auto/xml/sax/qxmlsimplereader/qxmlsimplereader.pro
deleted file mode 100644
index 349b976f58..0000000000
--- a/tests/auto/xml/sax/qxmlsimplereader/qxmlsimplereader.pro
+++ /dev/null
@@ -1,11 +0,0 @@
-CONFIG += testcase
-TARGET = tst_qxmlsimplereader
-INCLUDEPATH += parser
-
-HEADERS +=  parser/parser.h
-SOURCES += tst_qxmlsimplereader.cpp parser/parser.cpp 
-
-CONFIG += no_batch
-QT = core network xml testlib
-
-TESTDATA += encodings/* xmldocs/*
diff --git a/tests/auto/xml/sax/qxmlsimplereader/tst_qxmlsimplereader.cpp b/tests/auto/xml/sax/qxmlsimplereader/tst_qxmlsimplereader.cpp
deleted file mode 100644
index 6375a44983..0000000000
--- a/tests/auto/xml/sax/qxmlsimplereader/tst_qxmlsimplereader.cpp
+++ /dev/null
@@ -1,824 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2016 The Qt Company Ltd.
-** Contact: https://www.qt.io/licensing/
-**
-** This file is part of the test suite of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:GPL-EXCEPT$
-** Commercial License Usage
-** Licensees holding valid commercial Qt licenses may use this file in
-** accordance with the commercial license agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and The Qt Company. For licensing terms
-** and conditions see https://www.qt.io/terms-conditions. For further
-** information use the contact form at https://www.qt.io/contact-us.
-**
-** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU
-** General Public License version 3 as published by the Free Software
-** Foundation with exceptions as appearing in the file LICENSE.GPL3-EXCEPT
-** included in the packaging of this file. Please review the following
-** information to ensure the GNU General Public License requirements will
-** be met: https://www.gnu.org/licenses/gpl-3.0.html.
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-
-#include <QDomDocument>
-#include <qthread.h>
-#include <qtcpserver.h>
-#include <qtcpsocket.h>
-#include <QtTest/QtTest>
-#include <QtCore/qatomic.h>
-#include <QtCore/qsemaphore.h>
-#include <qfile.h>
-#include <qstring.h>
-#include <qdir.h>
-#include <qbuffer.h>
-#include "parser/parser.h"
-
-static const char *const inputString = "<!DOCTYPE inferno [<!ELEMENT inferno (circle+)><!ELEMENT circle (#PCDATA)>]><inferno><circle /><circle /></inferno>";
-static const char *const refString = "setDocumentLocator(locator={columnNumber=1, lineNumber=1})\nstartDocument()\nstartDTD(name=\"inferno\", publicId=\"\", systemId=\"\")\nendDTD()\nstartElement(namespaceURI=\"\", localName=\"inferno\", qName=\"inferno\", atts=[])\nstartElement(namespaceURI=\"\", localName=\"circle\", qName=\"circle\", atts=[])\nendElement(namespaceURI=\"\", localName=\"circle\", qName=\"circle\")\nstartElement(namespaceURI=\"\", localName=\"circle\", qName=\"circle\", atts=[])\nendElement(namespaceURI=\"\", localName=\"circle\", qName=\"circle\")\nendElement(namespaceURI=\"\", localName=\"inferno\", qName=\"inferno\")\nendDocument()\n";
-
-#define TEST_PORT 1088
-
-class XmlServer : public QThread
-{
-    Q_OBJECT
-public:
-    XmlServer(QObject *parent = 0) : QThread(parent) {}
-
-    QSemaphore threadStarted;
-    bool listening = false;
-    QAtomicInt quitSoon;
-
-protected:
-    virtual void run();
-};
-
-#define CHUNK_SIZE 2048
-
-void XmlServer::run()
-{
-    QTcpServer srv;
-
-    listening = srv.listen(QHostAddress::Any, TEST_PORT);
-    threadStarted.release();
-
-    if (!listening) {
-        qWarning() << "Failed to listen on" << TEST_PORT << srv.errorString();
-        return;
-    }
-
-    for (;;) {
-        srv.waitForNewConnection(100);
-
-        if (QTcpSocket *sock = srv.nextPendingConnection()) {
-            QByteArray fileName;
-            for (;;) {
-                char c;
-                if (sock->getChar(&c)) {
-                    if (c == '\n')
-                        break;
-                    fileName.append(c);
-                } else {
-                    if (!sock->waitForReadyRead(-1))
-                        break;
-                }
-            }
-
-            QFile file(QString::fromLocal8Bit(fileName));
-            if (!file.open(QIODevice::ReadOnly)) {
-                qWarning() << "XmlServer::run(): could not open" << fileName;
-                sock->abort();
-                delete sock;
-                continue;
-            }
-
-            QByteArray data = file.readAll();
-            for (int i = 0; i < data.size();) {
-                int cnt = qMin(CHUNK_SIZE, data.size() - i);
-                sock->write(data.constData() + i, cnt);
-                i += cnt;
-                sock->flush();
-                QTest::qSleep(1);
-
-                if (quitSoon.loadAcquire()) {
-                    sock->abort();
-                    break;
-                }
-            }
-
-            sock->disconnectFromHost();
-            delete sock;
-        }
-
-        if (quitSoon.loadAcquire())
-            break;
-    }
-
-    srv.close();
-}
-
-class tst_QXmlSimpleReader : public QObject
-{
-    Q_OBJECT
-
-#if QT_DEPRECATED_SINCE(5, 15)
-    public:
-        tst_QXmlSimpleReader();
-        ~tst_QXmlSimpleReader();
-
-    private slots:
-        void initTestCase();
-        void testGoodXmlFile();
-        void testGoodXmlFile_data();
-        void testBadXmlFile();
-        void testBadXmlFile_data();
-        void testIncrementalParsing();
-        void testIncrementalParsing_data();
-        void setDataQString();
-        void inputFromQIODevice();
-        void inputFromString();
-        void inputFromSocket_data();
-        void inputFromSocket();
-
-        void idsInParseException1();
-        void idsInParseException2();
-        void preserveCharacterReferences() const;
-        void reportNamespace() const;
-        void reportNamespace_data() const;
-        void roundtripWithNamespaces() const;
-        void dtdRecursionLimit();
-
-    private:
-        static QDomDocument fromByteArray(const QString &title, const QByteArray &ba, bool *ok);
-        XmlServer *server;
-        QString prefix;
-#endif // QT_DEPRECATED_SINCE(5, 15)
-};
-
-#if QT_DEPRECATED_SINCE(5, 15)
-QT_WARNING_PUSH
-QT_WARNING_DISABLE_DEPRECATED
-
-tst_QXmlSimpleReader::tst_QXmlSimpleReader() : server(new XmlServer(this))
-{
-    server->start();
-}
-
-tst_QXmlSimpleReader::~tst_QXmlSimpleReader()
-{
-    server->quitSoon.storeRelease(1);
-    server->wait();
-}
-
-class MyErrorHandler : public QXmlErrorHandler
-{
-public:
-    QString publicId;
-    QString systemId;
-
-    virtual bool error(const QXmlParseException &)
-    {
-        return false;
-    }
-
-    virtual QString errorString() const
-    {
-        return QString();
-    }
-
-    virtual bool fatalError(const QXmlParseException &exception)
-    {
-        publicId = exception.publicId();
-        systemId = exception.systemId();
-        return true;
-    }
-
-    virtual bool warning(const QXmlParseException &)
-    {
-        return true;
-    }
-
-};
-
-void tst_QXmlSimpleReader::initTestCase()
-{
-    prefix = QFileInfo(QFINDTESTDATA("xmldocs")).absolutePath();
-    if (prefix.isEmpty())
-        QFAIL("Cannot find xmldocs testdata!");
-    QDir::setCurrent(prefix);
-}
-
-void tst_QXmlSimpleReader::idsInParseException1()
-{
-    MyErrorHandler handler;
-    QXmlSimpleReader reader;
-
-    reader.setErrorHandler(&handler);
-
-    /* A non-wellformed XML document with PUBLIC and SYSTEM. */
-    QByteArray input("<!DOCTYPE html PUBLIC \"-//W3C//DTD XHTML 1.0 Strict//EN\" "
-                     "\"http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd\">"
-                     "<html xmlns=\"http://www.w3.org/1999/xhtml\" xml:lang=\"en\" lang=\"en\">"
-                     "<head>"
-                         "<a/><a/><a/>"
-                     "<head/>");
-
-    QBuffer buff(&input);
-    QXmlInputSource source(&buff);
-
-    /* Yes, parsing should be reported as a failure. */
-    QVERIFY(!reader.parse(source));
-
-    QCOMPARE(handler.publicId, QString::fromLatin1("-//W3C//DTD XHTML 1.0 Strict//EN"));
-    QCOMPARE(handler.systemId, QString::fromLatin1("http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"));
-}
-
-void tst_QXmlSimpleReader::idsInParseException2()
-{
-    MyErrorHandler handler;
-    QXmlSimpleReader reader;
-
-    reader.setErrorHandler(&handler);
-
-    /* A non-wellformed XML document with only SYSTEM. */
-    QByteArray input("<!DOCTYPE html SYSTEM \"http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd\">"
-                      "<html xmlns=\"http://www.w3.org/1999/xhtml\" xml:lang=\"en\" lang=\"en\">"
-                      "<head>"
-                          "<a/><a/><a/>"
-                      "<head/>");
-
-    QBuffer buff(&input);
-    QXmlInputSource source(&buff);
-
-    /* Yes, parsing should be reported as a failure. */
-    QVERIFY(!reader.parse(source));
-
-    QCOMPARE(handler.publicId, QString());
-    QCOMPARE(handler.systemId, QString::fromLatin1("http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"));
-}
-
-static QStringList findXmlFiles(QString dir_name)
-{
-    QStringList result;
-
-    dir_name = QFINDTESTDATA(dir_name);
-    QDir dir(dir_name);
-    QFileInfoList file_list = dir.entryInfoList(QStringList("*.xml"), QDir::Files, QDir::Name);
-
-    QFileInfoList::const_iterator it = file_list.begin();
-    for (; it != file_list.end(); ++it) {
-        const QFileInfo &file_info = *it;
-        result.append(file_info.filePath());
-    }
-
-    return result;
-}
-
-
-void tst_QXmlSimpleReader::testGoodXmlFile_data()
-{
-    const char * const good_data_dirs[] = {
-        "xmldocs/valid/sa",
-        "xmldocs/valid/not-sa",
-        "xmldocs/valid/ext-sa",
-        0
-    };
-    const char * const *d = good_data_dirs;
-
-    QStringList good_file_list;
-    for (; *d != 0; ++d)
-        good_file_list += findXmlFiles(*d);
-
-    QTest::addColumn<QString>("file_name");
-    QStringList::const_iterator it = good_file_list.begin();
-    for (; it != good_file_list.end(); ++it)
-        QTest::newRow((*it).toLatin1()) << *it;
-}
-
-void tst_QXmlSimpleReader::testGoodXmlFile()
-{
-    QFETCH(QString, file_name);
-    QFile file(file_name);
-    QVERIFY(file.open(QIODevice::ReadOnly));
-    QString content = file.readAll();
-    file.close();
-    QVERIFY(file.open(QIODevice::ReadOnly));
-    Parser parser;
-
-    QVERIFY(parser.parseFile(&file));
-
-    QFile ref_file(file_name + ".ref");
-    QVERIFY(ref_file.open(QIODevice::ReadOnly | QIODevice::Text));
-    QByteArray data = ref_file.readAll();
-    QString ref_file_contents = QString::fromUtf8(data.constData(), data.size());
-
-    QCOMPARE(parser.result(), ref_file_contents);
-}
-
-void tst_QXmlSimpleReader::testBadXmlFile_data()
-{
-    const char * const bad_data_dirs[] = {
-        "xmldocs/not-wf/sa",
-        0
-    };
-    const char * const *d = bad_data_dirs;
-
-    QStringList bad_file_list;
-    for (; *d != 0; ++d)
-        bad_file_list += findXmlFiles(*d);
-
-    QTest::addColumn<QString>("file_name");
-    QStringList::const_iterator it = bad_file_list.begin();
-    for (; it != bad_file_list.end(); ++it)
-        QTest::newRow((*it).toLatin1()) << *it;
-}
-
-void tst_QXmlSimpleReader::testBadXmlFile()
-{
-    QFETCH(QString, file_name);
-    QFile file(file_name);
-    QVERIFY(file.open(QIODevice::ReadOnly));
-    Parser parser;
-
-    QEXPECT_FAIL(QFINDTESTDATA("xmldocs/not-wf/sa/030.xml").toLocal8Bit().constData(), "a form feed character is not accepted in XML", Continue);
-    QEXPECT_FAIL(QFINDTESTDATA("xmldocs/not-wf/sa/031.xml").toLocal8Bit().constData(), "a form feed character is not accepted in a processing instruction", Continue);
-    QEXPECT_FAIL(QFINDTESTDATA("xmldocs/not-wf/sa/032.xml").toLocal8Bit().constData(), "a form feed character is not accepted in a comment", Continue);
-    QEXPECT_FAIL(QFINDTESTDATA("xmldocs/not-wf/sa/033.xml").toLocal8Bit().constData(), "overlong sequence - small latin letter d should be rejected", Continue);
-    QEXPECT_FAIL(QFINDTESTDATA("xmldocs/not-wf/sa/038.xml").toLocal8Bit().constData(), "attribute x redefined; should be rejected", Continue);
-    QEXPECT_FAIL(QFINDTESTDATA("xmldocs/not-wf/sa/072.xml").toLocal8Bit().constData(), "entity foo not defined", Continue);
-    QEXPECT_FAIL(QFINDTESTDATA("xmldocs/not-wf/sa/073.xml").toLocal8Bit().constData(), "entity f not defined", Continue);
-    QEXPECT_FAIL(QFINDTESTDATA("xmldocs/not-wf/sa/074.xml").toLocal8Bit().constData(), "entity e is not well-formed (</foo><foo>)", Continue);
-    QEXPECT_FAIL(QFINDTESTDATA("xmldocs/not-wf/sa/076.xml").toLocal8Bit().constData(), "entity foo is not defined", Continue);
-    QEXPECT_FAIL(QFINDTESTDATA("xmldocs/not-wf/sa/077.xml").toLocal8Bit().constData(), "entity bar is not defined within the definition of entity foo", Continue);
-    QEXPECT_FAIL(QFINDTESTDATA("xmldocs/not-wf/sa/078.xml").toLocal8Bit().constData(), "entity foo not defined", Continue);
-    QEXPECT_FAIL(QFINDTESTDATA("xmldocs/not-wf/sa/085.xml").toLocal8Bit().constData(), "Unfinished Public or System Id", Continue);
-    QEXPECT_FAIL(QFINDTESTDATA("xmldocs/not-wf/sa/086.xml").toLocal8Bit().constData(), "Unfinished Public or System Id", Continue);
-    QEXPECT_FAIL(QFINDTESTDATA("xmldocs/not-wf/sa/087.xml").toLocal8Bit().constData(), "Unfinished Public or System Id", Continue);
-    QEXPECT_FAIL(QFINDTESTDATA("xmldocs/not-wf/sa/101.xml").toLocal8Bit().constData(), "Invalid XML encoding name (space before utf-8)", Continue);
-    QEXPECT_FAIL(QFINDTESTDATA("xmldocs/not-wf/sa/102.xml").toLocal8Bit().constData(), "Invalid version specification (1.0 followed by space)", Continue);
-    QEXPECT_FAIL(QFINDTESTDATA("xmldocs/not-wf/sa/104.xml").toLocal8Bit().constData(), "Premature end of data in tag foo", Continue);
-    QEXPECT_FAIL(QFINDTESTDATA("xmldocs/not-wf/sa/116.xml").toLocal8Bit().constData(), "Invalid decimal value", Continue);
-    QEXPECT_FAIL(QFINDTESTDATA("xmldocs/not-wf/sa/117.xml").toLocal8Bit().constData(), "No name", Continue);
-    QEXPECT_FAIL(QFINDTESTDATA("xmldocs/not-wf/sa/119.xml").toLocal8Bit().constData(), "No name", Continue);
-    QEXPECT_FAIL(QFINDTESTDATA("xmldocs/not-wf/sa/122.xml").toLocal8Bit().constData(), "; expected in declaration of element", Continue);
-    QEXPECT_FAIL(QFINDTESTDATA("xmldocs/not-wf/sa/132.xml").toLocal8Bit().constData(), "; expected in declaration of element", Continue);
-    QEXPECT_FAIL(QFINDTESTDATA("xmldocs/not-wf/sa/142.xml").toLocal8Bit().constData(), "Invalid value '0'", Continue);
-    QEXPECT_FAIL(QFINDTESTDATA("xmldocs/not-wf/sa/143.xml").toLocal8Bit().constData(), "Invalid value '31'", Continue);
-
-    QEXPECT_FAIL(QFINDTESTDATA("xmldocs/not-wf/sa/144.xml").toLocal8Bit().constData(), "noncharacter code 0xFFFF should be rejected", Continue);
-    QEXPECT_FAIL(QFINDTESTDATA("xmldocs/not-wf/sa/145.xml").toLocal8Bit().constData(), "surrogate code point 0xD800 should be rejected", Continue);
-    QEXPECT_FAIL(QFINDTESTDATA("xmldocs/not-wf/sa/146.xml").toLocal8Bit().constData(), "code point out-of-range 0x110000 (must be < 0x10FFFE)", Abort);
-    QEXPECT_FAIL(QFINDTESTDATA("xmldocs/not-wf/sa/160.xml").toLocal8Bit().constData(), "Parameter references forbidden in internal subset", Continue);
-    QEXPECT_FAIL(QFINDTESTDATA("xmldocs/not-wf/sa/162.xml").toLocal8Bit().constData(), "Parameter references forbidden in internal subset", Continue);
-
-    QEXPECT_FAIL(QFINDTESTDATA("xmldocs/not-wf/sa/168.xml").toLocal8Bit().constData(), "Surrogate code point 0xEDA080 should be rejected", Continue);
-    QEXPECT_FAIL(QFINDTESTDATA("xmldocs/not-wf/sa/169.xml").toLocal8Bit().constData(), "Surrogate code point 0xEDB080 should be rejected", Continue);
-    QEXPECT_FAIL(QFINDTESTDATA("xmldocs/not-wf/sa/170.xml").toLocal8Bit().constData(), "Code point 0xF7808080 should be rejected", Continue);
-
-    QEXPECT_FAIL(QFINDTESTDATA("xmldocs/not-wf/sa/180.xml").toLocal8Bit().constData(), "Entity e is not defined", Continue);
-    QEXPECT_FAIL(QFINDTESTDATA("xmldocs/not-wf/sa/181.xml").toLocal8Bit().constData(), "Unregistered error message", Continue);
-    QEXPECT_FAIL(QFINDTESTDATA("xmldocs/not-wf/sa/182.xml").toLocal8Bit().constData(), "Comment not terminated", Continue);
-    QEXPECT_FAIL(QFINDTESTDATA("xmldocs/not-wf/sa/185.xml").toLocal8Bit().constData(), "Entity e not defined", Continue);
-    QEXPECT_FAIL(QFINDTESTDATA("xmldocs/not-wf/sa/186.xml").toLocal8Bit().constData(), "Attributes constructs error", Continue);
-
-    QVERIFY(!parser.parseFile(&file));
-
-    QFile ref_file(file_name + ".ref");
-    QVERIFY(ref_file.open(QIODevice::ReadOnly | QIODevice::Text));
-    QString ref_file_contents = QString::fromUtf8(ref_file.readAll());
-
-    QEXPECT_FAIL(QFINDTESTDATA("xmldocs/not-wf/sa/145.xml").toLocal8Bit().constData(), "Surrogate code point 0xD800 should be rejected", Continue);
-
-    QCOMPARE(parser.result(), ref_file_contents);
-}
-
-void tst_QXmlSimpleReader::testIncrementalParsing_data()
-{
-    QTest::addColumn<QString>("file_name");
-    QTest::addColumn<int>("chunkSize");
-
-    const char * const good_data_dirs[] = {
-        "xmldocs/valid/sa",
-        "xmldocs/valid/not-sa",
-        "xmldocs/valid/ext-sa",
-        0
-    };
-    const char * const *d = good_data_dirs;
-
-    QStringList good_file_list;
-    for (; *d != 0; ++d)
-        good_file_list += findXmlFiles(*d);
-
-    for (int i=1; i<10; ++i) {
-        QStringList::const_iterator it = good_file_list.begin();
-        const QString skip49 = QFINDTESTDATA("xmldocs/valid/sa/049.xml");
-        const QString skip50 = QFINDTESTDATA("xmldocs/valid/sa/050.xml");
-        const QString skip51 = QFINDTESTDATA("xmldocs/valid/sa/051.xml");
-        const QString skip52 = QFINDTESTDATA("xmldocs/valid/sa/052.xml");
-        const QString skip89 = QFINDTESTDATA("xmldocs/valid/sa/089.xml");
-
-        for (; it != good_file_list.end(); ++it) {
-            if ( *it == skip89 )
-                continue;// TODO: fails at the moment -- don't bother
-            if ( i==1 && (
-                        *it == skip49 ||
-                        *it == skip50 ||
-                        *it == skip51 ||
-                        *it == skip52 ) ) {
-                continue; // TODO: fails at the moment -- don't bother
-            }
-            QTest::newRow(QString("%1 %2").arg(*it).arg(i).toLatin1()) << *it << i;
-        }
-    }
-}
-
-void tst_QXmlSimpleReader::testIncrementalParsing()
-{
-    QFETCH(QString, file_name);
-    QFETCH(int, chunkSize);
-
-    QFile file(file_name);
-    QVERIFY(file.open(QIODevice::ReadOnly));
-
-    Parser parser;
-    QXmlInputSource source;
-    bool first = true;
-    while (!file.atEnd()) {
-        source.setData(file.read(chunkSize));
-        if(first) {
-            QVERIFY(parser.parse(&source, true));
-            first = false;
-        } else {
-            QVERIFY(parser.parseContinue());
-        }
-    }
-    // detect end of document
-    QVERIFY(parser.parseContinue());
-    // parsing should fail after the end of the document was reached
-    QVERIFY(!parser.parseContinue());
-
-    QFile ref_file(file_name + ".ref");
-    QVERIFY(ref_file.open(QIODevice::ReadOnly | QIODevice::Text));
-    QString ref_file_contents = QString::fromUtf8(ref_file.readAll());
-
-    QCOMPARE(parser.result(), ref_file_contents);
-}
-
-void tst_QXmlSimpleReader::setDataQString()
-{
-    QString input = inputString;
-    QString ref = refString;
-
-    QXmlInputSource source;
-    Parser parser;
-
-    source.setData(input);
-    QVERIFY(parser.parse(&source,false));
-
-    QBuffer resultBuffer;
-    resultBuffer.setData(parser.result().toLatin1());
-
-    QBuffer refBuffer;
-    refBuffer.setData(ref.toLatin1());
-
-    resultBuffer.open(QIODevice::ReadOnly);
-    refBuffer.open(QIODevice::ReadOnly);
-
-    bool success = true;
-    while (resultBuffer.canReadLine()) {
-        if (!refBuffer.canReadLine()) {
-            success = false; break ;
-        }
-        if (resultBuffer.readLine().simplified() != refBuffer.readLine().simplified()) {
-            success = false; break ;
-        }
-    }
-    QVERIFY(success);
-}
-
-void tst_QXmlSimpleReader::inputFromQIODevice()
-{
-    QBuffer inputBuffer;
-    inputBuffer.setData(inputString);
-
-    QXmlInputSource source(&inputBuffer);
-    Parser parser;
-
-    QVERIFY(parser.parse(&source,false));
-
-    QBuffer resultBuffer;
-    resultBuffer.setData(parser.result().toLatin1());
-
-    QBuffer refBuffer;
-    refBuffer.setData(refString);
-
-    resultBuffer.open(QIODevice::ReadOnly);
-    refBuffer.open(QIODevice::ReadOnly);
-
-    bool success = true;
-    while (resultBuffer.canReadLine()) {
-        if (!refBuffer.canReadLine()) {
-            success = false; break ;
-        }
-        if (resultBuffer.readLine().simplified() != refBuffer.readLine().simplified()) {
-            success = false; break ;
-        }
-    }
-    QVERIFY(success);
-}
-
-void tst_QXmlSimpleReader::inputFromString()
-{
-    QString str = "<foo><bar>kake</bar><bar>ja</bar></foo>";
-    QBuffer buff;
-    buff.setData((char*)str.utf16(), str.size()*sizeof(ushort));
-
-    QXmlInputSource input(&buff);
-
-    QXmlSimpleReader reader;
-    QXmlDefaultHandler handler;
-    reader.setContentHandler(&handler);
-
-    QVERIFY(reader.parse(&input));
-}
-
-void tst_QXmlSimpleReader::inputFromSocket_data()
-{
-    QStringList files = findXmlFiles(QLatin1String("encodings"));
-    QVERIFY(files.count() > 0);
-
-    QTest::addColumn<QString>("file_name");
-
-    foreach (const QString &file_name, files)
-        QTest::newRow(file_name.toLatin1()) << file_name;
-}
-
-void tst_QXmlSimpleReader::inputFromSocket()
-{
-    QFETCH(QString, file_name);
-
-    if (!server->threadStarted.tryAcquire(1, 15000)) {
-        // If something is wrong with QThreads, it's not a reason to fail
-        // XML-test, we are not testing QThread here after all!
-        QSKIP("XmlServer/thread has not started yet");
-    }
-
-    // Subsequent runs should be able to acquire the semaphore.
-    server->threadStarted.release(1);
-
-    if (!server->listening) {
-        // Again, QTcpServer is not the subject of this test!
-        QSKIP("QTcpServer::listen failed, bailing out");
-    }
-
-    QTcpSocket sock;
-    sock.connectToHost(QHostAddress::LocalHost, TEST_PORT);
-    QVERIFY2(sock.waitForConnected(),
-             qPrintable(QStringLiteral("Cannot connect on port ") + QString::number(TEST_PORT)
-                        + QStringLiteral(": ") + sock.errorString()));
-
-    sock.write(file_name.toLocal8Bit() + "\n");
-    QVERIFY(sock.waitForBytesWritten());
-
-    QXmlInputSource input(&sock);
-
-    QXmlSimpleReader reader;
-    QXmlDefaultHandler handler;
-    reader.setContentHandler(&handler);
-
-    QVERIFY(reader.parse(&input));
-
-//    qDebug() << "tst_QXmlSimpleReader::inputFromSocket(): success" << file_name;
-}
-
-void tst_QXmlSimpleReader::preserveCharacterReferences() const
-{
-    class Handler : public QXmlDefaultHandler
-    {
-    public:
-        virtual bool characters(const QString &chars)
-        {
-            received = chars;
-            return true;
-        }
-
-        QString received;
-    };
-
-    {
-        QByteArray input("<e>A&#160;&#160;&#160;&#160;A</e>");
-
-        QBuffer buff(&input);
-        QXmlInputSource source(&buff);
-
-        Handler h;
-        QXmlSimpleReader reader;
-        reader.setContentHandler(&h);
-        QVERIFY(reader.parse(&source, false));
-
-        QCOMPARE(h.received, QLatin1Char('A') + QString(4, QChar(160)) + QLatin1Char('A'));
-    }
-
-    {
-        QByteArray input("<e>&#160;&#160;&#160;&#160;</e>");
-
-        QBuffer buff(&input);
-        QXmlInputSource source(&buff);
-
-        Handler h;
-        QXmlSimpleReader reader;
-        reader.setContentHandler(&h);
-        QVERIFY(reader.parse(&source, false));
-
-        QCOMPARE(h.received, QString(4, QChar(160)));
-    }
-}
-
-void tst_QXmlSimpleReader::reportNamespace() const
-{
-    class Handler : public QXmlDefaultHandler
-    {
-    public:
-        virtual bool startElement(const QString &namespaceURI,
-                                  const QString &localName,
-                                  const QString &qName,
-                                  const QXmlAttributes &)
-        {
-            startNamespaceURI = namespaceURI;
-            startLocalName = localName;
-            startQName = qName;
-
-            return true;
-        }
-
-        virtual bool endElement(const QString &namespaceURI,
-                                const QString &localName,
-                                const QString &qName)
-        {
-            endNamespaceURI = namespaceURI;
-            endLocalName = localName;
-            endQName = qName;
-
-            return true;
-        }
-
-        QString startLocalName;
-        QString startQName;
-        QString startNamespaceURI;
-        QString endLocalName;
-        QString endQName;
-        QString endNamespaceURI;
-    };
-
-    QXmlSimpleReader reader;
-    Handler handler;
-    reader.setContentHandler(&handler);
-
-    QFETCH(QByteArray,  input);
-
-    QBuffer buffer(&input);
-    QVERIFY(buffer.open(QIODevice::ReadOnly));
-
-    QXmlInputSource source(&buffer);
-    QVERIFY(reader.parse(source));
-
-    QFETCH(QString,     expectedQName);
-    QFETCH(QString,     expectedLocalName);
-    QFETCH(QString,     expectedNamespace);
-
-    QCOMPARE(handler.startNamespaceURI, expectedNamespace);
-    QCOMPARE(handler.startLocalName, expectedLocalName);
-    QCOMPARE(handler.startQName, expectedQName);
-
-    QCOMPARE(handler.endNamespaceURI, expectedNamespace);
-    QCOMPARE(handler.endLocalName, expectedLocalName);
-    QCOMPARE(handler.endQName, expectedQName);
-}
-
-void tst_QXmlSimpleReader::reportNamespace_data() const
-{
-    QTest::addColumn<QByteArray>("input");
-    QTest::addColumn<QString>("expectedQName");
-    QTest::addColumn<QString>("expectedLocalName");
-    QTest::addColumn<QString>("expectedNamespace");
-
-    QTest::newRow("default ns") << QByteArray("<element xmlns='http://example.com/'/>")
-                                << QString("element")
-                                << QString("element")
-                                << QString("http://example.com/");
-
-    QTest::newRow("with prefix") << QByteArray("<p:element xmlns:p='http://example.com/'/>")
-                                 << QString("p:element")
-                                 << QString("element")
-                                 << QString("http://example.com/");
-}
-
-QDomDocument tst_QXmlSimpleReader::fromByteArray(const QString &title, const QByteArray &ba, bool *ok)
-{
-    QDomDocument doc(title);
-    *ok = doc.setContent(ba, true);
-    return doc;
-}
-
-void tst_QXmlSimpleReader::roundtripWithNamespaces() const
-{
-    const char *const expected = "<element b:attr=\"value\" xmlns:a=\"http://www.example.com/A\" xmlns:b=\"http://www.example.com/B\" />\n";
-    bool ok;
-
-    {
-        const char *const xml = "<element xmlns:b=\"http://www.example.com/B\" b:attr=\"value\" xmlns:a=\"http://www.example.com/A\"/>";
-
-        const QDomDocument one(fromByteArray("document", xml, &ok));
-        QVERIFY(ok);
-        const QDomDocument two(fromByteArray("document2", one.toByteArray(2), &ok));
-        QVERIFY(ok);
-
-        QEXPECT_FAIL("", "Known problem, see 154573. The fix happens to break uic.", Abort);
-
-        QCOMPARE(expected, one.toByteArray().constData());
-        QCOMPARE(one.toByteArray(2).constData(), two.toByteArray(2).constData());
-        QCOMPARE(two.toByteArray(2).constData(), two.toByteArray(2).constData());
-    }
-
-    {
-        const char *const xml = "<element b:attr=\"value\" xmlns:b=\"http://www.example.com/B\" xmlns:a=\"http://www.example.com/A\"/>";
-
-        const QDomDocument one(fromByteArray("document", xml, &ok));
-        QVERIFY(ok);
-        const QDomDocument two(fromByteArray("document2", one.toByteArray(2), &ok));
-        QVERIFY(ok);
-
-        QCOMPARE(expected, one.toByteArray().constData());
-        QCOMPARE(one.toByteArray(2).constData(), two.toByteArray(2).constData());
-        QCOMPARE(two.toByteArray(2).constData(), two.toByteArray(2).constData());
-    }
-}
-
-class TestHandler : public QXmlDefaultHandler
-{
-public:
-    TestHandler() :
-        recursionCount(0)
-    {
-    }
-
-    bool internalEntityDecl(const QString &name, const QString &value)
-    {
-        ++recursionCount;
-        return QXmlDefaultHandler::internalEntityDecl(name, value);
-    }
-
-    int recursionCount;
-};
-
-void tst_QXmlSimpleReader::dtdRecursionLimit()
-{
-    QFile file(QFINDTESTDATA("xmldocs/2-levels-nested-dtd.xml"));
-    QVERIFY(file.open(QIODevice::ReadOnly));
-    QXmlSimpleReader xmlReader;
-    {
-        QXmlInputSource source(&file);
-        TestHandler handler;
-        xmlReader.setDeclHandler(&handler);
-        xmlReader.setErrorHandler(&handler);
-        QVERIFY(!xmlReader.parse(&source));
-    }
-
-    file.close();
-    file.setFileName(QFINDTESTDATA("xmldocs/1-levels-nested-dtd.xml"));
-    QVERIFY(file.open(QIODevice::ReadOnly));
-    {
-        QXmlInputSource source(&file);
-        TestHandler handler;
-        xmlReader.setDeclHandler(&handler);
-        xmlReader.setErrorHandler(&handler);
-        QVERIFY(!xmlReader.parse(&source));
-        // The error wasn't because of the recursion limit being reached,
-        // it was because the document is not valid.
-        QVERIFY(handler.recursionCount < 2);
-    }
-
-    file.close();
-    file.setFileName(QFINDTESTDATA("xmldocs/internal-entity-polynomial-attribute.xml"));
-    QVERIFY(file.open(QIODevice::ReadOnly));
-    {
-        QXmlInputSource source(&file);
-        TestHandler handler;
-        xmlReader.setDeclHandler(&handler);
-        xmlReader.setErrorHandler(&handler);
-        QVERIFY(!xmlReader.parse(&source));
-        QCOMPARE(handler.recursionCount, 2);
-    }
-}
-
-QT_WARNING_POP
-#endif // QT_DEPRECATED_SINCE(5, 15)
-
-QTEST_MAIN(tst_QXmlSimpleReader)
-#include "tst_qxmlsimplereader.moc"
diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/1-levels-nested-dtd.xml b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/1-levels-nested-dtd.xml
deleted file mode 100644
index 0dfc15b165..0000000000
--- a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/1-levels-nested-dtd.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0"?>
-<!-- Test non-deterministic content model matching.
-
-Entity references are not part of the internal DTD subset (for good reason).
-
--->
-<!DOCTYPE root [
-<!ELEMENT e0 EMPTY>
-<!ENTITY % e1 "(e0,e0)">
-<!ELEMENT root (%e1;)?>
-]>
-<root/>
\ No newline at end of file
diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/2-levels-nested-dtd.xml b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/2-levels-nested-dtd.xml
deleted file mode 100644
index 7ec06db85f..0000000000
--- a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/2-levels-nested-dtd.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0"?>
-<!-- Test non-deterministic content model matching.
-
-Entity references are not part of the internal DTD subset (for good reason).
-
--->
-<!DOCTYPE root [
-<!ELEMENT e0 EMPTY>
-<!ENTITY % e1 "(e0,e0)">
-<!ENTITY % e2 "(%e1;,%e1;,%e1;,%e1;,%e1;,%e1;,%e1;,%e1;,%e1;,%e1;,%e1;,%e1;,%e1;)">
-<!ELEMENT root (%e2;)?>
-]>
-<root/>
diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/internal-entity-polynomial-attribute.xml b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/internal-entity-polynomial-attribute.xml
deleted file mode 100644
index bbb88f39f6..0000000000
--- a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/internal-entity-polynomial-attribute.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0"?>
-<!-- Test polynomial growth of expanded XML.
-     Expansion happens in an attribute. -->
-<!DOCTYPE root [
-<!ELEMENT root EMPTY>
-<!ATTLIST root id CDATA #IMPLIED>
-<!ENTITY e1 "XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX">
-<!ENTITY e2 "&e1;&e1;&e1;&e1;&e1;&e1;&e1;&e1;&e1;&e1;&e1;&e1;&e1;&e1;&e1;&e1;&e1;&e1;&e1;&e1;&e1;&e1;&e1;&e1;&e1;&e1;&e1;&e1;&e1;&e1;&e1;&e1;&e1;&e1;&e1;&e1;&e1;&e1;&e1;&e1;&e1;&e1;&e1;&e1;&e1;&e1;&e1;&e1;&e1;&e1;&e1;&e1;&e1;&e1;&e1;&e1;&e1;&e1;&e1;&e1;&e1;&e1;&e1;&e1;">
-<!ENTITY e3 "&e2;&e2;&e2;&e2;&e2;&e2;&e2;&e2;&e2;&e2;&e2;&e2;&e2;&e2;&e2;&e2;&e2;&e2;&e2;&e2;&e2;&e2;&e2;&e2;&e2;&e2;&e2;&e2;&e2;&e2;&e2;&e2;&e2;&e2;&e2;&e2;&e2;&e2;&e2;&e2;&e2;&e2;&e2;&e2;&e2;&e2;&e2;&e2;&e2;&e2;&e2;&e2;&e2;&e2;&e2;&e2;&e2;&e2;&e2;&e2;&e2;&e2;&e2;&e2;">
-<!ENTITY e4 "&e3;&e3;&e3;&e3;&e3;&e3;&e3;&e3;&e3;&e3;&e3;&e3;&e3;&e3;&e3;&e3;&e3;&e3;&e3;&e3;&e3;&e3;&e3;&e3;&e3;&e3;&e3;&e3;&e3;&e3;&e3;&e3;&e3;&e3;&e3;&e3;&e3;&e3;&e3;&e3;&e3;&e3;&e3;&e3;&e3;&e3;&e3;&e3;&e3;&e3;&e3;&e3;&e3;&e3;&e3;&e3;&e3;&e3;&e3;&e3;&e3;&e3;&e3;&e3;">
-]>
-<root id="&e4;&e4;&e4;&e4;&e4;&e4;&e4;&e4;&e4;&e4;&e4;&e4;&e4;&e4;&e4;&e4;&e4;&e4;&e4;&e4;&e4;&e4;&e4;&e4;&e4;&e4;&e4;&e4;&e4;&e4;&e4;&e4;&e4;&e4;&e4;&e4;&e4;&e4;&e4;&e4;&e4;&e4;&e4;&e4;&e4;&e4;&e4;&e4;&e4;&e4;&e4;&e4;&e4;&e4;&e4;&e4;&e4;&e4;&e4;&e4;&e4;&e4;&e4;&e4;"/>
-
diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/001.xml b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/001.xml
deleted file mode 100644
index d33ec68dcd..0000000000
--- a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/001.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<doc>

-<doc

-?

-<a</a>

-</doc>

diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/001.xml.ref b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/001.xml.ref
deleted file mode 100644
index e0fa20f83d..0000000000
--- a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/001.xml.ref
+++ /dev/null
@@ -1,5 +0,0 @@
-setDocumentLocator(locator={columnNumber=1, lineNumber=1})
-startDocument()
-   startElement(namespaceURI="", localName="doc", qName="doc", atts=[])
-      characters(ch="\r\n")
-      fatalError(exception={columnNumber=1, lineNumber=3, publicId="", systemId="", message="error occurred while parsing element"})
diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/002.xml b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/002.xml
deleted file mode 100644
index 0a64d52428..0000000000
--- a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/002.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<doc>

-<.doc></.doc>

-</doc>

-

diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/002.xml.ref b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/002.xml.ref
deleted file mode 100644
index 8ebfac2a80..0000000000
--- a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/002.xml.ref
+++ /dev/null
@@ -1,5 +0,0 @@
-setDocumentLocator(locator={columnNumber=1, lineNumber=1})
-startDocument()
-   startElement(namespaceURI="", localName="doc", qName="doc", atts=[])
-      characters(ch="\r\n")
-      fatalError(exception={columnNumber=2, lineNumber=2, publicId="", systemId="", message="error occurred while parsing element"})
diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/003.xml b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/003.xml
deleted file mode 100644
index e0b8bae4a4..0000000000
--- a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/003.xml
+++ /dev/null
@@ -1 +0,0 @@
-<doc><? ?></doc>

diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/003.xml.ref b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/003.xml.ref
deleted file mode 100644
index 988690b883..0000000000
--- a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/003.xml.ref
+++ /dev/null
@@ -1,4 +0,0 @@
-setDocumentLocator(locator={columnNumber=1, lineNumber=1})
-startDocument()
-   startElement(namespaceURI="", localName="doc", qName="doc", atts=[])
-      fatalError(exception={columnNumber=8, lineNumber=1, publicId="", systemId="", message="unexpected character"})
diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/004.xml b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/004.xml
deleted file mode 100644
index e85bc96e56..0000000000
--- a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/004.xml
+++ /dev/null
@@ -1 +0,0 @@
-<doc><?target some data></doc>

diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/004.xml.ref b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/004.xml.ref
deleted file mode 100644
index 0085dfefe6..0000000000
--- a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/004.xml.ref
+++ /dev/null
@@ -1,4 +0,0 @@
-setDocumentLocator(locator={columnNumber=1, lineNumber=1})
-startDocument()
-   startElement(namespaceURI="", localName="doc", qName="doc", atts=[])
-      fatalError(exception={columnNumber=1, lineNumber=2, publicId="", systemId="", message="unexpected end of file"})
diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/005.xml b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/005.xml
deleted file mode 100644
index 7cd44ef10c..0000000000
--- a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/005.xml
+++ /dev/null
@@ -1 +0,0 @@
-<doc><?target some data?</doc>

diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/005.xml.ref b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/005.xml.ref
deleted file mode 100644
index 0085dfefe6..0000000000
--- a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/005.xml.ref
+++ /dev/null
@@ -1,4 +0,0 @@
-setDocumentLocator(locator={columnNumber=1, lineNumber=1})
-startDocument()
-   startElement(namespaceURI="", localName="doc", qName="doc", atts=[])
-      fatalError(exception={columnNumber=1, lineNumber=2, publicId="", systemId="", message="unexpected end of file"})
diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/006.xml b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/006.xml
deleted file mode 100644
index 8594c35cc7..0000000000
--- a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/006.xml
+++ /dev/null
@@ -1 +0,0 @@
-<doc><!-- a comment -- another --></doc>

diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/006.xml.ref b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/006.xml.ref
deleted file mode 100644
index 3d07b93d8e..0000000000
--- a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/006.xml.ref
+++ /dev/null
@@ -1,4 +0,0 @@
-setDocumentLocator(locator={columnNumber=1, lineNumber=1})
-startDocument()
-   startElement(namespaceURI="", localName="doc", qName="doc", atts=[])
-      fatalError(exception={columnNumber=23, lineNumber=1, publicId="", systemId="", message="error occurred while parsing comment"})
diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/007.xml b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/007.xml
deleted file mode 100644
index 286756fdd5..0000000000
--- a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/007.xml
+++ /dev/null
@@ -1 +0,0 @@
-<doc>&amp no refc</doc>

diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/007.xml.ref b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/007.xml.ref
deleted file mode 100644
index bbd182b7f7..0000000000
--- a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/007.xml.ref
+++ /dev/null
@@ -1,4 +0,0 @@
-setDocumentLocator(locator={columnNumber=1, lineNumber=1})
-startDocument()
-   startElement(namespaceURI="", localName="doc", qName="doc", atts=[])
-      fatalError(exception={columnNumber=10, lineNumber=1, publicId="", systemId="", message="error occurred while parsing reference"})
diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/008.xml b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/008.xml
deleted file mode 100644
index 29ef40306b..0000000000
--- a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/008.xml
+++ /dev/null
@@ -1 +0,0 @@
-<doc>&.entity;</doc>

diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/008.xml.ref b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/008.xml.ref
deleted file mode 100644
index 19d21b4b3e..0000000000
--- a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/008.xml.ref
+++ /dev/null
@@ -1,4 +0,0 @@
-setDocumentLocator(locator={columnNumber=1, lineNumber=1})
-startDocument()
-   startElement(namespaceURI="", localName="doc", qName="doc", atts=[])
-      fatalError(exception={columnNumber=7, lineNumber=1, publicId="", systemId="", message="letter is expected"})
diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/009.xml b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/009.xml
deleted file mode 100644
index 8e3ff7de10..0000000000
--- a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/009.xml
+++ /dev/null
@@ -1 +0,0 @@
-<doc>&#RE;</doc>

diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/009.xml.ref b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/009.xml.ref
deleted file mode 100644
index a885634000..0000000000
--- a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/009.xml.ref
+++ /dev/null
@@ -1,4 +0,0 @@
-setDocumentLocator(locator={columnNumber=1, lineNumber=1})
-startDocument()
-   startElement(namespaceURI="", localName="doc", qName="doc", atts=[])
-      fatalError(exception={columnNumber=8, lineNumber=1, publicId="", systemId="", message="error occurred while parsing reference"})
diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/010.xml b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/010.xml
deleted file mode 100644
index a6790846c9..0000000000
--- a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/010.xml
+++ /dev/null
@@ -1 +0,0 @@
-<doc>A & B</doc>

diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/010.xml.ref b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/010.xml.ref
deleted file mode 100644
index 7db0ddb551..0000000000
--- a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/010.xml.ref
+++ /dev/null
@@ -1,4 +0,0 @@
-setDocumentLocator(locator={columnNumber=1, lineNumber=1})
-startDocument()
-   startElement(namespaceURI="", localName="doc", qName="doc", atts=[])
-      fatalError(exception={columnNumber=9, lineNumber=1, publicId="", systemId="", message="letter is expected"})
diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/011.xml b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/011.xml
deleted file mode 100644
index 57eaf9fc48..0000000000
--- a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/011.xml
+++ /dev/null
@@ -1 +0,0 @@
-<doc a1></doc>

diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/011.xml.ref b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/011.xml.ref
deleted file mode 100644
index bb837957be..0000000000
--- a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/011.xml.ref
+++ /dev/null
@@ -1,3 +0,0 @@
-setDocumentLocator(locator={columnNumber=1, lineNumber=1})
-startDocument()
-   fatalError(exception={columnNumber=8, lineNumber=1, publicId="", systemId="", message="unexpected character"})
diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/012.xml b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/012.xml
deleted file mode 100644
index 1b2539ffa6..0000000000
--- a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/012.xml
+++ /dev/null
@@ -1 +0,0 @@
-<doc a1=v1></doc>

diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/012.xml.ref b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/012.xml.ref
deleted file mode 100644
index 333fb0db76..0000000000
--- a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/012.xml.ref
+++ /dev/null
@@ -1,3 +0,0 @@
-setDocumentLocator(locator={columnNumber=1, lineNumber=1})
-startDocument()
-   fatalError(exception={columnNumber=9, lineNumber=1, publicId="", systemId="", message="unexpected character"})
diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/013.xml b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/013.xml
deleted file mode 100644
index 3540df9143..0000000000
--- a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/013.xml
+++ /dev/null
@@ -1 +0,0 @@
-<doc a1="v1'></doc>

diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/013.xml.ref b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/013.xml.ref
deleted file mode 100644
index 1fececc438..0000000000
--- a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/013.xml.ref
+++ /dev/null
@@ -1,3 +0,0 @@
-setDocumentLocator(locator={columnNumber=1, lineNumber=1})
-startDocument()
-   fatalError(exception={columnNumber=14, lineNumber=1, publicId="", systemId="", message="unexpected character"})
diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/014.xml b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/014.xml
deleted file mode 100644
index a613115609..0000000000
--- a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/014.xml
+++ /dev/null
@@ -1 +0,0 @@
-<doc a1="<foo>"></doc>

diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/014.xml.ref b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/014.xml.ref
deleted file mode 100644
index a9230f2d7c..0000000000
--- a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/014.xml.ref
+++ /dev/null
@@ -1,3 +0,0 @@
-setDocumentLocator(locator={columnNumber=1, lineNumber=1})
-startDocument()
-   fatalError(exception={columnNumber=10, lineNumber=1, publicId="", systemId="", message="unexpected character"})
diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/015.xml b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/015.xml
deleted file mode 100644
index f2baf947b5..0000000000
--- a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/015.xml
+++ /dev/null
@@ -1 +0,0 @@
-<doc a1=></doc>

diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/015.xml.ref b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/015.xml.ref
deleted file mode 100644
index 333fb0db76..0000000000
--- a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/015.xml.ref
+++ /dev/null
@@ -1,3 +0,0 @@
-setDocumentLocator(locator={columnNumber=1, lineNumber=1})
-startDocument()
-   fatalError(exception={columnNumber=9, lineNumber=1, publicId="", systemId="", message="unexpected character"})
diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/016.xml b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/016.xml
deleted file mode 100644
index 22d4b2e265..0000000000
--- a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/016.xml
+++ /dev/null
@@ -1 +0,0 @@
-<doc a1="v1" "v2"></doc>

diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/016.xml.ref b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/016.xml.ref
deleted file mode 100644
index e47a79ca68..0000000000
--- a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/016.xml.ref
+++ /dev/null
@@ -1,3 +0,0 @@
-setDocumentLocator(locator={columnNumber=1, lineNumber=1})
-startDocument()
-   fatalError(exception={columnNumber=14, lineNumber=1, publicId="", systemId="", message="error occurred while parsing element"})
diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/017.xml b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/017.xml
deleted file mode 100644
index a76f5929e9..0000000000
--- a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/017.xml
+++ /dev/null
@@ -1 +0,0 @@
-<doc><![CDATA[</doc>

diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/017.xml.ref b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/017.xml.ref
deleted file mode 100644
index 0085dfefe6..0000000000
--- a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/017.xml.ref
+++ /dev/null
@@ -1,4 +0,0 @@
-setDocumentLocator(locator={columnNumber=1, lineNumber=1})
-startDocument()
-   startElement(namespaceURI="", localName="doc", qName="doc", atts=[])
-      fatalError(exception={columnNumber=1, lineNumber=2, publicId="", systemId="", message="unexpected end of file"})
diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/018.xml b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/018.xml
deleted file mode 100644
index 66e204acc4..0000000000
--- a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/018.xml
+++ /dev/null
@@ -1 +0,0 @@
-<doc><![CDATA [ stuff]]></doc>

diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/018.xml.ref b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/018.xml.ref
deleted file mode 100644
index 651fa05573..0000000000
--- a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/018.xml.ref
+++ /dev/null
@@ -1,4 +0,0 @@
-setDocumentLocator(locator={columnNumber=1, lineNumber=1})
-startDocument()
-   startElement(namespaceURI="", localName="doc", qName="doc", atts=[])
-      fatalError(exception={columnNumber=14, lineNumber=1, publicId="", systemId="", message="unexpected character"})
diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/019.xml b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/019.xml
deleted file mode 100644
index b835c2d752..0000000000
--- a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/019.xml
+++ /dev/null
@@ -1 +0,0 @@
-<doc></>

diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/019.xml.ref b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/019.xml.ref
deleted file mode 100644
index 9196faad6d..0000000000
--- a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/019.xml.ref
+++ /dev/null
@@ -1,4 +0,0 @@
-setDocumentLocator(locator={columnNumber=1, lineNumber=1})
-startDocument()
-   startElement(namespaceURI="", localName="doc", qName="doc", atts=[])
-      fatalError(exception={columnNumber=8, lineNumber=1, publicId="", systemId="", message="error occurred while parsing element"})
diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/020.xml b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/020.xml
deleted file mode 100644
index b30cfcfc10..0000000000
--- a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/020.xml
+++ /dev/null
@@ -1 +0,0 @@
-<doc a1="A & B"></doc>

diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/020.xml.ref b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/020.xml.ref
deleted file mode 100644
index f52f775f12..0000000000
--- a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/020.xml.ref
+++ /dev/null
@@ -1,3 +0,0 @@
-setDocumentLocator(locator={columnNumber=1, lineNumber=1})
-startDocument()
-   fatalError(exception={columnNumber=13, lineNumber=1, publicId="", systemId="", message="letter is expected"})
diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/021.xml b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/021.xml
deleted file mode 100644
index 1bfa84aa64..0000000000
--- a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/021.xml
+++ /dev/null
@@ -1 +0,0 @@
-<doc a1="a&b"></doc>

diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/021.xml.ref b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/021.xml.ref
deleted file mode 100644
index 02ae4699b6..0000000000
--- a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/021.xml.ref
+++ /dev/null
@@ -1,3 +0,0 @@
-setDocumentLocator(locator={columnNumber=1, lineNumber=1})
-startDocument()
-   fatalError(exception={columnNumber=13, lineNumber=1, publicId="", systemId="", message="error occurred while parsing reference"})
diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/022.xml b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/022.xml
deleted file mode 100644
index 44c803bf1b..0000000000
--- a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/022.xml
+++ /dev/null
@@ -1 +0,0 @@
-<doc a1="&#123:"></doc>

diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/022.xml.ref b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/022.xml.ref
deleted file mode 100644
index 42bf38f488..0000000000
--- a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/022.xml.ref
+++ /dev/null
@@ -1,3 +0,0 @@
-setDocumentLocator(locator={columnNumber=1, lineNumber=1})
-startDocument()
-   fatalError(exception={columnNumber=15, lineNumber=1, publicId="", systemId="", message="error occurred while parsing reference"})
diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/023.xml b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/023.xml
deleted file mode 100644
index b877ae2a6b..0000000000
--- a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/023.xml
+++ /dev/null
@@ -1 +0,0 @@
-<doc 12="34"></doc>

diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/023.xml.ref b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/023.xml.ref
deleted file mode 100644
index 94f5cfa68c..0000000000
--- a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/023.xml.ref
+++ /dev/null
@@ -1,3 +0,0 @@
-setDocumentLocator(locator={columnNumber=1, lineNumber=1})
-startDocument()
-   fatalError(exception={columnNumber=6, lineNumber=1, publicId="", systemId="", message="error occurred while parsing element"})
diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/024.xml b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/024.xml
deleted file mode 100644
index cf68f2c073..0000000000
--- a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/024.xml
+++ /dev/null
@@ -1,3 +0,0 @@
-<doc>

-<123></123>

-</doc>

diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/024.xml.ref b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/024.xml.ref
deleted file mode 100644
index 8ebfac2a80..0000000000
--- a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/024.xml.ref
+++ /dev/null
@@ -1,5 +0,0 @@
-setDocumentLocator(locator={columnNumber=1, lineNumber=1})
-startDocument()
-   startElement(namespaceURI="", localName="doc", qName="doc", atts=[])
-      characters(ch="\r\n")
-      fatalError(exception={columnNumber=2, lineNumber=2, publicId="", systemId="", message="error occurred while parsing element"})
diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/025.xml b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/025.xml
deleted file mode 100644
index 6cba95cd78..0000000000
--- a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/025.xml
+++ /dev/null
@@ -1 +0,0 @@
-<doc>]]></doc>

diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/025.xml.ref b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/025.xml.ref
deleted file mode 100644
index 8f5d812e49..0000000000
--- a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/025.xml.ref
+++ /dev/null
@@ -1,4 +0,0 @@
-setDocumentLocator(locator={columnNumber=1, lineNumber=1})
-startDocument()
-   startElement(namespaceURI="", localName="doc", qName="doc", atts=[])
-      fatalError(exception={columnNumber=8, lineNumber=1, publicId="", systemId="", message="error occurred while parsing content"})
diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/026.xml b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/026.xml
deleted file mode 100644
index 347984fa73..0000000000
--- a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/026.xml
+++ /dev/null
@@ -1 +0,0 @@
-<doc>]]]></doc>

diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/026.xml.ref b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/026.xml.ref
deleted file mode 100644
index 3d0c743f13..0000000000
--- a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/026.xml.ref
+++ /dev/null
@@ -1,4 +0,0 @@
-setDocumentLocator(locator={columnNumber=1, lineNumber=1})
-startDocument()
-   startElement(namespaceURI="", localName="doc", qName="doc", atts=[])
-      fatalError(exception={columnNumber=9, lineNumber=1, publicId="", systemId="", message="error occurred while parsing content"})
diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/027.xml b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/027.xml
deleted file mode 100644
index cfafaf0d70..0000000000
--- a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/027.xml
+++ /dev/null
@@ -1,3 +0,0 @@
-<doc>

-<!-- abc

-</doc>

diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/027.xml.ref b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/027.xml.ref
deleted file mode 100644
index 178563e3d9..0000000000
--- a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/027.xml.ref
+++ /dev/null
@@ -1,5 +0,0 @@
-setDocumentLocator(locator={columnNumber=1, lineNumber=1})
-startDocument()
-   startElement(namespaceURI="", localName="doc", qName="doc", atts=[])
-      characters(ch="\r\n")
-      fatalError(exception={columnNumber=1, lineNumber=4, publicId="", systemId="", message="unexpected end of file"})
diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/028.xml b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/028.xml
deleted file mode 100644
index 522714993a..0000000000
--- a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/028.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<doc>

-<?a pi that is not closed

-</doc>

-

diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/028.xml.ref b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/028.xml.ref
deleted file mode 100644
index 45a61328b0..0000000000
--- a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/028.xml.ref
+++ /dev/null
@@ -1,5 +0,0 @@
-setDocumentLocator(locator={columnNumber=1, lineNumber=1})
-startDocument()
-   startElement(namespaceURI="", localName="doc", qName="doc", atts=[])
-      characters(ch="\r\n")
-      fatalError(exception={columnNumber=1, lineNumber=5, publicId="", systemId="", message="unexpected end of file"})
diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/029.xml b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/029.xml
deleted file mode 100644
index 9a8008bc9f..0000000000
--- a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/029.xml
+++ /dev/null
@@ -1 +0,0 @@
-<doc>abc]]]>def</doc>

diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/029.xml.ref b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/029.xml.ref
deleted file mode 100644
index da043096c0..0000000000
--- a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/029.xml.ref
+++ /dev/null
@@ -1,4 +0,0 @@
-setDocumentLocator(locator={columnNumber=1, lineNumber=1})
-startDocument()
-   startElement(namespaceURI="", localName="doc", qName="doc", atts=[])
-      fatalError(exception={columnNumber=12, lineNumber=1, publicId="", systemId="", message="error occurred while parsing content"})
diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/030.xml b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/030.xml
deleted file mode 100644
index 25861fa19b..0000000000
--- a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/030.xml
+++ /dev/null
@@ -1 +0,0 @@
-<doc>A form feed () is not legal in data</doc>

diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/030.xml.ref b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/030.xml.ref
deleted file mode 100644
index 3d7b2fd5f0..0000000000
--- a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/030.xml.ref
+++ /dev/null
@@ -1,6 +0,0 @@
-setDocumentLocator(locator={columnNumber=1, lineNumber=1})
-startDocument()
-   startElement(namespaceURI="", localName="doc", qName="doc", atts=[])
-      characters(ch="A form feed () is not legal in data")
-   endElement(namespaceURI="", localName="doc", qName="doc")
-endDocument()
diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/031.xml b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/031.xml
deleted file mode 100644
index f946536f39..0000000000
--- a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/031.xml
+++ /dev/null
@@ -1 +0,0 @@
-<doc><?pi a form feed () is not allowed in a pi?></doc>

diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/031.xml.ref b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/031.xml.ref
deleted file mode 100644
index 240d633529..0000000000
--- a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/031.xml.ref
+++ /dev/null
@@ -1,6 +0,0 @@
-setDocumentLocator(locator={columnNumber=1, lineNumber=1})
-startDocument()
-   startElement(namespaceURI="", localName="doc", qName="doc", atts=[])
-      processingInstruction(target="pi", data="a form feed () is not allowed in a pi")
-   endElement(namespaceURI="", localName="doc", qName="doc")
-endDocument()
diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/032.xml b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/032.xml
deleted file mode 100644
index 75952017ca..0000000000
--- a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/032.xml
+++ /dev/null
@@ -1 +0,0 @@
-<doc><!-- a form feed () is not allowed in a comment --></doc>

diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/032.xml.ref b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/032.xml.ref
deleted file mode 100644
index a85cab71f0..0000000000
--- a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/032.xml.ref
+++ /dev/null
@@ -1,6 +0,0 @@
-setDocumentLocator(locator={columnNumber=1, lineNumber=1})
-startDocument()
-   startElement(namespaceURI="", localName="doc", qName="doc", atts=[])
-      comment(ch=" a form feed () is not allowed in a comment ")
-   endElement(namespaceURI="", localName="doc", qName="doc")
-endDocument()
diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/033.xml b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/033.xml
deleted file mode 100644
index afd2328402..0000000000
--- a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/033.xml
+++ /dev/null
@@ -1 +0,0 @@
-<doc>abcdef</doc>

diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/033.xml.ref b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/033.xml.ref
deleted file mode 100644
index a059f8e0b2..0000000000
--- a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/033.xml.ref
+++ /dev/null
@@ -1,6 +0,0 @@
-setDocumentLocator(locator={columnNumber=1, lineNumber=1})
-startDocument()
-   startElement(namespaceURI="", localName="doc", qName="doc", atts=[])
-      characters(ch="abcdef")
-   endElement(namespaceURI="", localName="doc", qName="doc")
-endDocument()
diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/034.xml b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/034.xml
deleted file mode 100644
index d74a77719b..0000000000
--- a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/034.xml
+++ /dev/null
@@ -1 +0,0 @@
-<doc>A form-feed is not white space or a name character</doc>

diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/034.xml.ref b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/034.xml.ref
deleted file mode 100644
index 723dc1aa00..0000000000
--- a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/034.xml.ref
+++ /dev/null
@@ -1,3 +0,0 @@
-setDocumentLocator(locator={columnNumber=1, lineNumber=1})
-startDocument()
-   fatalError(exception={columnNumber=5, lineNumber=1, publicId="", systemId="", message="error occurred while parsing element"})
diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/035.xml b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/035.xml
deleted file mode 100644
index e1fc920522..0000000000
--- a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/035.xml
+++ /dev/null
@@ -1 +0,0 @@
-<doc>1 < 2 but not in XML</doc>

diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/035.xml.ref b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/035.xml.ref
deleted file mode 100644
index 6ca9412864..0000000000
--- a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/035.xml.ref
+++ /dev/null
@@ -1,5 +0,0 @@
-setDocumentLocator(locator={columnNumber=1, lineNumber=1})
-startDocument()
-   startElement(namespaceURI="", localName="doc", qName="doc", atts=[])
-      characters(ch="1 ")
-      fatalError(exception={columnNumber=9, lineNumber=1, publicId="", systemId="", message="error occurred while parsing element"})
diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/036.xml b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/036.xml
deleted file mode 100644
index b8ecb21ba1..0000000000
--- a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/036.xml
+++ /dev/null
@@ -1,2 +0,0 @@
-<doc></doc>

-Illegal data

diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/036.xml.ref b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/036.xml.ref
deleted file mode 100644
index 5341fe5c8a..0000000000
--- a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/036.xml.ref
+++ /dev/null
@@ -1,5 +0,0 @@
-setDocumentLocator(locator={columnNumber=1, lineNumber=1})
-startDocument()
-   startElement(namespaceURI="", localName="doc", qName="doc", atts=[])
-   endElement(namespaceURI="", localName="doc", qName="doc")
-   fatalError(exception={columnNumber=1, lineNumber=2, publicId="", systemId="", message="unexpected character"})
diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/037.xml b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/037.xml
deleted file mode 100644
index 2e02662926..0000000000
--- a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/037.xml
+++ /dev/null
@@ -1,2 +0,0 @@
-<doc></doc>

-&#32;

diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/037.xml.ref b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/037.xml.ref
deleted file mode 100644
index 5341fe5c8a..0000000000
--- a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/037.xml.ref
+++ /dev/null
@@ -1,5 +0,0 @@
-setDocumentLocator(locator={columnNumber=1, lineNumber=1})
-startDocument()
-   startElement(namespaceURI="", localName="doc", qName="doc", atts=[])
-   endElement(namespaceURI="", localName="doc", qName="doc")
-   fatalError(exception={columnNumber=1, lineNumber=2, publicId="", systemId="", message="unexpected character"})
diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/038.xml b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/038.xml
deleted file mode 100644
index 68b2803f82..0000000000
--- a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/038.xml
+++ /dev/null
@@ -1 +0,0 @@
-<doc x="foo" y="bar" x="baz"></doc>

diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/038.xml.ref b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/038.xml.ref
deleted file mode 100644
index 914f7edc6a..0000000000
--- a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/038.xml.ref
+++ /dev/null
@@ -1,5 +0,0 @@
-setDocumentLocator(locator={columnNumber=1, lineNumber=1})
-startDocument()
-   startElement(namespaceURI="", localName="doc", qName="doc", atts=[{localName="x", qName="x", uri="", type="CDATA", value="foo"}, {localName="y", qName="y", uri="", type="CDATA", value="bar"}, {localName="x", qName="x", uri="", type="CDATA", value="baz"}])
-   endElement(namespaceURI="", localName="doc", qName="doc")
-endDocument()
diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/039.xml b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/039.xml
deleted file mode 100644
index 80429e3e40..0000000000
--- a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/039.xml
+++ /dev/null
@@ -1 +0,0 @@
-<doc><a></aa></doc>

diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/039.xml.ref b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/039.xml.ref
deleted file mode 100644
index 82a67116c1..0000000000
--- a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/039.xml.ref
+++ /dev/null
@@ -1,5 +0,0 @@
-setDocumentLocator(locator={columnNumber=1, lineNumber=1})
-startDocument()
-   startElement(namespaceURI="", localName="doc", qName="doc", atts=[])
-      startElement(namespaceURI="", localName="a", qName="a", atts=[])
-         fatalError(exception={columnNumber=13, lineNumber=1, publicId="", systemId="", message="tag mismatch"})
diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/040.xml b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/040.xml
deleted file mode 100644
index dc8ba5a434..0000000000
--- a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/040.xml
+++ /dev/null
@@ -1,2 +0,0 @@
-<doc></doc>

-<doc></doc>

diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/040.xml.ref b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/040.xml.ref
deleted file mode 100644
index a28c24ab56..0000000000
--- a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/040.xml.ref
+++ /dev/null
@@ -1,5 +0,0 @@
-setDocumentLocator(locator={columnNumber=1, lineNumber=1})
-startDocument()
-   startElement(namespaceURI="", localName="doc", qName="doc", atts=[])
-   endElement(namespaceURI="", localName="doc", qName="doc")
-   fatalError(exception={columnNumber=2, lineNumber=2, publicId="", systemId="", message="unexpected character"})
diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/041.xml b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/041.xml
deleted file mode 100644
index 30bcdd6bfe..0000000000
--- a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/041.xml
+++ /dev/null
@@ -1,2 +0,0 @@
-<doc/>

-<doc></doc>

diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/041.xml.ref b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/041.xml.ref
deleted file mode 100644
index a28c24ab56..0000000000
--- a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/041.xml.ref
+++ /dev/null
@@ -1,5 +0,0 @@
-setDocumentLocator(locator={columnNumber=1, lineNumber=1})
-startDocument()
-   startElement(namespaceURI="", localName="doc", qName="doc", atts=[])
-   endElement(namespaceURI="", localName="doc", qName="doc")
-   fatalError(exception={columnNumber=2, lineNumber=2, publicId="", systemId="", message="unexpected character"})
diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/042.xml b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/042.xml
deleted file mode 100644
index 4ae50efc7b..0000000000
--- a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/042.xml
+++ /dev/null
@@ -1 +0,0 @@
-<doc/></doc/>

diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/042.xml.ref b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/042.xml.ref
deleted file mode 100644
index 493c67a337..0000000000
--- a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/042.xml.ref
+++ /dev/null
@@ -1,5 +0,0 @@
-setDocumentLocator(locator={columnNumber=1, lineNumber=1})
-startDocument()
-   startElement(namespaceURI="", localName="doc", qName="doc", atts=[])
-   endElement(namespaceURI="", localName="doc", qName="doc")
-   fatalError(exception={columnNumber=8, lineNumber=1, publicId="", systemId="", message="unexpected character"})
diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/043.xml b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/043.xml
deleted file mode 100644
index 41824eee4b..0000000000
--- a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/043.xml
+++ /dev/null
@@ -1,2 +0,0 @@
-<doc/>

-Illegal data

diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/043.xml.ref b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/043.xml.ref
deleted file mode 100644
index 5341fe5c8a..0000000000
--- a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/043.xml.ref
+++ /dev/null
@@ -1,5 +0,0 @@
-setDocumentLocator(locator={columnNumber=1, lineNumber=1})
-startDocument()
-   startElement(namespaceURI="", localName="doc", qName="doc", atts=[])
-   endElement(namespaceURI="", localName="doc", qName="doc")
-   fatalError(exception={columnNumber=1, lineNumber=2, publicId="", systemId="", message="unexpected character"})
diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/044.xml b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/044.xml
deleted file mode 100644
index 3fc232dc37..0000000000
--- a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/044.xml
+++ /dev/null
@@ -1 +0,0 @@
-<doc/><doc/>

diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/044.xml.ref b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/044.xml.ref
deleted file mode 100644
index 493c67a337..0000000000
--- a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/044.xml.ref
+++ /dev/null
@@ -1,5 +0,0 @@
-setDocumentLocator(locator={columnNumber=1, lineNumber=1})
-startDocument()
-   startElement(namespaceURI="", localName="doc", qName="doc", atts=[])
-   endElement(namespaceURI="", localName="doc", qName="doc")
-   fatalError(exception={columnNumber=8, lineNumber=1, publicId="", systemId="", message="unexpected character"})
diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/045.xml b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/045.xml
deleted file mode 100644
index 00c10f00bf..0000000000
--- a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/045.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<doc>

-<a/

-</doc>

-

diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/045.xml.ref b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/045.xml.ref
deleted file mode 100644
index d030deb272..0000000000
--- a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/045.xml.ref
+++ /dev/null
@@ -1,7 +0,0 @@
-setDocumentLocator(locator={columnNumber=1, lineNumber=1})
-startDocument()
-   startElement(namespaceURI="", localName="doc", qName="doc", atts=[])
-      characters(ch="\r\n")
-      startElement(namespaceURI="", localName="a", qName="a", atts=[])
-      endElement(namespaceURI="", localName="a", qName="a")
-      fatalError(exception={columnNumber=4, lineNumber=2, publicId="", systemId="", message="error occurred while parsing element"})
diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/046.xml b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/046.xml
deleted file mode 100644
index 265cb15301..0000000000
--- a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/046.xml
+++ /dev/null
@@ -1,3 +0,0 @@
-<doc>

-<a/</a>

-</doc>

diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/046.xml.ref b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/046.xml.ref
deleted file mode 100644
index d030deb272..0000000000
--- a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/046.xml.ref
+++ /dev/null
@@ -1,7 +0,0 @@
-setDocumentLocator(locator={columnNumber=1, lineNumber=1})
-startDocument()
-   startElement(namespaceURI="", localName="doc", qName="doc", atts=[])
-      characters(ch="\r\n")
-      startElement(namespaceURI="", localName="a", qName="a", atts=[])
-      endElement(namespaceURI="", localName="a", qName="a")
-      fatalError(exception={columnNumber=4, lineNumber=2, publicId="", systemId="", message="error occurred while parsing element"})
diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/047.xml b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/047.xml
deleted file mode 100644
index d18a4a4440..0000000000
--- a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/047.xml
+++ /dev/null
@@ -1,3 +0,0 @@
-<doc>

-<a / >

-</doc>

diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/047.xml.ref b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/047.xml.ref
deleted file mode 100644
index 4693ac42c3..0000000000
--- a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/047.xml.ref
+++ /dev/null
@@ -1,7 +0,0 @@
-setDocumentLocator(locator={columnNumber=1, lineNumber=1})
-startDocument()
-   startElement(namespaceURI="", localName="doc", qName="doc", atts=[])
-      characters(ch="\r\n")
-      startElement(namespaceURI="", localName="a", qName="a", atts=[])
-      endElement(namespaceURI="", localName="a", qName="a")
-      fatalError(exception={columnNumber=5, lineNumber=2, publicId="", systemId="", message="error occurred while parsing element"})
diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/048.xml b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/048.xml
deleted file mode 100644
index 67419c1ed5..0000000000
--- a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/048.xml
+++ /dev/null
@@ -1,3 +0,0 @@
-<doc>

-</doc>

-<![CDATA[]]>

diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/048.xml.ref b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/048.xml.ref
deleted file mode 100644
index f8e19b6108..0000000000
--- a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/048.xml.ref
+++ /dev/null
@@ -1,6 +0,0 @@
-setDocumentLocator(locator={columnNumber=1, lineNumber=1})
-startDocument()
-   startElement(namespaceURI="", localName="doc", qName="doc", atts=[])
-      characters(ch="\r\n")
-   endElement(namespaceURI="", localName="doc", qName="doc")
-   fatalError(exception={columnNumber=3, lineNumber=3, publicId="", systemId="", message="error occurred while parsing comment"})
diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/049.xml b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/049.xml
deleted file mode 100644
index 3cf0e79422..0000000000
--- a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/049.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<doc>

-<a><![CDATA[xyz]]]></a>

-<![CDATA[]]></a>

-</doc>

diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/049.xml.ref b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/049.xml.ref
deleted file mode 100644
index 1d89054d77..0000000000
--- a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/049.xml.ref
+++ /dev/null
@@ -1,14 +0,0 @@
-setDocumentLocator(locator={columnNumber=1, lineNumber=1})
-startDocument()
-   startElement(namespaceURI="", localName="doc", qName="doc", atts=[])
-      characters(ch="\r\n")
-      startElement(namespaceURI="", localName="a", qName="a", atts=[])
-         startCDATA()
-            characters(ch="xyz]")
-         endCDATA()
-      endElement(namespaceURI="", localName="a", qName="a")
-      characters(ch="\r\n")
-      startCDATA()
-         characters(ch="")
-      endCDATA()
-      fatalError(exception={columnNumber=16, lineNumber=3, publicId="", systemId="", message="tag mismatch"})
diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/050.xml b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/050.xml
deleted file mode 100644
index e69de29bb2..0000000000
--- a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/050.xml
+++ /dev/null
diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/050.xml.ref b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/050.xml.ref
deleted file mode 100644
index 2a3b59e093..0000000000
--- a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/050.xml.ref
+++ /dev/null
@@ -1,3 +0,0 @@
-setDocumentLocator(locator={columnNumber=1, lineNumber=1})
-startDocument()
-   fatalError(exception={columnNumber=1, lineNumber=1, publicId="", systemId="", message="unexpected end of file"})
diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/051.xml b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/051.xml
deleted file mode 100644
index b52df12cc4..0000000000
--- a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/051.xml
+++ /dev/null
@@ -1,3 +0,0 @@
-<!-- a comment -->

-<![CDATA[]]>

-<doc></doc>

diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/051.xml.ref b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/051.xml.ref
deleted file mode 100644
index 71c3e0d2f9..0000000000
--- a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/051.xml.ref
+++ /dev/null
@@ -1,4 +0,0 @@
-setDocumentLocator(locator={columnNumber=1, lineNumber=1})
-startDocument()
-   comment(ch=" a comment ")
-   fatalError(exception={columnNumber=3, lineNumber=2, publicId="", systemId="", message="error occurred while parsing element"})
diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/052.xml b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/052.xml
deleted file mode 100644
index 8283895990..0000000000
--- a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/052.xml
+++ /dev/null
@@ -1,3 +0,0 @@
-<!-- a comment -->

-&#32;

-<doc></doc>

diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/052.xml.ref b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/052.xml.ref
deleted file mode 100644
index 42126fdb25..0000000000
--- a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/052.xml.ref
+++ /dev/null
@@ -1,4 +0,0 @@
-setDocumentLocator(locator={columnNumber=1, lineNumber=1})
-startDocument()
-   comment(ch=" a comment ")
-   fatalError(exception={columnNumber=1, lineNumber=2, publicId="", systemId="", message="error occurred while parsing element"})
diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/053.xml b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/053.xml
deleted file mode 100644
index 9d7f36920f..0000000000
--- a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/053.xml
+++ /dev/null
@@ -1 +0,0 @@
-<doc></DOC>

diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/053.xml.ref b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/053.xml.ref
deleted file mode 100644
index 515dd0b446..0000000000
--- a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/053.xml.ref
+++ /dev/null
@@ -1,4 +0,0 @@
-setDocumentLocator(locator={columnNumber=1, lineNumber=1})
-startDocument()
-   startElement(namespaceURI="", localName="doc", qName="doc", atts=[])
-      fatalError(exception={columnNumber=11, lineNumber=1, publicId="", systemId="", message="tag mismatch"})
diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/054.xml b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/054.xml
deleted file mode 100644
index eda553c6d3..0000000000
--- a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/054.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<!DOCTYPE doc [

-<!ENTITY foo PUBLIC "some public id">

-]>

-<doc></doc>

diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/054.xml.ref b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/054.xml.ref
deleted file mode 100644
index 18412e39b2..0000000000
--- a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/054.xml.ref
+++ /dev/null
@@ -1,4 +0,0 @@
-setDocumentLocator(locator={columnNumber=1, lineNumber=1})
-startDocument()
-   startDTD(name="doc", publicId="", systemId="")
-      fatalError(exception={columnNumber=37, lineNumber=2, publicId="", systemId="", message="unexpected character"})
diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/055.xml b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/055.xml
deleted file mode 100644
index cbb3683a9d..0000000000
--- a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/055.xml
+++ /dev/null
@@ -1,2 +0,0 @@
-<!DOCTYPE doc [

-<doc></doc>

diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/055.xml.ref b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/055.xml.ref
deleted file mode 100644
index 3e1e132b5e..0000000000
--- a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/055.xml.ref
+++ /dev/null
@@ -1,4 +0,0 @@
-setDocumentLocator(locator={columnNumber=1, lineNumber=1})
-startDocument()
-   startDTD(name="doc", publicId="", systemId="")
-      fatalError(exception={columnNumber=2, lineNumber=2, publicId="", systemId="", message="letter is expected"})
diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/056.xml b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/056.xml
deleted file mode 100644
index a681684c58..0000000000
--- a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/056.xml
+++ /dev/null
@@ -1,2 +0,0 @@
-<!DOCTYPE doc -- a comment -- []>

-<doc></doc>

diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/056.xml.ref b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/056.xml.ref
deleted file mode 100644
index 938a47c172..0000000000
--- a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/056.xml.ref
+++ /dev/null
@@ -1,3 +0,0 @@
-setDocumentLocator(locator={columnNumber=1, lineNumber=1})
-startDocument()
-   fatalError(exception={columnNumber=15, lineNumber=1, publicId="", systemId="", message="error occurred while parsing document type definition"})
diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/057.xml b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/057.xml
deleted file mode 100644
index 848d347120..0000000000
--- a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/057.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<!DOCTYPE doc [

-<!ENTITY e "whatever" -- a comment -->

-]>

-<doc></doc>

diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/057.xml.ref b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/057.xml.ref
deleted file mode 100644
index 28576a7fdf..0000000000
--- a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/057.xml.ref
+++ /dev/null
@@ -1,5 +0,0 @@
-setDocumentLocator(locator={columnNumber=1, lineNumber=1})
-startDocument()
-   startDTD(name="doc", publicId="", systemId="")
-      internatlEntityDecl(name="e", value="whatever")
-      fatalError(exception={columnNumber=23, lineNumber=2, publicId="", systemId="", message="letter is expected"})
diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/058.xml b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/058.xml
deleted file mode 100644
index daba266af2..0000000000
--- a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/058.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<!DOCTYPE doc [

-<!ELEMENT doc (#PCDATA)>

-<!ATTLIST doc a1 (foo,bar) #IMPLIED>

-]>

-<doc></doc>

diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/058.xml.ref b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/058.xml.ref
deleted file mode 100644
index aa3101b7ef..0000000000
--- a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/058.xml.ref
+++ /dev/null
@@ -1,4 +0,0 @@
-setDocumentLocator(locator={columnNumber=1, lineNumber=1})
-startDocument()
-   startDTD(name="doc", publicId="", systemId="")
-      fatalError(exception={columnNumber=22, lineNumber=3, publicId="", systemId="", message="letter is expected"})
diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/059.xml b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/059.xml
deleted file mode 100644
index 316083dc25..0000000000
--- a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/059.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<!DOCTYPE doc [

-<!ELEMENT doc (#PCDATA)>

-<!ATTLIST doc a1 NMTOKEN v1>

-]>

-<doc></doc>

diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/059.xml.ref b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/059.xml.ref
deleted file mode 100644
index d0c60b2bf5..0000000000
--- a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/059.xml.ref
+++ /dev/null
@@ -1,4 +0,0 @@
-setDocumentLocator(locator={columnNumber=1, lineNumber=1})
-startDocument()
-   startDTD(name="doc", publicId="", systemId="")
-      fatalError(exception={columnNumber=26, lineNumber=3, publicId="", systemId="", message="unexpected character"})
diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/060.xml b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/060.xml
deleted file mode 100644
index 9a610fd38f..0000000000
--- a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/060.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<!DOCTYPE doc [

-<!ELEMENT doc (#PCDATA)>

-<!ATTLIST doc a1 NAME #IMPLIED>

-]>

-<doc></doc>

diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/060.xml.ref b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/060.xml.ref
deleted file mode 100644
index 22f1636205..0000000000
--- a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/060.xml.ref
+++ /dev/null
@@ -1,4 +0,0 @@
-setDocumentLocator(locator={columnNumber=1, lineNumber=1})
-startDocument()
-   startDTD(name="doc", publicId="", systemId="")
-      fatalError(exception={columnNumber=19, lineNumber=3, publicId="", systemId="", message="letter is expected"})
diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/061.xml b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/061.xml
deleted file mode 100644
index 59181e706f..0000000000
--- a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/061.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<!DOCTYPE doc [

-<!ENTITY e PUBLIC "whatever""e.ent">

-]>

-<doc></doc>

diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/061.xml.ref b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/061.xml.ref
deleted file mode 100644
index d49ec689aa..0000000000
--- a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/061.xml.ref
+++ /dev/null
@@ -1,4 +0,0 @@
-setDocumentLocator(locator={columnNumber=1, lineNumber=1})
-startDocument()
-   startDTD(name="doc", publicId="", systemId="")
-      fatalError(exception={columnNumber=29, lineNumber=2, publicId="", systemId="", message="unexpected character"})
diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/062.xml b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/062.xml
deleted file mode 100644
index e62e9cd370..0000000000
--- a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/062.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<!DOCTYPE doc [

-<!ENTITY foo"some text">

-]>

-<doc></doc>

diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/062.xml.ref b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/062.xml.ref
deleted file mode 100644
index 2388c50c2b..0000000000
--- a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/062.xml.ref
+++ /dev/null
@@ -1,4 +0,0 @@
-setDocumentLocator(locator={columnNumber=1, lineNumber=1})
-startDocument()
-   startDTD(name="doc", publicId="", systemId="")
-      fatalError(exception={columnNumber=13, lineNumber=2, publicId="", systemId="", message="letter is expected"})
diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/063.xml b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/063.xml
deleted file mode 100644
index 98675b9040..0000000000
--- a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/063.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<!DOCTYPE doc [

-<![INCLUDE[ ]]>

-]>

-<doc></doc>

diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/063.xml.ref b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/063.xml.ref
deleted file mode 100644
index c0c9152f3e..0000000000
--- a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/063.xml.ref
+++ /dev/null
@@ -1,4 +0,0 @@
-setDocumentLocator(locator={columnNumber=1, lineNumber=1})
-startDocument()
-   startDTD(name="doc", publicId="", systemId="")
-      fatalError(exception={columnNumber=3, lineNumber=2, publicId="", systemId="", message="letter is expected"})
diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/064.xml b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/064.xml
deleted file mode 100644
index 3888c46b8b..0000000000
--- a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/064.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<!DOCTYPE doc [

-<!ELEMENT doc (#PCDATA)>

-<!ATTLIST e a1 CDATA"foo">

-]>

-<doc></doc>

diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/064.xml.ref b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/064.xml.ref
deleted file mode 100644
index 11ba2bdc47..0000000000
--- a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/064.xml.ref
+++ /dev/null
@@ -1,4 +0,0 @@
-setDocumentLocator(locator={columnNumber=1, lineNumber=1})
-startDocument()
-   startDTD(name="doc", publicId="", systemId="")
-      fatalError(exception={columnNumber=21, lineNumber=3, publicId="", systemId="", message="letter is expected"})
diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/065.xml b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/065.xml
deleted file mode 100644
index da9cafd137..0000000000
--- a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/065.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<!DOCTYPE doc [

-<!ELEMENT doc (#PCDATA)>

-<!ATTLIST doc a1(foo|bar) #IMPLIED>

-]>

-<doc></doc>

diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/065.xml.ref b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/065.xml.ref
deleted file mode 100644
index c91f8597df..0000000000
--- a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/065.xml.ref
+++ /dev/null
@@ -1,4 +0,0 @@
-setDocumentLocator(locator={columnNumber=1, lineNumber=1})
-startDocument()
-   startDTD(name="doc", publicId="", systemId="")
-      fatalError(exception={columnNumber=17, lineNumber=3, publicId="", systemId="", message="letter is expected"})
diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/066.xml b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/066.xml
deleted file mode 100644
index 9c09eb4e5d..0000000000
--- a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/066.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<!DOCTYPE doc [

-<!ELEMENT doc (#PCDATA)>

-<!ATTLIST doc a1 (foo|bar)#IMPLIED>

-]>

-<doc></doc>

diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/066.xml.ref b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/066.xml.ref
deleted file mode 100644
index f044a71dd9..0000000000
--- a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/066.xml.ref
+++ /dev/null
@@ -1,4 +0,0 @@
-setDocumentLocator(locator={columnNumber=1, lineNumber=1})
-startDocument()
-   startDTD(name="doc", publicId="", systemId="")
-      fatalError(exception={columnNumber=27, lineNumber=3, publicId="", systemId="", message="letter is expected"})
diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/067.xml b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/067.xml
deleted file mode 100644
index 7e0809bd34..0000000000
--- a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/067.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<!DOCTYPE doc [

-<!ELEMENT doc (#PCDATA)>

-<!ATTLIST doc a1 (foo)"foo">

-]>

-<doc></doc>

diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/067.xml.ref b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/067.xml.ref
deleted file mode 100644
index 519e67fc02..0000000000
--- a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/067.xml.ref
+++ /dev/null
@@ -1,4 +0,0 @@
-setDocumentLocator(locator={columnNumber=1, lineNumber=1})
-startDocument()
-   startDTD(name="doc", publicId="", systemId="")
-      fatalError(exception={columnNumber=23, lineNumber=3, publicId="", systemId="", message="letter is expected"})
diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/068.xml b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/068.xml
deleted file mode 100644
index 53a80a83a8..0000000000
--- a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/068.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<!DOCTYPE doc [

-<!ELEMENT doc (#PCDATA)>

-<!ATTLIST doc a1 NOTATION(foo) #IMPLIED>

-]>

-<doc></doc>

diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/068.xml.ref b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/068.xml.ref
deleted file mode 100644
index aa7a9e3957..0000000000
--- a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/068.xml.ref
+++ /dev/null
@@ -1,4 +0,0 @@
-setDocumentLocator(locator={columnNumber=1, lineNumber=1})
-startDocument()
-   startDTD(name="doc", publicId="", systemId="")
-      fatalError(exception={columnNumber=26, lineNumber=3, publicId="", systemId="", message="letter is expected"})
diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/069.xml b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/069.xml
deleted file mode 100644
index 6f891dd5e1..0000000000
--- a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/069.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<!DOCTYPE doc [

-<!NOTATION eps SYSTEM "eps.exe">

-<!-- missing space before NDATA -->

-<!ENTITY foo SYSTEM "foo.eps"NDATA eps>

-]>

-<doc></doc>

diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/069.xml.ref b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/069.xml.ref
deleted file mode 100644
index 4d729c5075..0000000000
--- a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/069.xml.ref
+++ /dev/null
@@ -1,6 +0,0 @@
-setDocumentLocator(locator={columnNumber=1, lineNumber=1})
-startDocument()
-   startDTD(name="doc", publicId="", systemId="")
-      notationDecl(name="eps", publicId="", systemId="eps.exe")
-      comment(ch=" missing space before NDATA ")
-      fatalError(exception={columnNumber=30, lineNumber=4, publicId="", systemId="", message="letter is expected"})
diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/070.xml b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/070.xml
deleted file mode 100644
index faf4b0ae4c..0000000000
--- a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/070.xml
+++ /dev/null
@@ -1,2 +0,0 @@
-<!-- a comment ending with three dashes --->

-<doc></doc>

diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/070.xml.ref b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/070.xml.ref
deleted file mode 100644
index f24226f8e5..0000000000
--- a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/070.xml.ref
+++ /dev/null
@@ -1,3 +0,0 @@
-setDocumentLocator(locator={columnNumber=1, lineNumber=1})
-startDocument()
-   fatalError(exception={columnNumber=43, lineNumber=1, publicId="", systemId="", message="error occurred while parsing comment"})
diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/071.xml b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/071.xml
deleted file mode 100644
index 5bd3908968..0000000000
--- a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/071.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<!DOCTYPE doc [

-<!ENTITY e1 "&e2;">

-<!ENTITY e2 "&e3;">

-<!ENTITY e3 "&e1;">

-]>

-<doc>&e1;</doc>

diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/071.xml.ref b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/071.xml.ref
deleted file mode 100644
index da8c9347b2..0000000000
--- a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/071.xml.ref
+++ /dev/null
@@ -1,9 +0,0 @@
-setDocumentLocator(locator={columnNumber=1, lineNumber=1})
-startDocument()
-   startDTD(name="doc", publicId="", systemId="")
-      internatlEntityDecl(name="e1", value="&e2;")
-      internatlEntityDecl(name="e2", value="&e3;")
-      internatlEntityDecl(name="e3", value="&e1;")
-   endDTD()
-   startElement(namespaceURI="", localName="doc", qName="doc", atts=[])
-      fatalError(exception={columnNumber=9, lineNumber=6, publicId="", systemId="", message="recursive entities"})
diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/072.xml b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/072.xml
deleted file mode 100644
index 743ba79429..0000000000
--- a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/072.xml
+++ /dev/null
@@ -1 +0,0 @@
-<doc>&foo;</doc>

diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/072.xml.ref b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/072.xml.ref
deleted file mode 100644
index 48fd72baf3..0000000000
--- a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/072.xml.ref
+++ /dev/null
@@ -1,6 +0,0 @@
-setDocumentLocator(locator={columnNumber=1, lineNumber=1})
-startDocument()
-   startElement(namespaceURI="", localName="doc", qName="doc", atts=[])
-      skippedEntity(name="foo")
-   endElement(namespaceURI="", localName="doc", qName="doc")
-endDocument()
diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/073.xml b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/073.xml
deleted file mode 100644
index 2578af42ec..0000000000
--- a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/073.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<!DOCTYPE doc [

-<!ENTITY e "whatever">

-]>

-<doc>&f;</doc>

diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/073.xml.ref b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/073.xml.ref
deleted file mode 100644
index b60c7d49ac..0000000000
--- a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/073.xml.ref
+++ /dev/null
@@ -1,9 +0,0 @@
-setDocumentLocator(locator={columnNumber=1, lineNumber=1})
-startDocument()
-   startDTD(name="doc", publicId="", systemId="")
-      internatlEntityDecl(name="e", value="whatever")
-   endDTD()
-   startElement(namespaceURI="", localName="doc", qName="doc", atts=[])
-      skippedEntity(name="f")
-   endElement(namespaceURI="", localName="doc", qName="doc")
-endDocument()
diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/074.xml b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/074.xml
deleted file mode 100644
index f8abaeb22c..0000000000
--- a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/074.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<!DOCTYPE doc [

-<!ENTITY e "</foo><foo>">

-]>

-<doc>

-<foo>&e;</foo>

-</doc>

diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/074.xml.ref b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/074.xml.ref
deleted file mode 100644
index df8552d646..0000000000
--- a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/074.xml.ref
+++ /dev/null
@@ -1,14 +0,0 @@
-setDocumentLocator(locator={columnNumber=1, lineNumber=1})
-startDocument()
-   startDTD(name="doc", publicId="", systemId="")
-      internatlEntityDecl(name="e", value="</foo><foo>")
-   endDTD()
-   startElement(namespaceURI="", localName="doc", qName="doc", atts=[])
-      characters(ch="\r\n")
-      startElement(namespaceURI="", localName="foo", qName="foo", atts=[])
-      endElement(namespaceURI="", localName="foo", qName="foo")
-      startElement(namespaceURI="", localName="foo", qName="foo", atts=[])
-      endElement(namespaceURI="", localName="foo", qName="foo")
-      characters(ch="\r\n")
-   endElement(namespaceURI="", localName="doc", qName="doc")
-endDocument()
diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/075.xml b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/075.xml
deleted file mode 100644
index d3dbf50ed6..0000000000
--- a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/075.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<!DOCTYPE doc [

-<!ENTITY e1 "&e2;">

-<!ENTITY e2 "&e3;">

-<!ENTITY e3 "&e1;">

-]>

-<doc a="&e1;"></doc>

-

diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/075.xml.ref b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/075.xml.ref
deleted file mode 100644
index 5d8b1797b5..0000000000
--- a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/075.xml.ref
+++ /dev/null
@@ -1,8 +0,0 @@
-setDocumentLocator(locator={columnNumber=1, lineNumber=1})
-startDocument()
-   startDTD(name="doc", publicId="", systemId="")
-      internatlEntityDecl(name="e1", value="&e2;")
-      internatlEntityDecl(name="e2", value="&e3;")
-      internatlEntityDecl(name="e3", value="&e1;")
-   endDTD()
-   fatalError(exception={columnNumber=12, lineNumber=6, publicId="", systemId="", message="recursive entities"})
diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/076.xml b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/076.xml
deleted file mode 100644
index 60546720e7..0000000000
--- a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/076.xml
+++ /dev/null
@@ -1 +0,0 @@
-<doc a="&foo;"></doc>

diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/076.xml.ref b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/076.xml.ref
deleted file mode 100644
index 6a8b31965b..0000000000
--- a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/076.xml.ref
+++ /dev/null
@@ -1,6 +0,0 @@
-setDocumentLocator(locator={columnNumber=1, lineNumber=1})
-startDocument()
-   skippedEntity(name="foo")
-   startElement(namespaceURI="", localName="doc", qName="doc", atts=[{localName="a", qName="a", uri="", type="CDATA", value=""}])
-   endElement(namespaceURI="", localName="doc", qName="doc")
-endDocument()
diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/077.xml b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/077.xml
deleted file mode 100644
index f8ac23a5a2..0000000000
--- a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/077.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<!DOCTYPE doc [

-<!ENTITY foo "&bar;">

-]>

-<doc a="&foo;"></doc>

diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/077.xml.ref b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/077.xml.ref
deleted file mode 100644
index 4458152467..0000000000
--- a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/077.xml.ref
+++ /dev/null
@@ -1,9 +0,0 @@
-setDocumentLocator(locator={columnNumber=1, lineNumber=1})
-startDocument()
-   startDTD(name="doc", publicId="", systemId="")
-      internatlEntityDecl(name="foo", value="&bar;")
-   endDTD()
-   skippedEntity(name="bar")
-   startElement(namespaceURI="", localName="doc", qName="doc", atts=[{localName="a", qName="a", uri="", type="CDATA", value=""}])
-   endElement(namespaceURI="", localName="doc", qName="doc")
-endDocument()
diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/078.xml b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/078.xml
deleted file mode 100644
index 446cd85ef9..0000000000
--- a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/078.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<!DOCTYPE doc [

-<!ELEMENT doc (#PCDATA)>

-<!ATTLIST doc a CDATA "&foo;">

-]>

-<doc></doc>

diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/078.xml.ref b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/078.xml.ref
deleted file mode 100644
index 985f71ca2b..0000000000
--- a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/078.xml.ref
+++ /dev/null
@@ -1,9 +0,0 @@
-setDocumentLocator(locator={columnNumber=1, lineNumber=1})
-startDocument()
-   startDTD(name="doc", publicId="", systemId="")
-      skippedEntity(name="foo")
-      attributeDecl(eName="doc", aName="a", type="", valueDefault="", value="")
-   endDTD()
-   startElement(namespaceURI="", localName="doc", qName="doc", atts=[])
-   endElement(namespaceURI="", localName="doc", qName="doc")
-endDocument()
diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/079.xml b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/079.xml
deleted file mode 100644
index da016fd3b2..0000000000
--- a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/079.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<!DOCTYPE doc [

-<!ENTITY e1 "&e2;">

-<!ENTITY e2 "&e3;">

-<!ENTITY e3 "&e1;">

-<!ELEMENT doc (#PCDATA)>

-<!ATTLIST doc a CDATA "&e1;">

-]>

-<doc></doc>

diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/079.xml.ref b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/079.xml.ref
deleted file mode 100644
index a59833714d..0000000000
--- a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/079.xml.ref
+++ /dev/null
@@ -1,7 +0,0 @@
-setDocumentLocator(locator={columnNumber=1, lineNumber=1})
-startDocument()
-   startDTD(name="doc", publicId="", systemId="")
-      internatlEntityDecl(name="e1", value="&e2;")
-      internatlEntityDecl(name="e2", value="&e3;")
-      internatlEntityDecl(name="e3", value="&e1;")
-      fatalError(exception={columnNumber=27, lineNumber=6, publicId="", systemId="", message="recursive entities"})
diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/080.xml b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/080.xml
deleted file mode 100644
index fa4b9e428d..0000000000
--- a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/080.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<!DOCTYPE doc [

-<!ENTITY e1 "&e2;">

-<!ENTITY e2 "&e3;">

-<!ENTITY e3 "&e1;">

-<!ELEMENT doc (#PCDATA)>

-<!ATTLIST doc a CDATA #FIXED "&e1;">

-]>

-<doc></doc>

diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/080.xml.ref b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/080.xml.ref
deleted file mode 100644
index 13ee47bdf4..0000000000
--- a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/080.xml.ref
+++ /dev/null
@@ -1,7 +0,0 @@
-setDocumentLocator(locator={columnNumber=1, lineNumber=1})
-startDocument()
-   startDTD(name="doc", publicId="", systemId="")
-      internatlEntityDecl(name="e1", value="&e2;")
-      internatlEntityDecl(name="e2", value="&e3;")
-      internatlEntityDecl(name="e3", value="&e1;")
-      fatalError(exception={columnNumber=34, lineNumber=6, publicId="", systemId="", message="recursive entities"})
diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/081.xml b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/081.xml
deleted file mode 100644
index d676100e8a..0000000000
--- a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/081.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<!DOCTYPE doc [

-<!ENTITY e SYSTEM "nul">

-]>

-<doc a="&e;"></doc>

diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/081.xml.ref b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/081.xml.ref
deleted file mode 100644
index 4d386e4f34..0000000000
--- a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/081.xml.ref
+++ /dev/null
@@ -1,6 +0,0 @@
-setDocumentLocator(locator={columnNumber=1, lineNumber=1})
-startDocument()
-   startDTD(name="doc", publicId="", systemId="")
-      externalEntityDecl(name="e", publicId="", systemId="nul")
-   endDTD()
-   fatalError(exception={columnNumber=11, lineNumber=4, publicId="", systemId="", message="external parsed general entity reference not allowed in attribute value"})
diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/082.xml b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/082.xml
deleted file mode 100644
index 3217d6f8b4..0000000000
--- a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/082.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<!DOCTYPE doc [

-<!ENTITY e SYSTEM "nul">

-<!ELEMENT doc (#PCDATA)>

-<!ATTLIST doc a CDATA "&e;">

-]>

-<doc></doc>

diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/082.xml.ref b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/082.xml.ref
deleted file mode 100644
index eb81754e50..0000000000
--- a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/082.xml.ref
+++ /dev/null
@@ -1,5 +0,0 @@
-setDocumentLocator(locator={columnNumber=1, lineNumber=1})
-startDocument()
-   startDTD(name="doc", publicId="", systemId="")
-      externalEntityDecl(name="e", publicId="", systemId="nul")
-      fatalError(exception={columnNumber=26, lineNumber=4, publicId="", systemId="", message="external parsed general entity reference not allowed in attribute value"})
diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/083.xml b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/083.xml
deleted file mode 100644
index 469d43fd42..0000000000
--- a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/083.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<!DOCTYPE doc [

-<!ENTITY e SYSTEM "nul" NDATA n>

-]>

-<doc>&e;</doc>

diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/083.xml.ref b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/083.xml.ref
deleted file mode 100644
index ac1caa8f9c..0000000000
--- a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/083.xml.ref
+++ /dev/null
@@ -1,7 +0,0 @@
-setDocumentLocator(locator={columnNumber=1, lineNumber=1})
-startDocument()
-   startDTD(name="doc", publicId="", systemId="")
-      unparsedEntityDecl(name="e", publicId="", systemId="nul", notationName="n")
-   endDTD()
-   startElement(namespaceURI="", localName="doc", qName="doc", atts=[])
-      fatalError(exception={columnNumber=8, lineNumber=4, publicId="", systemId="", message="unparsed entity reference in wrong context"})
diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/084.xml b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/084.xml
deleted file mode 100644
index abbbcdea69..0000000000
--- a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/084.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<!DOCTYPE doc [

-<!ENTITY e SYSTEM "nul" NDATA n>

-<!ELEMENT doc (#PCDATA)>

-<!ATTLIST doc a CDATA "&e;">

-]>

-<doc></doc>

diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/084.xml.ref b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/084.xml.ref
deleted file mode 100644
index 9f69b94ccf..0000000000
--- a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/084.xml.ref
+++ /dev/null
@@ -1,5 +0,0 @@
-setDocumentLocator(locator={columnNumber=1, lineNumber=1})
-startDocument()
-   startDTD(name="doc", publicId="", systemId="")
-      unparsedEntityDecl(name="e", publicId="", systemId="nul", notationName="n")
-      fatalError(exception={columnNumber=26, lineNumber=4, publicId="", systemId="", message="unparsed entity reference in wrong context"})
diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/085.xml b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/085.xml
deleted file mode 100644
index ac0aeca3e4..0000000000
--- a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/085.xml
+++ /dev/null
@@ -1,2 +0,0 @@
-<!DOCTYPE doc PUBLIC "[" "null.ent">

-<doc></doc>

diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/085.xml.ref b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/085.xml.ref
deleted file mode 100644
index 4db671e035..0000000000
--- a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/085.xml.ref
+++ /dev/null
@@ -1,7 +0,0 @@
-setDocumentLocator(locator={columnNumber=1, lineNumber=1})
-startDocument()
-   startDTD(name="doc", publicId="[", systemId="null.ent")
-   endDTD()
-   startElement(namespaceURI="", localName="doc", qName="doc", atts=[])
-   endElement(namespaceURI="", localName="doc", qName="doc")
-endDocument()
diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/086.xml b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/086.xml
deleted file mode 100644
index df6adfd884..0000000000
--- a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/086.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<!DOCTYPE doc [

-<!ENTITY foo PUBLIC "[" "null.xml">

-]>

-<doc></doc>

diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/086.xml.ref b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/086.xml.ref
deleted file mode 100644
index 6254d59e0f..0000000000
--- a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/086.xml.ref
+++ /dev/null
@@ -1,8 +0,0 @@
-setDocumentLocator(locator={columnNumber=1, lineNumber=1})
-startDocument()
-   startDTD(name="doc", publicId="", systemId="")
-      externalEntityDecl(name="foo", publicId="[", systemId="null.xml")
-   endDTD()
-   startElement(namespaceURI="", localName="doc", qName="doc", atts=[])
-   endElement(namespaceURI="", localName="doc", qName="doc")
-endDocument()
diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/087.xml b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/087.xml
deleted file mode 100644
index ed49492a7a..0000000000
--- a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/087.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<!DOCTYPE doc [

-<!NOTATION foo PUBLIC "[" "null.ent">

-]>

-<doc></doc>

diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/087.xml.ref b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/087.xml.ref
deleted file mode 100644
index 8ec0ab3a12..0000000000
--- a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/087.xml.ref
+++ /dev/null
@@ -1,8 +0,0 @@
-setDocumentLocator(locator={columnNumber=1, lineNumber=1})
-startDocument()
-   startDTD(name="doc", publicId="", systemId="")
-      notationDecl(name="foo", publicId="[", systemId="null.ent")
-   endDTD()
-   startElement(namespaceURI="", localName="doc", qName="doc", atts=[])
-   endElement(namespaceURI="", localName="doc", qName="doc")
-endDocument()
diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/088.xml b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/088.xml
deleted file mode 100644
index da0a68c401..0000000000
--- a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/088.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<!DOCTYPE doc [

-<!ELEMENT doc (#PCDATA)>

-<!ATTLIST doc a CDATA #IMPLIED>

-<!ENTITY e '"'>

-]>

-<doc a="&e;></doc>

diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/088.xml.ref b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/088.xml.ref
deleted file mode 100644
index 27ed4e589d..0000000000
--- a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/088.xml.ref
+++ /dev/null
@@ -1,7 +0,0 @@
-setDocumentLocator(locator={columnNumber=1, lineNumber=1})
-startDocument()
-   startDTD(name="doc", publicId="", systemId="")
-      attributeDecl(eName="doc", aName="a", type="", valueDefault="", value="")
-      internatlEntityDecl(name="e", value="\"")
-   endDTD()
-   fatalError(exception={columnNumber=13, lineNumber=6, publicId="", systemId="", message="unexpected character"})
diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/089.xml b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/089.xml
deleted file mode 100644
index 0c6cf404c2..0000000000
--- a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/089.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<!DOCTYPE doc [

-<!ENTITY % foo SYSTEM "foo.xml" NDATA bar>

-]>

-<doc></doc>

diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/089.xml.ref b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/089.xml.ref
deleted file mode 100644
index 910213bf13..0000000000
--- a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/089.xml.ref
+++ /dev/null
@@ -1,5 +0,0 @@
-setDocumentLocator(locator={columnNumber=1, lineNumber=1})
-startDocument()
-   startDTD(name="doc", publicId="", systemId="")
-      externalEntityDecl(name="%foo", publicId="", systemId="foo.xml")
-      fatalError(exception={columnNumber=33, lineNumber=2, publicId="", systemId="", message="letter is expected"})
diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/090.xml b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/090.xml
deleted file mode 100644
index 3fb72f3cc0..0000000000
--- a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/090.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<!DOCTYPE doc [

-<!ENTITY e "<foo a='&#60;'></foo>">

-]>

-<doc>&e;</doc>

diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/090.xml.ref b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/090.xml.ref
deleted file mode 100644
index bc4280aa82..0000000000
--- a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/090.xml.ref
+++ /dev/null
@@ -1,7 +0,0 @@
-setDocumentLocator(locator={columnNumber=1, lineNumber=1})
-startDocument()
-   startDTD(name="doc", publicId="", systemId="")
-      internatlEntityDecl(name="e", value="<foo a='<'></foo>")
-   endDTD()
-   startElement(namespaceURI="", localName="doc", qName="doc", atts=[])
-      fatalError(exception={columnNumber=8, lineNumber=4, publicId="", systemId="", message="unexpected character"})
diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/091.xml b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/091.xml
deleted file mode 100644
index a61d0914f8..0000000000
--- a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/091.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<!DOCTYPE doc [

-<!NOTATION n SYSTEM "n">

-<!ENTITY % foo SYSTEM "foo.xml" NDATA n>

-]>

-<doc></doc>

diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/091.xml.ref b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/091.xml.ref
deleted file mode 100644
index c89444077e..0000000000
--- a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/091.xml.ref
+++ /dev/null
@@ -1,6 +0,0 @@
-setDocumentLocator(locator={columnNumber=1, lineNumber=1})
-startDocument()
-   startDTD(name="doc", publicId="", systemId="")
-      notationDecl(name="n", publicId="", systemId="n")
-      externalEntityDecl(name="%foo", publicId="", systemId="foo.xml")
-      fatalError(exception={columnNumber=33, lineNumber=3, publicId="", systemId="", message="letter is expected"})
diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/092.xml b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/092.xml
deleted file mode 100644
index be5266dada..0000000000
--- a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/092.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<!DOCTYPE doc [

-<!ENTITY e "<foo a='&#38;'></foo>">

-]>

-<doc>&e;</doc>

diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/092.xml.ref b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/092.xml.ref
deleted file mode 100644
index 4469beb325..0000000000
--- a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/092.xml.ref
+++ /dev/null
@@ -1,7 +0,0 @@
-setDocumentLocator(locator={columnNumber=1, lineNumber=1})
-startDocument()
-   startDTD(name="doc", publicId="", systemId="")
-      internatlEntityDecl(name="e", value="<foo a='&'></foo>")
-   endDTD()
-   startElement(namespaceURI="", localName="doc", qName="doc", atts=[])
-      fatalError(exception={columnNumber=8, lineNumber=4, publicId="", systemId="", message="letter is expected"})
diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/093.xml b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/093.xml
deleted file mode 100644
index 4af61bc645..0000000000
--- a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/093.xml
+++ /dev/null
@@ -1 +0,0 @@
-<doc>&#X58;</doc>

diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/093.xml.ref b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/093.xml.ref
deleted file mode 100644
index a885634000..0000000000
--- a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/093.xml.ref
+++ /dev/null
@@ -1,4 +0,0 @@
-setDocumentLocator(locator={columnNumber=1, lineNumber=1})
-startDocument()
-   startElement(namespaceURI="", localName="doc", qName="doc", atts=[])
-      fatalError(exception={columnNumber=8, lineNumber=1, publicId="", systemId="", message="error occurred while parsing reference"})
diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/094.xml b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/094.xml
deleted file mode 100644
index bdec7a4660..0000000000
--- a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/094.xml
+++ /dev/null
@@ -1,2 +0,0 @@
-<?xml VERSION="1.0"?>

-<doc></doc>

diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/094.xml.ref b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/094.xml.ref
deleted file mode 100644
index f37fb5877f..0000000000
--- a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/094.xml.ref
+++ /dev/null
@@ -1,3 +0,0 @@
-setDocumentLocator(locator={columnNumber=1, lineNumber=1})
-startDocument()
-   fatalError(exception={columnNumber=20, lineNumber=1, publicId="", systemId="", message="version expected while reading the XML declaration"})
diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/095.xml b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/095.xml
deleted file mode 100644
index 090b8b4eec..0000000000
--- a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/095.xml
+++ /dev/null
@@ -1,2 +0,0 @@
-<?xml encoding="UTF-8" version="1.0"?>

-<doc></doc>

diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/095.xml.ref b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/095.xml.ref
deleted file mode 100644
index 8852f79579..0000000000
--- a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/095.xml.ref
+++ /dev/null
@@ -1,3 +0,0 @@
-setDocumentLocator(locator={columnNumber=1, lineNumber=1})
-startDocument()
-   fatalError(exception={columnNumber=23, lineNumber=1, publicId="", systemId="", message="version expected while reading the XML declaration"})
diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/096.xml b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/096.xml
deleted file mode 100644
index d806c3b952..0000000000
--- a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/096.xml
+++ /dev/null
@@ -1,2 +0,0 @@
-<?xml version="1.0"encoding="UTF-8" ?>

-<doc></doc>
\ No newline at end of file
diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/096.xml.ref b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/096.xml.ref
deleted file mode 100644
index ddca718431..0000000000
--- a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/096.xml.ref
+++ /dev/null
@@ -1,3 +0,0 @@
-setDocumentLocator(locator={columnNumber=1, lineNumber=1})
-startDocument()
-   fatalError(exception={columnNumber=20, lineNumber=1, publicId="", systemId="", message="unexpected character"})
diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/097.xml b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/097.xml
deleted file mode 100644
index d4def544b0..0000000000
--- a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/097.xml
+++ /dev/null
@@ -1,2 +0,0 @@
-<?xml version="1.0' encoding="UTF-8" ?>

-<doc></doc>
\ No newline at end of file
diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/097.xml.ref b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/097.xml.ref
deleted file mode 100644
index 962de94d11..0000000000
--- a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/097.xml.ref
+++ /dev/null
@@ -1,3 +0,0 @@
-setDocumentLocator(locator={columnNumber=1, lineNumber=1})
-startDocument()
-   fatalError(exception={columnNumber=31, lineNumber=1, publicId="", systemId="", message="unexpected character"})
diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/098.xml b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/098.xml
deleted file mode 100644
index 9798496aa3..0000000000
--- a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/098.xml
+++ /dev/null
@@ -1,2 +0,0 @@
-<?xml version="1.0" version="1.0"?>

-<doc></doc>
\ No newline at end of file
diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/098.xml.ref b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/098.xml.ref
deleted file mode 100644
index c1665a4f03..0000000000
--- a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/098.xml.ref
+++ /dev/null
@@ -1,3 +0,0 @@
-setDocumentLocator(locator={columnNumber=1, lineNumber=1})
-startDocument()
-   fatalError(exception={columnNumber=34, lineNumber=1, publicId="", systemId="", message="encoding declaration or standalone declaration expected while reading the XML declaration"})
diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/099.xml b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/099.xml
deleted file mode 100644
index d5be08eff0..0000000000
--- a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/099.xml
+++ /dev/null
@@ -1,2 +0,0 @@
-<?xml version="1.0" valid="no" ?>

-<doc></doc>
\ No newline at end of file
diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/099.xml.ref b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/099.xml.ref
deleted file mode 100644
index 2d4e8516bc..0000000000
--- a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/099.xml.ref
+++ /dev/null
@@ -1,3 +0,0 @@
-setDocumentLocator(locator={columnNumber=1, lineNumber=1})
-startDocument()
-   fatalError(exception={columnNumber=31, lineNumber=1, publicId="", systemId="", message="encoding declaration or standalone declaration expected while reading the XML declaration"})
diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/100.xml b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/100.xml
deleted file mode 100644
index 51e06231c2..0000000000
--- a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/100.xml
+++ /dev/null
@@ -1,2 +0,0 @@
-<?xml version="1.0" standalone="YES" ?>

-<doc></doc>

diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/100.xml.ref b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/100.xml.ref
deleted file mode 100644
index eba06f283c..0000000000
--- a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/100.xml.ref
+++ /dev/null
@@ -1,3 +0,0 @@
-setDocumentLocator(locator={columnNumber=1, lineNumber=1})
-startDocument()
-   fatalError(exception={columnNumber=37, lineNumber=1, publicId="", systemId="", message="wrong value for standalone declaration"})
diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/101.xml b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/101.xml
deleted file mode 100644
index afa5a455fc..0000000000
--- a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/101.xml
+++ /dev/null
@@ -1,2 +0,0 @@
-<?xml version="1.0" encoding=" UTF-8"?>

-<doc></doc>

diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/101.xml.ref b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/101.xml.ref
deleted file mode 100644
index 068a6ae657..0000000000
--- a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/101.xml.ref
+++ /dev/null
@@ -1,6 +0,0 @@
-setDocumentLocator(locator={columnNumber=1, lineNumber=1})
-startDocument()
-   processingInstruction(target="xml", data="version='1.0' encoding=' UTF-8'")
-   startElement(namespaceURI="", localName="doc", qName="doc", atts=[])
-   endElement(namespaceURI="", localName="doc", qName="doc")
-endDocument()
diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/102.xml b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/102.xml
deleted file mode 100644
index 8734adaa6e..0000000000
--- a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/102.xml
+++ /dev/null
@@ -1,2 +0,0 @@
-<?xml version="1.0 " ?>

-<doc></doc>

diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/102.xml.ref b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/102.xml.ref
deleted file mode 100644
index 86b6ce0d3a..0000000000
--- a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/102.xml.ref
+++ /dev/null
@@ -1,6 +0,0 @@
-setDocumentLocator(locator={columnNumber=1, lineNumber=1})
-startDocument()
-   processingInstruction(target="xml", data="version='1.0 '")
-   startElement(namespaceURI="", localName="doc", qName="doc", atts=[])
-   endElement(namespaceURI="", localName="doc", qName="doc")
-endDocument()
diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/103.xml b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/103.xml
deleted file mode 100644
index 6c4716798f..0000000000
--- a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/103.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<!DOCTYPE doc [

-<!ENTITY e "&#60;foo>">

-]>

-<doc>&e;</doc>

diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/103.xml.ref b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/103.xml.ref
deleted file mode 100644
index 7a82f96305..0000000000
--- a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/103.xml.ref
+++ /dev/null
@@ -1,8 +0,0 @@
-setDocumentLocator(locator={columnNumber=1, lineNumber=1})
-startDocument()
-   startDTD(name="doc", publicId="", systemId="")
-      internatlEntityDecl(name="e", value="<foo>")
-   endDTD()
-   startElement(namespaceURI="", localName="doc", qName="doc", atts=[])
-      startElement(namespaceURI="", localName="foo", qName="foo", atts=[])
-         fatalError(exception={columnNumber=14, lineNumber=4, publicId="", systemId="", message="tag mismatch"})
diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/104.xml b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/104.xml
deleted file mode 100644
index dd57396239..0000000000
--- a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/104.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<!DOCTYPE doc [

-<!ENTITY e "<foo>">

-]>

-<doc>&e;</foo></doc>

diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/104.xml.ref b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/104.xml.ref
deleted file mode 100644
index 8059be12c8..0000000000
--- a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/104.xml.ref
+++ /dev/null
@@ -1,10 +0,0 @@
-setDocumentLocator(locator={columnNumber=1, lineNumber=1})
-startDocument()
-   startDTD(name="doc", publicId="", systemId="")
-      internatlEntityDecl(name="e", value="<foo>")
-   endDTD()
-   startElement(namespaceURI="", localName="doc", qName="doc", atts=[])
-      startElement(namespaceURI="", localName="foo", qName="foo", atts=[])
-      endElement(namespaceURI="", localName="foo", qName="foo")
-   endElement(namespaceURI="", localName="doc", qName="doc")
-endDocument()
diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/105.xml b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/105.xml
deleted file mode 100644
index 809e705870..0000000000
--- a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/105.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<?pi stuff?>

-<![CDATA[]]>

-<doc>

-</doc>

diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/105.xml.ref b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/105.xml.ref
deleted file mode 100644
index ff94b32716..0000000000
--- a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/105.xml.ref
+++ /dev/null
@@ -1,4 +0,0 @@
-setDocumentLocator(locator={columnNumber=1, lineNumber=1})
-startDocument()
-   processingInstruction(target="pi", data="stuff")
-   fatalError(exception={columnNumber=3, lineNumber=2, publicId="", systemId="", message="error occurred while parsing element"})
diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/106.xml b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/106.xml
deleted file mode 100644
index d32319ef09..0000000000
--- a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/106.xml
+++ /dev/null
@@ -1,2 +0,0 @@
-<?pi data?>

-&#32;<doc></doc>

diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/106.xml.ref b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/106.xml.ref
deleted file mode 100644
index e5c6c6b6a7..0000000000
--- a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/106.xml.ref
+++ /dev/null
@@ -1,4 +0,0 @@
-setDocumentLocator(locator={columnNumber=1, lineNumber=1})
-startDocument()
-   processingInstruction(target="pi", data="data")
-   fatalError(exception={columnNumber=1, lineNumber=2, publicId="", systemId="", message="error occurred while parsing element"})
diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/107.xml b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/107.xml
deleted file mode 100644
index 3dfd8200e2..0000000000
--- a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/107.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<!DOCTYPE doc [

-<![CDATA[]]>

-]>

-<doc></doc>

diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/107.xml.ref b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/107.xml.ref
deleted file mode 100644
index c0c9152f3e..0000000000
--- a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/107.xml.ref
+++ /dev/null
@@ -1,4 +0,0 @@
-setDocumentLocator(locator={columnNumber=1, lineNumber=1})
-startDocument()
-   startDTD(name="doc", publicId="", systemId="")
-      fatalError(exception={columnNumber=3, lineNumber=2, publicId="", systemId="", message="letter is expected"})
diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/108.xml b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/108.xml
deleted file mode 100644
index af5cf50d48..0000000000
--- a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/108.xml
+++ /dev/null
@@ -1,3 +0,0 @@
-<doc>

-<![CDATA [  ]]>

-</doc>

diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/108.xml.ref b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/108.xml.ref
deleted file mode 100644
index 3be3623019..0000000000
--- a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/108.xml.ref
+++ /dev/null
@@ -1,5 +0,0 @@
-setDocumentLocator(locator={columnNumber=1, lineNumber=1})
-startDocument()
-   startElement(namespaceURI="", localName="doc", qName="doc", atts=[])
-      characters(ch="\r\n")
-      fatalError(exception={columnNumber=9, lineNumber=2, publicId="", systemId="", message="unexpected character"})
diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/109.xml b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/109.xml
deleted file mode 100644
index 5afc03e8db..0000000000
--- a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/109.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<!DOCTYPE doc [

-<!ENTITY e "<doc></doc>">

-]>

-&e;

diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/109.xml.ref b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/109.xml.ref
deleted file mode 100644
index 13140d8022..0000000000
--- a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/109.xml.ref
+++ /dev/null
@@ -1,6 +0,0 @@
-setDocumentLocator(locator={columnNumber=1, lineNumber=1})
-startDocument()
-   startDTD(name="doc", publicId="", systemId="")
-      internatlEntityDecl(name="e", value="<doc></doc>")
-   endDTD()
-   fatalError(exception={columnNumber=1, lineNumber=4, publicId="", systemId="", message="error occurred while parsing element"})
diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/110.xml b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/110.xml
deleted file mode 100644
index cf54ebe5c0..0000000000
--- a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/110.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<!DOCTYPE doc [

-<!ENTITY e "">

-]>

-<doc></doc>

-&e;

diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/110.xml.ref b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/110.xml.ref
deleted file mode 100644
index aa5b66c13f..0000000000
--- a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/110.xml.ref
+++ /dev/null
@@ -1,8 +0,0 @@
-setDocumentLocator(locator={columnNumber=1, lineNumber=1})
-startDocument()
-   startDTD(name="doc", publicId="", systemId="")
-      internatlEntityDecl(name="e", value="")
-   endDTD()
-   startElement(namespaceURI="", localName="doc", qName="doc", atts=[])
-   endElement(namespaceURI="", localName="doc", qName="doc")
-   fatalError(exception={columnNumber=1, lineNumber=5, publicId="", systemId="", message="unexpected character"})
diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/111.xml b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/111.xml
deleted file mode 100644
index 84a469f5d1..0000000000
--- a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/111.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<!DOCTYPE doc [

-<!ENTITY e "foo='bar'">

-]>

-<doc &e;></doc>

diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/111.xml.ref b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/111.xml.ref
deleted file mode 100644
index d611ecd0df..0000000000
--- a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/111.xml.ref
+++ /dev/null
@@ -1,6 +0,0 @@
-setDocumentLocator(locator={columnNumber=1, lineNumber=1})
-startDocument()
-   startDTD(name="doc", publicId="", systemId="")
-      internatlEntityDecl(name="e", value="foo='bar'")
-   endDTD()
-   fatalError(exception={columnNumber=6, lineNumber=4, publicId="", systemId="", message="error occurred while parsing element"})
diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/112.xml b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/112.xml
deleted file mode 100644
index 0c5c1a4341..0000000000
--- a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/112.xml
+++ /dev/null
@@ -1,3 +0,0 @@
-<doc>

-<![cdata[data]]>

-</doc>

diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/112.xml.ref b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/112.xml.ref
deleted file mode 100644
index db6c1f3fe7..0000000000
--- a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/112.xml.ref
+++ /dev/null
@@ -1,5 +0,0 @@
-setDocumentLocator(locator={columnNumber=1, lineNumber=1})
-startDocument()
-   startElement(namespaceURI="", localName="doc", qName="doc", atts=[])
-      characters(ch="\r\n")
-      fatalError(exception={columnNumber=4, lineNumber=2, publicId="", systemId="", message="unexpected character"})
diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/113.xml b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/113.xml
deleted file mode 100644
index 04fc9d2318..0000000000
--- a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/113.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<!DOCTYPE doc [

-<!ENTITY % foo "&">

-]>

-<doc></doc>

diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/113.xml.ref b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/113.xml.ref
deleted file mode 100644
index af3a1378d1..0000000000
--- a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/113.xml.ref
+++ /dev/null
@@ -1,4 +0,0 @@
-setDocumentLocator(locator={columnNumber=1, lineNumber=1})
-startDocument()
-   startDTD(name="doc", publicId="", systemId="")
-      fatalError(exception={columnNumber=18, lineNumber=2, publicId="", systemId="", message="letter is expected"})
diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/114.xml b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/114.xml
deleted file mode 100644
index 1261ee49e1..0000000000
--- a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/114.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<!DOCTYPE doc [

-<!ENTITY foo "&">

-]>

-<doc></doc>

diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/114.xml.ref b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/114.xml.ref
deleted file mode 100644
index 611a07b6a7..0000000000
--- a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/114.xml.ref
+++ /dev/null
@@ -1,4 +0,0 @@
-setDocumentLocator(locator={columnNumber=1, lineNumber=1})
-startDocument()
-   startDTD(name="doc", publicId="", systemId="")
-      fatalError(exception={columnNumber=16, lineNumber=2, publicId="", systemId="", message="letter is expected"})
diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/115.xml b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/115.xml
deleted file mode 100644
index f111dbe153..0000000000
--- a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/115.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<!DOCTYPE doc [

-<!ENTITY e "&#38;">

-]>

-<doc a="&e;"></doc>

diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/115.xml.ref b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/115.xml.ref
deleted file mode 100644
index d4a1b97e12..0000000000
--- a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/115.xml.ref
+++ /dev/null
@@ -1,6 +0,0 @@
-setDocumentLocator(locator={columnNumber=1, lineNumber=1})
-startDocument()
-   startDTD(name="doc", publicId="", systemId="")
-      internatlEntityDecl(name="e", value="&")
-   endDTD()
-   fatalError(exception={columnNumber=12, lineNumber=4, publicId="", systemId="", message="letter is expected"})
diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/116.xml b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/116.xml
deleted file mode 100644
index 84bb762fdf..0000000000
--- a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/116.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<!DOCTYPE doc [

-<!ENTITY e "&#38;#9">

-]>

-<doc>&e;7;</doc>

diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/116.xml.ref b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/116.xml.ref
deleted file mode 100644
index f69ee0b24e..0000000000
--- a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/116.xml.ref
+++ /dev/null
@@ -1,9 +0,0 @@
-setDocumentLocator(locator={columnNumber=1, lineNumber=1})
-startDocument()
-   startDTD(name="doc", publicId="", systemId="")
-      internatlEntityDecl(name="e", value="&#9")
-   endDTD()
-   startElement(namespaceURI="", localName="doc", qName="doc", atts=[])
-      characters(ch="a")
-   endElement(namespaceURI="", localName="doc", qName="doc")
-endDocument()
diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/117.xml b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/117.xml
deleted file mode 100644
index e4a5e572ef..0000000000
--- a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/117.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<!DOCTYPE doc [

-<!ENTITY e "&#38;">

-]>

-<doc>&e;#97;</doc>

diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/117.xml.ref b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/117.xml.ref
deleted file mode 100644
index 9c54b53b28..0000000000
--- a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/117.xml.ref
+++ /dev/null
@@ -1,9 +0,0 @@
-setDocumentLocator(locator={columnNumber=1, lineNumber=1})
-startDocument()
-   startDTD(name="doc", publicId="", systemId="")
-      internatlEntityDecl(name="e", value="&")
-   endDTD()
-   startElement(namespaceURI="", localName="doc", qName="doc", atts=[])
-      characters(ch="a")
-   endElement(namespaceURI="", localName="doc", qName="doc")
-endDocument()
diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/118.xml b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/118.xml
deleted file mode 100644
index 494d53d208..0000000000
--- a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/118.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<!DOCTYPE doc [

-<!ENTITY e "#">

-]>

-<doc>&&e;97;</doc>

diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/118.xml.ref b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/118.xml.ref
deleted file mode 100644
index 714b497120..0000000000
--- a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/118.xml.ref
+++ /dev/null
@@ -1,7 +0,0 @@
-setDocumentLocator(locator={columnNumber=1, lineNumber=1})
-startDocument()
-   startDTD(name="doc", publicId="", systemId="")
-      internatlEntityDecl(name="e", value="#")
-   endDTD()
-   startElement(namespaceURI="", localName="doc", qName="doc", atts=[])
-      fatalError(exception={columnNumber=7, lineNumber=4, publicId="", systemId="", message="error occurred while parsing reference"})
diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/119.xml b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/119.xml
deleted file mode 100644
index aefaa44a1c..0000000000
--- a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/119.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<!DOCTYPE doc [

-<!ENTITY e "&#38;">

-]>

-<doc>

-&e;#38;

-</doc>

diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/119.xml.ref b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/119.xml.ref
deleted file mode 100644
index 625f318be6..0000000000
--- a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/119.xml.ref
+++ /dev/null
@@ -1,9 +0,0 @@
-setDocumentLocator(locator={columnNumber=1, lineNumber=1})
-startDocument()
-   startDTD(name="doc", publicId="", systemId="")
-      internatlEntityDecl(name="e", value="&")
-   endDTD()
-   startElement(namespaceURI="", localName="doc", qName="doc", atts=[])
-      characters(ch="\r\n&\r\n")
-   endElement(namespaceURI="", localName="doc", qName="doc")
-endDocument()
diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/120.xml b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/120.xml
deleted file mode 100644
index b7d6ff9ce9..0000000000
--- a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/120.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<!DOCTYPE doc [

-<!ENTITY e "&#38;">

-]>

-<doc>

-&e;

-</doc>

diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/120.xml.ref b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/120.xml.ref
deleted file mode 100644
index 56edb37c66..0000000000
--- a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/120.xml.ref
+++ /dev/null
@@ -1,7 +0,0 @@
-setDocumentLocator(locator={columnNumber=1, lineNumber=1})
-startDocument()
-   startDTD(name="doc", publicId="", systemId="")
-      internatlEntityDecl(name="e", value="&")
-   endDTD()
-   startElement(namespaceURI="", localName="doc", qName="doc", atts=[])
-      fatalError(exception={columnNumber=4, lineNumber=5, publicId="", systemId="", message="letter is expected"})
diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/121.xml b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/121.xml
deleted file mode 100644
index 2b4adcc6b4..0000000000
--- a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/121.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<!DOCTYPE doc [

-<!ENTITY #DEFAULT "default">

-]>

-<doc></doc>

diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/121.xml.ref b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/121.xml.ref
deleted file mode 100644
index a9f2c8f68d..0000000000
--- a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/121.xml.ref
+++ /dev/null
@@ -1,4 +0,0 @@
-setDocumentLocator(locator={columnNumber=1, lineNumber=1})
-startDocument()
-   startDTD(name="doc", publicId="", systemId="")
-      fatalError(exception={columnNumber=10, lineNumber=2, publicId="", systemId="", message="letter is expected"})
diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/122.xml b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/122.xml
deleted file mode 100644
index ef0b057cee..0000000000
--- a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/122.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<!DOCTYPE doc [

-<!ELEMENT doc (a, (b) | c)?>

-]>

-<doc></doc>

diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/122.xml.ref b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/122.xml.ref
deleted file mode 100644
index 37b53fc0b3..0000000000
--- a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/122.xml.ref
+++ /dev/null
@@ -1,7 +0,0 @@
-setDocumentLocator(locator={columnNumber=1, lineNumber=1})
-startDocument()
-   startDTD(name="doc", publicId="", systemId="")
-   endDTD()
-   startElement(namespaceURI="", localName="doc", qName="doc", atts=[])
-   endElement(namespaceURI="", localName="doc", qName="doc")
-endDocument()
diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/123.xml b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/123.xml
deleted file mode 100644
index 06d65f045b..0000000000
--- a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/123.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<!DOCTYPE doc [

-<!ELEMENT doc ((doc?)))>

-]>

-<doc></doc>

diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/123.xml.ref b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/123.xml.ref
deleted file mode 100644
index 66978b93a8..0000000000
--- a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/123.xml.ref
+++ /dev/null
@@ -1,4 +0,0 @@
-setDocumentLocator(locator={columnNumber=1, lineNumber=1})
-startDocument()
-   startDTD(name="doc", publicId="", systemId="")
-      fatalError(exception={columnNumber=23, lineNumber=2, publicId="", systemId="", message="unexpected character"})
diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/124.xml b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/124.xml
deleted file mode 100644
index 3bbe0f91a6..0000000000
--- a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/124.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<!DOCTYPE doc [

-<!ELEMENT doc (doc|#PCDATA)*>

-]>

-<doc></doc>

diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/124.xml.ref b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/124.xml.ref
deleted file mode 100644
index dc05a44ce5..0000000000
--- a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/124.xml.ref
+++ /dev/null
@@ -1,4 +0,0 @@
-setDocumentLocator(locator={columnNumber=1, lineNumber=1})
-startDocument()
-   startDTD(name="doc", publicId="", systemId="")
-      fatalError(exception={columnNumber=20, lineNumber=2, publicId="", systemId="", message="letter is expected"})
diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/125.xml b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/125.xml
deleted file mode 100644
index 5f9c22c0c6..0000000000
--- a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/125.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<!DOCTYPE doc [

-<!ELEMENT doc ((#PCDATA))>

-]>

-<doc></doc>

diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/125.xml.ref b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/125.xml.ref
deleted file mode 100644
index b60c5515b1..0000000000
--- a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/125.xml.ref
+++ /dev/null
@@ -1,4 +0,0 @@
-setDocumentLocator(locator={columnNumber=1, lineNumber=1})
-startDocument()
-   startDTD(name="doc", publicId="", systemId="")
-      fatalError(exception={columnNumber=17, lineNumber=2, publicId="", systemId="", message="letter is expected"})
diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/126.xml b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/126.xml
deleted file mode 100644
index 13e74d6d5e..0000000000
--- a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/126.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<!DOCTYPE doc [

-<!ELEMENT doc (#PCDATA)+>

-]>

-<doc></doc>

diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/126.xml.ref b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/126.xml.ref
deleted file mode 100644
index 03465a21d5..0000000000
--- a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/126.xml.ref
+++ /dev/null
@@ -1,4 +0,0 @@
-setDocumentLocator(locator={columnNumber=1, lineNumber=1})
-startDocument()
-   startDTD(name="doc", publicId="", systemId="")
-      fatalError(exception={columnNumber=24, lineNumber=2, publicId="", systemId="", message="unexpected character"})
diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/127.xml b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/127.xml
deleted file mode 100644
index a379b9e539..0000000000
--- a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/127.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<!DOCTYPE doc [

-<!ELEMENT doc (#PCDATA)?>

-]>

-<doc></doc>

diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/127.xml.ref b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/127.xml.ref
deleted file mode 100644
index 03465a21d5..0000000000
--- a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/127.xml.ref
+++ /dev/null
@@ -1,4 +0,0 @@
-setDocumentLocator(locator={columnNumber=1, lineNumber=1})
-startDocument()
-   startDTD(name="doc", publicId="", systemId="")
-      fatalError(exception={columnNumber=24, lineNumber=2, publicId="", systemId="", message="unexpected character"})
diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/128.xml b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/128.xml
deleted file mode 100644
index dd706bb21f..0000000000
--- a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/128.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<!DOCTYPE doc [

-<!ELEMENT doc CDATA>

-]>

-<doc></doc>

diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/128.xml.ref b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/128.xml.ref
deleted file mode 100644
index 45764a1653..0000000000
--- a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/128.xml.ref
+++ /dev/null
@@ -1,4 +0,0 @@
-setDocumentLocator(locator={columnNumber=1, lineNumber=1})
-startDocument()
-   startDTD(name="doc", publicId="", systemId="")
-      fatalError(exception={columnNumber=15, lineNumber=2, publicId="", systemId="", message="unexpected character"})
diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/129.xml b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/129.xml
deleted file mode 100644
index d4e4461a6d..0000000000
--- a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/129.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<!DOCTYPE doc [

-<!ELEMENT doc - - (#PCDATA)>

-]>

-<doc></doc>

diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/129.xml.ref b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/129.xml.ref
deleted file mode 100644
index 45764a1653..0000000000
--- a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/129.xml.ref
+++ /dev/null
@@ -1,4 +0,0 @@
-setDocumentLocator(locator={columnNumber=1, lineNumber=1})
-startDocument()
-   startDTD(name="doc", publicId="", systemId="")
-      fatalError(exception={columnNumber=15, lineNumber=2, publicId="", systemId="", message="unexpected character"})
diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/130.xml b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/130.xml
deleted file mode 100644
index fa7be641f1..0000000000
--- a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/130.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<!DOCTYPE doc [

-<!ELEMENT doc (doc?) +(foo)>

-]>

-<doc></doc>

diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/130.xml.ref b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/130.xml.ref
deleted file mode 100644
index ad943c6e9e..0000000000
--- a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/130.xml.ref
+++ /dev/null
@@ -1,4 +0,0 @@
-setDocumentLocator(locator={columnNumber=1, lineNumber=1})
-startDocument()
-   startDTD(name="doc", publicId="", systemId="")
-      fatalError(exception={columnNumber=22, lineNumber=2, publicId="", systemId="", message="unexpected character"})
diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/131.xml b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/131.xml
deleted file mode 100644
index f34ed453b5..0000000000
--- a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/131.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<!DOCTYPE doc [

-<!ELEMENT doc (doc?) -(foo)>

-]>

-<doc></doc>

diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/131.xml.ref b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/131.xml.ref
deleted file mode 100644
index ad943c6e9e..0000000000
--- a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/131.xml.ref
+++ /dev/null
@@ -1,4 +0,0 @@
-setDocumentLocator(locator={columnNumber=1, lineNumber=1})
-startDocument()
-   startDTD(name="doc", publicId="", systemId="")
-      fatalError(exception={columnNumber=22, lineNumber=2, publicId="", systemId="", message="unexpected character"})
diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/132.xml b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/132.xml
deleted file mode 100644
index ab6cc416e9..0000000000
--- a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/132.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<!DOCTYPE doc [

-<!ELEMENT doc (a, (b, c), (d, (e, f) | g))?>

-]>

-<doc></doc>

diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/132.xml.ref b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/132.xml.ref
deleted file mode 100644
index 37b53fc0b3..0000000000
--- a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/132.xml.ref
+++ /dev/null
@@ -1,7 +0,0 @@
-setDocumentLocator(locator={columnNumber=1, lineNumber=1})
-startDocument()
-   startDTD(name="doc", publicId="", systemId="")
-   endDTD()
-   startElement(namespaceURI="", localName="doc", qName="doc", atts=[])
-   endElement(namespaceURI="", localName="doc", qName="doc")
-endDocument()
diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/133.xml b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/133.xml
deleted file mode 100644
index d2aa604e9f..0000000000
--- a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/133.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<!DOCTYPE doc [

-<!ELEMENT doc (a *)>

-]>

-<doc></doc>

diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/133.xml.ref b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/133.xml.ref
deleted file mode 100644
index d0b59c54cc..0000000000
--- a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/133.xml.ref
+++ /dev/null
@@ -1,4 +0,0 @@
-setDocumentLocator(locator={columnNumber=1, lineNumber=1})
-startDocument()
-   startDTD(name="doc", publicId="", systemId="")
-      fatalError(exception={columnNumber=18, lineNumber=2, publicId="", systemId="", message="unexpected character"})
diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/134.xml b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/134.xml
deleted file mode 100644
index c8919c5ef8..0000000000
--- a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/134.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<!DOCTYPE doc [

-<!ELEMENT doc (a) *>

-]>

-<doc></doc>

diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/134.xml.ref b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/134.xml.ref
deleted file mode 100644
index 9da787c53b..0000000000
--- a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/134.xml.ref
+++ /dev/null
@@ -1,4 +0,0 @@
-setDocumentLocator(locator={columnNumber=1, lineNumber=1})
-startDocument()
-   startDTD(name="doc", publicId="", systemId="")
-      fatalError(exception={columnNumber=19, lineNumber=2, publicId="", systemId="", message="unexpected character"})
diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/135.xml b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/135.xml
deleted file mode 100644
index e639e8b6ea..0000000000
--- a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/135.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<!DOCTYPE doc [

-<!ELEMENT doc (a & b)?>

-]>

-<doc></doc>

diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/135.xml.ref b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/135.xml.ref
deleted file mode 100644
index d0b59c54cc..0000000000
--- a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/135.xml.ref
+++ /dev/null
@@ -1,4 +0,0 @@
-setDocumentLocator(locator={columnNumber=1, lineNumber=1})
-startDocument()
-   startDTD(name="doc", publicId="", systemId="")
-      fatalError(exception={columnNumber=18, lineNumber=2, publicId="", systemId="", message="unexpected character"})
diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/136.xml b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/136.xml
deleted file mode 100644
index 499e68bcea..0000000000
--- a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/136.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<!DOCTYPE doc [

-<!ELEMENT doc O O (#PCDATA)>

-]>

-<doc></doc>

diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/136.xml.ref b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/136.xml.ref
deleted file mode 100644
index 45764a1653..0000000000
--- a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/136.xml.ref
+++ /dev/null
@@ -1,4 +0,0 @@
-setDocumentLocator(locator={columnNumber=1, lineNumber=1})
-startDocument()
-   startDTD(name="doc", publicId="", systemId="")
-      fatalError(exception={columnNumber=15, lineNumber=2, publicId="", systemId="", message="unexpected character"})
diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/137.xml b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/137.xml
deleted file mode 100644
index 723b77f776..0000000000
--- a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/137.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<!DOCTYPE doc [

-<!ELEMENT doc(#PCDATA)>

-]>

-<doc></doc>

diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/137.xml.ref b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/137.xml.ref
deleted file mode 100644
index 58b922aec8..0000000000
--- a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/137.xml.ref
+++ /dev/null
@@ -1,4 +0,0 @@
-setDocumentLocator(locator={columnNumber=1, lineNumber=1})
-startDocument()
-   startDTD(name="doc", publicId="", systemId="")
-      fatalError(exception={columnNumber=14, lineNumber=2, publicId="", systemId="", message="unexpected character"})
diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/138.xml b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/138.xml
deleted file mode 100644
index 16934cc88e..0000000000
--- a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/138.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<!DOCTYPE doc [

-<!ELEMENT doc (doc*?)>

-]>

-<doc></doc>

diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/138.xml.ref b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/138.xml.ref
deleted file mode 100644
index 51b93a743e..0000000000
--- a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/138.xml.ref
+++ /dev/null
@@ -1,4 +0,0 @@
-setDocumentLocator(locator={columnNumber=1, lineNumber=1})
-startDocument()
-   startDTD(name="doc", publicId="", systemId="")
-      fatalError(exception={columnNumber=20, lineNumber=2, publicId="", systemId="", message="unexpected character"})
diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/139.xml b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/139.xml
deleted file mode 100644
index 34df52ed93..0000000000
--- a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/139.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<!DOCTYPE doc [

-<!ELEMENT doc ()>

-]>

-<doc></doc>

diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/139.xml.ref b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/139.xml.ref
deleted file mode 100644
index 5344a45ef8..0000000000
--- a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/139.xml.ref
+++ /dev/null
@@ -1,4 +0,0 @@
-setDocumentLocator(locator={columnNumber=1, lineNumber=1})
-startDocument()
-   startDTD(name="doc", publicId="", systemId="")
-      fatalError(exception={columnNumber=16, lineNumber=2, publicId="", systemId="", message="unexpected character"})
diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/140.xml b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/140.xml
deleted file mode 100644
index 467d5ed301..0000000000
--- a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/140.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<!DOCTYPE doc [

-<!ENTITY e "<&#x309a;></&#x309a;>">

-]>

-<doc>&e;</doc>

diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/140.xml.ref b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/140.xml.ref
deleted file mode 100644
index 123df1a99c..0000000000
--- a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/140.xml.ref
+++ /dev/null
@@ -1,7 +0,0 @@
-setDocumentLocator(locator={columnNumber=1, lineNumber=1})
-startDocument()
-   startDTD(name="doc", publicId="", systemId="")
-      internatlEntityDecl(name="e", value="<゚></゚>")
-   endDTD()
-   startElement(namespaceURI="", localName="doc", qName="doc", atts=[])
-      fatalError(exception={columnNumber=8, lineNumber=4, publicId="", systemId="", message="error occurred while parsing element"})
diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/141.xml b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/141.xml
deleted file mode 100644
index 409d0a7568..0000000000
--- a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/141.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<!DOCTYPE doc [

-<!ENTITY e "<X&#xe5c;></X&#xe5c;>">

-]>

-<doc>&e;</doc>

diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/141.xml.ref b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/141.xml.ref
deleted file mode 100644
index 1b6d92115a..0000000000
--- a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/141.xml.ref
+++ /dev/null
@@ -1,7 +0,0 @@
-setDocumentLocator(locator={columnNumber=1, lineNumber=1})
-startDocument()
-   startDTD(name="doc", publicId="", systemId="")
-      internatlEntityDecl(name="e", value="<X๜></X๜>")
-   endDTD()
-   startElement(namespaceURI="", localName="doc", qName="doc", atts=[])
-      fatalError(exception={columnNumber=8, lineNumber=4, publicId="", systemId="", message="error occurred while parsing element"})
diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/142.xml b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/142.xml
deleted file mode 100644
index 20e88f88b3..0000000000
--- a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/142.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<!DOCTYPE doc [

-<!ELEMENT doc (#PCDATA)>

-]>

-<doc>&#0;</doc>

diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/142.xml.ref b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/142.xml.ref
deleted file mode 100644
index 0684cfa943..0000000000
--- a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/142.xml.ref
+++ /dev/null
@@ -1,8 +0,0 @@
-setDocumentLocator(locator={columnNumber=1, lineNumber=1})
-startDocument()
-   startDTD(name="doc", publicId="", systemId="")
-   endDTD()
-   startElement(namespaceURI="", localName="doc", qName="doc", atts=[])
-      characters(ch="\\0")
-   endElement(namespaceURI="", localName="doc", qName="doc")
-endDocument()
diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/143.xml b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/143.xml
deleted file mode 100644
index 0ee1c614f8..0000000000
--- a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/143.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<!DOCTYPE doc [

-<!ELEMENT doc (#PCDATA)>

-]>

-<doc>&#31;</doc>

diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/143.xml.ref b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/143.xml.ref
deleted file mode 100644
index 664bfb7111..0000000000
--- a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/143.xml.ref
+++ /dev/null
@@ -1,8 +0,0 @@
-setDocumentLocator(locator={columnNumber=1, lineNumber=1})
-startDocument()
-   startDTD(name="doc", publicId="", systemId="")
-   endDTD()
-   startElement(namespaceURI="", localName="doc", qName="doc", atts=[])
-      characters(ch="")
-   endElement(namespaceURI="", localName="doc", qName="doc")
-endDocument()
diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/144.xml b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/144.xml
deleted file mode 100644
index 437548c0ba..0000000000
--- a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/144.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<!DOCTYPE doc [

-<!ELEMENT doc (#PCDATA)>

-]>

-<doc>&#xFFFF;</doc>

diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/144.xml.ref b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/144.xml.ref
deleted file mode 100644
index 8d3143070d..0000000000
--- a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/144.xml.ref
+++ /dev/null
@@ -1,8 +0,0 @@
-setDocumentLocator(locator={columnNumber=1, lineNumber=1})
-startDocument()
-   startDTD(name="doc", publicId="", systemId="")
-   endDTD()
-   startElement(namespaceURI="", localName="doc", qName="doc", atts=[])
-      characters(ch="￿")
-   endElement(namespaceURI="", localName="doc", qName="doc")
-endDocument()
diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/145.xml b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/145.xml
deleted file mode 100644
index 71b187a933..0000000000
--- a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/145.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<!DOCTYPE doc [

-<!ELEMENT doc (#PCDATA)>

-]>

-<doc>&#xD800;</doc>

diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/145.xml.ref b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/145.xml.ref
deleted file mode 100644
index 279ece7657..0000000000
--- a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/145.xml.ref
+++ /dev/null
@@ -1,8 +0,0 @@
-setDocumentLocator(locator={columnNumber=1, lineNumber=1})
-startDocument()
-   startDTD(name="doc", publicId="", systemId="")
-   endDTD()
-   startElement(namespaceURI="", localName="doc", qName="doc", atts=[])
-      characters(ch="���")
-   endElement(namespaceURI="", localName="doc", qName="doc")
-endDocument()
diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/146.xml b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/146.xml
deleted file mode 100644
index d0bfbca723..0000000000
--- a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/146.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<!DOCTYPE doc [

-<!ELEMENT doc (#PCDATA)>

-]>

-<doc>&#x110000;</doc>

diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/146.xml.ref b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/146.xml.ref
deleted file mode 100644
index 7ce4da6a06..0000000000
--- a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/146.xml.ref
+++ /dev/null
diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/147.xml b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/147.xml
deleted file mode 100644
index 3b6145615f..0000000000
--- a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/147.xml
+++ /dev/null
@@ -1,3 +0,0 @@
-

-<?xml version="1.0"?>

-<doc></doc>

diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/147.xml.ref b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/147.xml.ref
deleted file mode 100644
index dd85a80374..0000000000
--- a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/147.xml.ref
+++ /dev/null
@@ -1,3 +0,0 @@
-setDocumentLocator(locator={columnNumber=1, lineNumber=1})
-startDocument()
-   fatalError(exception={columnNumber=6, lineNumber=2, publicId="", systemId="", message="invalid name for processing instruction"})
diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/148.xml b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/148.xml
deleted file mode 100644
index 774dce18fd..0000000000
--- a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/148.xml
+++ /dev/null
@@ -1,3 +0,0 @@
-<!-- -->

-<?xml version="1.0"?>

-<doc></doc>

diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/148.xml.ref b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/148.xml.ref
deleted file mode 100644
index 9b58eb0b49..0000000000
--- a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/148.xml.ref
+++ /dev/null
@@ -1,4 +0,0 @@
-setDocumentLocator(locator={columnNumber=1, lineNumber=1})
-startDocument()
-   comment(ch=" ")
-   fatalError(exception={columnNumber=6, lineNumber=2, publicId="", systemId="", message="invalid name for processing instruction"})
diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/149.xml b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/149.xml
deleted file mode 100644
index 725eea0dec..0000000000
--- a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/149.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<!DOCTYPE doc [

-<!ELEMENT doc (#PCDATA)>

-<?xml version="1.0"?>

-]>

-<doc></doc>

diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/149.xml.ref b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/149.xml.ref
deleted file mode 100644
index aa73988e09..0000000000
--- a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/149.xml.ref
+++ /dev/null
@@ -1,4 +0,0 @@
-setDocumentLocator(locator={columnNumber=1, lineNumber=1})
-startDocument()
-   startDTD(name="doc", publicId="", systemId="")
-      fatalError(exception={columnNumber=6, lineNumber=3, publicId="", systemId="", message="invalid name for processing instruction"})
diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/150.xml b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/150.xml
deleted file mode 100644
index 44f6b6df92..0000000000
--- a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/150.xml
+++ /dev/null
@@ -1,3 +0,0 @@
-<doc>

-<?xml version="1.0"?>

-</doc>

diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/150.xml.ref b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/150.xml.ref
deleted file mode 100644
index 2bc5abe271..0000000000
--- a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/150.xml.ref
+++ /dev/null
@@ -1,5 +0,0 @@
-setDocumentLocator(locator={columnNumber=1, lineNumber=1})
-startDocument()
-   startElement(namespaceURI="", localName="doc", qName="doc", atts=[])
-      characters(ch="\r\n")
-      fatalError(exception={columnNumber=6, lineNumber=2, publicId="", systemId="", message="invalid name for processing instruction"})
diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/151.xml b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/151.xml
deleted file mode 100644
index fecc4f24e3..0000000000
--- a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/151.xml
+++ /dev/null
@@ -1,3 +0,0 @@
-<doc>

-</doc>

-<?xml version="1.0"?>

diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/151.xml.ref b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/151.xml.ref
deleted file mode 100644
index e5d98b1232..0000000000
--- a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/151.xml.ref
+++ /dev/null
@@ -1,6 +0,0 @@
-setDocumentLocator(locator={columnNumber=1, lineNumber=1})
-startDocument()
-   startElement(namespaceURI="", localName="doc", qName="doc", atts=[])
-      characters(ch="\r\n")
-   endElement(namespaceURI="", localName="doc", qName="doc")
-   fatalError(exception={columnNumber=6, lineNumber=3, publicId="", systemId="", message="invalid name for processing instruction"})
diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/152.xml b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/152.xml
deleted file mode 100644
index b5c5cb26ae..0000000000
--- a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/152.xml
+++ /dev/null
@@ -1,2 +0,0 @@
-<?xml encoding="UTF-8"?>

-<doc></doc>

diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/152.xml.ref b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/152.xml.ref
deleted file mode 100644
index 8852f79579..0000000000
--- a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/152.xml.ref
+++ /dev/null
@@ -1,3 +0,0 @@
-setDocumentLocator(locator={columnNumber=1, lineNumber=1})
-startDocument()
-   fatalError(exception={columnNumber=23, lineNumber=1, publicId="", systemId="", message="version expected while reading the XML declaration"})
diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/153.xml b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/153.xml
deleted file mode 100644
index 5e2973707e..0000000000
--- a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/153.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<!DOCTYPE doc [

-<!ELEMENT doc (#PCDATA)>

-<!ENTITY e "<?xml encoding='UTF-8'?>">

-]>

-<doc>&e;</doc>

diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/153.xml.ref b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/153.xml.ref
deleted file mode 100644
index 1198fe07c6..0000000000
--- a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/153.xml.ref
+++ /dev/null
@@ -1,7 +0,0 @@
-setDocumentLocator(locator={columnNumber=1, lineNumber=1})
-startDocument()
-   startDTD(name="doc", publicId="", systemId="")
-      internatlEntityDecl(name="e", value="<?xml encoding='UTF-8'?>")
-   endDTD()
-   startElement(namespaceURI="", localName="doc", qName="doc", atts=[])
-      fatalError(exception={columnNumber=8, lineNumber=5, publicId="", systemId="", message="invalid name for processing instruction"})
diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/154.xml b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/154.xml
deleted file mode 100644
index 96e01d63f5..0000000000
--- a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/154.xml
+++ /dev/null
@@ -1,2 +0,0 @@
-<?XML version="1.0"?>

-<doc></doc>

diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/154.xml.ref b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/154.xml.ref
deleted file mode 100644
index 74a9eb1488..0000000000
--- a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/154.xml.ref
+++ /dev/null
@@ -1,3 +0,0 @@
-setDocumentLocator(locator={columnNumber=1, lineNumber=1})
-startDocument()
-   fatalError(exception={columnNumber=6, lineNumber=1, publicId="", systemId="", message="invalid name for processing instruction"})
diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/155.xml b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/155.xml
deleted file mode 100644
index 4f16d0f163..0000000000
--- a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/155.xml
+++ /dev/null
@@ -1,2 +0,0 @@
-<?xmL version="1.0"?>

-<doc></doc>

diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/155.xml.ref b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/155.xml.ref
deleted file mode 100644
index 74a9eb1488..0000000000
--- a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/155.xml.ref
+++ /dev/null
@@ -1,3 +0,0 @@
-setDocumentLocator(locator={columnNumber=1, lineNumber=1})
-startDocument()
-   fatalError(exception={columnNumber=6, lineNumber=1, publicId="", systemId="", message="invalid name for processing instruction"})
diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/156.xml b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/156.xml
deleted file mode 100644
index c6d93fd312..0000000000
--- a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/156.xml
+++ /dev/null
@@ -1,3 +0,0 @@
-<doc>

-<?xMl version="1.0"?>

-</doc>

diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/156.xml.ref b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/156.xml.ref
deleted file mode 100644
index 2bc5abe271..0000000000
--- a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/156.xml.ref
+++ /dev/null
@@ -1,5 +0,0 @@
-setDocumentLocator(locator={columnNumber=1, lineNumber=1})
-startDocument()
-   startElement(namespaceURI="", localName="doc", qName="doc", atts=[])
-      characters(ch="\r\n")
-      fatalError(exception={columnNumber=6, lineNumber=2, publicId="", systemId="", message="invalid name for processing instruction"})
diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/157.xml b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/157.xml
deleted file mode 100644
index 2f058dac3e..0000000000
--- a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/157.xml
+++ /dev/null
@@ -1,3 +0,0 @@
-<doc>

-<?xmL?>

-</doc>

diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/157.xml.ref b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/157.xml.ref
deleted file mode 100644
index 2bc5abe271..0000000000
--- a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/157.xml.ref
+++ /dev/null
@@ -1,5 +0,0 @@
-setDocumentLocator(locator={columnNumber=1, lineNumber=1})
-startDocument()
-   startElement(namespaceURI="", localName="doc", qName="doc", atts=[])
-      characters(ch="\r\n")
-      fatalError(exception={columnNumber=6, lineNumber=2, publicId="", systemId="", message="invalid name for processing instruction"})
diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/158.xml b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/158.xml
deleted file mode 100644
index 32b90b722d..0000000000
--- a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/158.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<!DOCTYPE doc [

-<!ELEMENT doc (#PCDATA)>

-<!NOTATION gif PUBLIC "image/gif" "">

-<!ATTLIST #NOTATION gif a1 CDATA #IMPLIED>

-]>

-<doc></doc>

diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/158.xml.ref b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/158.xml.ref
deleted file mode 100644
index 38210c24da..0000000000
--- a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/158.xml.ref
+++ /dev/null
@@ -1,5 +0,0 @@
-setDocumentLocator(locator={columnNumber=1, lineNumber=1})
-startDocument()
-   startDTD(name="doc", publicId="", systemId="")
-      notationDecl(name="gif", publicId="image/gif", systemId="")
-      fatalError(exception={columnNumber=11, lineNumber=4, publicId="", systemId="", message="letter is expected"})
diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/159.xml b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/159.xml
deleted file mode 100644
index 066244cb91..0000000000
--- a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/159.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<!DOCTYPE doc [

-<!ELEMENT doc (#PCDATA)>

-<!ENTITY e "<![CDATA[Tim & Michael]]>">

-]>

-<doc>&e;</doc>

diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/159.xml.ref b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/159.xml.ref
deleted file mode 100644
index f044a71dd9..0000000000
--- a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/159.xml.ref
+++ /dev/null
@@ -1,4 +0,0 @@
-setDocumentLocator(locator={columnNumber=1, lineNumber=1})
-startDocument()
-   startDTD(name="doc", publicId="", systemId="")
-      fatalError(exception={columnNumber=27, lineNumber=3, publicId="", systemId="", message="letter is expected"})
diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/160.xml b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/160.xml
deleted file mode 100644
index 85424acb1b..0000000000
--- a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/160.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<!DOCTYPE doc [

-<!ELEMENT doc (#PCDATA)>

-<!ENTITY % e "">

-<!ENTITY foo "%e;">

-]>

-<doc></doc>

diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/160.xml.ref b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/160.xml.ref
deleted file mode 100644
index 0c1afe80b8..0000000000
--- a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/160.xml.ref
+++ /dev/null
@@ -1,9 +0,0 @@
-setDocumentLocator(locator={columnNumber=1, lineNumber=1})
-startDocument()
-   startDTD(name="doc", publicId="", systemId="")
-      internatlEntityDecl(name="%e", value="")
-      internatlEntityDecl(name="foo", value="")
-   endDTD()
-   startElement(namespaceURI="", localName="doc", qName="doc", atts=[])
-   endElement(namespaceURI="", localName="doc", qName="doc")
-endDocument()
diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/161.xml b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/161.xml
deleted file mode 100644
index 4f8a5b7b6b..0000000000
--- a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/161.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<!DOCTYPE doc [

-<!ENTITY % e "#PCDATA">

-<!ELEMENT doc (%e;)>

-]>

-<doc></doc>

diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/161.xml.ref b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/161.xml.ref
deleted file mode 100644
index 35ee5e8c6c..0000000000
--- a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/161.xml.ref
+++ /dev/null
@@ -1,5 +0,0 @@
-setDocumentLocator(locator={columnNumber=1, lineNumber=1})
-startDocument()
-   startDTD(name="doc", publicId="", systemId="")
-      internatlEntityDecl(name="%e", value="#PCDATA")
-      fatalError(exception={columnNumber=16, lineNumber=3, publicId="", systemId="", message="letter is expected"})
diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/162.xml b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/162.xml
deleted file mode 100644
index efae4b190e..0000000000
--- a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/162.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<!DOCTYPE doc [

-<!ELEMENT doc (#PCDATA)>

-<!ENTITY % e1 "">

-<!ENTITY % e2 "%e1;">

-]>

-<doc></doc>

diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/162.xml.ref b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/162.xml.ref
deleted file mode 100644
index a802c74aed..0000000000
--- a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/162.xml.ref
+++ /dev/null
@@ -1,9 +0,0 @@
-setDocumentLocator(locator={columnNumber=1, lineNumber=1})
-startDocument()
-   startDTD(name="doc", publicId="", systemId="")
-      internatlEntityDecl(name="%e1", value="")
-      internatlEntityDecl(name="%e2", value="")
-   endDTD()
-   startElement(namespaceURI="", localName="doc", qName="doc", atts=[])
-   endElement(namespaceURI="", localName="doc", qName="doc")
-endDocument()
diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/163.xml b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/163.xml
deleted file mode 100644
index e14fb76c31..0000000000
--- a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/163.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<!DOCTYPE doc [

-<!ELEMENT doc (#PCDATA)>

-<!ENTITY % e "">

-]>

-%e;

-<doc></doc>

diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/163.xml.ref b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/163.xml.ref
deleted file mode 100644
index e4c32252dd..0000000000
--- a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/163.xml.ref
+++ /dev/null
@@ -1,6 +0,0 @@
-setDocumentLocator(locator={columnNumber=1, lineNumber=1})
-startDocument()
-   startDTD(name="doc", publicId="", systemId="")
-      internatlEntityDecl(name="%e", value="")
-   endDTD()
-   fatalError(exception={columnNumber=1, lineNumber=5, publicId="", systemId="", message="error occurred while parsing element"})
diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/164.xml b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/164.xml
deleted file mode 100644
index 98dd267c21..0000000000
--- a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/164.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<!DOCTYPE doc [

-<!ELEMENT doc (#PCDATA)>

-<!ENTITY % e "">

-] %e; >

-<doc></doc>

diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/164.xml.ref b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/164.xml.ref
deleted file mode 100644
index 80314341d6..0000000000
--- a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/164.xml.ref
+++ /dev/null
@@ -1,5 +0,0 @@
-setDocumentLocator(locator={columnNumber=1, lineNumber=1})
-startDocument()
-   startDTD(name="doc", publicId="", systemId="")
-      internatlEntityDecl(name="%e", value="")
-      fatalError(exception={columnNumber=3, lineNumber=4, publicId="", systemId="", message="error occurred while parsing document type definition"})
diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/165.xml b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/165.xml
deleted file mode 100644
index 36c04618ef..0000000000
--- a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/165.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<!DOCTYPE doc [

-<!ENTITY% e "">

-<!ELEMENT doc (#PCDATA)>

-]>

-<doc></doc>

diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/165.xml.ref b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/165.xml.ref
deleted file mode 100644
index 64fd8b4d0d..0000000000
--- a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/165.xml.ref
+++ /dev/null
@@ -1,4 +0,0 @@
-setDocumentLocator(locator={columnNumber=1, lineNumber=1})
-startDocument()
-   startDTD(name="doc", publicId="", systemId="")
-      fatalError(exception={columnNumber=9, lineNumber=2, publicId="", systemId="", message="letter is expected"})
diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/166.xml b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/166.xml
deleted file mode 100644
index ee2ce28630..0000000000
--- a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/166.xml
+++ /dev/null
@@ -1 +0,0 @@
-<doc>￿</doc>

diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/166.xml.ref b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/166.xml.ref
deleted file mode 100644
index dca4f7b1cd..0000000000
--- a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/166.xml.ref
+++ /dev/null
@@ -1,4 +0,0 @@
-setDocumentLocator(locator={columnNumber=1, lineNumber=1})
-startDocument()
-   startElement(namespaceURI="", localName="doc", qName="doc", atts=[])
-      fatalError(exception={columnNumber=6, lineNumber=1, publicId="", systemId="", message="unexpected end of file"})
diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/167.xml b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/167.xml
deleted file mode 100644
index 9bdc6c1278..0000000000
--- a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/167.xml
+++ /dev/null
@@ -1 +0,0 @@
-<doc>￾</doc>

diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/167.xml.ref b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/167.xml.ref
deleted file mode 100644
index dca4f7b1cd..0000000000
--- a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/167.xml.ref
+++ /dev/null
@@ -1,4 +0,0 @@
-setDocumentLocator(locator={columnNumber=1, lineNumber=1})
-startDocument()
-   startElement(namespaceURI="", localName="doc", qName="doc", atts=[])
-      fatalError(exception={columnNumber=6, lineNumber=1, publicId="", systemId="", message="unexpected end of file"})
diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/168.xml b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/168.xml
deleted file mode 100644
index f83221a3ad..0000000000
--- a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/168.xml
+++ /dev/null
@@ -1 +0,0 @@
-<doc>���</doc>

diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/168.xml.ref b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/168.xml.ref
deleted file mode 100644
index 61659843c1..0000000000
--- a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/168.xml.ref
+++ /dev/null
@@ -1,6 +0,0 @@
-setDocumentLocator(locator={columnNumber=1, lineNumber=1})
-startDocument()
-   startElement(namespaceURI="", localName="doc", qName="doc", atts=[])
-      characters(ch="���")
-   endElement(namespaceURI="", localName="doc", qName="doc")
-endDocument()
diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/169.xml b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/169.xml
deleted file mode 100644
index 310029b976..0000000000
--- a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/169.xml
+++ /dev/null
@@ -1 +0,0 @@
-<doc>���</doc>

diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/169.xml.ref b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/169.xml.ref
deleted file mode 100644
index 78385bd8bc..0000000000
--- a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/169.xml.ref
+++ /dev/null
@@ -1,6 +0,0 @@
-setDocumentLocator(locator={columnNumber=1, lineNumber=1})
-startDocument()
-   startElement(namespaceURI="", localName="doc", qName="doc", atts=[])
-      characters(ch="���")
-   endElement(namespaceURI="", localName="doc", qName="doc")
-endDocument()
diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/170.xml b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/170.xml
deleted file mode 100644
index cfa0aee155..0000000000
--- a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/170.xml
+++ /dev/null
@@ -1 +0,0 @@
-<doc>����</doc>

diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/170.xml.ref b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/170.xml.ref
deleted file mode 100644
index 87336aa00f..0000000000
--- a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/170.xml.ref
+++ /dev/null
@@ -1,6 +0,0 @@
-setDocumentLocator(locator={columnNumber=1, lineNumber=1})
-startDocument()
-   startElement(namespaceURI="", localName="doc", qName="doc", atts=[])
-      characters(ch="����")
-   endElement(namespaceURI="", localName="doc", qName="doc")
-endDocument()
diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/171.xml b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/171.xml
deleted file mode 100644
index 48b5c7d3bc..0000000000
--- a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/171.xml
+++ /dev/null
@@ -1,2 +0,0 @@
-<!-- ￿ -->

-<doc></doc>

diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/171.xml.ref b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/171.xml.ref
deleted file mode 100644
index f729ad3da3..0000000000
--- a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/171.xml.ref
+++ /dev/null
@@ -1,3 +0,0 @@
-setDocumentLocator(locator={columnNumber=1, lineNumber=1})
-startDocument()
-   fatalError(exception={columnNumber=6, lineNumber=1, publicId="", systemId="", message="unexpected end of file"})
diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/172.xml b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/172.xml
deleted file mode 100644
index 6651d4d299..0000000000
--- a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/172.xml
+++ /dev/null
@@ -1,2 +0,0 @@
-<?pi ￿?>

-<doc></doc>

diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/172.xml.ref b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/172.xml.ref
deleted file mode 100644
index f729ad3da3..0000000000
--- a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/172.xml.ref
+++ /dev/null
@@ -1,3 +0,0 @@
-setDocumentLocator(locator={columnNumber=1, lineNumber=1})
-startDocument()
-   fatalError(exception={columnNumber=6, lineNumber=1, publicId="", systemId="", message="unexpected end of file"})
diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/173.xml b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/173.xml
deleted file mode 100644
index f9f9f42023..0000000000
--- a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/173.xml
+++ /dev/null
@@ -1 +0,0 @@
-<doc a="￿"></doc>

diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/173.xml.ref b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/173.xml.ref
deleted file mode 100644
index cda5d63d26..0000000000
--- a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/173.xml.ref
+++ /dev/null
@@ -1,3 +0,0 @@
-setDocumentLocator(locator={columnNumber=1, lineNumber=1})
-startDocument()
-   fatalError(exception={columnNumber=9, lineNumber=1, publicId="", systemId="", message="unexpected end of file"})
diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/174.xml b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/174.xml
deleted file mode 100644
index 42bef861c6..0000000000
--- a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/174.xml
+++ /dev/null
@@ -1 +0,0 @@
-<doc><![CDATA[￿]]></doc>

diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/174.xml.ref b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/174.xml.ref
deleted file mode 100644
index 5f23fbdcdb..0000000000
--- a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/174.xml.ref
+++ /dev/null
@@ -1,4 +0,0 @@
-setDocumentLocator(locator={columnNumber=1, lineNumber=1})
-startDocument()
-   startElement(namespaceURI="", localName="doc", qName="doc", atts=[])
-      fatalError(exception={columnNumber=15, lineNumber=1, publicId="", systemId="", message="unexpected end of file"})
diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/175.xml b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/175.xml
deleted file mode 100644
index 69912f36d2..0000000000
--- a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/175.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<!DOCTYPE doc [

-<!ELEMENT doc (#PCDATA)>

-<!ENTITY % e "￿">

-]>

-<doc></doc>

diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/175.xml.ref b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/175.xml.ref
deleted file mode 100644
index 27549bc7de..0000000000
--- a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/175.xml.ref
+++ /dev/null
@@ -1,4 +0,0 @@
-setDocumentLocator(locator={columnNumber=1, lineNumber=1})
-startDocument()
-   startDTD(name="doc", publicId="", systemId="")
-      fatalError(exception={columnNumber=15, lineNumber=3, publicId="", systemId="", message="unexpected end of file"})
diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/176.xml b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/176.xml
deleted file mode 100644
index 39153ad5a8..0000000000
--- a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/176.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<!DOCTYPE doc [
-<!ELEMENT doc (#PCDATA)>
-]>
-<doc>
\ No newline at end of file
diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/176.xml.ref b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/176.xml.ref
deleted file mode 100644
index 4348506993..0000000000
--- a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/176.xml.ref
+++ /dev/null
@@ -1,6 +0,0 @@
-setDocumentLocator(locator={columnNumber=1, lineNumber=1})
-startDocument()
-   startDTD(name="doc", publicId="", systemId="")
-   endDTD()
-   startElement(namespaceURI="", localName="doc", qName="doc", atts=[])
-      fatalError(exception={columnNumber=1, lineNumber=5, publicId="", systemId="", message="unexpected end of file"})
diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/177.xml b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/177.xml
deleted file mode 100644
index 6bc8228879..0000000000
--- a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/177.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<!DOCTYPE doc [

-<!ELEMENT doc (#PCDATA)>

-]>

-<doc>A￿</doc>

diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/177.xml.ref b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/177.xml.ref
deleted file mode 100644
index 94f3c3b9e5..0000000000
--- a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/177.xml.ref
+++ /dev/null
@@ -1,6 +0,0 @@
-setDocumentLocator(locator={columnNumber=1, lineNumber=1})
-startDocument()
-   startDTD(name="doc", publicId="", systemId="")
-   endDTD()
-   startElement(namespaceURI="", localName="doc", qName="doc", atts=[])
-      fatalError(exception={columnNumber=7, lineNumber=4, publicId="", systemId="", message="unexpected end of file"})
diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/178.xml b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/178.xml
deleted file mode 100644
index e8f2d18eed..0000000000
--- a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/178.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<!DOCTYPE doc [

-<!ELEMENT doc (#PCDATA)>

-<!ATTLIST doc a CDATA #IMPLIED>

-]>

-<doc a="&#34;></doc>

diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/178.xml.ref b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/178.xml.ref
deleted file mode 100644
index 5aae44a1bf..0000000000
--- a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/178.xml.ref
+++ /dev/null
@@ -1,6 +0,0 @@
-setDocumentLocator(locator={columnNumber=1, lineNumber=1})
-startDocument()
-   startDTD(name="doc", publicId="", systemId="")
-      attributeDecl(eName="doc", aName="a", type="", valueDefault="", value="")
-   endDTD()
-   fatalError(exception={columnNumber=15, lineNumber=5, publicId="", systemId="", message="unexpected character"})
diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/179.xml b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/179.xml
deleted file mode 100644
index e8f1f419db..0000000000
--- a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/179.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<!DOCTYPE doc [

-<!ENTITY e "&#34;>

-]>

-<doc></doc>

diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/179.xml.ref b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/179.xml.ref
deleted file mode 100644
index a4c6cffd5d..0000000000
--- a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/179.xml.ref
+++ /dev/null
@@ -1,4 +0,0 @@
-setDocumentLocator(locator={columnNumber=1, lineNumber=1})
-startDocument()
-   startDTD(name="doc", publicId="", systemId="")
-      fatalError(exception={columnNumber=1, lineNumber=5, publicId="", systemId="", message="unexpected end of file"})
diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/180.xml b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/180.xml
deleted file mode 100644
index 569d553a8c..0000000000
--- a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/180.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<!DOCTYPE doc [

-<!ELEMENT doc (#PCDATA)>

-<!ATTLIST doc a CDATA "&e;">

-<!ENTITY e "v">

-]>

-<doc></doc>

diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/180.xml.ref b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/180.xml.ref
deleted file mode 100644
index 42542d990e..0000000000
--- a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/180.xml.ref
+++ /dev/null
@@ -1,10 +0,0 @@
-setDocumentLocator(locator={columnNumber=1, lineNumber=1})
-startDocument()
-   startDTD(name="doc", publicId="", systemId="")
-      skippedEntity(name="e")
-      attributeDecl(eName="doc", aName="a", type="", valueDefault="", value="")
-      internatlEntityDecl(name="e", value="v")
-   endDTD()
-   startElement(namespaceURI="", localName="doc", qName="doc", atts=[])
-   endElement(namespaceURI="", localName="doc", qName="doc")
-endDocument()
diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/181.xml b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/181.xml
deleted file mode 100644
index 4341d99ee2..0000000000
--- a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/181.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<!DOCTYPE doc [

-<!ENTITY e "&#60;![CDATA[">

-<!ELEMENT doc (#PCDATA)>

-]>

-<doc>&e;]]></doc>

diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/181.xml.ref b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/181.xml.ref
deleted file mode 100644
index 8e1b4457fc..0000000000
--- a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/181.xml.ref
+++ /dev/null
@@ -1,11 +0,0 @@
-setDocumentLocator(locator={columnNumber=1, lineNumber=1})
-startDocument()
-   startDTD(name="doc", publicId="", systemId="")
-      internatlEntityDecl(name="e", value="<![CDATA[")
-   endDTD()
-   startElement(namespaceURI="", localName="doc", qName="doc", atts=[])
-      startCDATA()
-         characters(ch="")
-      endCDATA()
-   endElement(namespaceURI="", localName="doc", qName="doc")
-endDocument()
diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/182.xml b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/182.xml
deleted file mode 100644
index 920f431666..0000000000
--- a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/182.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<!DOCTYPE doc [

-<!ENTITY e "&#60;!--">

-<!ELEMENT doc (#PCDATA)>

-]>

-<doc>&e;--></doc>

diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/182.xml.ref b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/182.xml.ref
deleted file mode 100644
index abb11afa92..0000000000
--- a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/182.xml.ref
+++ /dev/null
@@ -1,9 +0,0 @@
-setDocumentLocator(locator={columnNumber=1, lineNumber=1})
-startDocument()
-   startDTD(name="doc", publicId="", systemId="")
-      internatlEntityDecl(name="e", value="<!--")
-   endDTD()
-   startElement(namespaceURI="", localName="doc", qName="doc", atts=[])
-      comment(ch="")
-   endElement(namespaceURI="", localName="doc", qName="doc")
-endDocument()
diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/183.xml b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/183.xml
deleted file mode 100644
index 7a5677de54..0000000000
--- a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/183.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<!DOCTYPE doc [

-<!ELEMENT doc (#PCDATA | foo*)* >

-<!ELEMENT foo EMPTY>

-]>

-<doc></doc>

diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/183.xml.ref b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/183.xml.ref
deleted file mode 100644
index d49ec689aa..0000000000
--- a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/183.xml.ref
+++ /dev/null
@@ -1,4 +0,0 @@
-setDocumentLocator(locator={columnNumber=1, lineNumber=1})
-startDocument()
-   startDTD(name="doc", publicId="", systemId="")
-      fatalError(exception={columnNumber=29, lineNumber=2, publicId="", systemId="", message="unexpected character"})
diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/184.xml b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/184.xml
deleted file mode 100644
index 103384a06e..0000000000
--- a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/184.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<!DOCTYPE doc [

-<!ELEMENT doc (#PCDATA | (foo))* >

-<!ELEMENT foo EMPTY>

-]>

-<doc></doc>

-

diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/184.xml.ref b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/184.xml.ref
deleted file mode 100644
index 8d879bf2e6..0000000000
--- a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/184.xml.ref
+++ /dev/null
@@ -1,4 +0,0 @@
-setDocumentLocator(locator={columnNumber=1, lineNumber=1})
-startDocument()
-   startDTD(name="doc", publicId="", systemId="")
-      fatalError(exception={columnNumber=26, lineNumber=2, publicId="", systemId="", message="unexpected character"})
diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/185.ent b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/185.ent
deleted file mode 100644
index e557426454..0000000000
--- a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/185.ent
+++ /dev/null
@@ -1 +0,0 @@
-<!ELEMENT doc (#PCDATA)>

diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/185.xml b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/185.xml
deleted file mode 100644
index 81d5ef4bcd..0000000000
--- a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/185.xml
+++ /dev/null
@@ -1,3 +0,0 @@
-<?xml version="1.0" standalone="yes"?>

-<!DOCTYPE doc SYSTEM "185.ent">

-<doc>&e;</doc>

diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/185.xml.ref b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/185.xml.ref
deleted file mode 100644
index 7f5838399b..0000000000
--- a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/185.xml.ref
+++ /dev/null
@@ -1,9 +0,0 @@
-setDocumentLocator(locator={columnNumber=1, lineNumber=1})
-startDocument()
-   processingInstruction(target="xml", data="version='1.0' standalone='yes'")
-   startDTD(name="doc", publicId="", systemId="185.ent")
-   endDTD()
-   startElement(namespaceURI="", localName="doc", qName="doc", atts=[])
-      skippedEntity(name="e")
-   endElement(namespaceURI="", localName="doc", qName="doc")
-endDocument()
diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/186.xml b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/186.xml
deleted file mode 100644
index 85b26ec0a2..0000000000
--- a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/186.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<!DOCTYPE a [

-<!ELEMENT a EMPTY>

-<!ATTLIST a b CDATA #IMPLIED d CDATA #IMPLIED>

-]>

-<a b="c"d="e"/>

diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/186.xml.ref b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/186.xml.ref
deleted file mode 100644
index 63d0d3e3f6..0000000000
--- a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/186.xml.ref
+++ /dev/null
@@ -1,9 +0,0 @@
-setDocumentLocator(locator={columnNumber=1, lineNumber=1})
-startDocument()
-   startDTD(name="a", publicId="", systemId="")
-      attributeDecl(eName="a", aName="b", type="", valueDefault="", value="")
-      attributeDecl(eName="a", aName="d", type="", valueDefault="", value="")
-   endDTD()
-   startElement(namespaceURI="", localName="a", qName="a", atts=[{localName="b", qName="b", uri="", type="CDATA", value="c"}, {localName="d", qName="d", uri="", type="CDATA", value="e"}])
-   endElement(namespaceURI="", localName="a", qName="a")
-endDocument()
diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/null.ent b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/null.ent
deleted file mode 100644
index e69de29bb2..0000000000
--- a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/not-wf/sa/null.ent
+++ /dev/null
diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/ext-sa/001.ent b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/ext-sa/001.ent
deleted file mode 100644
index 1cff3fd44f..0000000000
--- a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/ext-sa/001.ent
+++ /dev/null
@@ -1 +0,0 @@
-Data

diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/ext-sa/001.xml b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/ext-sa/001.xml
deleted file mode 100644
index 147d70d2d1..0000000000
--- a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/ext-sa/001.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<!DOCTYPE doc [

-<!ELEMENT doc (#PCDATA)>

-<!ENTITY e SYSTEM "001.ent">

-]>

-<doc>&e;</doc>

diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/ext-sa/001.xml.ref b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/ext-sa/001.xml.ref
deleted file mode 100644
index 355c937e11..0000000000
--- a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/ext-sa/001.xml.ref
+++ /dev/null
@@ -1,10 +0,0 @@
-setDocumentLocator(locator={columnNumber=1, lineNumber=1})
-startDocument()
-   startDTD(name="doc", publicId="", systemId="")
-      externalEntityDecl(name="e", publicId="", systemId="001.ent")
-   endDTD()
-   startElement(namespaceURI="", localName="doc", qName="doc", atts=[])
-      resolveEntity(publicId="", systemId="001.ent", ret={})
-      skippedEntity(name="e")
-   endElement(namespaceURI="", localName="doc", qName="doc")
-endDocument()
diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/ext-sa/002.ent b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/ext-sa/002.ent
deleted file mode 100644
index 45f6d8e74e..0000000000
--- a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/ext-sa/002.ent
+++ /dev/null
@@ -1 +0,0 @@
-Data
\ No newline at end of file
diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/ext-sa/002.xml b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/ext-sa/002.xml
deleted file mode 100644
index 9eaf91724f..0000000000
--- a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/ext-sa/002.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<!DOCTYPE doc [

-<!ELEMENT doc (#PCDATA)>

-<!ENTITY e SYSTEM "002.ent">

-]>

-<doc>&e;</doc>

diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/ext-sa/002.xml.ref b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/ext-sa/002.xml.ref
deleted file mode 100644
index f843995646..0000000000
--- a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/ext-sa/002.xml.ref
+++ /dev/null
@@ -1,10 +0,0 @@
-setDocumentLocator(locator={columnNumber=1, lineNumber=1})
-startDocument()
-   startDTD(name="doc", publicId="", systemId="")
-      externalEntityDecl(name="e", publicId="", systemId="002.ent")
-   endDTD()
-   startElement(namespaceURI="", localName="doc", qName="doc", atts=[])
-      resolveEntity(publicId="", systemId="002.ent", ret={})
-      skippedEntity(name="e")
-   endElement(namespaceURI="", localName="doc", qName="doc")
-endDocument()
diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/ext-sa/003.ent b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/ext-sa/003.ent
deleted file mode 100644
index e69de29bb2..0000000000
--- a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/ext-sa/003.ent
+++ /dev/null
diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/ext-sa/003.xml b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/ext-sa/003.xml
deleted file mode 100644
index bb60b663ef..0000000000
--- a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/ext-sa/003.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<!DOCTYPE doc [

-<!ELEMENT doc (#PCDATA)>

-<!ENTITY e SYSTEM "003.ent">

-]>

-<doc>&e;</doc>

diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/ext-sa/003.xml.ref b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/ext-sa/003.xml.ref
deleted file mode 100644
index 79d3531637..0000000000
--- a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/ext-sa/003.xml.ref
+++ /dev/null
@@ -1,10 +0,0 @@
-setDocumentLocator(locator={columnNumber=1, lineNumber=1})
-startDocument()
-   startDTD(name="doc", publicId="", systemId="")
-      externalEntityDecl(name="e", publicId="", systemId="003.ent")
-   endDTD()
-   startElement(namespaceURI="", localName="doc", qName="doc", atts=[])
-      resolveEntity(publicId="", systemId="003.ent", ret={})
-      skippedEntity(name="e")
-   endElement(namespaceURI="", localName="doc", qName="doc")
-endDocument()
diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/ext-sa/004.ent b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/ext-sa/004.ent
deleted file mode 100644
index 3436f20001..0000000000
--- a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/ext-sa/004.ent
+++ /dev/null
@@ -1 +0,0 @@
-Data
\ No newline at end of file
diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/ext-sa/004.xml b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/ext-sa/004.xml
deleted file mode 100644
index 074498ce19..0000000000
--- a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/ext-sa/004.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<!DOCTYPE doc [

-<!ELEMENT doc (#PCDATA)>

-<!ENTITY e SYSTEM "004.ent">

-]>

-<doc>&e;</doc>

diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/ext-sa/004.xml.ref b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/ext-sa/004.xml.ref
deleted file mode 100644
index 38abcb2fc6..0000000000
--- a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/ext-sa/004.xml.ref
+++ /dev/null
@@ -1,10 +0,0 @@
-setDocumentLocator(locator={columnNumber=1, lineNumber=1})
-startDocument()
-   startDTD(name="doc", publicId="", systemId="")
-      externalEntityDecl(name="e", publicId="", systemId="004.ent")
-   endDTD()
-   startElement(namespaceURI="", localName="doc", qName="doc", atts=[])
-      resolveEntity(publicId="", systemId="004.ent", ret={})
-      skippedEntity(name="e")
-   endElement(namespaceURI="", localName="doc", qName="doc")
-endDocument()
diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/ext-sa/005.ent b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/ext-sa/005.ent
deleted file mode 100644
index c6e97f821f..0000000000
--- a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/ext-sa/005.ent
+++ /dev/null
@@ -1 +0,0 @@
-<e/><e/><e/>
\ No newline at end of file
diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/ext-sa/005.xml b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/ext-sa/005.xml
deleted file mode 100644
index 82a6228205..0000000000
--- a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/ext-sa/005.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<!DOCTYPE doc [

-<!ELEMENT doc (e*)>

-<!ELEMENT e EMPTY>

-<!ENTITY e SYSTEM "005.ent">

-]>

-<doc>&e;</doc>

diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/ext-sa/005.xml.ref b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/ext-sa/005.xml.ref
deleted file mode 100644
index 2601030f2a..0000000000
--- a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/ext-sa/005.xml.ref
+++ /dev/null
@@ -1,10 +0,0 @@
-setDocumentLocator(locator={columnNumber=1, lineNumber=1})
-startDocument()
-   startDTD(name="doc", publicId="", systemId="")
-      externalEntityDecl(name="e", publicId="", systemId="005.ent")
-   endDTD()
-   startElement(namespaceURI="", localName="doc", qName="doc", atts=[])
-      resolveEntity(publicId="", systemId="005.ent", ret={})
-      skippedEntity(name="e")
-   endElement(namespaceURI="", localName="doc", qName="doc")
-endDocument()
diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/ext-sa/006.ent b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/ext-sa/006.ent
deleted file mode 100644
index 4df2f0c2ac..0000000000
--- a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/ext-sa/006.ent
+++ /dev/null
@@ -1,4 +0,0 @@
-Data

-<e/>

-More data

-<e/>

diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/ext-sa/006.xml b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/ext-sa/006.xml
deleted file mode 100644
index 0b326cad4c..0000000000
--- a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/ext-sa/006.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<!DOCTYPE doc [

-<!ELEMENT doc (#PCDATA|e)*>

-<!ELEMENT e EMPTY>

-<!ENTITY e SYSTEM "006.ent">

-]>

-<doc>&e;</doc>

diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/ext-sa/006.xml.ref b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/ext-sa/006.xml.ref
deleted file mode 100644
index 17fd238b67..0000000000
--- a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/ext-sa/006.xml.ref
+++ /dev/null
@@ -1,10 +0,0 @@
-setDocumentLocator(locator={columnNumber=1, lineNumber=1})
-startDocument()
-   startDTD(name="doc", publicId="", systemId="")
-      externalEntityDecl(name="e", publicId="", systemId="006.ent")
-   endDTD()
-   startElement(namespaceURI="", localName="doc", qName="doc", atts=[])
-      resolveEntity(publicId="", systemId="006.ent", ret={})
-      skippedEntity(name="e")
-   endElement(namespaceURI="", localName="doc", qName="doc")
-endDocument()
diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/ext-sa/007.ent b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/ext-sa/007.ent
deleted file mode 100644
index ab1d696dd7..0000000000
--- a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/ext-sa/007.ent
+++ /dev/null
diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/ext-sa/007.xml b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/ext-sa/007.xml
deleted file mode 100644
index 825e3b286a..0000000000
--- a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/ext-sa/007.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<!DOCTYPE doc [

-<!ELEMENT doc (#PCDATA)>

-<!ENTITY e SYSTEM "007.ent">

-]>

-<doc>X&e;Z</doc>

diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/ext-sa/007.xml.ref b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/ext-sa/007.xml.ref
deleted file mode 100644
index 81e7ccdaf3..0000000000
--- a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/ext-sa/007.xml.ref
+++ /dev/null
@@ -1,11 +0,0 @@
-setDocumentLocator(locator={columnNumber=1, lineNumber=1})
-startDocument()
-   startDTD(name="doc", publicId="", systemId="")
-      externalEntityDecl(name="e", publicId="", systemId="007.ent")
-   endDTD()
-   startElement(namespaceURI="", localName="doc", qName="doc", atts=[])
-      resolveEntity(publicId="", systemId="007.ent", ret={})
-      skippedEntity(name="e")
-      characters(ch="XZ")
-   endElement(namespaceURI="", localName="doc", qName="doc")
-endDocument()
diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/ext-sa/008.ent b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/ext-sa/008.ent
deleted file mode 100644
index c6ca61f9c8..0000000000
--- a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/ext-sa/008.ent
+++ /dev/null
diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/ext-sa/008.xml b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/ext-sa/008.xml
deleted file mode 100644
index 3c001b6cb3..0000000000
--- a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/ext-sa/008.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<!DOCTYPE doc [

-<!ELEMENT doc (#PCDATA)>

-<!ENTITY e SYSTEM "008.ent">

-]>

-<doc>X&e;Z</doc>

diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/ext-sa/008.xml.ref b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/ext-sa/008.xml.ref
deleted file mode 100644
index eb7f1086e1..0000000000
--- a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/ext-sa/008.xml.ref
+++ /dev/null
@@ -1,11 +0,0 @@
-setDocumentLocator(locator={columnNumber=1, lineNumber=1})
-startDocument()
-   startDTD(name="doc", publicId="", systemId="")
-      externalEntityDecl(name="e", publicId="", systemId="008.ent")
-   endDTD()
-   startElement(namespaceURI="", localName="doc", qName="doc", atts=[])
-      resolveEntity(publicId="", systemId="008.ent", ret={})
-      skippedEntity(name="e")
-      characters(ch="XZ")
-   endElement(namespaceURI="", localName="doc", qName="doc")
-endDocument()
diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/ext-sa/009.ent b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/ext-sa/009.ent
deleted file mode 100644
index 67c3297611..0000000000
--- a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/ext-sa/009.ent
+++ /dev/null
@@ -1 +0,0 @@
-
\ No newline at end of file
diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/ext-sa/009.xml b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/ext-sa/009.xml
deleted file mode 100644
index a5866e5a77..0000000000
--- a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/ext-sa/009.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<!DOCTYPE doc [

-<!ELEMENT doc (#PCDATA)>

-<!ENTITY e SYSTEM "009.ent">

-]>

-<doc>&e;</doc>

diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/ext-sa/009.xml.ref b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/ext-sa/009.xml.ref
deleted file mode 100644
index 5c294de017..0000000000
--- a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/ext-sa/009.xml.ref
+++ /dev/null
@@ -1,10 +0,0 @@
-setDocumentLocator(locator={columnNumber=1, lineNumber=1})
-startDocument()
-   startDTD(name="doc", publicId="", systemId="")
-      externalEntityDecl(name="e", publicId="", systemId="009.ent")
-   endDTD()
-   startElement(namespaceURI="", localName="doc", qName="doc", atts=[])
-      resolveEntity(publicId="", systemId="009.ent", ret={})
-      skippedEntity(name="e")
-   endElement(namespaceURI="", localName="doc", qName="doc")
-endDocument()
diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/ext-sa/010.ent b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/ext-sa/010.ent
deleted file mode 100644
index e69de29bb2..0000000000
--- a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/ext-sa/010.ent
+++ /dev/null
diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/ext-sa/010.xml b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/ext-sa/010.xml
deleted file mode 100644
index 418e9b0141..0000000000
--- a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/ext-sa/010.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<!DOCTYPE doc [

-<!ELEMENT doc (#PCDATA)>

-<!ENTITY e SYSTEM "010.ent">

-]>

-<doc>&e;</doc>

diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/ext-sa/010.xml.ref b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/ext-sa/010.xml.ref
deleted file mode 100644
index 4dc03c6dba..0000000000
--- a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/ext-sa/010.xml.ref
+++ /dev/null
@@ -1,10 +0,0 @@
-setDocumentLocator(locator={columnNumber=1, lineNumber=1})
-startDocument()
-   startDTD(name="doc", publicId="", systemId="")
-      externalEntityDecl(name="e", publicId="", systemId="010.ent")
-   endDTD()
-   startElement(namespaceURI="", localName="doc", qName="doc", atts=[])
-      resolveEntity(publicId="", systemId="010.ent", ret={})
-      skippedEntity(name="e")
-   endElement(namespaceURI="", localName="doc", qName="doc")
-endDocument()
diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/ext-sa/011.ent b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/ext-sa/011.ent
deleted file mode 100644
index b19be3a497..0000000000
--- a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/ext-sa/011.ent
+++ /dev/null
@@ -1 +0,0 @@
-xyzzy

diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/ext-sa/011.xml b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/ext-sa/011.xml
deleted file mode 100644
index 2ceefa1d21..0000000000
--- a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/ext-sa/011.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<!DOCTYPE doc [

-<!ELEMENT doc (#PCDATA)>

-<!ENTITY e PUBLIC "a not very interesting file" "011.ent">

-]>

-<doc>&e;</doc>

diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/ext-sa/011.xml.ref b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/ext-sa/011.xml.ref
deleted file mode 100644
index c078139d84..0000000000
--- a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/ext-sa/011.xml.ref
+++ /dev/null
@@ -1,10 +0,0 @@
-setDocumentLocator(locator={columnNumber=1, lineNumber=1})
-startDocument()
-   startDTD(name="doc", publicId="", systemId="")
-      externalEntityDecl(name="e", publicId="a not very interesting file", systemId="011.ent")
-   endDTD()
-   startElement(namespaceURI="", localName="doc", qName="doc", atts=[])
-      resolveEntity(publicId="a not very interesting file", systemId="011.ent", ret={})
-      skippedEntity(name="e")
-   endElement(namespaceURI="", localName="doc", qName="doc")
-endDocument()
diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/ext-sa/012.ent b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/ext-sa/012.ent
deleted file mode 100644
index 8eb1fb9c41..0000000000
--- a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/ext-sa/012.ent
+++ /dev/null
@@ -1 +0,0 @@
-&e4;
\ No newline at end of file
diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/ext-sa/012.xml b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/ext-sa/012.xml
deleted file mode 100644
index 5a8f009b4a..0000000000
--- a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/ext-sa/012.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<!DOCTYPE doc [

-<!ENTITY e1 "&e2;">

-<!ENTITY e2 "&e3;">

-<!ENTITY e3 SYSTEM "012.ent">

-<!ENTITY e4 "&e5;">

-<!ENTITY e5 "(e5)">

-<!ELEMENT doc (#PCDATA)>

-]>

-<doc>&e1;</doc>

diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/ext-sa/012.xml.ref b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/ext-sa/012.xml.ref
deleted file mode 100644
index 2af77a3b99..0000000000
--- a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/ext-sa/012.xml.ref
+++ /dev/null
@@ -1,14 +0,0 @@
-setDocumentLocator(locator={columnNumber=1, lineNumber=1})
-startDocument()
-   startDTD(name="doc", publicId="", systemId="")
-      internatlEntityDecl(name="e1", value="&e2;")
-      internatlEntityDecl(name="e2", value="&e3;")
-      externalEntityDecl(name="e3", publicId="", systemId="012.ent")
-      internatlEntityDecl(name="e4", value="&e5;")
-      internatlEntityDecl(name="e5", value="(e5)")
-   endDTD()
-   startElement(namespaceURI="", localName="doc", qName="doc", atts=[])
-      resolveEntity(publicId="", systemId="012.ent", ret={})
-      skippedEntity(name="e3")
-   endElement(namespaceURI="", localName="doc", qName="doc")
-endDocument()
diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/ext-sa/013.ent b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/ext-sa/013.ent
deleted file mode 100644
index 7f25c502dd..0000000000
--- a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/ext-sa/013.ent
+++ /dev/null
@@ -1 +0,0 @@
-<e/>
\ No newline at end of file
diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/ext-sa/013.xml b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/ext-sa/013.xml
deleted file mode 100644
index 7717c97afe..0000000000
--- a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/ext-sa/013.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<!DOCTYPE doc [

-<!ELEMENT doc (e)>

-<!ELEMENT e (#PCDATA)>

-<!ATTLIST e

-  a1 CDATA "a1 default"

-  a2 NMTOKENS "a2 default"

->

-<!ENTITY x SYSTEM "013.ent">

-]>

-<doc>&x;</doc>

diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/ext-sa/013.xml.ref b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/ext-sa/013.xml.ref
deleted file mode 100644
index 92fb65a2d2..0000000000
--- a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/ext-sa/013.xml.ref
+++ /dev/null
@@ -1,12 +0,0 @@
-setDocumentLocator(locator={columnNumber=1, lineNumber=1})
-startDocument()
-   startDTD(name="doc", publicId="", systemId="")
-      attributeDecl(eName="e", aName="a1", type="", valueDefault="", value="")
-      attributeDecl(eName="e", aName="a2", type="", valueDefault="", value="")
-      externalEntityDecl(name="x", publicId="", systemId="013.ent")
-   endDTD()
-   startElement(namespaceURI="", localName="doc", qName="doc", atts=[])
-      resolveEntity(publicId="", systemId="013.ent", ret={})
-      skippedEntity(name="x")
-   endElement(namespaceURI="", localName="doc", qName="doc")
-endDocument()
diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/ext-sa/014.ent b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/ext-sa/014.ent
deleted file mode 100644
index 470fd6fe44..0000000000
--- a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/ext-sa/014.ent
+++ /dev/null
diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/ext-sa/014.xml b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/ext-sa/014.xml
deleted file mode 100644
index 816fd1e796..0000000000
--- a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/ext-sa/014.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<!DOCTYPE doc [

-<!ELEMENT doc (#PCDATA)>

-<!ENTITY e SYSTEM "014.ent">

-]>

-<doc>&e;</doc>

diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/ext-sa/014.xml.ref b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/ext-sa/014.xml.ref
deleted file mode 100644
index a087786e69..0000000000
--- a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/ext-sa/014.xml.ref
+++ /dev/null
@@ -1,10 +0,0 @@
-setDocumentLocator(locator={columnNumber=1, lineNumber=1})
-startDocument()
-   startDTD(name="doc", publicId="", systemId="")
-      externalEntityDecl(name="e", publicId="", systemId="014.ent")
-   endDTD()
-   startElement(namespaceURI="", localName="doc", qName="doc", atts=[])
-      resolveEntity(publicId="", systemId="014.ent", ret={})
-      skippedEntity(name="e")
-   endElement(namespaceURI="", localName="doc", qName="doc")
-endDocument()
diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/ext-sa/undef_entity_1.xml b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/ext-sa/undef_entity_1.xml
deleted file mode 100644
index e91a10895e..0000000000
--- a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/ext-sa/undef_entity_1.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no" ?>
-<!DOCTYPE foo SYSTEM "foo.dtd" [
-    <!ENTITY def "foo">
-]>
-<foo>
-    <!-- check that the call to skippedEntity() is inserted in the right place -->
-    <a>abc&undef;gh</a>
-    <b>&undef;gh</b>
-    <c>abc&undef;</c>
-    <d>&undef;</d>
-    <e>&undef;&def;&undef;&def;</e>
-    <e>a&undef;b&def;c&undef;d&def;e</e>
-</foo>
diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/ext-sa/undef_entity_1.xml.ref b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/ext-sa/undef_entity_1.xml.ref
deleted file mode 100644
index 67f1fbe808..0000000000
--- a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/ext-sa/undef_entity_1.xml.ref
+++ /dev/null
@@ -1,47 +0,0 @@
-setDocumentLocator(locator={columnNumber=1, lineNumber=1})
-startDocument()
-   processingInstruction(target="xml", data="version='1.0' encoding='UTF-8' standalone='no'")
-   startDTD(name="foo", publicId="", systemId="foo.dtd")
-      internatlEntityDecl(name="def", value="foo")
-   endDTD()
-   startElement(namespaceURI="", localName="foo", qName="foo", atts=[])
-      characters(ch="\n    ")
-      comment(ch=" check that the call to skippedEntity() is inserted in the right place ")
-      characters(ch="\n    ")
-      startElement(namespaceURI="", localName="a", qName="a", atts=[])
-         characters(ch="abc")
-         skippedEntity(name="undef")
-         characters(ch="gh")
-      endElement(namespaceURI="", localName="a", qName="a")
-      characters(ch="\n    ")
-      startElement(namespaceURI="", localName="b", qName="b", atts=[])
-         skippedEntity(name="undef")
-         characters(ch="gh")
-      endElement(namespaceURI="", localName="b", qName="b")
-      characters(ch="\n    ")
-      startElement(namespaceURI="", localName="c", qName="c", atts=[])
-         characters(ch="abc")
-         skippedEntity(name="undef")
-      endElement(namespaceURI="", localName="c", qName="c")
-      characters(ch="\n    ")
-      startElement(namespaceURI="", localName="d", qName="d", atts=[])
-         skippedEntity(name="undef")
-      endElement(namespaceURI="", localName="d", qName="d")
-      characters(ch="\n    ")
-      startElement(namespaceURI="", localName="e", qName="e", atts=[])
-         skippedEntity(name="undef")
-         characters(ch="foo")
-         skippedEntity(name="undef")
-         characters(ch="foo")
-      endElement(namespaceURI="", localName="e", qName="e")
-      characters(ch="\n    ")
-      startElement(namespaceURI="", localName="e", qName="e", atts=[])
-         characters(ch="a")
-         skippedEntity(name="undef")
-         characters(ch="bfooc")
-         skippedEntity(name="undef")
-         characters(ch="dfooe")
-      endElement(namespaceURI="", localName="e", qName="e")
-      characters(ch="\n")
-   endElement(namespaceURI="", localName="foo", qName="foo")
-endDocument()
diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/ext-sa/undef_entity_2.xml b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/ext-sa/undef_entity_2.xml
deleted file mode 100644
index a1fb393371..0000000000
--- a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/ext-sa/undef_entity_2.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no" ?>
-<!DOCTYPE foo SYSTEM "foo.dtd" [
-    <!ENTITY a1 "&a2;">
-    <!ENTITY a2 "&a3;">
-    <!ENTITY def "foo">
-]>
-<foo>
-    <a>abc&a1;gh</a>
-    <b>&a1;gh</b>
-    <c>abc&a1;</c>
-    <d>&a1;</d>
-    <e>&a1;&def;&a1;&def;</e>
-    <e>a&a1;b&def;c&a1;d&def;e</e>
-</foo>
diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/ext-sa/undef_entity_2.xml.ref b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/ext-sa/undef_entity_2.xml.ref
deleted file mode 100644
index a7ed3a2848..0000000000
--- a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/ext-sa/undef_entity_2.xml.ref
+++ /dev/null
@@ -1,47 +0,0 @@
-setDocumentLocator(locator={columnNumber=1, lineNumber=1})
-startDocument()
-   processingInstruction(target="xml", data="version='1.0' encoding='UTF-8' standalone='no'")
-   startDTD(name="foo", publicId="", systemId="foo.dtd")
-      internatlEntityDecl(name="a1", value="&a2;")
-      internatlEntityDecl(name="a2", value="&a3;")
-      internatlEntityDecl(name="def", value="foo")
-   endDTD()
-   startElement(namespaceURI="", localName="foo", qName="foo", atts=[])
-      characters(ch="\n    ")
-      startElement(namespaceURI="", localName="a", qName="a", atts=[])
-         characters(ch="abc")
-         skippedEntity(name="a3")
-         characters(ch="gh")
-      endElement(namespaceURI="", localName="a", qName="a")
-      characters(ch="\n    ")
-      startElement(namespaceURI="", localName="b", qName="b", atts=[])
-         skippedEntity(name="a3")
-         characters(ch="gh")
-      endElement(namespaceURI="", localName="b", qName="b")
-      characters(ch="\n    ")
-      startElement(namespaceURI="", localName="c", qName="c", atts=[])
-         characters(ch="abc")
-         skippedEntity(name="a3")
-      endElement(namespaceURI="", localName="c", qName="c")
-      characters(ch="\n    ")
-      startElement(namespaceURI="", localName="d", qName="d", atts=[])
-         skippedEntity(name="a3")
-      endElement(namespaceURI="", localName="d", qName="d")
-      characters(ch="\n    ")
-      startElement(namespaceURI="", localName="e", qName="e", atts=[])
-         skippedEntity(name="a3")
-         characters(ch="foo")
-         skippedEntity(name="a3")
-         characters(ch="foo")
-      endElement(namespaceURI="", localName="e", qName="e")
-      characters(ch="\n    ")
-      startElement(namespaceURI="", localName="e", qName="e", atts=[])
-         characters(ch="a")
-         skippedEntity(name="a3")
-         characters(ch="bfooc")
-         skippedEntity(name="a3")
-         characters(ch="dfooe")
-      endElement(namespaceURI="", localName="e", qName="e")
-      characters(ch="\n")
-   endElement(namespaceURI="", localName="foo", qName="foo")
-endDocument()
diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/ext-sa/undef_entity_3.xml b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/ext-sa/undef_entity_3.xml
deleted file mode 100644
index ae745d4da1..0000000000
--- a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/ext-sa/undef_entity_3.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no" ?>
-<!DOCTYPE foo SYSTEM "foo.dtd" [
-    <!ENTITY a1 "&a2;">
-    <!ENTITY a2 "&a3;">
-    <!ENTITY def "foo">
-]>
-<foo>
-    <a attr="foo&a1;bar&def;ding"/>
-</foo>
diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/ext-sa/undef_entity_3.xml.ref b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/ext-sa/undef_entity_3.xml.ref
deleted file mode 100644
index 09f8e96b9c..0000000000
--- a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/ext-sa/undef_entity_3.xml.ref
+++ /dev/null
@@ -1,16 +0,0 @@
-setDocumentLocator(locator={columnNumber=1, lineNumber=1})
-startDocument()
-   processingInstruction(target="xml", data="version='1.0' encoding='UTF-8' standalone='no'")
-   startDTD(name="foo", publicId="", systemId="foo.dtd")
-      internatlEntityDecl(name="a1", value="&a2;")
-      internatlEntityDecl(name="a2", value="&a3;")
-      internatlEntityDecl(name="def", value="foo")
-   endDTD()
-   startElement(namespaceURI="", localName="foo", qName="foo", atts=[])
-      characters(ch="\n    ")
-      skippedEntity(name="a3")
-      startElement(namespaceURI="", localName="a", qName="a", atts=[{localName="attr", qName="attr", uri="", type="CDATA", value="foobarfooding"}])
-      endElement(namespaceURI="", localName="a", qName="a")
-      characters(ch="\n")
-   endElement(namespaceURI="", localName="foo", qName="foo")
-endDocument()
diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/not-sa/001.ent b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/not-sa/001.ent
deleted file mode 100644
index e69de29bb2..0000000000
--- a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/not-sa/001.ent
+++ /dev/null
diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/not-sa/001.xml b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/not-sa/001.xml
deleted file mode 100644
index 2d6f41a137..0000000000
--- a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/not-sa/001.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<!DOCTYPE doc SYSTEM "001.ent" [

-<!ELEMENT doc EMPTY>

-]>

-<doc></doc>

diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/not-sa/001.xml.ref b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/not-sa/001.xml.ref
deleted file mode 100644
index eea47ce41b..0000000000
--- a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/not-sa/001.xml.ref
+++ /dev/null
@@ -1,7 +0,0 @@
-setDocumentLocator(locator={columnNumber=1, lineNumber=1})
-startDocument()
-   startDTD(name="doc", publicId="", systemId="001.ent")
-   endDTD()
-   startElement(namespaceURI="", localName="doc", qName="doc", atts=[])
-   endElement(namespaceURI="", localName="doc", qName="doc")
-endDocument()
diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/not-sa/002.ent b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/not-sa/002.ent
deleted file mode 100644
index 67c3297611..0000000000
--- a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/not-sa/002.ent
+++ /dev/null
@@ -1 +0,0 @@
-
\ No newline at end of file
diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/not-sa/002.xml b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/not-sa/002.xml
deleted file mode 100644
index 023fce8499..0000000000
--- a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/not-sa/002.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<!DOCTYPE doc SYSTEM "002.ent" [

-<!ELEMENT doc EMPTY>

-]>

-<doc></doc>

diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/not-sa/002.xml.ref b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/not-sa/002.xml.ref
deleted file mode 100644
index cbaf6dc22d..0000000000
--- a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/not-sa/002.xml.ref
+++ /dev/null
@@ -1,7 +0,0 @@
-setDocumentLocator(locator={columnNumber=1, lineNumber=1})
-startDocument()
-   startDTD(name="doc", publicId="", systemId="002.ent")
-   endDTD()
-   startElement(namespaceURI="", localName="doc", qName="doc", atts=[])
-   endElement(namespaceURI="", localName="doc", qName="doc")
-endDocument()
diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/not-sa/003-1.ent b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/not-sa/003-1.ent
deleted file mode 100644
index 931f3ad6d8..0000000000
--- a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/not-sa/003-1.ent
+++ /dev/null
@@ -1,3 +0,0 @@
-<!ELEMENT doc EMPTY>

-<!ENTITY % e SYSTEM "003-2.ent">

-<!ATTLIST doc a1 CDATA %e; "v1">

diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/not-sa/003-2.ent b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/not-sa/003-2.ent
deleted file mode 100644
index e69de29bb2..0000000000
--- a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/not-sa/003-2.ent
+++ /dev/null
diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/not-sa/003.xml b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/not-sa/003.xml
deleted file mode 100644
index 63a5e8bdfc..0000000000
--- a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/not-sa/003.xml
+++ /dev/null
@@ -1,2 +0,0 @@
-<!DOCTYPE doc SYSTEM "003-1.ent">

-<doc></doc>

diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/not-sa/003.xml.ref b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/not-sa/003.xml.ref
deleted file mode 100644
index 4f83c741fb..0000000000
--- a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/not-sa/003.xml.ref
+++ /dev/null
@@ -1,7 +0,0 @@
-setDocumentLocator(locator={columnNumber=1, lineNumber=1})
-startDocument()
-   startDTD(name="doc", publicId="", systemId="003-1.ent")
-   endDTD()
-   startElement(namespaceURI="", localName="doc", qName="doc", atts=[])
-   endElement(namespaceURI="", localName="doc", qName="doc")
-endDocument()
diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/not-sa/004-1.ent b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/not-sa/004-1.ent
deleted file mode 100644
index 40f7ff58a2..0000000000
--- a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/not-sa/004-1.ent
+++ /dev/null
@@ -1,4 +0,0 @@
-<!ELEMENT doc EMPTY>

-<!ENTITY % e1 SYSTEM "004-2.ent">

-<!ENTITY % e2 "%e1;">

-%e1;

diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/not-sa/004-2.ent b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/not-sa/004-2.ent
deleted file mode 100644
index 61def75cb7..0000000000
--- a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/not-sa/004-2.ent
+++ /dev/null
@@ -1 +0,0 @@
-<!ATTLIST doc a1 CDATA "value">

diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/not-sa/004.xml b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/not-sa/004.xml
deleted file mode 100644
index adc9201496..0000000000
--- a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/not-sa/004.xml
+++ /dev/null
@@ -1,2 +0,0 @@
-<!DOCTYPE doc SYSTEM "004-1.ent">

-<doc></doc>

diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/not-sa/004.xml.ref b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/not-sa/004.xml.ref
deleted file mode 100644
index e2d3af888e..0000000000
--- a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/not-sa/004.xml.ref
+++ /dev/null
@@ -1,7 +0,0 @@
-setDocumentLocator(locator={columnNumber=1, lineNumber=1})
-startDocument()
-   startDTD(name="doc", publicId="", systemId="004-1.ent")
-   endDTD()
-   startElement(namespaceURI="", localName="doc", qName="doc", atts=[])
-   endElement(namespaceURI="", localName="doc", qName="doc")
-endDocument()
diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/not-sa/005-1.ent b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/not-sa/005-1.ent
deleted file mode 100644
index ade9599032..0000000000
--- a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/not-sa/005-1.ent
+++ /dev/null
@@ -1,3 +0,0 @@
-<!ELEMENT doc EMPTY>

-<!ENTITY % e SYSTEM "005-2.ent">

-%e;

diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/not-sa/005-2.ent b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/not-sa/005-2.ent
deleted file mode 100644
index bef50b1f38..0000000000
--- a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/not-sa/005-2.ent
+++ /dev/null
@@ -1 +0,0 @@
-<!ATTLIST doc a1 CDATA "v1">

diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/not-sa/005.xml b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/not-sa/005.xml
deleted file mode 100644
index 6bd44cfee0..0000000000
--- a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/not-sa/005.xml
+++ /dev/null
@@ -1,2 +0,0 @@
-<!DOCTYPE doc SYSTEM "005-1.ent">

-<doc></doc>

diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/not-sa/005.xml.ref b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/not-sa/005.xml.ref
deleted file mode 100644
index 8057322cf2..0000000000
--- a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/not-sa/005.xml.ref
+++ /dev/null
@@ -1,7 +0,0 @@
-setDocumentLocator(locator={columnNumber=1, lineNumber=1})
-startDocument()
-   startDTD(name="doc", publicId="", systemId="005-1.ent")
-   endDTD()
-   startElement(namespaceURI="", localName="doc", qName="doc", atts=[])
-   endElement(namespaceURI="", localName="doc", qName="doc")
-endDocument()
diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/not-sa/006.ent b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/not-sa/006.ent
deleted file mode 100644
index 8f305a82bd..0000000000
--- a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/not-sa/006.ent
+++ /dev/null
@@ -1,2 +0,0 @@
-<!ELEMENT doc EMPTY>

-<!ATTLIST doc a1 CDATA "w1" a2 CDATA "w2">

diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/not-sa/006.xml b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/not-sa/006.xml
deleted file mode 100644
index eb80bb7409..0000000000
--- a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/not-sa/006.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<!DOCTYPE doc SYSTEM "006.ent" [

-<!ATTLIST doc a1 CDATA "v1">

-]>

-<doc></doc>

diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/not-sa/006.xml.ref b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/not-sa/006.xml.ref
deleted file mode 100644
index e2e2584353..0000000000
--- a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/not-sa/006.xml.ref
+++ /dev/null
@@ -1,8 +0,0 @@
-setDocumentLocator(locator={columnNumber=1, lineNumber=1})
-startDocument()
-   startDTD(name="doc", publicId="", systemId="006.ent")
-      attributeDecl(eName="doc", aName="a1", type="", valueDefault="", value="")
-   endDTD()
-   startElement(namespaceURI="", localName="doc", qName="doc", atts=[])
-   endElement(namespaceURI="", localName="doc", qName="doc")
-endDocument()
diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/not-sa/007.ent b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/not-sa/007.ent
deleted file mode 100644
index fbf4ca4947..0000000000
--- a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/not-sa/007.ent
+++ /dev/null
@@ -1,2 +0,0 @@
-<!ELEMENT doc (#PCDATA)>

-<!ATTLIST doc a1 CDATA "v1">

diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/not-sa/007.xml b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/not-sa/007.xml
deleted file mode 100644
index 38897e34ea..0000000000
--- a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/not-sa/007.xml
+++ /dev/null
@@ -1,2 +0,0 @@
-<!DOCTYPE doc SYSTEM "007.ent">

-<doc></doc>

diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/not-sa/007.xml.ref b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/not-sa/007.xml.ref
deleted file mode 100644
index d96790fb37..0000000000
--- a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/not-sa/007.xml.ref
+++ /dev/null
@@ -1,7 +0,0 @@
-setDocumentLocator(locator={columnNumber=1, lineNumber=1})
-startDocument()
-   startDTD(name="doc", publicId="", systemId="007.ent")
-   endDTD()
-   startElement(namespaceURI="", localName="doc", qName="doc", atts=[])
-   endElement(namespaceURI="", localName="doc", qName="doc")
-endDocument()
diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/not-sa/008.ent b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/not-sa/008.ent
deleted file mode 100644
index fbf4ca4947..0000000000
--- a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/not-sa/008.ent
+++ /dev/null
@@ -1,2 +0,0 @@
-<!ELEMENT doc (#PCDATA)>

-<!ATTLIST doc a1 CDATA "v1">

diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/not-sa/008.xml b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/not-sa/008.xml
deleted file mode 100644
index bf777a7ff2..0000000000
--- a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/not-sa/008.xml
+++ /dev/null
@@ -1,2 +0,0 @@
-<!DOCTYPE doc PUBLIC "whatever" "008.ent">

-<doc></doc>

diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/not-sa/008.xml.ref b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/not-sa/008.xml.ref
deleted file mode 100644
index 08ba9c035b..0000000000
--- a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/not-sa/008.xml.ref
+++ /dev/null
@@ -1,7 +0,0 @@
-setDocumentLocator(locator={columnNumber=1, lineNumber=1})
-startDocument()
-   startDTD(name="doc", publicId="whatever", systemId="008.ent")
-   endDTD()
-   startElement(namespaceURI="", localName="doc", qName="doc", atts=[])
-   endElement(namespaceURI="", localName="doc", qName="doc")
-endDocument()
diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/not-sa/009.ent b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/not-sa/009.ent
deleted file mode 100644
index fbf4ca4947..0000000000
--- a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/not-sa/009.ent
+++ /dev/null
@@ -1,2 +0,0 @@
-<!ELEMENT doc (#PCDATA)>

-<!ATTLIST doc a1 CDATA "v1">

diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/not-sa/009.xml b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/not-sa/009.xml
deleted file mode 100644
index c17562fe68..0000000000
--- a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/not-sa/009.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<!DOCTYPE doc PUBLIC "whatever" "009.ent" [

-<!ATTLIST doc a2 CDATA "v2">

-]>

-<doc></doc>

diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/not-sa/009.xml.ref b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/not-sa/009.xml.ref
deleted file mode 100644
index d789785173..0000000000
--- a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/not-sa/009.xml.ref
+++ /dev/null
@@ -1,8 +0,0 @@
-setDocumentLocator(locator={columnNumber=1, lineNumber=1})
-startDocument()
-   startDTD(name="doc", publicId="whatever", systemId="009.ent")
-      attributeDecl(eName="doc", aName="a2", type="", valueDefault="", value="")
-   endDTD()
-   startElement(namespaceURI="", localName="doc", qName="doc", atts=[])
-   endElement(namespaceURI="", localName="doc", qName="doc")
-endDocument()
diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/not-sa/010.ent b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/not-sa/010.ent
deleted file mode 100644
index 52a28f5deb..0000000000
--- a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/not-sa/010.ent
+++ /dev/null
@@ -1,2 +0,0 @@
-<!ELEMENT doc (#PCDATA)>

-<!ATTLIST doc a1 CDATA "v2">

diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/not-sa/010.xml b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/not-sa/010.xml
deleted file mode 100644
index 2786b328f3..0000000000
--- a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/not-sa/010.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<!DOCTYPE doc SYSTEM "010.ent" [

-<!ATTLIST doc a1 CDATA "v1">

-]>

-<doc></doc>

diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/not-sa/010.xml.ref b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/not-sa/010.xml.ref
deleted file mode 100644
index 6045d46296..0000000000
--- a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/not-sa/010.xml.ref
+++ /dev/null
@@ -1,8 +0,0 @@
-setDocumentLocator(locator={columnNumber=1, lineNumber=1})
-startDocument()
-   startDTD(name="doc", publicId="", systemId="010.ent")
-      attributeDecl(eName="doc", aName="a1", type="", valueDefault="", value="")
-   endDTD()
-   startElement(namespaceURI="", localName="doc", qName="doc", atts=[])
-   endElement(namespaceURI="", localName="doc", qName="doc")
-endDocument()
diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/not-sa/011.ent b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/not-sa/011.ent
deleted file mode 100644
index fbf4ca4947..0000000000
--- a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/not-sa/011.ent
+++ /dev/null
@@ -1,2 +0,0 @@
-<!ELEMENT doc (#PCDATA)>

-<!ATTLIST doc a1 CDATA "v1">

diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/not-sa/011.xml b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/not-sa/011.xml
deleted file mode 100644
index 03b482bbb6..0000000000
--- a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/not-sa/011.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<!DOCTYPE doc [

-<!ENTITY % e SYSTEM "011.ent">

-%e;

-]>

-<doc></doc>

diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/not-sa/011.xml.ref b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/not-sa/011.xml.ref
deleted file mode 100644
index 09fd89bd38..0000000000
--- a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/not-sa/011.xml.ref
+++ /dev/null
@@ -1,10 +0,0 @@
-setDocumentLocator(locator={columnNumber=1, lineNumber=1})
-startDocument()
-   startDTD(name="doc", publicId="", systemId="")
-      externalEntityDecl(name="%e", publicId="", systemId="011.ent")
-      resolveEntity(publicId="", systemId="011.ent", ret={})
-      skippedEntity(name="%e")
-   endDTD()
-   startElement(namespaceURI="", localName="doc", qName="doc", atts=[])
-   endElement(namespaceURI="", localName="doc", qName="doc")
-endDocument()
diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/not-sa/012.ent b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/not-sa/012.ent
deleted file mode 100644
index 7e372e65e9..0000000000
--- a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/not-sa/012.ent
+++ /dev/null
@@ -1,3 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<!ELEMENT doc (#PCDATA)>

-<!ATTLIST doc a1 CDATA "v1">

diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/not-sa/012.xml b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/not-sa/012.xml
deleted file mode 100644
index 1967edbba7..0000000000
--- a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/not-sa/012.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<!DOCTYPE doc [

-<!ENTITY % e SYSTEM "012.ent">

-%e;

-]>

-<doc></doc>

diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/not-sa/012.xml.ref b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/not-sa/012.xml.ref
deleted file mode 100644
index 8d90b187dd..0000000000
--- a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/not-sa/012.xml.ref
+++ /dev/null
@@ -1,10 +0,0 @@
-setDocumentLocator(locator={columnNumber=1, lineNumber=1})
-startDocument()
-   startDTD(name="doc", publicId="", systemId="")
-      externalEntityDecl(name="%e", publicId="", systemId="012.ent")
-      resolveEntity(publicId="", systemId="012.ent", ret={})
-      skippedEntity(name="%e")
-   endDTD()
-   startElement(namespaceURI="", localName="doc", qName="doc", atts=[])
-   endElement(namespaceURI="", localName="doc", qName="doc")
-endDocument()
diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/not-sa/013.ent b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/not-sa/013.ent
deleted file mode 100644
index a3691d9f08..0000000000
--- a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/not-sa/013.ent
+++ /dev/null
@@ -1,4 +0,0 @@
-<!ELEMENT doc (#PCDATA)>

-<![ INCLUDE [

-<!ATTLIST doc a1 CDATA "v1">

-]]>

diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/not-sa/013.xml b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/not-sa/013.xml
deleted file mode 100644
index cf44f2600a..0000000000
--- a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/not-sa/013.xml
+++ /dev/null
@@ -1,2 +0,0 @@
-<!DOCTYPE doc SYSTEM "013.ent">

-<doc></doc>

diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/not-sa/013.xml.ref b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/not-sa/013.xml.ref
deleted file mode 100644
index d84839e625..0000000000
--- a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/not-sa/013.xml.ref
+++ /dev/null
@@ -1,7 +0,0 @@
-setDocumentLocator(locator={columnNumber=1, lineNumber=1})
-startDocument()
-   startDTD(name="doc", publicId="", systemId="013.ent")
-   endDTD()
-   startElement(namespaceURI="", localName="doc", qName="doc", atts=[])
-   endElement(namespaceURI="", localName="doc", qName="doc")
-endDocument()
diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/not-sa/014.ent b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/not-sa/014.ent
deleted file mode 100644
index 6eaf779329..0000000000
--- a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/not-sa/014.ent
+++ /dev/null
@@ -1,4 +0,0 @@
-<!ELEMENT doc (#PCDATA)>

-<![ %e; [

-<!ATTLIST doc a1 CDATA "v1">

-]]>

diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/not-sa/014.xml b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/not-sa/014.xml
deleted file mode 100644
index bd08502489..0000000000
--- a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/not-sa/014.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<!DOCTYPE doc SYSTEM "014.ent" [

-<!ENTITY % e "INCLUDE">

-]>

-<doc></doc>

diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/not-sa/014.xml.ref b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/not-sa/014.xml.ref
deleted file mode 100644
index f9c8220bbb..0000000000
--- a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/not-sa/014.xml.ref
+++ /dev/null
@@ -1,8 +0,0 @@
-setDocumentLocator(locator={columnNumber=1, lineNumber=1})
-startDocument()
-   startDTD(name="doc", publicId="", systemId="014.ent")
-      internatlEntityDecl(name="%e", value="INCLUDE")
-   endDTD()
-   startElement(namespaceURI="", localName="doc", qName="doc", atts=[])
-   endElement(namespaceURI="", localName="doc", qName="doc")
-endDocument()
diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/not-sa/015.ent b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/not-sa/015.ent
deleted file mode 100644
index 00d2f30e1d..0000000000
--- a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/not-sa/015.ent
+++ /dev/null
@@ -1,5 +0,0 @@
-<!ELEMENT doc (#PCDATA)>

-<![ %e; [

-<!ATTLIST doc a1 CDATA "v1">

-]]>

-<!ATTLIST doc a2 CDATA "v2">

diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/not-sa/015.xml b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/not-sa/015.xml
deleted file mode 100644
index e04e75ffca..0000000000
--- a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/not-sa/015.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<!DOCTYPE doc SYSTEM "015.ent" [

-<!ENTITY % e "IGNORE">

-]>

-<doc></doc>

diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/not-sa/015.xml.ref b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/not-sa/015.xml.ref
deleted file mode 100644
index de94a45356..0000000000
--- a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/not-sa/015.xml.ref
+++ /dev/null
@@ -1,8 +0,0 @@
-setDocumentLocator(locator={columnNumber=1, lineNumber=1})
-startDocument()
-   startDTD(name="doc", publicId="", systemId="015.ent")
-      internatlEntityDecl(name="%e", value="IGNORE")
-   endDTD()
-   startElement(namespaceURI="", localName="doc", qName="doc", atts=[])
-   endElement(namespaceURI="", localName="doc", qName="doc")
-endDocument()
diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/not-sa/016.ent b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/not-sa/016.ent
deleted file mode 100644
index bf77ef8336..0000000000
--- a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/not-sa/016.ent
+++ /dev/null
@@ -1,4 +0,0 @@
-<!ELEMENT doc (#PCDATA)>

-<![%e;[

-<!ATTLIST doc a1 CDATA "v1">

-]]>

diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/not-sa/016.xml b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/not-sa/016.xml
deleted file mode 100644
index 4ccf4af350..0000000000
--- a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/not-sa/016.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<!DOCTYPE doc SYSTEM "016.ent" [

-<!ENTITY % e "INCLUDE">

-]>

-<doc></doc>

diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/not-sa/016.xml.ref b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/not-sa/016.xml.ref
deleted file mode 100644
index 7c234cfc5f..0000000000
--- a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/not-sa/016.xml.ref
+++ /dev/null
@@ -1,8 +0,0 @@
-setDocumentLocator(locator={columnNumber=1, lineNumber=1})
-startDocument()
-   startDTD(name="doc", publicId="", systemId="016.ent")
-      internatlEntityDecl(name="%e", value="INCLUDE")
-   endDTD()
-   startElement(namespaceURI="", localName="doc", qName="doc", atts=[])
-   endElement(namespaceURI="", localName="doc", qName="doc")
-endDocument()
diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/not-sa/017.ent b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/not-sa/017.ent
deleted file mode 100644
index ffd9adde61..0000000000
--- a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/not-sa/017.ent
+++ /dev/null
@@ -1,3 +0,0 @@
-<!ELEMENT doc (#PCDATA)>

-<!ENTITY % e "<!ATTLIST doc a1 CDATA 'v1'>">

-%e;

diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/not-sa/017.xml b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/not-sa/017.xml
deleted file mode 100644
index 7fe18f4c7a..0000000000
--- a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/not-sa/017.xml
+++ /dev/null
@@ -1,2 +0,0 @@
-<!DOCTYPE doc SYSTEM "017.ent">

-<doc></doc>

diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/not-sa/017.xml.ref b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/not-sa/017.xml.ref
deleted file mode 100644
index 25cc198610..0000000000
--- a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/not-sa/017.xml.ref
+++ /dev/null
@@ -1,7 +0,0 @@
-setDocumentLocator(locator={columnNumber=1, lineNumber=1})
-startDocument()
-   startDTD(name="doc", publicId="", systemId="017.ent")
-   endDTD()
-   startElement(namespaceURI="", localName="doc", qName="doc", atts=[])
-   endElement(namespaceURI="", localName="doc", qName="doc")
-endDocument()
diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/not-sa/018.ent b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/not-sa/018.ent
deleted file mode 100644
index 2d46f76fc3..0000000000
--- a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/not-sa/018.ent
+++ /dev/null
@@ -1,3 +0,0 @@
-<!ELEMENT doc (#PCDATA)>

-<!ENTITY % e "'v1'">

-<!ATTLIST doc a1 CDATA %e;>

diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/not-sa/018.xml b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/not-sa/018.xml
deleted file mode 100644
index 31e90f2405..0000000000
--- a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/not-sa/018.xml
+++ /dev/null
@@ -1,2 +0,0 @@
-<!DOCTYPE doc SYSTEM "018.ent">

-<doc></doc>

diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/not-sa/018.xml.ref b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/not-sa/018.xml.ref
deleted file mode 100644
index 3db7bc846b..0000000000
--- a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/not-sa/018.xml.ref
+++ /dev/null
@@ -1,7 +0,0 @@
-setDocumentLocator(locator={columnNumber=1, lineNumber=1})
-startDocument()
-   startDTD(name="doc", publicId="", systemId="018.ent")
-   endDTD()
-   startElement(namespaceURI="", localName="doc", qName="doc", atts=[])
-   endElement(namespaceURI="", localName="doc", qName="doc")
-endDocument()
diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/not-sa/019.ent b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/not-sa/019.ent
deleted file mode 100644
index d18201a98b..0000000000
--- a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/not-sa/019.ent
+++ /dev/null
@@ -1,3 +0,0 @@
-<!ELEMENT doc (#PCDATA)>

-<!ENTITY % e "'v1'">

-<!ATTLIST doc a1 CDATA%e;>

diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/not-sa/019.xml b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/not-sa/019.xml
deleted file mode 100644
index b7a18faba0..0000000000
--- a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/not-sa/019.xml
+++ /dev/null
@@ -1,2 +0,0 @@
-<!DOCTYPE doc SYSTEM "019.ent">

-<doc></doc>

diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/not-sa/019.xml.ref b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/not-sa/019.xml.ref
deleted file mode 100644
index 9961aa93b4..0000000000
--- a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/not-sa/019.xml.ref
+++ /dev/null
@@ -1,7 +0,0 @@
-setDocumentLocator(locator={columnNumber=1, lineNumber=1})
-startDocument()
-   startDTD(name="doc", publicId="", systemId="019.ent")
-   endDTD()
-   startElement(namespaceURI="", localName="doc", qName="doc", atts=[])
-   endElement(namespaceURI="", localName="doc", qName="doc")
-endDocument()
diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/not-sa/020.ent b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/not-sa/020.ent
deleted file mode 100644
index 815291c6d2..0000000000
--- a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/not-sa/020.ent
+++ /dev/null
@@ -1,3 +0,0 @@
-<!ENTITY % e "doc">

-<!ELEMENT doc (#PCDATA)>

-<!ATTLIST%e;a1 CDATA "v1">

diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/not-sa/020.xml b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/not-sa/020.xml
deleted file mode 100644
index d70892f7ad..0000000000
--- a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/not-sa/020.xml
+++ /dev/null
@@ -1,2 +0,0 @@
-<!DOCTYPE doc SYSTEM "020.ent">

-<doc></doc>

diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/not-sa/020.xml.ref b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/not-sa/020.xml.ref
deleted file mode 100644
index fc9a0535c1..0000000000
--- a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/not-sa/020.xml.ref
+++ /dev/null
@@ -1,7 +0,0 @@
-setDocumentLocator(locator={columnNumber=1, lineNumber=1})
-startDocument()
-   startDTD(name="doc", publicId="", systemId="020.ent")
-   endDTD()
-   startElement(namespaceURI="", localName="doc", qName="doc", atts=[])
-   endElement(namespaceURI="", localName="doc", qName="doc")
-endDocument()
diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/not-sa/021.ent b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/not-sa/021.ent
deleted file mode 100644
index 9f8f2afd2b..0000000000
--- a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/not-sa/021.ent
+++ /dev/null
@@ -1,3 +0,0 @@
-<!ENTITY % e "doc a1 CDATA">

-<!ELEMENT doc (#PCDATA)>

-<!ATTLIST %e; "v1">

diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/not-sa/021.xml b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/not-sa/021.xml
deleted file mode 100644
index 70c28730db..0000000000
--- a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/not-sa/021.xml
+++ /dev/null
@@ -1,2 +0,0 @@
-<!DOCTYPE doc SYSTEM "021.ent">

-<doc></doc>

diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/not-sa/021.xml.ref b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/not-sa/021.xml.ref
deleted file mode 100644
index e6d91722d3..0000000000
--- a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/not-sa/021.xml.ref
+++ /dev/null
@@ -1,7 +0,0 @@
-setDocumentLocator(locator={columnNumber=1, lineNumber=1})
-startDocument()
-   startDTD(name="doc", publicId="", systemId="021.ent")
-   endDTD()
-   startElement(namespaceURI="", localName="doc", qName="doc", atts=[])
-   endElement(namespaceURI="", localName="doc", qName="doc")
-endDocument()
diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/not-sa/022.ent b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/not-sa/022.ent
deleted file mode 100644
index 26f2d8beb2..0000000000
--- a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/not-sa/022.ent
+++ /dev/null
@@ -1,3 +0,0 @@
-<!ENTITY % e "INCLUDE[">

-<!ELEMENT doc (#PCDATA)>

-<![ %e; <!ATTLIST doc a1 CDATA "v1"> ]]>

diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/not-sa/022.xml b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/not-sa/022.xml
deleted file mode 100644
index b639f2551c..0000000000
--- a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/not-sa/022.xml
+++ /dev/null
@@ -1,2 +0,0 @@
-<!DOCTYPE doc SYSTEM "022.ent">

-<doc></doc>

diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/not-sa/022.xml.ref b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/not-sa/022.xml.ref
deleted file mode 100644
index de3ddf732f..0000000000
--- a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/not-sa/022.xml.ref
+++ /dev/null
@@ -1,7 +0,0 @@
-setDocumentLocator(locator={columnNumber=1, lineNumber=1})
-startDocument()
-   startDTD(name="doc", publicId="", systemId="022.ent")
-   endDTD()
-   startElement(namespaceURI="", localName="doc", qName="doc", atts=[])
-   endElement(namespaceURI="", localName="doc", qName="doc")
-endDocument()
diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/not-sa/023.ent b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/not-sa/023.ent
deleted file mode 100644
index e3268819f7..0000000000
--- a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/not-sa/023.ent
+++ /dev/null
@@ -1,5 +0,0 @@
-<!ELEMENT doc (#PCDATA)>

-<!ENTITY % e1 "do">

-<!ENTITY % e2 "c">

-<!ENTITY % e3 "%e1;%e2;">

-<!ATTLIST %e3; a1 CDATA "v1">

diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/not-sa/023.xml b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/not-sa/023.xml
deleted file mode 100644
index 1c2484b70b..0000000000
--- a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/not-sa/023.xml
+++ /dev/null
@@ -1,2 +0,0 @@
-<!DOCTYPE doc SYSTEM "023.ent">

-<doc></doc>

diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/not-sa/023.xml.ref b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/not-sa/023.xml.ref
deleted file mode 100644
index a150bde52a..0000000000
--- a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/not-sa/023.xml.ref
+++ /dev/null
@@ -1,7 +0,0 @@
-setDocumentLocator(locator={columnNumber=1, lineNumber=1})
-startDocument()
-   startDTD(name="doc", publicId="", systemId="023.ent")
-   endDTD()
-   startElement(namespaceURI="", localName="doc", qName="doc", atts=[])
-   endElement(namespaceURI="", localName="doc", qName="doc")
-endDocument()
diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/not-sa/024.ent b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/not-sa/024.ent
deleted file mode 100644
index aa6d0eccac..0000000000
--- a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/not-sa/024.ent
+++ /dev/null
@@ -1,4 +0,0 @@
-<!ELEMENT doc (#PCDATA)>

-<!ENTITY % e1 "'v1'">

-<!ENTITY % e2 'a1 CDATA %e1;'>

-<!ATTLIST doc %e2;>

diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/not-sa/024.xml b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/not-sa/024.xml
deleted file mode 100644
index 96e1ecb61b..0000000000
--- a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/not-sa/024.xml
+++ /dev/null
@@ -1,2 +0,0 @@
-<!DOCTYPE doc SYSTEM "024.ent">

-<doc></doc>

diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/not-sa/024.xml.ref b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/not-sa/024.xml.ref
deleted file mode 100644
index e97c61bd94..0000000000
--- a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/not-sa/024.xml.ref
+++ /dev/null
@@ -1,7 +0,0 @@
-setDocumentLocator(locator={columnNumber=1, lineNumber=1})
-startDocument()
-   startDTD(name="doc", publicId="", systemId="024.ent")
-   endDTD()
-   startElement(namespaceURI="", localName="doc", qName="doc", atts=[])
-   endElement(namespaceURI="", localName="doc", qName="doc")
-endDocument()
diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/not-sa/025.ent b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/not-sa/025.ent
deleted file mode 100644
index 389d259eb1..0000000000
--- a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/not-sa/025.ent
+++ /dev/null
@@ -1,5 +0,0 @@
-<!ELEMENT doc EMPTY>

-<!ENTITY % e "x">

-<!ENTITY % e "y">

-<!ENTITY % v "'%e;'">

-<!ATTLIST doc a1 CDATA %v;>

diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/not-sa/025.xml b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/not-sa/025.xml
deleted file mode 100644
index 8fdbc14c47..0000000000
--- a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/not-sa/025.xml
+++ /dev/null
@@ -1,2 +0,0 @@
-<!DOCTYPE doc SYSTEM "025.ent">

-<doc></doc>

diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/not-sa/025.xml.ref b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/not-sa/025.xml.ref
deleted file mode 100644
index 1eca607181..0000000000
--- a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/not-sa/025.xml.ref
+++ /dev/null
@@ -1,7 +0,0 @@
-setDocumentLocator(locator={columnNumber=1, lineNumber=1})
-startDocument()
-   startDTD(name="doc", publicId="", systemId="025.ent")
-   endDTD()
-   startElement(namespaceURI="", localName="doc", qName="doc", atts=[])
-   endElement(namespaceURI="", localName="doc", qName="doc")
-endDocument()
diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/not-sa/026.ent b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/not-sa/026.ent
deleted file mode 100644
index bdc93af639..0000000000
--- a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/not-sa/026.ent
+++ /dev/null
@@ -1 +0,0 @@
-<!ATTLIST doc a1 CDATA "w1">

diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/not-sa/026.xml b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/not-sa/026.xml
deleted file mode 100644
index 7b109c0913..0000000000
--- a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/not-sa/026.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<!DOCTYPE doc [

-<!ELEMENT doc ANY>

-<!ENTITY % e SYSTEM "026.ent">

-%e;

-<!ATTLIST doc a1 CDATA "x1" a2 CDATA "x2">

-]>

-<doc></doc>

diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/not-sa/026.xml.ref b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/not-sa/026.xml.ref
deleted file mode 100644
index 1bea883d9c..0000000000
--- a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/not-sa/026.xml.ref
+++ /dev/null
@@ -1,12 +0,0 @@
-setDocumentLocator(locator={columnNumber=1, lineNumber=1})
-startDocument()
-   startDTD(name="doc", publicId="", systemId="")
-      externalEntityDecl(name="%e", publicId="", systemId="026.ent")
-      resolveEntity(publicId="", systemId="026.ent", ret={})
-      skippedEntity(name="%e")
-      attributeDecl(eName="doc", aName="a1", type="", valueDefault="", value="")
-      attributeDecl(eName="doc", aName="a2", type="", valueDefault="", value="")
-   endDTD()
-   startElement(namespaceURI="", localName="doc", qName="doc", atts=[])
-   endElement(namespaceURI="", localName="doc", qName="doc")
-endDocument()
diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/not-sa/027.ent b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/not-sa/027.ent
deleted file mode 100644
index 712cce3700..0000000000
--- a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/not-sa/027.ent
+++ /dev/null
@@ -1,2 +0,0 @@
-<!ENTITY % e "">

-<!ELEMENT doc (#PCDATA %e;)>

diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/not-sa/027.xml b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/not-sa/027.xml
deleted file mode 100644
index d0c8c7abb5..0000000000
--- a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/not-sa/027.xml
+++ /dev/null
@@ -1,2 +0,0 @@
-<!DOCTYPE doc SYSTEM "027.ent">

-<doc></doc>

diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/not-sa/027.xml.ref b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/not-sa/027.xml.ref
deleted file mode 100644
index d010327624..0000000000
--- a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/not-sa/027.xml.ref
+++ /dev/null
@@ -1,7 +0,0 @@
-setDocumentLocator(locator={columnNumber=1, lineNumber=1})
-startDocument()
-   startDTD(name="doc", publicId="", systemId="027.ent")
-   endDTD()
-   startElement(namespaceURI="", localName="doc", qName="doc", atts=[])
-   endElement(namespaceURI="", localName="doc", qName="doc")
-endDocument()
diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/not-sa/028.ent b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/not-sa/028.ent
deleted file mode 100644
index ac249d7b2c..0000000000
--- a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/not-sa/028.ent
+++ /dev/null
@@ -1,2 +0,0 @@
-<!ELEMENT doc (#PCDATA)>

-<![INCLUDE[<!ATTLIST doc a1 CDATA "v1">]]>

diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/not-sa/028.xml b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/not-sa/028.xml
deleted file mode 100644
index 50e5248cbf..0000000000
--- a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/not-sa/028.xml
+++ /dev/null
@@ -1,2 +0,0 @@
-<!DOCTYPE doc SYSTEM "028.ent">

-<doc></doc>

diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/not-sa/028.xml.ref b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/not-sa/028.xml.ref
deleted file mode 100644
index 8466141897..0000000000
--- a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/not-sa/028.xml.ref
+++ /dev/null
@@ -1,7 +0,0 @@
-setDocumentLocator(locator={columnNumber=1, lineNumber=1})
-startDocument()
-   startDTD(name="doc", publicId="", systemId="028.ent")
-   endDTD()
-   startElement(namespaceURI="", localName="doc", qName="doc", atts=[])
-   endElement(namespaceURI="", localName="doc", qName="doc")
-endDocument()
diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/not-sa/029.ent b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/not-sa/029.ent
deleted file mode 100644
index df94df5560..0000000000
--- a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/not-sa/029.ent
+++ /dev/null
@@ -1,3 +0,0 @@
-<!ELEMENT doc (#PCDATA)>

-<![IGNORE[<!ATTLIST doc a1 CDATA "v1">]]>

-<!ATTLIST doc a1 CDATA "v2">

diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/not-sa/029.xml b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/not-sa/029.xml
deleted file mode 100644
index 07e226c1d7..0000000000
--- a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/not-sa/029.xml
+++ /dev/null
@@ -1,2 +0,0 @@
-<!DOCTYPE doc SYSTEM "029.ent">

-<doc></doc>

diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/not-sa/029.xml.ref b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/not-sa/029.xml.ref
deleted file mode 100644
index 0bffc4aaa7..0000000000
--- a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/not-sa/029.xml.ref
+++ /dev/null
@@ -1,7 +0,0 @@
-setDocumentLocator(locator={columnNumber=1, lineNumber=1})
-startDocument()
-   startDTD(name="doc", publicId="", systemId="029.ent")
-   endDTD()
-   startElement(namespaceURI="", localName="doc", qName="doc", atts=[])
-   endElement(namespaceURI="", localName="doc", qName="doc")
-endDocument()
diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/not-sa/030.ent b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/not-sa/030.ent
deleted file mode 100644
index e3864460df..0000000000
--- a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/not-sa/030.ent
+++ /dev/null
@@ -1,3 +0,0 @@
-<!ELEMENT doc (#PCDATA)>

-<![IGNORE[]]>

-<![INCLUDE[]]>

diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/not-sa/030.xml b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/not-sa/030.xml
deleted file mode 100644
index 01fc2be4ca..0000000000
--- a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/not-sa/030.xml
+++ /dev/null
@@ -1,2 +0,0 @@
-<!DOCTYPE doc SYSTEM "030.ent">

-<doc></doc>

diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/not-sa/030.xml.ref b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/not-sa/030.xml.ref
deleted file mode 100644
index 51e7f033f9..0000000000
--- a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/not-sa/030.xml.ref
+++ /dev/null
@@ -1,7 +0,0 @@
-setDocumentLocator(locator={columnNumber=1, lineNumber=1})
-startDocument()
-   startDTD(name="doc", publicId="", systemId="030.ent")
-   endDTD()
-   startElement(namespaceURI="", localName="doc", qName="doc", atts=[])
-   endElement(namespaceURI="", localName="doc", qName="doc")
-endDocument()
diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/not-sa/031-1.ent b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/not-sa/031-1.ent
deleted file mode 100644
index f7f94ab152..0000000000
--- a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/not-sa/031-1.ent
+++ /dev/null
@@ -1,3 +0,0 @@
-<!ELEMENT doc (#PCDATA)>

-<!ENTITY % e SYSTEM "031-2.ent">

-<!ENTITY e "<![CDATA[%e;]]>">

diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/not-sa/031-2.ent b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/not-sa/031-2.ent
deleted file mode 100644
index bef50b1f38..0000000000
--- a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/not-sa/031-2.ent
+++ /dev/null
@@ -1 +0,0 @@
-<!ATTLIST doc a1 CDATA "v1">

diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/not-sa/031.xml b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/not-sa/031.xml
deleted file mode 100644
index c3fe5fca71..0000000000
--- a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/not-sa/031.xml
+++ /dev/null
@@ -1,2 +0,0 @@
-<!DOCTYPE doc SYSTEM "031-1.ent">

-<doc>&e;</doc>

diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/not-sa/031.xml.ref b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/not-sa/031.xml.ref
deleted file mode 100644
index 72ab9d974f..0000000000
--- a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/not-sa/031.xml.ref
+++ /dev/null
@@ -1,8 +0,0 @@
-setDocumentLocator(locator={columnNumber=1, lineNumber=1})
-startDocument()
-   startDTD(name="doc", publicId="", systemId="031-1.ent")
-   endDTD()
-   startElement(namespaceURI="", localName="doc", qName="doc", atts=[])
-      skippedEntity(name="e")
-   endElement(namespaceURI="", localName="doc", qName="doc")
-endDocument()
diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/001.xml b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/001.xml
deleted file mode 100644
index 7fbef49502..0000000000
--- a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/001.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<!DOCTYPE doc [

-<!ELEMENT doc (#PCDATA)>

-]>

-<doc></doc>

diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/001.xml.ref b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/001.xml.ref
deleted file mode 100644
index 37b53fc0b3..0000000000
--- a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/001.xml.ref
+++ /dev/null
@@ -1,7 +0,0 @@
-setDocumentLocator(locator={columnNumber=1, lineNumber=1})
-startDocument()
-   startDTD(name="doc", publicId="", systemId="")
-   endDTD()
-   startElement(namespaceURI="", localName="doc", qName="doc", atts=[])
-   endElement(namespaceURI="", localName="doc", qName="doc")
-endDocument()
diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/002.xml b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/002.xml
deleted file mode 100644
index 2e3f1d81dd..0000000000
--- a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/002.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<!DOCTYPE doc [

-<!ELEMENT doc (#PCDATA)>

-]>

-<doc ></doc>

diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/002.xml.ref b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/002.xml.ref
deleted file mode 100644
index 37b53fc0b3..0000000000
--- a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/002.xml.ref
+++ /dev/null
@@ -1,7 +0,0 @@
-setDocumentLocator(locator={columnNumber=1, lineNumber=1})
-startDocument()
-   startDTD(name="doc", publicId="", systemId="")
-   endDTD()
-   startElement(namespaceURI="", localName="doc", qName="doc", atts=[])
-   endElement(namespaceURI="", localName="doc", qName="doc")
-endDocument()
diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/003.xml b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/003.xml
deleted file mode 100644
index c841b81784..0000000000
--- a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/003.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<!DOCTYPE doc [

-<!ELEMENT doc (#PCDATA)>

-]>

-<doc></doc >

diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/003.xml.ref b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/003.xml.ref
deleted file mode 100644
index 37b53fc0b3..0000000000
--- a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/003.xml.ref
+++ /dev/null
@@ -1,7 +0,0 @@
-setDocumentLocator(locator={columnNumber=1, lineNumber=1})
-startDocument()
-   startDTD(name="doc", publicId="", systemId="")
-   endDTD()
-   startElement(namespaceURI="", localName="doc", qName="doc", atts=[])
-   endElement(namespaceURI="", localName="doc", qName="doc")
-endDocument()
diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/004.xml b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/004.xml
deleted file mode 100644
index a9c5756933..0000000000
--- a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/004.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<!DOCTYPE doc [

-<!ELEMENT doc (#PCDATA)>

-<!ATTLIST doc a1 CDATA #IMPLIED>

-]>

-<doc a1="v1"></doc>

diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/004.xml.ref b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/004.xml.ref
deleted file mode 100644
index 2d7bfdfd73..0000000000
--- a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/004.xml.ref
+++ /dev/null
@@ -1,8 +0,0 @@
-setDocumentLocator(locator={columnNumber=1, lineNumber=1})
-startDocument()
-   startDTD(name="doc", publicId="", systemId="")
-      attributeDecl(eName="doc", aName="a1", type="", valueDefault="", value="")
-   endDTD()
-   startElement(namespaceURI="", localName="doc", qName="doc", atts=[{localName="a1", qName="a1", uri="", type="CDATA", value="v1"}])
-   endElement(namespaceURI="", localName="doc", qName="doc")
-endDocument()
diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/005.xml b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/005.xml
deleted file mode 100644
index b069efe727..0000000000
--- a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/005.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<!DOCTYPE doc [

-<!ELEMENT doc (#PCDATA)>

-<!ATTLIST doc a1 CDATA #IMPLIED>

-]>

-<doc a1 = "v1"></doc>

diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/005.xml.ref b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/005.xml.ref
deleted file mode 100644
index 2d7bfdfd73..0000000000
--- a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/005.xml.ref
+++ /dev/null
@@ -1,8 +0,0 @@
-setDocumentLocator(locator={columnNumber=1, lineNumber=1})
-startDocument()
-   startDTD(name="doc", publicId="", systemId="")
-      attributeDecl(eName="doc", aName="a1", type="", valueDefault="", value="")
-   endDTD()
-   startElement(namespaceURI="", localName="doc", qName="doc", atts=[{localName="a1", qName="a1", uri="", type="CDATA", value="v1"}])
-   endElement(namespaceURI="", localName="doc", qName="doc")
-endDocument()
diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/006.xml b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/006.xml
deleted file mode 100644
index 39a346342f..0000000000
--- a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/006.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<!DOCTYPE doc [

-<!ELEMENT doc (#PCDATA)>

-<!ATTLIST doc a1 CDATA #IMPLIED>

-]>

-<doc a1='v1'></doc>

diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/006.xml.ref b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/006.xml.ref
deleted file mode 100644
index 2d7bfdfd73..0000000000
--- a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/006.xml.ref
+++ /dev/null
@@ -1,8 +0,0 @@
-setDocumentLocator(locator={columnNumber=1, lineNumber=1})
-startDocument()
-   startDTD(name="doc", publicId="", systemId="")
-      attributeDecl(eName="doc", aName="a1", type="", valueDefault="", value="")
-   endDTD()
-   startElement(namespaceURI="", localName="doc", qName="doc", atts=[{localName="a1", qName="a1", uri="", type="CDATA", value="v1"}])
-   endElement(namespaceURI="", localName="doc", qName="doc")
-endDocument()
diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/007.xml b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/007.xml
deleted file mode 100644
index cc3dc53166..0000000000
--- a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/007.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<!DOCTYPE doc [

-<!ELEMENT doc (#PCDATA)>

-]>

-<doc>&#32;</doc>

diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/007.xml.ref b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/007.xml.ref
deleted file mode 100644
index 016a577ded..0000000000
--- a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/007.xml.ref
+++ /dev/null
@@ -1,8 +0,0 @@
-setDocumentLocator(locator={columnNumber=1, lineNumber=1})
-startDocument()
-   startDTD(name="doc", publicId="", systemId="")
-   endDTD()
-   startElement(namespaceURI="", localName="doc", qName="doc", atts=[])
-      characters(ch=" ")
-   endElement(namespaceURI="", localName="doc", qName="doc")
-endDocument()
diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/008.xml b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/008.xml
deleted file mode 100644
index b3370eb1cc..0000000000
--- a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/008.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<!DOCTYPE doc [

-<!ELEMENT doc (#PCDATA)>

-]>

-<doc>&amp;&lt;&gt;&quot;&apos;</doc>

diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/008.xml.ref b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/008.xml.ref
deleted file mode 100644
index 2c879a43a9..0000000000
--- a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/008.xml.ref
+++ /dev/null
@@ -1,8 +0,0 @@
-setDocumentLocator(locator={columnNumber=1, lineNumber=1})
-startDocument()
-   startDTD(name="doc", publicId="", systemId="")
-   endDTD()
-   startElement(namespaceURI="", localName="doc", qName="doc", atts=[])
-      characters(ch="&<>\"'")
-   endElement(namespaceURI="", localName="doc", qName="doc")
-endDocument()
diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/009.xml b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/009.xml
deleted file mode 100644
index 0fa183eccf..0000000000
--- a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/009.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<!DOCTYPE doc [

-<!ELEMENT doc (#PCDATA)>

-]>

-<doc>&#x20;</doc>

diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/009.xml.ref b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/009.xml.ref
deleted file mode 100644
index 016a577ded..0000000000
--- a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/009.xml.ref
+++ /dev/null
@@ -1,8 +0,0 @@
-setDocumentLocator(locator={columnNumber=1, lineNumber=1})
-startDocument()
-   startDTD(name="doc", publicId="", systemId="")
-   endDTD()
-   startElement(namespaceURI="", localName="doc", qName="doc", atts=[])
-      characters(ch=" ")
-   endElement(namespaceURI="", localName="doc", qName="doc")
-endDocument()
diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/010.xml b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/010.xml
deleted file mode 100644
index eb64d18590..0000000000
--- a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/010.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<!DOCTYPE doc [

-<!ELEMENT doc (#PCDATA)>

-<!ATTLIST doc a1 CDATA #IMPLIED>

-]>

-<doc a1="v1" ></doc>

diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/010.xml.ref b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/010.xml.ref
deleted file mode 100644
index 2d7bfdfd73..0000000000
--- a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/010.xml.ref
+++ /dev/null
@@ -1,8 +0,0 @@
-setDocumentLocator(locator={columnNumber=1, lineNumber=1})
-startDocument()
-   startDTD(name="doc", publicId="", systemId="")
-      attributeDecl(eName="doc", aName="a1", type="", valueDefault="", value="")
-   endDTD()
-   startElement(namespaceURI="", localName="doc", qName="doc", atts=[{localName="a1", qName="a1", uri="", type="CDATA", value="v1"}])
-   endElement(namespaceURI="", localName="doc", qName="doc")
-endDocument()
diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/011.xml b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/011.xml
deleted file mode 100644
index 4cac44b4e4..0000000000
--- a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/011.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<!DOCTYPE doc [

-<!ELEMENT doc (#PCDATA)>

-<!ATTLIST doc a1 CDATA #IMPLIED a2 CDATA #IMPLIED>

-]>

-<doc a1="v1" a2="v2"></doc>

diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/011.xml.ref b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/011.xml.ref
deleted file mode 100644
index 9fc96fdb80..0000000000
--- a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/011.xml.ref
+++ /dev/null
@@ -1,9 +0,0 @@
-setDocumentLocator(locator={columnNumber=1, lineNumber=1})
-startDocument()
-   startDTD(name="doc", publicId="", systemId="")
-      attributeDecl(eName="doc", aName="a1", type="", valueDefault="", value="")
-      attributeDecl(eName="doc", aName="a2", type="", valueDefault="", value="")
-   endDTD()
-   startElement(namespaceURI="", localName="doc", qName="doc", atts=[{localName="a1", qName="a1", uri="", type="CDATA", value="v1"}, {localName="a2", qName="a2", uri="", type="CDATA", value="v2"}])
-   endElement(namespaceURI="", localName="doc", qName="doc")
-endDocument()
diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/012.xml b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/012.xml
deleted file mode 100644
index 6ce2a3eae2..0000000000
--- a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/012.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<!DOCTYPE doc [

-<!ELEMENT doc (#PCDATA)>

-<!ATTLIST doc : CDATA #IMPLIED>

-]>

-<doc :="v1"></doc>

diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/012.xml.ref b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/012.xml.ref
deleted file mode 100644
index 00c76deaf9..0000000000
--- a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/012.xml.ref
+++ /dev/null
@@ -1,8 +0,0 @@
-setDocumentLocator(locator={columnNumber=1, lineNumber=1})
-startDocument()
-   startDTD(name="doc", publicId="", systemId="")
-      attributeDecl(eName="doc", aName=":", type="", valueDefault="", value="")
-   endDTD()
-   startElement(namespaceURI="", localName="doc", qName="doc", atts=[{localName="", qName=":", uri="", type="CDATA", value="v1"}])
-   endElement(namespaceURI="", localName="doc", qName="doc")
-endDocument()
diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/013.xml b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/013.xml
deleted file mode 100644
index 2f4aae4e28..0000000000
--- a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/013.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<!DOCTYPE doc [

-<!ELEMENT doc (#PCDATA)>

-<!ATTLIST doc _.-0123456789 CDATA #IMPLIED>

-]>

-<doc _.-0123456789="v1"></doc>

diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/013.xml.ref b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/013.xml.ref
deleted file mode 100644
index ef2903d87a..0000000000
--- a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/013.xml.ref
+++ /dev/null
@@ -1,8 +0,0 @@
-setDocumentLocator(locator={columnNumber=1, lineNumber=1})
-startDocument()
-   startDTD(name="doc", publicId="", systemId="")
-      attributeDecl(eName="doc", aName="_.-0123456789", type="", valueDefault="", value="")
-   endDTD()
-   startElement(namespaceURI="", localName="doc", qName="doc", atts=[{localName="_.-0123456789", qName="_.-0123456789", uri="", type="CDATA", value="v1"}])
-   endElement(namespaceURI="", localName="doc", qName="doc")
-endDocument()
diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/014.xml b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/014.xml
deleted file mode 100644
index 47f1f723e3..0000000000
--- a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/014.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<!DOCTYPE doc [

-<!ELEMENT doc (#PCDATA)>

-<!ATTLIST doc abcdefghijklmnopqrstuvwxyz CDATA #IMPLIED>

-]>

-<doc abcdefghijklmnopqrstuvwxyz="v1"></doc>

diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/014.xml.ref b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/014.xml.ref
deleted file mode 100644
index bbf1ff75e7..0000000000
--- a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/014.xml.ref
+++ /dev/null
@@ -1,8 +0,0 @@
-setDocumentLocator(locator={columnNumber=1, lineNumber=1})
-startDocument()
-   startDTD(name="doc", publicId="", systemId="")
-      attributeDecl(eName="doc", aName="abcdefghijklmnopqrstuvwxyz", type="", valueDefault="", value="")
-   endDTD()
-   startElement(namespaceURI="", localName="doc", qName="doc", atts=[{localName="abcdefghijklmnopqrstuvwxyz", qName="abcdefghijklmnopqrstuvwxyz", uri="", type="CDATA", value="v1"}])
-   endElement(namespaceURI="", localName="doc", qName="doc")
-endDocument()
diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/015.xml b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/015.xml
deleted file mode 100644
index 861df8a610..0000000000
--- a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/015.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<!DOCTYPE doc [

-<!ELEMENT doc (#PCDATA)>

-<!ATTLIST doc ABCDEFGHIJKLMNOPQRSTUVWXYZ CDATA #IMPLIED>

-]>

-<doc ABCDEFGHIJKLMNOPQRSTUVWXYZ="v1"></doc>

diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/015.xml.ref b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/015.xml.ref
deleted file mode 100644
index 882da5a6fd..0000000000
--- a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/015.xml.ref
+++ /dev/null
@@ -1,8 +0,0 @@
-setDocumentLocator(locator={columnNumber=1, lineNumber=1})
-startDocument()
-   startDTD(name="doc", publicId="", systemId="")
-      attributeDecl(eName="doc", aName="ABCDEFGHIJKLMNOPQRSTUVWXYZ", type="", valueDefault="", value="")
-   endDTD()
-   startElement(namespaceURI="", localName="doc", qName="doc", atts=[{localName="ABCDEFGHIJKLMNOPQRSTUVWXYZ", qName="ABCDEFGHIJKLMNOPQRSTUVWXYZ", uri="", type="CDATA", value="v1"}])
-   endElement(namespaceURI="", localName="doc", qName="doc")
-endDocument()
diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/016.xml b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/016.xml
deleted file mode 100644
index 66b1973c5d..0000000000
--- a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/016.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<!DOCTYPE doc [

-<!ELEMENT doc (#PCDATA)>

-]>

-<doc><?pi?></doc>

diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/016.xml.ref b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/016.xml.ref
deleted file mode 100644
index 32c60b28a7..0000000000
--- a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/016.xml.ref
+++ /dev/null
@@ -1,8 +0,0 @@
-setDocumentLocator(locator={columnNumber=1, lineNumber=1})
-startDocument()
-   startDTD(name="doc", publicId="", systemId="")
-   endDTD()
-   startElement(namespaceURI="", localName="doc", qName="doc", atts=[])
-      processingInstruction(target="pi", data="")
-   endElement(namespaceURI="", localName="doc", qName="doc")
-endDocument()
diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/017.xml b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/017.xml
deleted file mode 100644
index 827ba963bf..0000000000
--- a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/017.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<!DOCTYPE doc [

-<!ELEMENT doc (#PCDATA)>

-]>

-<doc><?pi some data ? > <??></doc>

diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/017.xml.ref b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/017.xml.ref
deleted file mode 100644
index 604d975e15..0000000000
--- a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/017.xml.ref
+++ /dev/null
@@ -1,8 +0,0 @@
-setDocumentLocator(locator={columnNumber=1, lineNumber=1})
-startDocument()
-   startDTD(name="doc", publicId="", systemId="")
-   endDTD()
-   startElement(namespaceURI="", localName="doc", qName="doc", atts=[])
-      processingInstruction(target="pi", data="some data ? > <?")
-   endElement(namespaceURI="", localName="doc", qName="doc")
-endDocument()
diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/018.xml b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/018.xml
deleted file mode 100644
index 4570903fee..0000000000
--- a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/018.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<!DOCTYPE doc [

-<!ELEMENT doc (#PCDATA)>

-]>

-<doc><![CDATA[<foo>]]></doc>

diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/018.xml.ref b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/018.xml.ref
deleted file mode 100644
index 21117d22b4..0000000000
--- a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/018.xml.ref
+++ /dev/null
@@ -1,10 +0,0 @@
-setDocumentLocator(locator={columnNumber=1, lineNumber=1})
-startDocument()
-   startDTD(name="doc", publicId="", systemId="")
-   endDTD()
-   startElement(namespaceURI="", localName="doc", qName="doc", atts=[])
-      startCDATA()
-         characters(ch="<foo>")
-      endCDATA()
-   endElement(namespaceURI="", localName="doc", qName="doc")
-endDocument()
diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/019.xml b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/019.xml
deleted file mode 100644
index 3e6b74cbf2..0000000000
--- a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/019.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<!DOCTYPE doc [

-<!ELEMENT doc (#PCDATA)>

-]>

-<doc><![CDATA[<&]]></doc>

diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/019.xml.ref b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/019.xml.ref
deleted file mode 100644
index f95f625b33..0000000000
--- a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/019.xml.ref
+++ /dev/null
@@ -1,10 +0,0 @@
-setDocumentLocator(locator={columnNumber=1, lineNumber=1})
-startDocument()
-   startDTD(name="doc", publicId="", systemId="")
-   endDTD()
-   startElement(namespaceURI="", localName="doc", qName="doc", atts=[])
-      startCDATA()
-         characters(ch="<&")
-      endCDATA()
-   endElement(namespaceURI="", localName="doc", qName="doc")
-endDocument()
diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/020.xml b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/020.xml
deleted file mode 100644
index f749551a1b..0000000000
--- a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/020.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<!DOCTYPE doc [

-<!ELEMENT doc (#PCDATA)>

-]>

-<doc><![CDATA[<&]>]]]></doc>

diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/020.xml.ref b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/020.xml.ref
deleted file mode 100644
index ff6ff3683c..0000000000
--- a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/020.xml.ref
+++ /dev/null
@@ -1,10 +0,0 @@
-setDocumentLocator(locator={columnNumber=1, lineNumber=1})
-startDocument()
-   startDTD(name="doc", publicId="", systemId="")
-   endDTD()
-   startElement(namespaceURI="", localName="doc", qName="doc", atts=[])
-      startCDATA()
-         characters(ch="<&]>]")
-      endCDATA()
-   endElement(namespaceURI="", localName="doc", qName="doc")
-endDocument()
diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/021.xml b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/021.xml
deleted file mode 100644
index 13dda8c8a5..0000000000
--- a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/021.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<!DOCTYPE doc [

-<!ELEMENT doc (#PCDATA)>

-]>

-<doc><!-- a comment --></doc>

diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/021.xml.ref b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/021.xml.ref
deleted file mode 100644
index 52bf68a717..0000000000
--- a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/021.xml.ref
+++ /dev/null
@@ -1,8 +0,0 @@
-setDocumentLocator(locator={columnNumber=1, lineNumber=1})
-startDocument()
-   startDTD(name="doc", publicId="", systemId="")
-   endDTD()
-   startElement(namespaceURI="", localName="doc", qName="doc", atts=[])
-      comment(ch=" a comment ")
-   endElement(namespaceURI="", localName="doc", qName="doc")
-endDocument()
diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/022.xml b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/022.xml
deleted file mode 100644
index 41d300e950..0000000000
--- a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/022.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<!DOCTYPE doc [

-<!ELEMENT doc (#PCDATA)>

-]>

-<doc><!-- a comment ->--></doc>

diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/022.xml.ref b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/022.xml.ref
deleted file mode 100644
index b299ce71ee..0000000000
--- a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/022.xml.ref
+++ /dev/null
@@ -1,8 +0,0 @@
-setDocumentLocator(locator={columnNumber=1, lineNumber=1})
-startDocument()
-   startDTD(name="doc", publicId="", systemId="")
-   endDTD()
-   startElement(namespaceURI="", localName="doc", qName="doc", atts=[])
-      comment(ch=" a comment ->")
-   endElement(namespaceURI="", localName="doc", qName="doc")
-endDocument()
diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/023.xml b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/023.xml
deleted file mode 100644
index 3837b831ad..0000000000
--- a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/023.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<!DOCTYPE doc [

-<!ELEMENT doc (#PCDATA)>

-<!ENTITY e "">

-]>

-<doc>&e;</doc>

diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/023.xml.ref b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/023.xml.ref
deleted file mode 100644
index b59c216593..0000000000
--- a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/023.xml.ref
+++ /dev/null
@@ -1,8 +0,0 @@
-setDocumentLocator(locator={columnNumber=1, lineNumber=1})
-startDocument()
-   startDTD(name="doc", publicId="", systemId="")
-      internatlEntityDecl(name="e", value="")
-   endDTD()
-   startElement(namespaceURI="", localName="doc", qName="doc", atts=[])
-   endElement(namespaceURI="", localName="doc", qName="doc")
-endDocument()
diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/024.xml b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/024.xml
deleted file mode 100644
index b0655c634c..0000000000
--- a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/024.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<!DOCTYPE doc [

-<!ELEMENT doc (foo)>

-<!ELEMENT foo (#PCDATA)>

-<!ENTITY e "&#60;foo></foo>">

-]>

-<doc>&e;</doc>

diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/024.xml.ref b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/024.xml.ref
deleted file mode 100644
index 00f7fce160..0000000000
--- a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/024.xml.ref
+++ /dev/null
@@ -1,10 +0,0 @@
-setDocumentLocator(locator={columnNumber=1, lineNumber=1})
-startDocument()
-   startDTD(name="doc", publicId="", systemId="")
-      internatlEntityDecl(name="e", value="<foo></foo>")
-   endDTD()
-   startElement(namespaceURI="", localName="doc", qName="doc", atts=[])
-      startElement(namespaceURI="", localName="foo", qName="foo", atts=[])
-      endElement(namespaceURI="", localName="foo", qName="foo")
-   endElement(namespaceURI="", localName="doc", qName="doc")
-endDocument()
diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/025.xml b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/025.xml
deleted file mode 100644
index ed01f36d89..0000000000
--- a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/025.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<!DOCTYPE doc [

-<!ELEMENT doc (foo*)>

-<!ELEMENT foo (#PCDATA)>

-]>

-<doc><foo/><foo></foo></doc>

diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/025.xml.ref b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/025.xml.ref
deleted file mode 100644
index 6a7605c082..0000000000
--- a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/025.xml.ref
+++ /dev/null
@@ -1,11 +0,0 @@
-setDocumentLocator(locator={columnNumber=1, lineNumber=1})
-startDocument()
-   startDTD(name="doc", publicId="", systemId="")
-   endDTD()
-   startElement(namespaceURI="", localName="doc", qName="doc", atts=[])
-      startElement(namespaceURI="", localName="foo", qName="foo", atts=[])
-      endElement(namespaceURI="", localName="foo", qName="foo")
-      startElement(namespaceURI="", localName="foo", qName="foo", atts=[])
-      endElement(namespaceURI="", localName="foo", qName="foo")
-   endElement(namespaceURI="", localName="doc", qName="doc")
-endDocument()
diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/026.xml b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/026.xml
deleted file mode 100644
index 1ba033c1a7..0000000000
--- a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/026.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<!DOCTYPE doc [

-<!ELEMENT doc (foo*)>

-<!ELEMENT foo EMPTY>

-]>

-<doc><foo/><foo></foo></doc>

diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/026.xml.ref b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/026.xml.ref
deleted file mode 100644
index 6a7605c082..0000000000
--- a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/026.xml.ref
+++ /dev/null
@@ -1,11 +0,0 @@
-setDocumentLocator(locator={columnNumber=1, lineNumber=1})
-startDocument()
-   startDTD(name="doc", publicId="", systemId="")
-   endDTD()
-   startElement(namespaceURI="", localName="doc", qName="doc", atts=[])
-      startElement(namespaceURI="", localName="foo", qName="foo", atts=[])
-      endElement(namespaceURI="", localName="foo", qName="foo")
-      startElement(namespaceURI="", localName="foo", qName="foo", atts=[])
-      endElement(namespaceURI="", localName="foo", qName="foo")
-   endElement(namespaceURI="", localName="doc", qName="doc")
-endDocument()
diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/027.xml b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/027.xml
deleted file mode 100644
index ee02439051..0000000000
--- a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/027.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<!DOCTYPE doc [

-<!ELEMENT doc (foo*)>

-<!ELEMENT foo ANY>

-]>

-<doc><foo/><foo></foo></doc>

diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/027.xml.ref b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/027.xml.ref
deleted file mode 100644
index 6a7605c082..0000000000
--- a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/027.xml.ref
+++ /dev/null
@@ -1,11 +0,0 @@
-setDocumentLocator(locator={columnNumber=1, lineNumber=1})
-startDocument()
-   startDTD(name="doc", publicId="", systemId="")
-   endDTD()
-   startElement(namespaceURI="", localName="doc", qName="doc", atts=[])
-      startElement(namespaceURI="", localName="foo", qName="foo", atts=[])
-      endElement(namespaceURI="", localName="foo", qName="foo")
-      startElement(namespaceURI="", localName="foo", qName="foo", atts=[])
-      endElement(namespaceURI="", localName="foo", qName="foo")
-   endElement(namespaceURI="", localName="doc", qName="doc")
-endDocument()
diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/028.xml b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/028.xml
deleted file mode 100644
index 3d95747913..0000000000
--- a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/028.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0"?>

-<!DOCTYPE doc [

-<!ELEMENT doc (#PCDATA)>

-]>

-<doc></doc>

diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/028.xml.ref b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/028.xml.ref
deleted file mode 100644
index dcda37de1e..0000000000
--- a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/028.xml.ref
+++ /dev/null
@@ -1,8 +0,0 @@
-setDocumentLocator(locator={columnNumber=1, lineNumber=1})
-startDocument()
-   processingInstruction(target="xml", data="version='1.0'")
-   startDTD(name="doc", publicId="", systemId="")
-   endDTD()
-   startElement(namespaceURI="", localName="doc", qName="doc", atts=[])
-   endElement(namespaceURI="", localName="doc", qName="doc")
-endDocument()
diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/029.xml b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/029.xml
deleted file mode 100644
index 909f6ff712..0000000000
--- a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/029.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version='1.0'?>

-<!DOCTYPE doc [

-<!ELEMENT doc (#PCDATA)>

-]>

-<doc></doc>

diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/029.xml.ref b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/029.xml.ref
deleted file mode 100644
index dcda37de1e..0000000000
--- a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/029.xml.ref
+++ /dev/null
@@ -1,8 +0,0 @@
-setDocumentLocator(locator={columnNumber=1, lineNumber=1})
-startDocument()
-   processingInstruction(target="xml", data="version='1.0'")
-   startDTD(name="doc", publicId="", systemId="")
-   endDTD()
-   startElement(namespaceURI="", localName="doc", qName="doc", atts=[])
-   endElement(namespaceURI="", localName="doc", qName="doc")
-endDocument()
diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/030.xml b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/030.xml
deleted file mode 100644
index 3a7ddaa716..0000000000
--- a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/030.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version = "1.0"?>

-<!DOCTYPE doc [

-<!ELEMENT doc (#PCDATA)>

-]>

-<doc></doc>

diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/030.xml.ref b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/030.xml.ref
deleted file mode 100644
index dcda37de1e..0000000000
--- a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/030.xml.ref
+++ /dev/null
@@ -1,8 +0,0 @@
-setDocumentLocator(locator={columnNumber=1, lineNumber=1})
-startDocument()
-   processingInstruction(target="xml", data="version='1.0'")
-   startDTD(name="doc", publicId="", systemId="")
-   endDTD()
-   startElement(namespaceURI="", localName="doc", qName="doc", atts=[])
-   endElement(namespaceURI="", localName="doc", qName="doc")
-endDocument()
diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/031.xml b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/031.xml
deleted file mode 100644
index a58e05867f..0000000000
--- a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/031.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version='1.0' encoding="UTF-8"?>

-<!DOCTYPE doc [

-<!ELEMENT doc (#PCDATA)>

-]>

-<doc></doc>

diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/031.xml.ref b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/031.xml.ref
deleted file mode 100644
index 7d81068e24..0000000000
--- a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/031.xml.ref
+++ /dev/null
@@ -1,8 +0,0 @@
-setDocumentLocator(locator={columnNumber=1, lineNumber=1})
-startDocument()
-   processingInstruction(target="xml", data="version='1.0' encoding='UTF-8'")
-   startDTD(name="doc", publicId="", systemId="")
-   endDTD()
-   startElement(namespaceURI="", localName="doc", qName="doc", atts=[])
-   endElement(namespaceURI="", localName="doc", qName="doc")
-endDocument()
diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/032.xml b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/032.xml
deleted file mode 100644
index be55c8d721..0000000000
--- a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/032.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version='1.0' standalone='yes'?>

-<!DOCTYPE doc [

-<!ELEMENT doc (#PCDATA)>

-]>

-<doc></doc>

diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/032.xml.ref b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/032.xml.ref
deleted file mode 100644
index 96d8f1014d..0000000000
--- a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/032.xml.ref
+++ /dev/null
@@ -1,8 +0,0 @@
-setDocumentLocator(locator={columnNumber=1, lineNumber=1})
-startDocument()
-   processingInstruction(target="xml", data="version='1.0' standalone='yes'")
-   startDTD(name="doc", publicId="", systemId="")
-   endDTD()
-   startElement(namespaceURI="", localName="doc", qName="doc", atts=[])
-   endElement(namespaceURI="", localName="doc", qName="doc")
-endDocument()
diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/033.xml b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/033.xml
deleted file mode 100644
index a3f9053868..0000000000
--- a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/033.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version='1.0' encoding="UTF-8" standalone='yes'?>

-<!DOCTYPE doc [

-<!ELEMENT doc (#PCDATA)>

-]>

-<doc></doc>

diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/033.xml.ref b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/033.xml.ref
deleted file mode 100644
index d56d96d584..0000000000
--- a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/033.xml.ref
+++ /dev/null
@@ -1,8 +0,0 @@
-setDocumentLocator(locator={columnNumber=1, lineNumber=1})
-startDocument()
-   processingInstruction(target="xml", data="version='1.0' encoding='UTF-8' standalone='yes'")
-   startDTD(name="doc", publicId="", systemId="")
-   endDTD()
-   startElement(namespaceURI="", localName="doc", qName="doc", atts=[])
-   endElement(namespaceURI="", localName="doc", qName="doc")
-endDocument()
diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/034.xml b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/034.xml
deleted file mode 100644
index 7d52f31c0e..0000000000
--- a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/034.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<!DOCTYPE doc [

-<!ELEMENT doc (#PCDATA)>

-]>

-<doc/>

diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/034.xml.ref b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/034.xml.ref
deleted file mode 100644
index 37b53fc0b3..0000000000
--- a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/034.xml.ref
+++ /dev/null
@@ -1,7 +0,0 @@
-setDocumentLocator(locator={columnNumber=1, lineNumber=1})
-startDocument()
-   startDTD(name="doc", publicId="", systemId="")
-   endDTD()
-   startElement(namespaceURI="", localName="doc", qName="doc", atts=[])
-   endElement(namespaceURI="", localName="doc", qName="doc")
-endDocument()
diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/035.xml b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/035.xml
deleted file mode 100644
index f109a8b782..0000000000
--- a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/035.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<!DOCTYPE doc [

-<!ELEMENT doc (#PCDATA)>

-]>

-<doc />

diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/035.xml.ref b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/035.xml.ref
deleted file mode 100644
index 37b53fc0b3..0000000000
--- a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/035.xml.ref
+++ /dev/null
@@ -1,7 +0,0 @@
-setDocumentLocator(locator={columnNumber=1, lineNumber=1})
-startDocument()
-   startDTD(name="doc", publicId="", systemId="")
-   endDTD()
-   startElement(namespaceURI="", localName="doc", qName="doc", atts=[])
-   endElement(namespaceURI="", localName="doc", qName="doc")
-endDocument()
diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/036.xml b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/036.xml
deleted file mode 100644
index 8ab2b3fb16..0000000000
--- a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/036.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<!DOCTYPE doc [

-<!ELEMENT doc (#PCDATA)>

-]>

-<doc></doc>

-<?pi data?>

diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/036.xml.ref b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/036.xml.ref
deleted file mode 100644
index db2cbb1e8d..0000000000
--- a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/036.xml.ref
+++ /dev/null
@@ -1,8 +0,0 @@
-setDocumentLocator(locator={columnNumber=1, lineNumber=1})
-startDocument()
-   startDTD(name="doc", publicId="", systemId="")
-   endDTD()
-   startElement(namespaceURI="", localName="doc", qName="doc", atts=[])
-   endElement(namespaceURI="", localName="doc", qName="doc")
-   processingInstruction(target="pi", data="data")
-endDocument()
diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/037.xml b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/037.xml
deleted file mode 100644
index f9b2113940..0000000000
--- a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/037.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<!DOCTYPE doc [

-<!ELEMENT doc (#PCDATA)>

-]>

-<doc></doc>

-<!-- comment -->

-

diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/037.xml.ref b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/037.xml.ref
deleted file mode 100644
index 12d6a77cad..0000000000
--- a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/037.xml.ref
+++ /dev/null
@@ -1,8 +0,0 @@
-setDocumentLocator(locator={columnNumber=1, lineNumber=1})
-startDocument()
-   startDTD(name="doc", publicId="", systemId="")
-   endDTD()
-   startElement(namespaceURI="", localName="doc", qName="doc", atts=[])
-   endElement(namespaceURI="", localName="doc", qName="doc")
-   comment(ch=" comment ")
-endDocument()
diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/038.xml b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/038.xml
deleted file mode 100644
index d14f41bfe2..0000000000
--- a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/038.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<!-- comment -->

-<!DOCTYPE doc [

-<!ELEMENT doc (#PCDATA)>

-]>

-<doc></doc>

-

diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/038.xml.ref b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/038.xml.ref
deleted file mode 100644
index d24c10b495..0000000000
--- a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/038.xml.ref
+++ /dev/null
@@ -1,8 +0,0 @@
-setDocumentLocator(locator={columnNumber=1, lineNumber=1})
-startDocument()
-   comment(ch=" comment ")
-   startDTD(name="doc", publicId="", systemId="")
-   endDTD()
-   startElement(namespaceURI="", localName="doc", qName="doc", atts=[])
-   endElement(namespaceURI="", localName="doc", qName="doc")
-endDocument()
diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/039.xml b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/039.xml
deleted file mode 100644
index 0897316e46..0000000000
--- a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/039.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?pi data?>

-<!DOCTYPE doc [

-<!ELEMENT doc (#PCDATA)>

-]>

-<doc></doc>

diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/039.xml.ref b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/039.xml.ref
deleted file mode 100644
index 9eb38b42bb..0000000000
--- a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/039.xml.ref
+++ /dev/null
@@ -1,8 +0,0 @@
-setDocumentLocator(locator={columnNumber=1, lineNumber=1})
-startDocument()
-   processingInstruction(target="pi", data="data")
-   startDTD(name="doc", publicId="", systemId="")
-   endDTD()
-   startElement(namespaceURI="", localName="doc", qName="doc", atts=[])
-   endElement(namespaceURI="", localName="doc", qName="doc")
-endDocument()
diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/040.xml b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/040.xml
deleted file mode 100644
index 12c419b65b..0000000000
--- a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/040.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<!DOCTYPE doc [

-<!ELEMENT doc (#PCDATA)>

-<!ATTLIST doc a1 CDATA #IMPLIED>

-]>

-<doc a1="&quot;&lt;&amp;&gt;&apos;"></doc>

diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/040.xml.ref b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/040.xml.ref
deleted file mode 100644
index 81409bdc13..0000000000
--- a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/040.xml.ref
+++ /dev/null
@@ -1,8 +0,0 @@
-setDocumentLocator(locator={columnNumber=1, lineNumber=1})
-startDocument()
-   startDTD(name="doc", publicId="", systemId="")
-      attributeDecl(eName="doc", aName="a1", type="", valueDefault="", value="")
-   endDTD()
-   startElement(namespaceURI="", localName="doc", qName="doc", atts=[{localName="a1", qName="a1", uri="", type="CDATA", value="\"<&>'"}])
-   endElement(namespaceURI="", localName="doc", qName="doc")
-endDocument()
diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/041.xml b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/041.xml
deleted file mode 100644
index a59f536277..0000000000
--- a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/041.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<!DOCTYPE doc [

-<!ELEMENT doc (#PCDATA)>

-<!ATTLIST doc a1 CDATA #IMPLIED>

-]>

-<doc a1="&#65;"></doc>

diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/041.xml.ref b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/041.xml.ref
deleted file mode 100644
index 13f83dffcf..0000000000
--- a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/041.xml.ref
+++ /dev/null
@@ -1,8 +0,0 @@
-setDocumentLocator(locator={columnNumber=1, lineNumber=1})
-startDocument()
-   startDTD(name="doc", publicId="", systemId="")
-      attributeDecl(eName="doc", aName="a1", type="", valueDefault="", value="")
-   endDTD()
-   startElement(namespaceURI="", localName="doc", qName="doc", atts=[{localName="a1", qName="a1", uri="", type="CDATA", value="A"}])
-   endElement(namespaceURI="", localName="doc", qName="doc")
-endDocument()
diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/042.xml b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/042.xml
deleted file mode 100644
index 5d7c650944..0000000000
--- a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/042.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<!DOCTYPE doc [

-<!ELEMENT doc (#PCDATA)>

-]>

-<doc>&#00000000000000000000000000000000065;</doc>

diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/042.xml.ref b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/042.xml.ref
deleted file mode 100644
index ed02b8c709..0000000000
--- a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/042.xml.ref
+++ /dev/null
@@ -1,8 +0,0 @@
-setDocumentLocator(locator={columnNumber=1, lineNumber=1})
-startDocument()
-   startDTD(name="doc", publicId="", systemId="")
-   endDTD()
-   startElement(namespaceURI="", localName="doc", qName="doc", atts=[])
-      characters(ch="A")
-   endElement(namespaceURI="", localName="doc", qName="doc")
-endDocument()
diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/043.xml b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/043.xml
deleted file mode 100644
index a8095dfe28..0000000000
--- a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/043.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<!DOCTYPE doc [

-<!ATTLIST doc a1 CDATA #IMPLIED>

-<!ELEMENT doc (#PCDATA)>

-]>

-<doc a1="foo

-bar"></doc>

diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/043.xml.ref b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/043.xml.ref
deleted file mode 100644
index 3f898a182a..0000000000
--- a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/043.xml.ref
+++ /dev/null
@@ -1,8 +0,0 @@
-setDocumentLocator(locator={columnNumber=1, lineNumber=1})
-startDocument()
-   startDTD(name="doc", publicId="", systemId="")
-      attributeDecl(eName="doc", aName="a1", type="", valueDefault="", value="")
-   endDTD()
-   startElement(namespaceURI="", localName="doc", qName="doc", atts=[{localName="a1", qName="a1", uri="", type="CDATA", value="foo\r\nbar"}])
-   endElement(namespaceURI="", localName="doc", qName="doc")
-endDocument()
diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/044.xml b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/044.xml
deleted file mode 100644
index bee1d23e1a..0000000000
--- a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/044.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<!DOCTYPE doc [

-<!ELEMENT doc (e*)>

-<!ELEMENT e EMPTY>

-<!ATTLIST e a1 CDATA "v1" a2 CDATA "v2" a3 CDATA #IMPLIED>

-]>

-<doc>

-<e a3="v3"/>

-<e a1="w1"/>

-<e a2="w2" a3="v3"/>

-</doc>

diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/044.xml.ref b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/044.xml.ref
deleted file mode 100644
index daab693b31..0000000000
--- a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/044.xml.ref
+++ /dev/null
@@ -1,20 +0,0 @@
-setDocumentLocator(locator={columnNumber=1, lineNumber=1})
-startDocument()
-   startDTD(name="doc", publicId="", systemId="")
-      attributeDecl(eName="e", aName="a1", type="", valueDefault="", value="")
-      attributeDecl(eName="e", aName="a2", type="", valueDefault="", value="")
-      attributeDecl(eName="e", aName="a3", type="", valueDefault="", value="")
-   endDTD()
-   startElement(namespaceURI="", localName="doc", qName="doc", atts=[])
-      characters(ch="\r\n")
-      startElement(namespaceURI="", localName="e", qName="e", atts=[{localName="a3", qName="a3", uri="", type="CDATA", value="v3"}])
-      endElement(namespaceURI="", localName="e", qName="e")
-      characters(ch="\r\n")
-      startElement(namespaceURI="", localName="e", qName="e", atts=[{localName="a1", qName="a1", uri="", type="CDATA", value="w1"}])
-      endElement(namespaceURI="", localName="e", qName="e")
-      characters(ch="\r\n")
-      startElement(namespaceURI="", localName="e", qName="e", atts=[{localName="a2", qName="a2", uri="", type="CDATA", value="w2"}, {localName="a3", qName="a3", uri="", type="CDATA", value="v3"}])
-      endElement(namespaceURI="", localName="e", qName="e")
-      characters(ch="\r\n")
-   endElement(namespaceURI="", localName="doc", qName="doc")
-endDocument()
diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/045.xml b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/045.xml
deleted file mode 100644
index e2567f532d..0000000000
--- a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/045.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<!DOCTYPE doc [

-<!ELEMENT doc (#PCDATA)>

-<!ATTLIST doc a1 CDATA "v1">

-<!ATTLIST doc a1 CDATA "z1">

-]>

-<doc></doc>

diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/045.xml.ref b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/045.xml.ref
deleted file mode 100644
index 566221ae0d..0000000000
--- a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/045.xml.ref
+++ /dev/null
@@ -1,9 +0,0 @@
-setDocumentLocator(locator={columnNumber=1, lineNumber=1})
-startDocument()
-   startDTD(name="doc", publicId="", systemId="")
-      attributeDecl(eName="doc", aName="a1", type="", valueDefault="", value="")
-      attributeDecl(eName="doc", aName="a1", type="", valueDefault="", value="")
-   endDTD()
-   startElement(namespaceURI="", localName="doc", qName="doc", atts=[])
-   endElement(namespaceURI="", localName="doc", qName="doc")
-endDocument()
diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/046.xml b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/046.xml
deleted file mode 100644
index c50a2846f9..0000000000
--- a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/046.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<!DOCTYPE doc [

-<!ELEMENT doc (#PCDATA)>

-<!ATTLIST doc a1 CDATA "v1">

-<!ATTLIST doc a2 CDATA "v2">

-]>

-<doc></doc>

diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/046.xml.ref b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/046.xml.ref
deleted file mode 100644
index 7b1a28d90c..0000000000
--- a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/046.xml.ref
+++ /dev/null
@@ -1,9 +0,0 @@
-setDocumentLocator(locator={columnNumber=1, lineNumber=1})
-startDocument()
-   startDTD(name="doc", publicId="", systemId="")
-      attributeDecl(eName="doc", aName="a1", type="", valueDefault="", value="")
-      attributeDecl(eName="doc", aName="a2", type="", valueDefault="", value="")
-   endDTD()
-   startElement(namespaceURI="", localName="doc", qName="doc", atts=[])
-   endElement(namespaceURI="", localName="doc", qName="doc")
-endDocument()
diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/047.xml b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/047.xml
deleted file mode 100644
index a4c688cf1a..0000000000
--- a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/047.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<!DOCTYPE doc [

-<!ELEMENT doc (#PCDATA)>

-]>

-<doc>X

-Y</doc>

diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/047.xml.ref b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/047.xml.ref
deleted file mode 100644
index 3af5bf2d74..0000000000
--- a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/047.xml.ref
+++ /dev/null
@@ -1,8 +0,0 @@
-setDocumentLocator(locator={columnNumber=1, lineNumber=1})
-startDocument()
-   startDTD(name="doc", publicId="", systemId="")
-   endDTD()
-   startElement(namespaceURI="", localName="doc", qName="doc", atts=[])
-      characters(ch="X\r\nY")
-   endElement(namespaceURI="", localName="doc", qName="doc")
-endDocument()
diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/048.xml b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/048.xml
deleted file mode 100644
index c6b2dedbba..0000000000
--- a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/048.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<!DOCTYPE doc [

-<!ELEMENT doc (#PCDATA)>

-]>

-<doc>]</doc>

diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/048.xml.ref b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/048.xml.ref
deleted file mode 100644
index 0e8482350f..0000000000
--- a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/048.xml.ref
+++ /dev/null
@@ -1,8 +0,0 @@
-setDocumentLocator(locator={columnNumber=1, lineNumber=1})
-startDocument()
-   startDTD(name="doc", publicId="", systemId="")
-   endDTD()
-   startElement(namespaceURI="", localName="doc", qName="doc", atts=[])
-      characters(ch="]")
-   endElement(namespaceURI="", localName="doc", qName="doc")
-endDocument()
diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/049.xml b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/049.xml
deleted file mode 100644
index c3cc797b59..0000000000
--- a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/049.xml
+++ /dev/null
diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/049.xml.ref b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/049.xml.ref
deleted file mode 100644
index 72897d1943..0000000000
--- a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/049.xml.ref
+++ /dev/null
@@ -1,8 +0,0 @@
-setDocumentLocator(locator={columnNumber=1, lineNumber=1})
-startDocument()
-   startDTD(name="doc", publicId="", systemId="")
-   endDTD()
-   startElement(namespaceURI="", localName="doc", qName="doc", atts=[])
-      characters(ch="£")
-   endElement(namespaceURI="", localName="doc", qName="doc")
-endDocument()
diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/050.xml b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/050.xml
deleted file mode 100644
index 12303b1af2..0000000000
--- a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/050.xml
+++ /dev/null
diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/050.xml.ref b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/050.xml.ref
deleted file mode 100644
index 8f39355258..0000000000
--- a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/050.xml.ref
+++ /dev/null
@@ -1,8 +0,0 @@
-setDocumentLocator(locator={columnNumber=1, lineNumber=1})
-startDocument()
-   startDTD(name="doc", publicId="", systemId="")
-   endDTD()
-   startElement(namespaceURI="", localName="doc", qName="doc", atts=[])
-      characters(ch="เจมส์")
-   endElement(namespaceURI="", localName="doc", qName="doc")
-endDocument()
diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/051.xml b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/051.xml
deleted file mode 100644
index 7ae8f6c73a..0000000000
--- a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/051.xml
+++ /dev/null
diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/051.xml.ref b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/051.xml.ref
deleted file mode 100644
index 71a89a922c..0000000000
--- a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/051.xml.ref
+++ /dev/null
@@ -1,7 +0,0 @@
-setDocumentLocator(locator={columnNumber=1, lineNumber=1})
-startDocument()
-   startDTD(name="เจมส์", publicId="", systemId="")
-   endDTD()
-   startElement(namespaceURI="", localName="เจมส์", qName="เจมส์", atts=[])
-   endElement(namespaceURI="", localName="เจมส์", qName="เจมส์")
-endDocument()
diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/052.xml b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/052.xml
deleted file mode 100644
index 3f33a4c760..0000000000
--- a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/052.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<!DOCTYPE doc [

-<!ELEMENT doc (#PCDATA)>

-]>

-<doc>𐀀􏿽</doc>

diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/052.xml.ref b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/052.xml.ref
deleted file mode 100644
index 0b806c96a8..0000000000
--- a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/052.xml.ref
+++ /dev/null
@@ -1,8 +0,0 @@
-setDocumentLocator(locator={columnNumber=1, lineNumber=1})
-startDocument()
-   startDTD(name="doc", publicId="", systemId="")
-   endDTD()
-   startElement(namespaceURI="", localName="doc", qName="doc", atts=[])
-      characters(ch="𐀀􏿽")
-   endElement(namespaceURI="", localName="doc", qName="doc")
-endDocument()
diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/053.xml b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/053.xml
deleted file mode 100644
index 0d88f28718..0000000000
--- a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/053.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<!DOCTYPE doc [

-<!ENTITY e "<e/>">

-<!ELEMENT doc (e)>

-<!ELEMENT e EMPTY>

-]>

-<doc>&e;</doc>

diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/053.xml.ref b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/053.xml.ref
deleted file mode 100644
index 2aa90a79d0..0000000000
--- a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/053.xml.ref
+++ /dev/null
@@ -1,10 +0,0 @@
-setDocumentLocator(locator={columnNumber=1, lineNumber=1})
-startDocument()
-   startDTD(name="doc", publicId="", systemId="")
-      internatlEntityDecl(name="e", value="<e/>")
-   endDTD()
-   startElement(namespaceURI="", localName="doc", qName="doc", atts=[])
-      startElement(namespaceURI="", localName="e", qName="e", atts=[])
-      endElement(namespaceURI="", localName="e", qName="e")
-   endElement(namespaceURI="", localName="doc", qName="doc")
-endDocument()
diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/054.xml b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/054.xml
deleted file mode 100644
index 5d1c88b946..0000000000
--- a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/054.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<!DOCTYPE doc [

-<!ELEMENT doc (#PCDATA)>

-]>

-

-

-<doc

-></doc

->

-

-

diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/054.xml.ref b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/054.xml.ref
deleted file mode 100644
index 37b53fc0b3..0000000000
--- a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/054.xml.ref
+++ /dev/null
@@ -1,7 +0,0 @@
-setDocumentLocator(locator={columnNumber=1, lineNumber=1})
-startDocument()
-   startDTD(name="doc", publicId="", systemId="")
-   endDTD()
-   startElement(namespaceURI="", localName="doc", qName="doc", atts=[])
-   endElement(namespaceURI="", localName="doc", qName="doc")
-endDocument()
diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/055.xml b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/055.xml
deleted file mode 100644
index da0292c5bc..0000000000
--- a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/055.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<!DOCTYPE doc [

-<!ELEMENT doc (#PCDATA)>

-]>

-<?pi  data?>

-<doc></doc>

diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/055.xml.ref b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/055.xml.ref
deleted file mode 100644
index dc3312be38..0000000000
--- a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/055.xml.ref
+++ /dev/null
@@ -1,8 +0,0 @@
-setDocumentLocator(locator={columnNumber=1, lineNumber=1})
-startDocument()
-   startDTD(name="doc", publicId="", systemId="")
-   endDTD()
-   processingInstruction(target="pi", data="data")
-   startElement(namespaceURI="", localName="doc", qName="doc", atts=[])
-   endElement(namespaceURI="", localName="doc", qName="doc")
-endDocument()
diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/056.xml b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/056.xml
deleted file mode 100644
index 144871b2a3..0000000000
--- a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/056.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<!DOCTYPE doc [

-<!ELEMENT doc (#PCDATA)>

-]>

-<doc>&#x0000000000000000000000000000000000000041;</doc>

diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/056.xml.ref b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/056.xml.ref
deleted file mode 100644
index ed02b8c709..0000000000
--- a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/056.xml.ref
+++ /dev/null
@@ -1,8 +0,0 @@
-setDocumentLocator(locator={columnNumber=1, lineNumber=1})
-startDocument()
-   startDTD(name="doc", publicId="", systemId="")
-   endDTD()
-   startElement(namespaceURI="", localName="doc", qName="doc", atts=[])
-      characters(ch="A")
-   endElement(namespaceURI="", localName="doc", qName="doc")
-endDocument()
diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/057.xml b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/057.xml
deleted file mode 100644
index c1ac849ed1..0000000000
--- a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/057.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<!DOCTYPE doc [

-<!ELEMENT doc (a*)>

-]>

-<doc></doc>

diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/057.xml.ref b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/057.xml.ref
deleted file mode 100644
index 37b53fc0b3..0000000000
--- a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/057.xml.ref
+++ /dev/null
@@ -1,7 +0,0 @@
-setDocumentLocator(locator={columnNumber=1, lineNumber=1})
-startDocument()
-   startDTD(name="doc", publicId="", systemId="")
-   endDTD()
-   startElement(namespaceURI="", localName="doc", qName="doc", atts=[])
-   endElement(namespaceURI="", localName="doc", qName="doc")
-endDocument()
diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/058.xml b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/058.xml
deleted file mode 100644
index 2ff23b233f..0000000000
--- a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/058.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<!DOCTYPE doc [

-<!ATTLIST doc a1 NMTOKENS #IMPLIED>

-<!ELEMENT doc (#PCDATA)>

-]>

-<doc a1=" 1  	2 	"></doc>

diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/058.xml.ref b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/058.xml.ref
deleted file mode 100644
index 0acf5f4acd..0000000000
--- a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/058.xml.ref
+++ /dev/null
@@ -1,8 +0,0 @@
-setDocumentLocator(locator={columnNumber=1, lineNumber=1})
-startDocument()
-   startDTD(name="doc", publicId="", systemId="")
-      attributeDecl(eName="doc", aName="a1", type="", valueDefault="", value="")
-   endDTD()
-   startElement(namespaceURI="", localName="doc", qName="doc", atts=[{localName="a1", qName="a1", uri="", type="CDATA", value=" 1  \t2 \t"}])
-   endElement(namespaceURI="", localName="doc", qName="doc")
-endDocument()
diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/059.xml b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/059.xml
deleted file mode 100644
index 2171480ecf..0000000000
--- a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/059.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<!DOCTYPE doc [

-<!ELEMENT doc (e*)>

-<!ELEMENT e EMPTY>

-<!ATTLIST e a1 CDATA #IMPLIED a2 CDATA #IMPLIED a3 CDATA #IMPLIED>

-]>

-<doc>

-<e a1="v1" a2="v2" a3="v3"/>

-<e a1="w1" a2="v2"/>

-<e a1="v1" a2="w2" a3="v3"/>

-</doc>

diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/059.xml.ref b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/059.xml.ref
deleted file mode 100644
index 8a73895f0d..0000000000
--- a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/059.xml.ref
+++ /dev/null
@@ -1,20 +0,0 @@
-setDocumentLocator(locator={columnNumber=1, lineNumber=1})
-startDocument()
-   startDTD(name="doc", publicId="", systemId="")
-      attributeDecl(eName="e", aName="a1", type="", valueDefault="", value="")
-      attributeDecl(eName="e", aName="a2", type="", valueDefault="", value="")
-      attributeDecl(eName="e", aName="a3", type="", valueDefault="", value="")
-   endDTD()
-   startElement(namespaceURI="", localName="doc", qName="doc", atts=[])
-      characters(ch="\r\n")
-      startElement(namespaceURI="", localName="e", qName="e", atts=[{localName="a1", qName="a1", uri="", type="CDATA", value="v1"}, {localName="a2", qName="a2", uri="", type="CDATA", value="v2"}, {localName="a3", qName="a3", uri="", type="CDATA", value="v3"}])
-      endElement(namespaceURI="", localName="e", qName="e")
-      characters(ch="\r\n")
-      startElement(namespaceURI="", localName="e", qName="e", atts=[{localName="a1", qName="a1", uri="", type="CDATA", value="w1"}, {localName="a2", qName="a2", uri="", type="CDATA", value="v2"}])
-      endElement(namespaceURI="", localName="e", qName="e")
-      characters(ch="\r\n")
-      startElement(namespaceURI="", localName="e", qName="e", atts=[{localName="a1", qName="a1", uri="", type="CDATA", value="v1"}, {localName="a2", qName="a2", uri="", type="CDATA", value="w2"}, {localName="a3", qName="a3", uri="", type="CDATA", value="v3"}])
-      endElement(namespaceURI="", localName="e", qName="e")
-      characters(ch="\r\n")
-   endElement(namespaceURI="", localName="doc", qName="doc")
-endDocument()
diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/060.xml b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/060.xml
deleted file mode 100644
index 6cd6b4386b..0000000000
--- a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/060.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<!DOCTYPE doc [

-<!ELEMENT doc (#PCDATA)>

-]>

-<doc>X&#10;Y</doc>

diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/060.xml.ref b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/060.xml.ref
deleted file mode 100644
index ea1cbd40c0..0000000000
--- a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/060.xml.ref
+++ /dev/null
@@ -1,8 +0,0 @@
-setDocumentLocator(locator={columnNumber=1, lineNumber=1})
-startDocument()
-   startDTD(name="doc", publicId="", systemId="")
-   endDTD()
-   startElement(namespaceURI="", localName="doc", qName="doc", atts=[])
-      characters(ch="X\nY")
-   endElement(namespaceURI="", localName="doc", qName="doc")
-endDocument()
diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/061.xml b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/061.xml
deleted file mode 100644
index bbdc152492..0000000000
--- a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/061.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<!DOCTYPE doc [

-<!ELEMENT doc (#PCDATA)>

-]>

-<doc>&#163;</doc>

diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/061.xml.ref b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/061.xml.ref
deleted file mode 100644
index 72897d1943..0000000000
--- a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/061.xml.ref
+++ /dev/null
@@ -1,8 +0,0 @@
-setDocumentLocator(locator={columnNumber=1, lineNumber=1})
-startDocument()
-   startDTD(name="doc", publicId="", systemId="")
-   endDTD()
-   startElement(namespaceURI="", localName="doc", qName="doc", atts=[])
-      characters(ch="£")
-   endElement(namespaceURI="", localName="doc", qName="doc")
-endDocument()
diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/062.xml b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/062.xml
deleted file mode 100644
index f4ba53090a..0000000000
--- a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/062.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<!DOCTYPE doc [

-<!ELEMENT doc (#PCDATA)>

-]>

-<doc>&#xe40;&#xe08;&#xe21;ส์</doc>

diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/062.xml.ref b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/062.xml.ref
deleted file mode 100644
index 8f39355258..0000000000
--- a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/062.xml.ref
+++ /dev/null
@@ -1,8 +0,0 @@
-setDocumentLocator(locator={columnNumber=1, lineNumber=1})
-startDocument()
-   startDTD(name="doc", publicId="", systemId="")
-   endDTD()
-   startElement(namespaceURI="", localName="doc", qName="doc", atts=[])
-      characters(ch="เจมส์")
-   endElement(namespaceURI="", localName="doc", qName="doc")
-endDocument()
diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/063.xml b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/063.xml
deleted file mode 100644
index 9668f2da73..0000000000
--- a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/063.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<!DOCTYPE เจมส์ [

-<!ELEMENT เจมส์ (#PCDATA)>

-]>

-<เจมส์></เจมส์>

diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/063.xml.ref b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/063.xml.ref
deleted file mode 100644
index 71a89a922c..0000000000
--- a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/063.xml.ref
+++ /dev/null
@@ -1,7 +0,0 @@
-setDocumentLocator(locator={columnNumber=1, lineNumber=1})
-startDocument()
-   startDTD(name="เจมส์", publicId="", systemId="")
-   endDTD()
-   startElement(namespaceURI="", localName="เจมส์", qName="เจมส์", atts=[])
-   endElement(namespaceURI="", localName="เจมส์", qName="เจมส์")
-endDocument()
diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/064.xml b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/064.xml
deleted file mode 100644
index 74a97aa431..0000000000
--- a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/064.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<!DOCTYPE doc [

-<!ELEMENT doc (#PCDATA)>

-]>

-<doc>&#x10000;&#x10FFFD;</doc>

diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/064.xml.ref b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/064.xml.ref
deleted file mode 100644
index 0b806c96a8..0000000000
--- a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/064.xml.ref
+++ /dev/null
@@ -1,8 +0,0 @@
-setDocumentLocator(locator={columnNumber=1, lineNumber=1})
-startDocument()
-   startDTD(name="doc", publicId="", systemId="")
-   endDTD()
-   startElement(namespaceURI="", localName="doc", qName="doc", atts=[])
-      characters(ch="𐀀􏿽")
-   endElement(namespaceURI="", localName="doc", qName="doc")
-endDocument()
diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/065.xml b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/065.xml
deleted file mode 100644
index f708f2bc17..0000000000
--- a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/065.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<!DOCTYPE doc [

-<!ENTITY e "&#60;">

-<!ELEMENT doc (#PCDATA)>

-]>

-<doc></doc>

diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/065.xml.ref b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/065.xml.ref
deleted file mode 100644
index ba31414499..0000000000
--- a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/065.xml.ref
+++ /dev/null
@@ -1,8 +0,0 @@
-setDocumentLocator(locator={columnNumber=1, lineNumber=1})
-startDocument()
-   startDTD(name="doc", publicId="", systemId="")
-      internatlEntityDecl(name="e", value="<")
-   endDTD()
-   startElement(namespaceURI="", localName="doc", qName="doc", atts=[])
-   endElement(namespaceURI="", localName="doc", qName="doc")
-endDocument()
diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/066.xml b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/066.xml
deleted file mode 100644
index a27340b9a7..0000000000
--- a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/066.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<!DOCTYPE doc [

-<!ELEMENT doc (#PCDATA)>

-<!ATTLIST doc a1 CDATA #IMPLIED>

-<!-- 34 is double quote -->

-<!ENTITY e1 "&#34;">

-]>

-<doc a1="&e1;"></doc>

diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/066.xml.ref b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/066.xml.ref
deleted file mode 100644
index d650af13d3..0000000000
--- a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/066.xml.ref
+++ /dev/null
@@ -1,10 +0,0 @@
-setDocumentLocator(locator={columnNumber=1, lineNumber=1})
-startDocument()
-   startDTD(name="doc", publicId="", systemId="")
-      attributeDecl(eName="doc", aName="a1", type="", valueDefault="", value="")
-      comment(ch=" 34 is double quote ")
-      internatlEntityDecl(name="e1", value="\"")
-   endDTD()
-   startElement(namespaceURI="", localName="doc", qName="doc", atts=[{localName="a1", qName="a1", uri="", type="CDATA", value="\""}])
-   endElement(namespaceURI="", localName="doc", qName="doc")
-endDocument()
diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/067.xml b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/067.xml
deleted file mode 100644
index a0ccf772a5..0000000000
--- a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/067.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<!DOCTYPE doc [

-<!ELEMENT doc (#PCDATA)>

-]>

-<doc>&#13;</doc>

diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/067.xml.ref b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/067.xml.ref
deleted file mode 100644
index 9a2358d700..0000000000
--- a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/067.xml.ref
+++ /dev/null
@@ -1,8 +0,0 @@
-setDocumentLocator(locator={columnNumber=1, lineNumber=1})
-startDocument()
-   startDTD(name="doc", publicId="", systemId="")
-   endDTD()
-   startElement(namespaceURI="", localName="doc", qName="doc", atts=[])
-      characters(ch="\r")
-   endElement(namespaceURI="", localName="doc", qName="doc")
-endDocument()
diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/068.xml b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/068.xml
deleted file mode 100644
index 8ed806b9a3..0000000000
--- a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/068.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<!DOCTYPE doc [

-<!ELEMENT doc (#PCDATA)>

-<!ENTITY e "&#13;">

-]>

-<doc>&e;</doc>

diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/068.xml.ref b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/068.xml.ref
deleted file mode 100644
index 8ebf150e48..0000000000
--- a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/068.xml.ref
+++ /dev/null
@@ -1,9 +0,0 @@
-setDocumentLocator(locator={columnNumber=1, lineNumber=1})
-startDocument()
-   startDTD(name="doc", publicId="", systemId="")
-      internatlEntityDecl(name="e", value="\r")
-   endDTD()
-   startElement(namespaceURI="", localName="doc", qName="doc", atts=[])
-      characters(ch="\r")
-   endElement(namespaceURI="", localName="doc", qName="doc")
-endDocument()
diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/069.xml b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/069.xml
deleted file mode 100644
index 2437f60530..0000000000
--- a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/069.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<!DOCTYPE doc [

-<!ELEMENT doc (#PCDATA)>

-<!NOTATION n PUBLIC "whatever">

-]>

-<doc></doc>

diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/069.xml.ref b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/069.xml.ref
deleted file mode 100644
index c5685c6d7a..0000000000
--- a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/069.xml.ref
+++ /dev/null
@@ -1,8 +0,0 @@
-setDocumentLocator(locator={columnNumber=1, lineNumber=1})
-startDocument()
-   startDTD(name="doc", publicId="", systemId="")
-      notationDecl(name="n", publicId="whatever", systemId="")
-   endDTD()
-   startElement(namespaceURI="", localName="doc", qName="doc", atts=[])
-   endElement(namespaceURI="", localName="doc", qName="doc")
-endDocument()
diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/070.xml b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/070.xml
deleted file mode 100644
index eef097df76..0000000000
--- a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/070.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<!DOCTYPE doc [

-<!ENTITY % e "<!ELEMENT doc (#PCDATA)>">

-%e;

-]>

-<doc></doc>

diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/070.xml.ref b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/070.xml.ref
deleted file mode 100644
index 2525ef6ae3..0000000000
--- a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/070.xml.ref
+++ /dev/null
@@ -1,8 +0,0 @@
-setDocumentLocator(locator={columnNumber=1, lineNumber=1})
-startDocument()
-   startDTD(name="doc", publicId="", systemId="")
-      internatlEntityDecl(name="%e", value="<!ELEMENT doc (#PCDATA)>")
-   endDTD()
-   startElement(namespaceURI="", localName="doc", qName="doc", atts=[])
-   endElement(namespaceURI="", localName="doc", qName="doc")
-endDocument()
diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/071.xml b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/071.xml
deleted file mode 100644
index ebfba230a4..0000000000
--- a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/071.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<!DOCTYPE doc [

-<!ELEMENT doc (#PCDATA)>

-<!ATTLIST doc a ID #IMPLIED>

-]>

-<doc></doc>

diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/071.xml.ref b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/071.xml.ref
deleted file mode 100644
index 0b8e512b33..0000000000
--- a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/071.xml.ref
+++ /dev/null
@@ -1,8 +0,0 @@
-setDocumentLocator(locator={columnNumber=1, lineNumber=1})
-startDocument()
-   startDTD(name="doc", publicId="", systemId="")
-      attributeDecl(eName="doc", aName="a", type="", valueDefault="", value="")
-   endDTD()
-   startElement(namespaceURI="", localName="doc", qName="doc", atts=[])
-   endElement(namespaceURI="", localName="doc", qName="doc")
-endDocument()
diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/072.xml b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/072.xml
deleted file mode 100644
index 6ef39dc49e..0000000000
--- a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/072.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<!DOCTYPE doc [

-<!ELEMENT doc (#PCDATA)>

-<!ATTLIST doc a IDREF #IMPLIED>

-]>

-<doc></doc>

diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/072.xml.ref b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/072.xml.ref
deleted file mode 100644
index 0b8e512b33..0000000000
--- a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/072.xml.ref
+++ /dev/null
@@ -1,8 +0,0 @@
-setDocumentLocator(locator={columnNumber=1, lineNumber=1})
-startDocument()
-   startDTD(name="doc", publicId="", systemId="")
-      attributeDecl(eName="doc", aName="a", type="", valueDefault="", value="")
-   endDTD()
-   startElement(namespaceURI="", localName="doc", qName="doc", atts=[])
-   endElement(namespaceURI="", localName="doc", qName="doc")
-endDocument()
diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/073.xml b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/073.xml
deleted file mode 100644
index 217476d9a9..0000000000
--- a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/073.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<!DOCTYPE doc [

-<!ELEMENT doc (#PCDATA)>

-<!ATTLIST doc a IDREFS #IMPLIED>

-]>

-<doc></doc>

diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/073.xml.ref b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/073.xml.ref
deleted file mode 100644
index 0b8e512b33..0000000000
--- a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/073.xml.ref
+++ /dev/null
@@ -1,8 +0,0 @@
-setDocumentLocator(locator={columnNumber=1, lineNumber=1})
-startDocument()
-   startDTD(name="doc", publicId="", systemId="")
-      attributeDecl(eName="doc", aName="a", type="", valueDefault="", value="")
-   endDTD()
-   startElement(namespaceURI="", localName="doc", qName="doc", atts=[])
-   endElement(namespaceURI="", localName="doc", qName="doc")
-endDocument()
diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/074.xml b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/074.xml
deleted file mode 100644
index 8b2354ff73..0000000000
--- a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/074.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<!DOCTYPE doc [

-<!ELEMENT doc (#PCDATA)>

-<!ATTLIST doc a ENTITY #IMPLIED>

-]>

-<doc></doc>

diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/074.xml.ref b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/074.xml.ref
deleted file mode 100644
index 0b8e512b33..0000000000
--- a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/074.xml.ref
+++ /dev/null
@@ -1,8 +0,0 @@
-setDocumentLocator(locator={columnNumber=1, lineNumber=1})
-startDocument()
-   startDTD(name="doc", publicId="", systemId="")
-      attributeDecl(eName="doc", aName="a", type="", valueDefault="", value="")
-   endDTD()
-   startElement(namespaceURI="", localName="doc", qName="doc", atts=[])
-   endElement(namespaceURI="", localName="doc", qName="doc")
-endDocument()
diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/075.xml b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/075.xml
deleted file mode 100644
index 33c012441a..0000000000
--- a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/075.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<!DOCTYPE doc [

-<!ELEMENT doc (#PCDATA)>

-<!ATTLIST doc a ENTITIES #IMPLIED>

-]>

-<doc></doc>

diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/075.xml.ref b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/075.xml.ref
deleted file mode 100644
index 0b8e512b33..0000000000
--- a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/075.xml.ref
+++ /dev/null
@@ -1,8 +0,0 @@
-setDocumentLocator(locator={columnNumber=1, lineNumber=1})
-startDocument()
-   startDTD(name="doc", publicId="", systemId="")
-      attributeDecl(eName="doc", aName="a", type="", valueDefault="", value="")
-   endDTD()
-   startElement(namespaceURI="", localName="doc", qName="doc", atts=[])
-   endElement(namespaceURI="", localName="doc", qName="doc")
-endDocument()
diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/076.xml b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/076.xml
deleted file mode 100644
index 65b731cf6d..0000000000
--- a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/076.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<!DOCTYPE doc [

-<!ELEMENT doc (#PCDATA)>

-<!ATTLIST doc a NOTATION (n1|n2) #IMPLIED>

-<!NOTATION n1 SYSTEM "http://www.w3.org/">

-<!NOTATION n2 SYSTEM "http://www.w3.org/">

-]>

-<doc></doc>

diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/076.xml.ref b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/076.xml.ref
deleted file mode 100644
index 3145f641b2..0000000000
--- a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/076.xml.ref
+++ /dev/null
@@ -1,10 +0,0 @@
-setDocumentLocator(locator={columnNumber=1, lineNumber=1})
-startDocument()
-   startDTD(name="doc", publicId="", systemId="")
-      attributeDecl(eName="doc", aName="a", type="", valueDefault="", value="")
-      notationDecl(name="n1", publicId="", systemId="http://www.w3.org/")
-      notationDecl(name="n2", publicId="", systemId="http://www.w3.org/")
-   endDTD()
-   startElement(namespaceURI="", localName="doc", qName="doc", atts=[])
-   endElement(namespaceURI="", localName="doc", qName="doc")
-endDocument()
diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/077.xml b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/077.xml
deleted file mode 100644
index e5f301eac8..0000000000
--- a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/077.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<!DOCTYPE doc [

-<!ELEMENT doc (#PCDATA)>

-<!ATTLIST doc a (1|2) #IMPLIED>

-]>

-<doc></doc>

diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/077.xml.ref b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/077.xml.ref
deleted file mode 100644
index 0b8e512b33..0000000000
--- a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/077.xml.ref
+++ /dev/null
@@ -1,8 +0,0 @@
-setDocumentLocator(locator={columnNumber=1, lineNumber=1})
-startDocument()
-   startDTD(name="doc", publicId="", systemId="")
-      attributeDecl(eName="doc", aName="a", type="", valueDefault="", value="")
-   endDTD()
-   startElement(namespaceURI="", localName="doc", qName="doc", atts=[])
-   endElement(namespaceURI="", localName="doc", qName="doc")
-endDocument()
diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/078.xml b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/078.xml
deleted file mode 100644
index b31f40f94e..0000000000
--- a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/078.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<!DOCTYPE doc [

-<!ELEMENT doc (#PCDATA)>

-<!ATTLIST doc a CDATA #REQUIRED>

-]>

-<doc a="v"></doc>

diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/078.xml.ref b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/078.xml.ref
deleted file mode 100644
index 6b4e3c4f31..0000000000
--- a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/078.xml.ref
+++ /dev/null
@@ -1,8 +0,0 @@
-setDocumentLocator(locator={columnNumber=1, lineNumber=1})
-startDocument()
-   startDTD(name="doc", publicId="", systemId="")
-      attributeDecl(eName="doc", aName="a", type="", valueDefault="", value="")
-   endDTD()
-   startElement(namespaceURI="", localName="doc", qName="doc", atts=[{localName="a", qName="a", uri="", type="CDATA", value="v"}])
-   endElement(namespaceURI="", localName="doc", qName="doc")
-endDocument()
diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/079.xml b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/079.xml
deleted file mode 100644
index a3290d6cbb..0000000000
--- a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/079.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<!DOCTYPE doc [

-<!ELEMENT doc (#PCDATA)>

-<!ATTLIST doc a CDATA #FIXED "v">

-]>

-<doc a="v"></doc>

diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/079.xml.ref b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/079.xml.ref
deleted file mode 100644
index 6b4e3c4f31..0000000000
--- a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/079.xml.ref
+++ /dev/null
@@ -1,8 +0,0 @@
-setDocumentLocator(locator={columnNumber=1, lineNumber=1})
-startDocument()
-   startDTD(name="doc", publicId="", systemId="")
-      attributeDecl(eName="doc", aName="a", type="", valueDefault="", value="")
-   endDTD()
-   startElement(namespaceURI="", localName="doc", qName="doc", atts=[{localName="a", qName="a", uri="", type="CDATA", value="v"}])
-   endElement(namespaceURI="", localName="doc", qName="doc")
-endDocument()
diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/080.xml b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/080.xml
deleted file mode 100644
index 3208fa9aa5..0000000000
--- a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/080.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<!DOCTYPE doc [

-<!ELEMENT doc (#PCDATA)>

-<!ATTLIST doc a CDATA #FIXED "v">

-]>

-<doc></doc>

diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/080.xml.ref b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/080.xml.ref
deleted file mode 100644
index 0b8e512b33..0000000000
--- a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/080.xml.ref
+++ /dev/null
@@ -1,8 +0,0 @@
-setDocumentLocator(locator={columnNumber=1, lineNumber=1})
-startDocument()
-   startDTD(name="doc", publicId="", systemId="")
-      attributeDecl(eName="doc", aName="a", type="", valueDefault="", value="")
-   endDTD()
-   startElement(namespaceURI="", localName="doc", qName="doc", atts=[])
-   endElement(namespaceURI="", localName="doc", qName="doc")
-endDocument()
diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/081.xml b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/081.xml
deleted file mode 100644
index 51ee1a375c..0000000000
--- a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/081.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<!DOCTYPE doc [

-<!ELEMENT doc (a, b, c)>

-<!ELEMENT a (a?)>

-<!ELEMENT b (b*)>

-<!ELEMENT c (a | b)+>

-]>

-<doc><a/><b/><c><a/></c></doc>

diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/081.xml.ref b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/081.xml.ref
deleted file mode 100644
index 1bc73000f8..0000000000
--- a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/081.xml.ref
+++ /dev/null
@@ -1,15 +0,0 @@
-setDocumentLocator(locator={columnNumber=1, lineNumber=1})
-startDocument()
-   startDTD(name="doc", publicId="", systemId="")
-   endDTD()
-   startElement(namespaceURI="", localName="doc", qName="doc", atts=[])
-      startElement(namespaceURI="", localName="a", qName="a", atts=[])
-      endElement(namespaceURI="", localName="a", qName="a")
-      startElement(namespaceURI="", localName="b", qName="b", atts=[])
-      endElement(namespaceURI="", localName="b", qName="b")
-      startElement(namespaceURI="", localName="c", qName="c", atts=[])
-         startElement(namespaceURI="", localName="a", qName="a", atts=[])
-         endElement(namespaceURI="", localName="a", qName="a")
-      endElement(namespaceURI="", localName="c", qName="c")
-   endElement(namespaceURI="", localName="doc", qName="doc")
-endDocument()
diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/082.xml b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/082.xml
deleted file mode 100644
index d5245ac51a..0000000000
--- a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/082.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<!DOCTYPE doc [

-<!ENTITY % e SYSTEM "e.dtd">

-<!ELEMENT doc (#PCDATA)>

-]>

-<doc></doc>

diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/082.xml.ref b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/082.xml.ref
deleted file mode 100644
index a333feb826..0000000000
--- a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/082.xml.ref
+++ /dev/null
@@ -1,8 +0,0 @@
-setDocumentLocator(locator={columnNumber=1, lineNumber=1})
-startDocument()
-   startDTD(name="doc", publicId="", systemId="")
-      externalEntityDecl(name="%e", publicId="", systemId="e.dtd")
-   endDTD()
-   startElement(namespaceURI="", localName="doc", qName="doc", atts=[])
-   endElement(namespaceURI="", localName="doc", qName="doc")
-endDocument()
diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/083.xml b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/083.xml
deleted file mode 100644
index 937cfc0bdd..0000000000
--- a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/083.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<!DOCTYPE doc [

-<!ENTITY % e PUBLIC 'whatever' "e.dtd">

-<!ELEMENT doc (#PCDATA)>

-]>

-<doc></doc>

diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/083.xml.ref b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/083.xml.ref
deleted file mode 100644
index d52b5aa8b9..0000000000
--- a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/083.xml.ref
+++ /dev/null
@@ -1,8 +0,0 @@
-setDocumentLocator(locator={columnNumber=1, lineNumber=1})
-startDocument()
-   startDTD(name="doc", publicId="", systemId="")
-      externalEntityDecl(name="%e", publicId="whatever", systemId="e.dtd")
-   endDTD()
-   startElement(namespaceURI="", localName="doc", qName="doc", atts=[])
-   endElement(namespaceURI="", localName="doc", qName="doc")
-endDocument()
diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/084.xml b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/084.xml
deleted file mode 100644
index 82760767aa..0000000000
--- a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/084.xml
+++ /dev/null
@@ -1 +0,0 @@
-<!DOCTYPE doc [<!ELEMENT doc (#PCDATA)>]><doc></doc>

diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/084.xml.ref b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/084.xml.ref
deleted file mode 100644
index 37b53fc0b3..0000000000
--- a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/084.xml.ref
+++ /dev/null
@@ -1,7 +0,0 @@
-setDocumentLocator(locator={columnNumber=1, lineNumber=1})
-startDocument()
-   startDTD(name="doc", publicId="", systemId="")
-   endDTD()
-   startElement(namespaceURI="", localName="doc", qName="doc", atts=[])
-   endElement(namespaceURI="", localName="doc", qName="doc")
-endDocument()
diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/085.xml b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/085.xml
deleted file mode 100644
index cf5834f2a5..0000000000
--- a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/085.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<!DOCTYPE doc [

-<!ELEMENT doc (#PCDATA)>

-<!ENTITY % e "<foo>">

-<!ENTITY e "">

-]>

-<doc>&e;</doc>

diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/085.xml.ref b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/085.xml.ref
deleted file mode 100644
index 8f9cdcc6d0..0000000000
--- a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/085.xml.ref
+++ /dev/null
@@ -1,9 +0,0 @@
-setDocumentLocator(locator={columnNumber=1, lineNumber=1})
-startDocument()
-   startDTD(name="doc", publicId="", systemId="")
-      internatlEntityDecl(name="%e", value="<foo>")
-   endDTD()
-   startElement(namespaceURI="", localName="doc", qName="doc", atts=[])
-      skippedEntity(name="e")
-   endElement(namespaceURI="", localName="doc", qName="doc")
-endDocument()
diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/086.xml b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/086.xml
deleted file mode 100644
index bbc3080db6..0000000000
--- a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/086.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<!DOCTYPE doc [

-<!ELEMENT doc (#PCDATA)>

-<!ENTITY e "">

-<!ENTITY e "<foo>">

-]>

-<doc>&e;</doc>

diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/086.xml.ref b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/086.xml.ref
deleted file mode 100644
index b59c216593..0000000000
--- a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/086.xml.ref
+++ /dev/null
@@ -1,8 +0,0 @@
-setDocumentLocator(locator={columnNumber=1, lineNumber=1})
-startDocument()
-   startDTD(name="doc", publicId="", systemId="")
-      internatlEntityDecl(name="e", value="")
-   endDTD()
-   startElement(namespaceURI="", localName="doc", qName="doc", atts=[])
-   endElement(namespaceURI="", localName="doc", qName="doc")
-endDocument()
diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/087.xml b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/087.xml
deleted file mode 100644
index 34797a67d7..0000000000
--- a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/087.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<!DOCTYPE doc [

-<!ENTITY e "<foo/&#62;">

-<!ELEMENT doc (foo)>

-<!ELEMENT foo EMPTY>

-]>

-<doc>&e;</doc>

diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/087.xml.ref b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/087.xml.ref
deleted file mode 100644
index 33d23092ef..0000000000
--- a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/087.xml.ref
+++ /dev/null
@@ -1,10 +0,0 @@
-setDocumentLocator(locator={columnNumber=1, lineNumber=1})
-startDocument()
-   startDTD(name="doc", publicId="", systemId="")
-      internatlEntityDecl(name="e", value="<foo/>")
-   endDTD()
-   startElement(namespaceURI="", localName="doc", qName="doc", atts=[])
-      startElement(namespaceURI="", localName="foo", qName="foo", atts=[])
-      endElement(namespaceURI="", localName="foo", qName="foo")
-   endElement(namespaceURI="", localName="doc", qName="doc")
-endDocument()
diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/088.xml b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/088.xml
deleted file mode 100644
index f97d96848d..0000000000
--- a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/088.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<!DOCTYPE doc [

-<!ELEMENT doc (#PCDATA)>

-<!ENTITY e "&lt;foo>">

-]>

-<doc>&e;</doc>

diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/088.xml.ref b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/088.xml.ref
deleted file mode 100644
index db24f3408f..0000000000
--- a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/088.xml.ref
+++ /dev/null
@@ -1,9 +0,0 @@
-setDocumentLocator(locator={columnNumber=1, lineNumber=1})
-startDocument()
-   startDTD(name="doc", publicId="", systemId="")
-      internatlEntityDecl(name="e", value="&lt;foo>")
-   endDTD()
-   startElement(namespaceURI="", localName="doc", qName="doc", atts=[])
-      characters(ch="<foo>")
-   endElement(namespaceURI="", localName="doc", qName="doc")
-endDocument()
diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/089.xml b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/089.xml
deleted file mode 100644
index 2d80c8f3fb..0000000000
--- a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/089.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<!DOCTYPE doc [

-<!ENTITY e "&#x10000;&#x10FFFD;&#x10FFFF;">

-<!ELEMENT doc (#PCDATA)>

-]>

-<doc>&e;</doc>

diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/089.xml.ref b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/089.xml.ref
deleted file mode 100644
index f09bc2bd09..0000000000
--- a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/089.xml.ref
+++ /dev/null
@@ -1,9 +0,0 @@
-setDocumentLocator(locator={columnNumber=1, lineNumber=1})
-startDocument()
-   startDTD(name="doc", publicId="", systemId="")
-      internatlEntityDecl(name="e", value="𐀀􏿽􏿿")
-   endDTD()
-   startElement(namespaceURI="", localName="doc", qName="doc", atts=[])
-      characters(ch="𐀀􏿽􏿿")
-   endElement(namespaceURI="", localName="doc", qName="doc")
-endDocument()
diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/090.xml b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/090.xml
deleted file mode 100644
index c392c96084..0000000000
--- a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/090.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<!DOCTYPE doc [

-<!ATTLIST e a NOTATION (n) #IMPLIED>

-<!ELEMENT doc (e)*>

-<!ELEMENT e (#PCDATA)>

-<!NOTATION n PUBLIC "whatever">

-]>

-<doc></doc>

diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/090.xml.ref b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/090.xml.ref
deleted file mode 100644
index 1cc0f1e082..0000000000
--- a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/090.xml.ref
+++ /dev/null
@@ -1,9 +0,0 @@
-setDocumentLocator(locator={columnNumber=1, lineNumber=1})
-startDocument()
-   startDTD(name="doc", publicId="", systemId="")
-      attributeDecl(eName="e", aName="a", type="", valueDefault="", value="")
-      notationDecl(name="n", publicId="whatever", systemId="")
-   endDTD()
-   startElement(namespaceURI="", localName="doc", qName="doc", atts=[])
-   endElement(namespaceURI="", localName="doc", qName="doc")
-endDocument()
diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/091.xml b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/091.xml
deleted file mode 100644
index 7343d0f795..0000000000
--- a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/091.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<!DOCTYPE doc [

-<!NOTATION n SYSTEM "http://www.w3.org/">

-<!ENTITY e SYSTEM "http://www.w3.org/" NDATA n>

-<!ELEMENT doc (#PCDATA)>

-<!ATTLIST doc a ENTITY "e">

-]>

-<doc></doc>

diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/091.xml.ref b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/091.xml.ref
deleted file mode 100644
index da92a9d906..0000000000
--- a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/091.xml.ref
+++ /dev/null
@@ -1,10 +0,0 @@
-setDocumentLocator(locator={columnNumber=1, lineNumber=1})
-startDocument()
-   startDTD(name="doc", publicId="", systemId="")
-      notationDecl(name="n", publicId="", systemId="http://www.w3.org/")
-      unparsedEntityDecl(name="e", publicId="", systemId="http://www.w3.org/", notationName="n")
-      attributeDecl(eName="doc", aName="a", type="", valueDefault="", value="")
-   endDTD()
-   startElement(namespaceURI="", localName="doc", qName="doc", atts=[])
-   endElement(namespaceURI="", localName="doc", qName="doc")
-endDocument()
diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/092.xml b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/092.xml
deleted file mode 100644
index 627b74ecdf..0000000000
--- a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/092.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<!DOCTYPE doc [

-<!ELEMENT doc (a)*>

-<!ELEMENT a EMPTY>

-]>

-<doc>

-<a/>

-    <a/>	<a/>

-

-

-</doc>

diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/092.xml.ref b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/092.xml.ref
deleted file mode 100644
index 3b9e06dc9e..0000000000
--- a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/092.xml.ref
+++ /dev/null
@@ -1,17 +0,0 @@
-setDocumentLocator(locator={columnNumber=1, lineNumber=1})
-startDocument()
-   startDTD(name="doc", publicId="", systemId="")
-   endDTD()
-   startElement(namespaceURI="", localName="doc", qName="doc", atts=[])
-      characters(ch="\r\n")
-      startElement(namespaceURI="", localName="a", qName="a", atts=[])
-      endElement(namespaceURI="", localName="a", qName="a")
-      characters(ch="\r\n    ")
-      startElement(namespaceURI="", localName="a", qName="a", atts=[])
-      endElement(namespaceURI="", localName="a", qName="a")
-      characters(ch="\t")
-      startElement(namespaceURI="", localName="a", qName="a", atts=[])
-      endElement(namespaceURI="", localName="a", qName="a")
-      characters(ch="\r\n\r\n\r\n")
-   endElement(namespaceURI="", localName="doc", qName="doc")
-endDocument()
diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/093.xml b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/093.xml
deleted file mode 100644
index 968acb628f..0000000000
--- a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/093.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<!DOCTYPE doc [
-<!ELEMENT doc (#PCDATA)>
-]>
-<doc>

-

</doc>
\ No newline at end of file
diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/093.xml.ref b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/093.xml.ref
deleted file mode 100644
index 2e8bee6814..0000000000
--- a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/093.xml.ref
+++ /dev/null
@@ -1,8 +0,0 @@
-setDocumentLocator(locator={columnNumber=1, lineNumber=1})
-startDocument()
-   startDTD(name="doc", publicId="", systemId="")
-   endDTD()
-   startElement(namespaceURI="", localName="doc", qName="doc", atts=[])
-      characters(ch="\r\n\r\r")
-   endElement(namespaceURI="", localName="doc", qName="doc")
-endDocument()
diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/094.xml b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/094.xml
deleted file mode 100644
index 5726e7db6f..0000000000
--- a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/094.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<!DOCTYPE doc [

-<!ENTITY % e "foo">

-<!ELEMENT doc (#PCDATA)>

-<!ATTLIST doc a1 CDATA "%e;">

-]>

-<doc></doc>

diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/094.xml.ref b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/094.xml.ref
deleted file mode 100644
index 4f42980c0b..0000000000
--- a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/094.xml.ref
+++ /dev/null
@@ -1,9 +0,0 @@
-setDocumentLocator(locator={columnNumber=1, lineNumber=1})
-startDocument()
-   startDTD(name="doc", publicId="", systemId="")
-      internatlEntityDecl(name="%e", value="foo")
-      attributeDecl(eName="doc", aName="a1", type="", valueDefault="", value="")
-   endDTD()
-   startElement(namespaceURI="", localName="doc", qName="doc", atts=[])
-   endElement(namespaceURI="", localName="doc", qName="doc")
-endDocument()
diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/095.xml b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/095.xml
deleted file mode 100644
index 1fe69596da..0000000000
--- a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/095.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<!DOCTYPE doc [

-<!ATTLIST doc a1 CDATA #IMPLIED>

-<!ATTLIST doc a1 NMTOKENS #IMPLIED>

-<!ELEMENT doc (#PCDATA)>

-]>

-<doc a1="1  2"></doc>

diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/095.xml.ref b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/095.xml.ref
deleted file mode 100644
index 567feee5ad..0000000000
--- a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/095.xml.ref
+++ /dev/null
@@ -1,9 +0,0 @@
-setDocumentLocator(locator={columnNumber=1, lineNumber=1})
-startDocument()
-   startDTD(name="doc", publicId="", systemId="")
-      attributeDecl(eName="doc", aName="a1", type="", valueDefault="", value="")
-      attributeDecl(eName="doc", aName="a1", type="", valueDefault="", value="")
-   endDTD()
-   startElement(namespaceURI="", localName="doc", qName="doc", atts=[{localName="a1", qName="a1", uri="", type="CDATA", value="1  2"}])
-   endElement(namespaceURI="", localName="doc", qName="doc")
-endDocument()
diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/096.xml b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/096.xml
deleted file mode 100644
index a6f8f43620..0000000000
--- a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/096.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<!DOCTYPE doc [

-<!ATTLIST doc a1 NMTOKENS " 1  	2 	">

-<!ELEMENT doc (#PCDATA)>

-]>

-<doc></doc>

diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/096.xml.ref b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/096.xml.ref
deleted file mode 100644
index 1e3200f48c..0000000000
--- a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/096.xml.ref
+++ /dev/null
@@ -1,8 +0,0 @@
-setDocumentLocator(locator={columnNumber=1, lineNumber=1})
-startDocument()
-   startDTD(name="doc", publicId="", systemId="")
-      attributeDecl(eName="doc", aName="a1", type="", valueDefault="", value="")
-   endDTD()
-   startElement(namespaceURI="", localName="doc", qName="doc", atts=[])
-   endElement(namespaceURI="", localName="doc", qName="doc")
-endDocument()
diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/097.ent b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/097.ent
deleted file mode 100644
index e06554ace2..0000000000
--- a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/097.ent
+++ /dev/null
@@ -1 +0,0 @@
-<!ATTLIST doc a2 CDATA #IMPLIED>

diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/097.xml b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/097.xml
deleted file mode 100644
index c606afa97f..0000000000
--- a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/097.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<!DOCTYPE doc [

-<!ELEMENT doc (#PCDATA)>

-<!ENTITY % e SYSTEM "097.ent">

-<!ATTLIST doc a1 CDATA "v1">

-%e;

-<!ATTLIST doc a2 CDATA "v2">

-]>

-<doc></doc>

diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/097.xml.ref b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/097.xml.ref
deleted file mode 100644
index b211a094ed..0000000000
--- a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/097.xml.ref
+++ /dev/null
@@ -1,12 +0,0 @@
-setDocumentLocator(locator={columnNumber=1, lineNumber=1})
-startDocument()
-   startDTD(name="doc", publicId="", systemId="")
-      externalEntityDecl(name="%e", publicId="", systemId="097.ent")
-      attributeDecl(eName="doc", aName="a1", type="", valueDefault="", value="")
-      resolveEntity(publicId="", systemId="097.ent", ret={})
-      skippedEntity(name="%e")
-      attributeDecl(eName="doc", aName="a2", type="", valueDefault="", value="")
-   endDTD()
-   startElement(namespaceURI="", localName="doc", qName="doc", atts=[])
-   endElement(namespaceURI="", localName="doc", qName="doc")
-endDocument()
diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/098.xml b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/098.xml
deleted file mode 100644
index 33a64ce5ae..0000000000
--- a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/098.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<!DOCTYPE doc [

-<!ELEMENT doc (#PCDATA)>

-]>

-<doc><?pi x

-y?></doc>

diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/098.xml.ref b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/098.xml.ref
deleted file mode 100644
index 5108be0763..0000000000
--- a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/098.xml.ref
+++ /dev/null
@@ -1,8 +0,0 @@
-setDocumentLocator(locator={columnNumber=1, lineNumber=1})
-startDocument()
-   startDTD(name="doc", publicId="", systemId="")
-   endDTD()
-   startElement(namespaceURI="", localName="doc", qName="doc", atts=[])
-      processingInstruction(target="pi", data="x\r\ny")
-   endElement(namespaceURI="", localName="doc", qName="doc")
-endDocument()
diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/099.xml b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/099.xml
deleted file mode 100644
index 1b7214a137..0000000000
--- a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/099.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>

-<!DOCTYPE doc [

-<!ELEMENT doc (#PCDATA)>

-]>

-<doc></doc>

diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/099.xml.ref b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/099.xml.ref
deleted file mode 100644
index 21cd9bced2..0000000000
--- a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/099.xml.ref
+++ /dev/null
@@ -1,8 +0,0 @@
-setDocumentLocator(locator={columnNumber=1, lineNumber=1})
-startDocument()
-   processingInstruction(target="xml", data="version='1.0' encoding='utf-8'")
-   startDTD(name="doc", publicId="", systemId="")
-   endDTD()
-   startElement(namespaceURI="", localName="doc", qName="doc", atts=[])
-   endElement(namespaceURI="", localName="doc", qName="doc")
-endDocument()
diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/100.xml b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/100.xml
deleted file mode 100644
index 5b839e76bc..0000000000
--- a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/100.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<!DOCTYPE doc [

-<!ENTITY e PUBLIC ";!*#@$_%" "100.xml">

-<!ELEMENT doc (#PCDATA)>

-]>

-<doc></doc>

diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/100.xml.ref b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/100.xml.ref
deleted file mode 100644
index aaeec27038..0000000000
--- a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/100.xml.ref
+++ /dev/null
@@ -1,8 +0,0 @@
-setDocumentLocator(locator={columnNumber=1, lineNumber=1})
-startDocument()
-   startDTD(name="doc", publicId="", systemId="")
-      externalEntityDecl(name="e", publicId=";!*#@$_%", systemId="100.xml")
-   endDTD()
-   startElement(namespaceURI="", localName="doc", qName="doc", atts=[])
-   endElement(namespaceURI="", localName="doc", qName="doc")
-endDocument()
diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/101.xml b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/101.xml
deleted file mode 100644
index f464484bf5..0000000000
--- a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/101.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<!DOCTYPE doc [

-<!ELEMENT doc (#PCDATA)>

-<!ENTITY e "&#34;">

-]>

-<doc></doc>

diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/101.xml.ref b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/101.xml.ref
deleted file mode 100644
index 5b7646c82f..0000000000
--- a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/101.xml.ref
+++ /dev/null
@@ -1,8 +0,0 @@
-setDocumentLocator(locator={columnNumber=1, lineNumber=1})
-startDocument()
-   startDTD(name="doc", publicId="", systemId="")
-      internatlEntityDecl(name="e", value="\"")
-   endDTD()
-   startElement(namespaceURI="", localName="doc", qName="doc", atts=[])
-   endElement(namespaceURI="", localName="doc", qName="doc")
-endDocument()
diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/102.xml b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/102.xml
deleted file mode 100644
index f239ff5fee..0000000000
--- a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/102.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<!DOCTYPE doc [

-<!ELEMENT doc (#PCDATA)>

-<!ATTLIST doc a CDATA #IMPLIED>

-]>

-<doc a="&#34;"></doc>

diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/102.xml.ref b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/102.xml.ref
deleted file mode 100644
index 75b25052de..0000000000
--- a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/102.xml.ref
+++ /dev/null
@@ -1,8 +0,0 @@
-setDocumentLocator(locator={columnNumber=1, lineNumber=1})
-startDocument()
-   startDTD(name="doc", publicId="", systemId="")
-      attributeDecl(eName="doc", aName="a", type="", valueDefault="", value="")
-   endDTD()
-   startElement(namespaceURI="", localName="doc", qName="doc", atts=[{localName="a", qName="a", uri="", type="CDATA", value="\""}])
-   endElement(namespaceURI="", localName="doc", qName="doc")
-endDocument()
diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/103.xml b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/103.xml
deleted file mode 100644
index 1dbbd5bb7c..0000000000
--- a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/103.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<!DOCTYPE doc [

-<!ELEMENT doc (#PCDATA)>

-]>

-<doc>&#60;doc></doc>

diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/103.xml.ref b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/103.xml.ref
deleted file mode 100644
index 63526243dc..0000000000
--- a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/103.xml.ref
+++ /dev/null
@@ -1,8 +0,0 @@
-setDocumentLocator(locator={columnNumber=1, lineNumber=1})
-startDocument()
-   startDTD(name="doc", publicId="", systemId="")
-   endDTD()
-   startElement(namespaceURI="", localName="doc", qName="doc", atts=[])
-      characters(ch="<doc>")
-   endElement(namespaceURI="", localName="doc", qName="doc")
-endDocument()
diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/104.xml b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/104.xml
deleted file mode 100644
index 666f43de0f..0000000000
--- a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/104.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<!DOCTYPE doc [

-<!ELEMENT doc (#PCDATA)>

-<!ATTLIST doc a CDATA #IMPLIED>

-]>

-<doc a="x	y"></doc>

diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/104.xml.ref b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/104.xml.ref
deleted file mode 100644
index 2bccd0e3c7..0000000000
--- a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/104.xml.ref
+++ /dev/null
@@ -1,8 +0,0 @@
-setDocumentLocator(locator={columnNumber=1, lineNumber=1})
-startDocument()
-   startDTD(name="doc", publicId="", systemId="")
-      attributeDecl(eName="doc", aName="a", type="", valueDefault="", value="")
-   endDTD()
-   startElement(namespaceURI="", localName="doc", qName="doc", atts=[{localName="a", qName="a", uri="", type="CDATA", value="x\ty"}])
-   endElement(namespaceURI="", localName="doc", qName="doc")
-endDocument()
diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/105.xml b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/105.xml
deleted file mode 100644
index 6b3af2b847..0000000000
--- a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/105.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<!DOCTYPE doc [

-<!ELEMENT doc (#PCDATA)>

-<!ATTLIST doc a CDATA #IMPLIED>

-]>

-<doc a="x&#9;y"></doc>

diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/105.xml.ref b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/105.xml.ref
deleted file mode 100644
index 2bccd0e3c7..0000000000
--- a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/105.xml.ref
+++ /dev/null
@@ -1,8 +0,0 @@
-setDocumentLocator(locator={columnNumber=1, lineNumber=1})
-startDocument()
-   startDTD(name="doc", publicId="", systemId="")
-      attributeDecl(eName="doc", aName="a", type="", valueDefault="", value="")
-   endDTD()
-   startElement(namespaceURI="", localName="doc", qName="doc", atts=[{localName="a", qName="a", uri="", type="CDATA", value="x\ty"}])
-   endElement(namespaceURI="", localName="doc", qName="doc")
-endDocument()
diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/106.xml b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/106.xml
deleted file mode 100644
index 8757c0a5ae..0000000000
--- a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/106.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<!DOCTYPE doc [

-<!ELEMENT doc (#PCDATA)>

-<!ATTLIST doc a CDATA #IMPLIED>

-]>

-<doc a="x&#10;y"></doc>

diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/106.xml.ref b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/106.xml.ref
deleted file mode 100644
index 1e9cc0949b..0000000000
--- a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/106.xml.ref
+++ /dev/null
@@ -1,8 +0,0 @@
-setDocumentLocator(locator={columnNumber=1, lineNumber=1})
-startDocument()
-   startDTD(name="doc", publicId="", systemId="")
-      attributeDecl(eName="doc", aName="a", type="", valueDefault="", value="")
-   endDTD()
-   startElement(namespaceURI="", localName="doc", qName="doc", atts=[{localName="a", qName="a", uri="", type="CDATA", value="x\ny"}])
-   endElement(namespaceURI="", localName="doc", qName="doc")
-endDocument()
diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/107.xml b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/107.xml
deleted file mode 100644
index 3d2c2566a7..0000000000
--- a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/107.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<!DOCTYPE doc [

-<!ELEMENT doc (#PCDATA)>

-<!ATTLIST doc a CDATA #IMPLIED>

-]>

-<doc a="x&#13;y"></doc>

diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/107.xml.ref b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/107.xml.ref
deleted file mode 100644
index 803dbc297b..0000000000
--- a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/107.xml.ref
+++ /dev/null
@@ -1,8 +0,0 @@
-setDocumentLocator(locator={columnNumber=1, lineNumber=1})
-startDocument()
-   startDTD(name="doc", publicId="", systemId="")
-      attributeDecl(eName="doc", aName="a", type="", valueDefault="", value="")
-   endDTD()
-   startElement(namespaceURI="", localName="doc", qName="doc", atts=[{localName="a", qName="a", uri="", type="CDATA", value="x\ry"}])
-   endElement(namespaceURI="", localName="doc", qName="doc")
-endDocument()
diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/108.xml b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/108.xml
deleted file mode 100644
index e919bf229a..0000000000
--- a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/108.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<!DOCTYPE doc [

-<!ELEMENT doc (#PCDATA)>

-<!ENTITY e "

-">

-<!ATTLIST doc a CDATA #IMPLIED>

-]>

-<doc a="x&e;y"></doc>

diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/108.xml.ref b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/108.xml.ref
deleted file mode 100644
index 2199bd8fb3..0000000000
--- a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/108.xml.ref
+++ /dev/null
@@ -1,9 +0,0 @@
-setDocumentLocator(locator={columnNumber=1, lineNumber=1})
-startDocument()
-   startDTD(name="doc", publicId="", systemId="")
-      internatlEntityDecl(name="e", value="\r\n")
-      attributeDecl(eName="doc", aName="a", type="", valueDefault="", value="")
-   endDTD()
-   startElement(namespaceURI="", localName="doc", qName="doc", atts=[{localName="a", qName="a", uri="", type="CDATA", value="x\r\ny"}])
-   endElement(namespaceURI="", localName="doc", qName="doc")
-endDocument()
diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/109.xml b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/109.xml
deleted file mode 100644
index 33fa38e13b..0000000000
--- a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/109.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<!DOCTYPE doc [

-<!ELEMENT doc (#PCDATA)>

-<!ATTLIST doc a CDATA #IMPLIED>

-]>

-<doc a=""></doc>

diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/109.xml.ref b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/109.xml.ref
deleted file mode 100644
index 789cb33821..0000000000
--- a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/109.xml.ref
+++ /dev/null
@@ -1,8 +0,0 @@
-setDocumentLocator(locator={columnNumber=1, lineNumber=1})
-startDocument()
-   startDTD(name="doc", publicId="", systemId="")
-      attributeDecl(eName="doc", aName="a", type="", valueDefault="", value="")
-   endDTD()
-   startElement(namespaceURI="", localName="doc", qName="doc", atts=[{localName="a", qName="a", uri="", type="CDATA", value=""}])
-   endElement(namespaceURI="", localName="doc", qName="doc")
-endDocument()
diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/110.xml b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/110.xml
deleted file mode 100644
index 0c61c65119..0000000000
--- a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/110.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<!DOCTYPE doc [

-<!ELEMENT doc (#PCDATA)>

-<!ENTITY e "&#13;&#10;">

-<!ATTLIST doc a CDATA #IMPLIED>

-]>

-<doc a="x&e;y"></doc>

diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/110.xml.ref b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/110.xml.ref
deleted file mode 100644
index 2199bd8fb3..0000000000
--- a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/110.xml.ref
+++ /dev/null
@@ -1,9 +0,0 @@
-setDocumentLocator(locator={columnNumber=1, lineNumber=1})
-startDocument()
-   startDTD(name="doc", publicId="", systemId="")
-      internatlEntityDecl(name="e", value="\r\n")
-      attributeDecl(eName="doc", aName="a", type="", valueDefault="", value="")
-   endDTD()
-   startElement(namespaceURI="", localName="doc", qName="doc", atts=[{localName="a", qName="a", uri="", type="CDATA", value="x\r\ny"}])
-   endElement(namespaceURI="", localName="doc", qName="doc")
-endDocument()
diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/111.xml b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/111.xml
deleted file mode 100644
index cb56f264b0..0000000000
--- a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/111.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<!DOCTYPE doc [

-<!ELEMENT doc (#PCDATA)>

-<!ATTLIST doc a NMTOKENS #IMPLIED>

-]>

-<doc a="&#32;x&#32;&#32;y&#32;"></doc>

diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/111.xml.ref b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/111.xml.ref
deleted file mode 100644
index 152e284e58..0000000000
--- a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/111.xml.ref
+++ /dev/null
@@ -1,8 +0,0 @@
-setDocumentLocator(locator={columnNumber=1, lineNumber=1})
-startDocument()
-   startDTD(name="doc", publicId="", systemId="")
-      attributeDecl(eName="doc", aName="a", type="", valueDefault="", value="")
-   endDTD()
-   startElement(namespaceURI="", localName="doc", qName="doc", atts=[{localName="a", qName="a", uri="", type="CDATA", value=" x  y "}])
-   endElement(namespaceURI="", localName="doc", qName="doc")
-endDocument()
diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/112.xml b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/112.xml
deleted file mode 100644
index 27b6a4c793..0000000000
--- a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/112.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<!DOCTYPE doc [

-<!ELEMENT doc (a | b)>

-<!ELEMENT a (#PCDATA)>

-]>

-<doc><a></a></doc>

diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/112.xml.ref b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/112.xml.ref
deleted file mode 100644
index f82c6dca3f..0000000000
--- a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/112.xml.ref
+++ /dev/null
@@ -1,9 +0,0 @@
-setDocumentLocator(locator={columnNumber=1, lineNumber=1})
-startDocument()
-   startDTD(name="doc", publicId="", systemId="")
-   endDTD()
-   startElement(namespaceURI="", localName="doc", qName="doc", atts=[])
-      startElement(namespaceURI="", localName="a", qName="a", atts=[])
-      endElement(namespaceURI="", localName="a", qName="a")
-   endElement(namespaceURI="", localName="doc", qName="doc")
-endDocument()
diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/113.xml b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/113.xml
deleted file mode 100644
index d2edd0f01d..0000000000
--- a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/113.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<!DOCTYPE doc [

-<!ELEMENT doc (#PCDATA)>

-<!ATTLIST e a CDATA #IMPLIED>

-]>

-<doc></doc>

diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/113.xml.ref b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/113.xml.ref
deleted file mode 100644
index 6342ccc536..0000000000
--- a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/113.xml.ref
+++ /dev/null
@@ -1,8 +0,0 @@
-setDocumentLocator(locator={columnNumber=1, lineNumber=1})
-startDocument()
-   startDTD(name="doc", publicId="", systemId="")
-      attributeDecl(eName="e", aName="a", type="", valueDefault="", value="")
-   endDTD()
-   startElement(namespaceURI="", localName="doc", qName="doc", atts=[])
-   endElement(namespaceURI="", localName="doc", qName="doc")
-endDocument()
diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/114.xml b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/114.xml
deleted file mode 100644
index 52e207096d..0000000000
--- a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/114.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<!DOCTYPE doc [

-<!ELEMENT doc (#PCDATA)>

-<!ENTITY e "<![CDATA[&foo;]]>">

-]>

-<doc>&e;</doc>

diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/114.xml.ref b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/114.xml.ref
deleted file mode 100644
index b11750e4b0..0000000000
--- a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/114.xml.ref
+++ /dev/null
@@ -1,11 +0,0 @@
-setDocumentLocator(locator={columnNumber=1, lineNumber=1})
-startDocument()
-   startDTD(name="doc", publicId="", systemId="")
-      internatlEntityDecl(name="e", value="<![CDATA[&foo;]]>")
-   endDTD()
-   startElement(namespaceURI="", localName="doc", qName="doc", atts=[])
-      startCDATA()
-         characters(ch="&foo;")
-      endCDATA()
-   endElement(namespaceURI="", localName="doc", qName="doc")
-endDocument()
diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/115.xml b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/115.xml
deleted file mode 100644
index d939a67010..0000000000
--- a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/115.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<!DOCTYPE doc [

-<!ELEMENT doc (#PCDATA)>

-<!ENTITY e1 "&e2;">

-<!ENTITY e2 "v">

-]>

-<doc>&e1;</doc>

diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/115.xml.ref b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/115.xml.ref
deleted file mode 100644
index 5b09ebd425..0000000000
--- a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/115.xml.ref
+++ /dev/null
@@ -1,10 +0,0 @@
-setDocumentLocator(locator={columnNumber=1, lineNumber=1})
-startDocument()
-   startDTD(name="doc", publicId="", systemId="")
-      internatlEntityDecl(name="e1", value="&e2;")
-      internatlEntityDecl(name="e2", value="v")
-   endDTD()
-   startElement(namespaceURI="", localName="doc", qName="doc", atts=[])
-      characters(ch="v")
-   endElement(namespaceURI="", localName="doc", qName="doc")
-endDocument()
diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/116.xml b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/116.xml
deleted file mode 100644
index 55ab49620b..0000000000
--- a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/116.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<!DOCTYPE doc [

-<!ELEMENT doc (#PCDATA)>

-]>

-<doc><![CDATA[

-]]></doc>

diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/116.xml.ref b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/116.xml.ref
deleted file mode 100644
index 9bdec9e5cc..0000000000
--- a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/116.xml.ref
+++ /dev/null
@@ -1,10 +0,0 @@
-setDocumentLocator(locator={columnNumber=1, lineNumber=1})
-startDocument()
-   startDTD(name="doc", publicId="", systemId="")
-   endDTD()
-   startElement(namespaceURI="", localName="doc", qName="doc", atts=[])
-      startCDATA()
-         characters(ch="\r\n")
-      endCDATA()
-   endElement(namespaceURI="", localName="doc", qName="doc")
-endDocument()
diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/117.xml b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/117.xml
deleted file mode 100644
index e4f02b14c8..0000000000
--- a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/117.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<!DOCTYPE doc [

-<!ELEMENT doc (#PCDATA)>

-<!ENTITY rsqb "]">

-]>

-<doc>&rsqb;</doc>

diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/117.xml.ref b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/117.xml.ref
deleted file mode 100644
index 78dd11416a..0000000000
--- a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/117.xml.ref
+++ /dev/null
@@ -1,9 +0,0 @@
-setDocumentLocator(locator={columnNumber=1, lineNumber=1})
-startDocument()
-   startDTD(name="doc", publicId="", systemId="")
-      internatlEntityDecl(name="rsqb", value="]")
-   endDTD()
-   startElement(namespaceURI="", localName="doc", qName="doc", atts=[])
-      characters(ch="]")
-   endElement(namespaceURI="", localName="doc", qName="doc")
-endDocument()
diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/118.xml b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/118.xml
deleted file mode 100644
index fba6c44668..0000000000
--- a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/118.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<!DOCTYPE doc [

-<!ELEMENT doc (#PCDATA)>

-<!ENTITY rsqb "]]">

-]>

-<doc>&rsqb;</doc>

diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/118.xml.ref b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/118.xml.ref
deleted file mode 100644
index c84da55fe0..0000000000
--- a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/118.xml.ref
+++ /dev/null
@@ -1,9 +0,0 @@
-setDocumentLocator(locator={columnNumber=1, lineNumber=1})
-startDocument()
-   startDTD(name="doc", publicId="", systemId="")
-      internatlEntityDecl(name="rsqb", value="]]")
-   endDTD()
-   startElement(namespaceURI="", localName="doc", qName="doc", atts=[])
-      characters(ch="]]")
-   endElement(namespaceURI="", localName="doc", qName="doc")
-endDocument()
diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/119.xml b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/119.xml
deleted file mode 100644
index 876e74730c..0000000000
--- a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/119.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<!DOCTYPE doc [

-<!ELEMENT doc ANY>

-]>

-<doc><!-- -á --></doc>

diff --git a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/119.xml.ref b/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/119.xml.ref
deleted file mode 100644
index d1c643ee03..0000000000
--- a/tests/auto/xml/sax/qxmlsimplereader/xmldocs/valid/sa/119.xml.ref
+++ /dev/null
@@ -1,8 +0,0 @@
-setDocumentLocator(locator={columnNumber=1, lineNumber=1})
-startDocument()
-   startDTD(name="doc", publicId="", systemId="")
-   endDTD()
-   startElement(namespaceURI="", localName="doc", qName="doc", atts=[])
-      comment(ch=" -á ")
-   endElement(namespaceURI="", localName="doc", qName="doc")
-endDocument()
diff --git a/tests/auto/xml/sax/sax.pro b/tests/auto/xml/sax/sax.pro
deleted file mode 100644
index d232ee90e7..0000000000
--- a/tests/auto/xml/sax/sax.pro
+++ /dev/null
@@ -1,8 +0,0 @@
-TEMPLATE=subdirs
-SUBDIRS=\
-   qxml \
-
-qtHaveModule(network): SUBDIRS += \
-   qxmlinputsource \
-   qxmlsimplereader \
-
diff --git a/tests/auto/xml/xml.pro b/tests/auto/xml/xml.pro
index 4b90ffbe13..f111d4a0c8 100644
--- a/tests/auto/xml/xml.pro
+++ b/tests/auto/xml/xml.pro
@@ -1,5 +1,4 @@
 TEMPLATE=subdirs
 SUBDIRS=\
    dom \
-   sax \