From 6267d02a4851b8570c404dcb9b025178dd16cf21 Mon Sep 17 00:00:00 2001 From: Ivailo Monev Date: Tue, 25 Oct 2016 23:29:24 +0000 Subject: [PATCH] headers compat werk Signed-off-by: Ivailo Monev --- CMakeLists.txt | 28 ++++++++++++++-------------- scripts/incfsck.py | 1 + src/xml/CMakeLists.txt | 2 ++ 3 files changed, 17 insertions(+), 14 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 68aaa0fa3..543fca7a1 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -707,6 +707,7 @@ katie_generate_obsolete(qlistiterator.h QtCore qlist.h) katie_generate_obsolete(qreadlocker.h QtCore qreadwritelock.h) katie_generate_obsolete(qxmlstreamreader.h QtCore qxmlstream.h) katie_generate_obsolete(qxmlstreamentitydeclarations.h QtCore qxmlstream.h) +katie_generate_obsolete(qmetamethod.h QtCore qmetaobject.h) katie_generate_obsolete(q_pid.h QtCore qprocess.h) katie_generate_obsolete(qtdebug.h QtCore qdebug.h) katie_generate_obsolete(qcharref.h QtCore qstring.h) @@ -717,7 +718,6 @@ katie_generate_obsolete(qmutablemapiterator.h QtCore qmap.h) katie_generate_obsolete(qlatin1literal.h QtCore qstringbuilder.h) katie_generate_obsolete(qtendian.h QtCore qendian.h) katie_generate_obsolete(qxmlstreamattributes.h QtCore qxmlstream.h) -katie_generate_obsolete(qmetamethod.h QtCore qmetaobject.h) katie_generate_obsolete(qabstracttablemodel.h QtCore qabstractitemmodel.h) katie_generate_obsolete(qsizef.h QtCore qsize.h) katie_generate_obsolete(qvariantmap.h QtCore qvariant.h) @@ -930,36 +930,36 @@ katie_generate_obsolete(qtestkeyevent.h QtTest qtestevent.h) katie_generate_obsolete(qspontanekeyevent.h QtTest qtestspontaneevent.h) katie_generate_obsolete(qtestmouseevent.h QtTest qtestevent.h) katie_generate_obsolete(qxmlnamespacesupport.h QtXml qxml.h) +katie_generate_obsolete(qdomdocumentfragment.h QtXml qdom.h) katie_generate_obsolete(qdomcomment.h QtXml qdom.h) katie_generate_obsolete(qdomtext.h QtXml qdom.h) -katie_generate_obsolete(qxmlentityresolver.h QtXml qxml.h) -katie_generate_obsolete(qxmllexicalhandler.h QtXml qxml.h) -katie_generate_obsolete(qxmlcontenthandler.h QtXml qxml.h) -katie_generate_obsolete(qxmlattributes.h QtXml qxml.h) -katie_generate_obsolete(qxmlinputsource.h QtXml qxml.h) -katie_generate_obsolete(qxmlsimplereader.h QtXml qxml.h) -katie_generate_obsolete(qdomentity.h QtXml qdom.h) -katie_generate_obsolete(qxmldefaulthandler.h QtXml qxml.h) -katie_generate_obsolete(qdomdocumenttype.h QtXml qdom.h) -katie_generate_obsolete(qdomattr.h QtXml qdom.h) -katie_generate_obsolete(qdomdocument.h QtXml qdom.h) -katie_generate_obsolete(qdomdocumentfragment.h QtXml qdom.h) katie_generate_obsolete(qxmldeclhandler.h QtXml qxml.h) katie_generate_obsolete(qdomnamednodemap.h QtXml qdom.h) katie_generate_obsolete(qdomnotation.h QtXml qdom.h) katie_generate_obsolete(qdomprocessinginstruction.h QtXml qdom.h) katie_generate_obsolete(qdomcharacterdata.h QtXml qdom.h) +katie_generate_obsolete(qxmllexicalhandler.h QtXml qxml.h) katie_generate_obsolete(qxmlreader.h QtXml qxml.h) katie_generate_obsolete(qxmllocator.h QtXml qxml.h) katie_generate_obsolete(qdomimplementation.h QtXml qdom.h) -katie_generate_obsolete(qxmlerrorhandler.h QtXml qxml.h) +katie_generate_obsolete(qxmlentityresolver.h QtXml qxml.h) +katie_generate_obsolete(qxmldefaulthandler.h QtXml qxml.h) katie_generate_obsolete(qdomelement.h QtXml qdom.h) katie_generate_obsolete(qdomnode.h QtXml qdom.h) +katie_generate_obsolete(qxmlattributes.h QtXml qxml.h) katie_generate_obsolete(qdomentityreference.h QtXml qdom.h) +katie_generate_obsolete(qxmlinputsource.h QtXml qxml.h) +katie_generate_obsolete(qxmlsimplereader.h QtXml qxml.h) +katie_generate_obsolete(qdomentity.h QtXml qdom.h) katie_generate_obsolete(qxmlparseexception.h QtXml qxml.h) katie_generate_obsolete(qdomnodelist.h QtXml qdom.h) +katie_generate_obsolete(qxmlcontenthandler.h QtXml qxml.h) +katie_generate_obsolete(qdomdocumenttype.h QtXml qdom.h) +katie_generate_obsolete(qdomattr.h QtXml qdom.h) katie_generate_obsolete(qdomcdatasection.h QtXml qdom.h) +katie_generate_obsolete(qdomdocument.h QtXml qdom.h) katie_generate_obsolete(qxmldtdhandler.h QtXml qxml.h) +katie_generate_obsolete(qxmlerrorhandler.h QtXml qxml.h) # aliases are not handled by the incfsck script on purpose if(UNIX AND WITH_X11 AND X11_FOUND) katie_generate_obsolete(qx11info.h QtGui qx11info_x11.h) diff --git a/scripts/incfsck.py b/scripts/incfsck.py index 60b3c99b9..0aab60e0a 100755 --- a/scripts/incfsck.py +++ b/scripts/incfsck.py @@ -267,6 +267,7 @@ incmap = { 'QXmlParseException': 'qxml.h', 'QXmlContentHandler': 'qxml.h', 'QXmlInputSource': 'qxml.h', + 'QXmlDefaultHandler': 'qxml.h', }, 'QtDeclarative': { 'QDeclarativeListProperty': 'qdeclarativelist.h', diff --git a/src/xml/CMakeLists.txt b/src/xml/CMakeLists.txt index df6976bbe..58256e9a1 100644 --- a/src/xml/CMakeLists.txt +++ b/src/xml/CMakeLists.txt @@ -28,6 +28,8 @@ set(XML_PUBLIC_HEADERS QXmlLocator QXmlNamespaceSupport QXmlReader + QXmlDefaultHandler + QXmlInputSource # both in core and xml QXmlStreamAttribute QXmlStreamAttributes -- 2.11.0