From 79e0374143ab385cb12a17443e91c8eb9d2f3a4b Mon Sep 17 00:00:00 2001 From: Lars Knoll Date: Mon, 7 Sep 2020 14:01:20 +0200 Subject: 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 --- src/tools/bootstrap/CMakeLists.txt | 1 - src/tools/bootstrap/bootstrap.pro | 3 +-- src/tools/uic/qclass_lib_map.h | 14 -------------- 3 files changed, 1 insertion(+), 17 deletions(-) (limited to 'src/tools') diff --git a/src/tools/bootstrap/CMakeLists.txt b/src/tools/bootstrap/CMakeLists.txt index 272cd92128..fe69c371cb 100644 --- a/src/tools/bootstrap/CMakeLists.txt +++ b/src/tools/bootstrap/CMakeLists.txt @@ -127,7 +127,6 @@ qt_extend_target(Bootstrap ../../corelib/tools/qsize.cpp ../../corelib/tools/qversionnumber.cpp ../../xml/dom/qdom.cpp - ../../xml/sax/qxml.cpp DEFINES HAVE_CONFIG_H PCRE2_CODE_UNIT_WIDTH=16 diff --git a/src/tools/bootstrap/bootstrap.pro b/src/tools/bootstrap/bootstrap.pro index c9277735c8..d2a780593e 100644 --- a/src/tools/bootstrap/bootstrap.pro +++ b/src/tools/bootstrap/bootstrap.pro @@ -112,8 +112,7 @@ SOURCES += \ ../../corelib/tools/qsize.cpp \ ../../corelib/tools/qline.cpp \ ../../corelib/tools/qversionnumber.cpp \ - ../../xml/dom/qdom.cpp \ - ../../xml/sax/qxml.cpp + ../../xml/dom/qdom.cpp unix:SOURCES += ../../corelib/kernel/qcore_unix.cpp \ ../../corelib/kernel/qsharedmemory_posix.cpp \ diff --git a/src/tools/uic/qclass_lib_map.h b/src/tools/uic/qclass_lib_map.h index 4bd3051cf2..5e11d61089 100644 --- a/src/tools/uic/qclass_lib_map.h +++ b/src/tools/uic/qclass_lib_map.h @@ -313,20 +313,6 @@ QT_CLASS_LIB(QDomNotation, QtXml, qdom.h) QT_CLASS_LIB(QDomEntity, QtXml, qdom.h) QT_CLASS_LIB(QDomEntityReference, QtXml, qdom.h) QT_CLASS_LIB(QDomProcessingInstruction, QtXml, qdom.h) -QT_CLASS_LIB(QXmlNamespaceSupport, QtXml, qxml.h) -QT_CLASS_LIB(QXmlAttributes, QtXml, qxml.h) -QT_CLASS_LIB(QXmlInputSource, QtXml, qxml.h) -QT_CLASS_LIB(QXmlParseException, QtXml, qxml.h) -QT_CLASS_LIB(QXmlReader, QtXml, qxml.h) -QT_CLASS_LIB(QXmlSimpleReader, QtXml, qxml.h) -QT_CLASS_LIB(QXmlLocator, QtXml, qxml.h) -QT_CLASS_LIB(QXmlContentHandler, QtXml, qxml.h) -QT_CLASS_LIB(QXmlErrorHandler, QtXml, qxml.h) -QT_CLASS_LIB(QXmlDTDHandler, QtXml, qxml.h) -QT_CLASS_LIB(QXmlEntityResolver, QtXml, qxml.h) -QT_CLASS_LIB(QXmlLexicalHandler, QtXml, qxml.h) -QT_CLASS_LIB(QXmlDeclHandler, QtXml, qxml.h) -QT_CLASS_LIB(QXmlDefaultHandler, QtXml, qxml.h) QT_CLASS_LIB(QXmlStreamAttribute, QtXml, qxmlstream.h) QT_CLASS_LIB(QXmlStreamAttributes, QtXml, qxmlstream.h) QT_CLASS_LIB(QXmlStreamEntityDeclaration, QtXml, qxmlstream.h) -- cgit v1.2.3