rework fancy and meta header generators

Signed-off-by: Ivailo Monev <xakepa10@laimg.moc>

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 3763c1d..fea7f88 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -562,345 +562,344 @@ if(KATIE_UTILS)
 endif()
 
 # the macro calls bellow are generted via the incfsck script
-katie_generate_obsolete(qsqldriverfactoryinterface.h QtSql qsqldriverplugin.h)
-katie_generate_obsolete(qsqldrivercreatorbase.h QtSql qsqldatabase.h)
-katie_generate_obsolete(qsqldrivercreator.h QtSql qsqldatabase.h)
-katie_generate_obsolete(qsqlrelation.h QtSql qsqlrelationaltablemodel.h)
-katie_generate_obsolete(qtestaccessibility.h QtTest qtestaccessible.h)
-katie_generate_obsolete(qeventsizeofchecker.h QtTest qtestspontaneevent.h)
-katie_generate_obsolete(qtestkeyclicksevent.h QtTest qtestevent.h)
-katie_generate_obsolete(qtesteventlist.h QtTest qtestevent.h)
-katie_generate_obsolete(qtestaccessibilityevent.h QtTest qtestaccessible.h)
-katie_generate_obsolete(qttestgui.h QtTest qtest_gui.h)
-katie_generate_obsolete(qtestdelayevent.h QtTest qtestevent.h)
-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(qstyleoptionviewitem.h QtGui qstyleoption.h)
-katie_generate_obsolete(qintvalidator.h QtGui qvalidator.h)
-katie_generate_obsolete(qwheelevent.h QtGui qevent.h)
-katie_generate_obsolete(qvboxlayout.h QtGui qboxlayout.h)
-katie_generate_obsolete(qtexttableformat.h QtGui qtextformat.h)
-katie_generate_obsolete(qstylehintreturnmask.h QtGui qstyleoption.h)
-katie_generate_obsolete(qaccessiblebridgefactoryinterface.h QtGui qaccessiblebridge.h)
-katie_generate_obsolete(qaccessibleinterfaceex.h QtGui qaccessible.h)
-katie_generate_obsolete(qdragenterevent.h QtGui qevent.h)
-katie_generate_obsolete(qgraphicslineitem.h QtGui qgraphicsitem.h)
-katie_generate_obsolete(qdragleaveevent.h QtGui qevent.h)
-katie_generate_obsolete(qaccessibleapplication.h QtGui qaccessibleobject.h)
-katie_generate_obsolete(qaccessibletableinterface.h QtGui qaccessible2.h)
-katie_generate_obsolete(qgraphicsscenehoverevent.h QtGui qgraphicssceneevent.h)
-katie_generate_obsolete(qstyleoptionfocusrect.h QtGui qstyleoption.h)
-katie_generate_obsolete(qgestureevent.h QtGui qevent.h)
-katie_generate_obsolete(qaccessibleactioninterface.h QtGui qaccessible2.h)
-katie_generate_obsolete(qstyleoptiontabbarbase.h QtGui qstyleoption.h)
-katie_generate_obsolete(qiconenginefactoryinterfacev2.h QtGui qiconengineplugin.h)
-katie_generate_obsolete(qtreewidgetitem.h QtGui qtreewidget.h)
-katie_generate_obsolete(qdateedit.h QtGui qdatetimeedit.h)
-katie_generate_obsolete(qhelpevent.h QtGui qevent.h)
-katie_generate_obsolete(qgraphicstextitem.h QtGui qgraphicsitem.h)
-katie_generate_obsolete(qstyleoptiontabv3.h QtGui qstyleoption.h)
-katie_generate_obsolete(qstyleoptiontabv2.h QtGui qstyleoption.h)
-katie_generate_obsolete(qdragmoveevent.h QtGui qevent.h)
-katie_generate_obsolete(qstyleoptionframev2.h QtGui qstyleoption.h)
-katie_generate_obsolete(qgraphicsrectitem.h QtGui qgraphicsitem.h)
-katie_generate_obsolete(qkeyevent.h QtGui qevent.h)
-katie_generate_obsolete(qstyleoptiondockwidget.h QtGui qstyleoption.h)
-katie_generate_obsolete(qabstractundoitem.h QtGui qtextdocument.h)
-katie_generate_obsolete(qgraphicssceneresizeevent.h QtGui qgraphicssceneevent.h)
-katie_generate_obsolete(qstyleoptiontoolbutton.h QtGui qstyleoption.h)
-katie_generate_obsolete(qaccessibletable2interface.h QtGui qaccessible2.h)
-katie_generate_obsolete(qgraphicsscenemouseevent.h QtGui qgraphicssceneevent.h)
-katie_generate_obsolete(qgraphicspixmapitem.h QtGui qgraphicsitem.h)
-katie_generate_obsolete(qdropevent.h QtGui qevent.h)
-katie_generate_obsolete(qpolygonf.h QtGui qpolygon.h)
-katie_generate_obsolete(qstyleoptionrubberband.h QtGui qstyleoption.h)
-katie_generate_obsolete(qaccessibletable2cellinterface.h QtGui qaccessible2.h)
-katie_generate_obsolete(qgraphicsscenewheelevent.h QtGui qgraphicssceneevent.h)
-katie_generate_obsolete(qstyleoptionviewitemv3.h QtGui qstyleoption.h)
-katie_generate_obsolete(qstyleoptiongraphicsitem.h QtGui qstyleoption.h)
-katie_generate_obsolete(qitemselection.h QtGui qitemselectionmodel.h)
-katie_generate_obsolete(qgraphicsscenecontextmenuevent.h QtGui qgraphicssceneevent.h)
-katie_generate_obsolete(qundocommand.h QtGui qundostack.h)
-katie_generate_obsolete(qgraphicsdropshadoweffect.h QtGui qgraphicseffect.h)
-katie_generate_obsolete(qactionevent.h QtGui qevent.h)
-katie_generate_obsolete(qgraphicsscenehelpevent.h QtGui qgraphicssceneevent.h)
-katie_generate_obsolete(qgraphicsobject.h QtGui qgraphicsitem.h)
-katie_generate_obsolete(qgraphicspolygonitem.h QtGui qgraphicsitem.h)
-katie_generate_obsolete(qtouchevent.h QtGui qevent.h)
-katie_generate_obsolete(qtextcharformat.h QtGui qtextformat.h)
-katie_generate_obsolete(qinputevent.h QtGui qevent.h)
-katie_generate_obsolete(qspaceritem.h QtGui qlayoutitem.h)
-katie_generate_obsolete(qiconenginefactoryinterface.h QtGui qiconengineplugin.h)
-katie_generate_obsolete(qstyleoptionmenuitem.h QtGui qstyleoption.h)
-katie_generate_obsolete(qstyleoptionspinbox.h QtGui qstyleoption.h)
-katie_generate_obsolete(qshortcutevent.h QtGui qevent.h)
-katie_generate_obsolete(qdoublevalidator.h QtGui qvalidator.h)
-katie_generate_obsolete(qaccessibleinterface.h QtGui qaccessible.h)
-katie_generate_obsolete(qinputcontextfactoryinterface.h QtGui qinputcontextplugin.h)
-katie_generate_obsolete(qiconenginepluginv2.h QtGui qiconengineplugin.h)
-katie_generate_obsolete(qtextblock.h QtGui qtextobject.h)
-katie_generate_obsolete(qstyleoptionprogressbarv2.h QtGui qstyleoption.h)
-katie_generate_obsolete(qcloseevent.h QtGui qevent.h)
-katie_generate_obsolete(qwindowstatechangeevent.h QtGui qevent.h)
-katie_generate_obsolete(qshowevent.h QtGui qevent.h)
-katie_generate_obsolete(qtextblockformat.h QtGui qtextformat.h)
-katie_generate_obsolete(qiconenginev2.h QtGui qiconengine.h)
-katie_generate_obsolete(qitemeditorcreatorbase.h QtGui qitemeditorfactory.h)
-katie_generate_obsolete(qhboxlayout.h QtGui qboxlayout.h)
-katie_generate_obsolete(qstyleoptioncombobox.h QtGui qstyleoption.h)
-katie_generate_obsolete(qgraphicsitemgroup.h QtGui qgraphicsitem.h)
-katie_generate_obsolete(qaccessiblefactoryinterface.h QtGui qaccessibleplugin.h)
-katie_generate_obsolete(qstyleoptionframev3.h QtGui qstyleoption.h)
-katie_generate_obsolete(qgraphicsscenemoveevent.h QtGui qgraphicssceneevent.h)
-katie_generate_obsolete(qaccessiblebridgeplugin.h QtGui qaccessiblebridge.h)
-katie_generate_obsolete(qlistwidgetitem.h QtGui qlistwidget.h)
-katie_generate_obsolete(qcontextmenuevent.h QtGui qevent.h)
-katie_generate_obsolete(qgraphicspathitem.h QtGui qgraphicsitem.h)
-katie_generate_obsolete(qtablewidgetitem.h QtGui qtablewidget.h)
-katie_generate_obsolete(qimageioplugin.h QtGui qimageiohandler.h)
-katie_generate_obsolete(qwizardpage.h QtGui qwizard.h)
-katie_generate_obsolete(qaccessibleimageinterface.h QtGui qaccessible2.h)
-katie_generate_obsolete(qstyleoptiongroupbox.h QtGui qstyleoption.h)
-katie_generate_obsolete(qmoveevent.h QtGui qevent.h)
-katie_generate_obsolete(qstyleoptionviewitemv4.h QtGui qstyleoption.h)
-katie_generate_obsolete(qitemselectionrange.h QtGui qitemselectionmodel.h)
-katie_generate_obsolete(qtextline.h QtGui qtextlayout.h)
-katie_generate_obsolete(qabstractgraphicsshapeitem.h QtGui qgraphicsitem.h)
-katie_generate_obsolete(qstyleoptionprogressbar.h QtGui qstyleoption.h)
-katie_generate_obsolete(qstandarditem.h QtGui qstandarditemmodel.h)
-katie_generate_obsolete(qstyleoptionviewitemv2.h QtGui qstyleoption.h)
-katie_generate_obsolete(qstyleoptionbutton.h QtGui qstyleoption.h)
-katie_generate_obsolete(qgraphicsscale.h QtGui qgraphicstransform.h)
-katie_generate_obsolete(qaccessiblesimpleeditabletextinterface.h QtGui qaccessible2.h)
-katie_generate_obsolete(qstyleoptionframe.h QtGui qstyleoption.h)
-katie_generate_obsolete(qconicalgradient.h QtGui qbrush.h)
-katie_generate_obsolete(qaccessibleobjectex.h QtGui qaccessibleobject.h)
-katie_generate_obsolete(qradialgradient.h QtGui qbrush.h)
-katie_generate_obsolete(qstyleoptionslider.h QtGui qstyleoption.h)
-katie_generate_obsolete(qstyleoptiontoolbar.h QtGui qstyleoption.h)
-katie_generate_obsolete(qtextlength.h QtGui qtextformat.h)
-katie_generate_obsolete(qregexpvalidator.h QtGui qvalidator.h)
-katie_generate_obsolete(qpinchgesture.h QtGui qgesture.h)
-katie_generate_obsolete(qgraphicsscenedragdropevent.h QtGui qgraphicssceneevent.h)
-katie_generate_obsolete(qgraphicsopacityeffect.h QtGui qgraphicseffect.h)
-katie_generate_obsolete(qpaintevent.h QtGui qevent.h)
-katie_generate_obsolete(qfontmetricsf.h QtGui qfontmetrics.h)
-katie_generate_obsolete(qgraphicsellipseitem.h QtGui qgraphicsitem.h)
-katie_generate_obsolete(qhideevent.h QtGui qevent.h)
-katie_generate_obsolete(qstyleoptiontab.h QtGui qstyleoption.h)
-katie_generate_obsolete(qtevents.h QtGui qevent.h)
-katie_generate_obsolete(qinputmethodevent.h QtGui qevent.h)
-katie_generate_obsolete(qdoublespinbox.h QtGui qspinbox.h)
-katie_generate_obsolete(qaccessible2interface.h QtGui qaccessible2.h)
-katie_generate_obsolete(qtimeedit.h QtGui qdatetimeedit.h)
-katie_generate_obsolete(qstyleoptiontabwidgetframe.h QtGui qstyleoption.h)
-katie_generate_obsolete(qstyleoptiontitlebar.h QtGui qstyleoption.h)
-katie_generate_obsolete(qhoverevent.h QtGui qevent.h)
-katie_generate_obsolete(qstyleoptiondockwidgetv2.h QtGui qstyleoption.h)
-katie_generate_obsolete(qanimationdriver.h QtGui qabstractanimation.h)
-katie_generate_obsolete(qstyleoptioncomplex.h QtGui qstyleoption.h)
-katie_generate_obsolete(qstyleoptiontabwidgetframev2.h QtGui qstyleoption.h)
-katie_generate_obsolete(qaccessibletextinterface.h QtGui qaccessible2.h)
-katie_generate_obsolete(qgradient.h QtGui qbrush.h)
-katie_generate_obsolete(qstyleoptionheader.h QtGui qstyleoption.h)
-katie_generate_obsolete(qresizeevent.h QtGui qevent.h)
-katie_generate_obsolete(qtextframe.h QtGui qtextobject.h)
-katie_generate_obsolete(qtexttablecell.h QtGui qtexttable.h)
-katie_generate_obsolete(qitemeditorcreator.h QtGui qitemeditorfactory.h)
-katie_generate_obsolete(qpainterpathstroker.h QtGui qpainterpath.h)
-katie_generate_obsolete(qaccessibleevent.h QtGui qaccessible.h)
-katie_generate_obsolete(qtextblockuserdata.h QtGui qtextobject.h)
-katie_generate_obsolete(qplaintextdocumentlayout.h QtGui qplaintextedit.h)
-katie_generate_obsolete(qmouseevent.h QtGui qevent.h)
-katie_generate_obsolete(qfocusevent.h QtGui qevent.h)
-katie_generate_obsolete(qimageiohandlerfactoryinterface.h QtGui qimageiohandler.h)
-katie_generate_obsolete(qlineargradient.h QtGui qbrush.h)
-katie_generate_obsolete(qwidgetitem.h QtGui qlayoutitem.h)
-katie_generate_obsolete(qgraphicssimpletextitem.h QtGui qgraphicsitem.h)
-katie_generate_obsolete(qgraphicsrotation.h QtGui qgraphicstransform.h)
-katie_generate_obsolete(qaccessibleeditabletextinterface.h QtGui qaccessible2.h)
-katie_generate_obsolete(qsplitterhandle.h QtGui qsplitter.h)
-katie_generate_obsolete(qwidgetlist.h QtGui qwindowdefs.h)
-katie_generate_obsolete(qtextlistformat.h QtGui qtextformat.h)
-katie_generate_obsolete(qaccessiblevalueinterface.h QtGui qaccessible2.h)
-katie_generate_obsolete(qdesignerlayoutdecorationextension.h QtDesigner layoutdecoration.h)
-katie_generate_obsolete(qdesignericoncacheinterface.h QtDesigner abstracticoncache.h)
-katie_generate_obsolete(qdesignerbrushmanagerinterface.h QtDesigner abstractbrushmanager.h)
-katie_generate_obsolete(qdesignerdnditeminterface.h QtDesigner abstractdnditem.h)
-katie_generate_obsolete(qdesignermembersheetextension.h QtDesigner membersheet.h)
-katie_generate_obsolete(qdesignerintegrationinterface.h QtDesigner abstractintegration.h)
-katie_generate_obsolete(qdesignerwidgetdatabaseiteminterface.h QtDesigner abstractwidgetdatabase.h)
-katie_generate_obsolete(qdesignerformwindowmanagerinterface.h QtDesigner abstractformwindowmanager.h)
-katie_generate_obsolete(qdesignercomponents.h QtDesigner qdesigner_components.h)
-katie_generate_obsolete(qdesignerformwindowtoolinterface.h QtDesigner abstractformwindowtool.h)
-katie_generate_obsolete(qdesignerdynamicpropertysheetextension.h QtDesigner dynamicpropertysheet.h)
-katie_generate_obsolete(qdesignerlanguageextension.h QtDesigner abstractlanguage.h)
-katie_generate_obsolete(qdesignerpropertysheetextension.h QtDesigner propertysheet.h)
-katie_generate_obsolete(qdesignerpromotioninterface.h QtDesigner abstractpromotioninterface.h)
-katie_generate_obsolete(qdesignerobjectinspectorinterface.h QtDesigner abstractobjectinspector.h)
-katie_generate_obsolete(qdesignerextrainfoextension.h QtDesigner extrainfo.h)
-katie_generate_obsolete(qdesignerformeditorplugininterface.h QtDesigner abstractformeditorplugin.h)
-katie_generate_obsolete(qdesigneractioneditorinterface.h QtDesigner abstractactioneditor.h)
-katie_generate_obsolete(qdesignertaskmenuextension.h QtDesigner taskmenu.h)
-katie_generate_obsolete(qdesignerformeditorinterface.h QtDesigner abstractformeditor.h)
-katie_generate_obsolete(qdesignercustomwidgetinterface.h QtDesigner customwidget.h)
-katie_generate_obsolete(qdesignermetadatabaseiteminterface.h QtDesigner abstractmetadatabase.h)
-katie_generate_obsolete(qdesignermetadatabaseinterface.h QtDesigner abstractmetadatabase.h)
-katie_generate_obsolete(qdesignercustomwidgetcollectioninterface.h QtDesigner customwidget.h)
-katie_generate_obsolete(qdesignerformwindowcursorinterface.h QtDesigner abstractformwindowcursor.h)
-katie_generate_obsolete(qabstractformbuilder.h QtDesigner abstractformbuilder.h)
-katie_generate_obsolete(qdesignerpropertyeditorinterface.h QtDesigner abstractpropertyeditor.h)
-katie_generate_obsolete(qdesignerresourcebrowserinterface.h QtDesigner abstractresourcebrowser.h)
-katie_generate_obsolete(qdesignerwidgetfactoryinterface.h QtDesigner abstractwidgetfactory.h)
-katie_generate_obsolete(qextensionfactory.h QtDesigner default_extensionfactory.h)
-katie_generate_obsolete(qdesignerwidgetboxinterface.h QtDesigner abstractwidgetbox.h)
-katie_generate_obsolete(qdesignercontainerextension.h QtDesigner container.h)
-katie_generate_obsolete(qdesignerformwindowinterface.h QtDesigner abstractformwindow.h)
-katie_generate_obsolete(qdesignerwidgetdatabaseinterface.h QtDesigner abstractwidgetdatabase.h)
-katie_generate_obsolete(qdbuspendingreplydata.h QtDBus qdbuspendingreply.h)
-katie_generate_obsolete(qdbusabstractinterfacebase.h QtDBus qdbusabstractinterface.h)
-katie_generate_obsolete(qdbuspendingcallwatcher.h QtDBus qdbuspendingcall.h)
-katie_generate_obsolete(qdbusobjectpath.h QtDBus qdbusextratypes.h)
-katie_generate_obsolete(qdbusvariant.h QtDBus qdbusextratypes.h)
-katie_generate_obsolete(qdbussignature.h QtDBus qdbusextratypes.h)
-katie_generate_obsolete(qdeclarativelistproperty.h QtDeclarative qdeclarativelist.h)
-katie_generate_obsolete(qxmlstreamnotationdeclaration.h QtXml qxmlstream.h)
-katie_generate_obsolete(qxmlnamespacesupport.h QtXml qxml.h)
-katie_generate_obsolete(qxmlstreamattribute.h QtXml qxmlstream.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(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(qxmlstreamwriter.h QtXml qxmlstream.h)
-katie_generate_obsolete(qxmlreader.h QtXml qxml.h)
-katie_generate_obsolete(qxmllocator.h QtXml qxml.h)
-katie_generate_obsolete(qxmlstreamentitydeclarations.h QtXml qxmlstream.h)
-katie_generate_obsolete(qdomimplementation.h QtXml qdom.h)
-katie_generate_obsolete(qxmlentityresolver.h QtXml qxml.h)
-katie_generate_obsolete(qxmlstreamnamespacedeclaration.h QtXml qxmlstream.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(qxmlstreamentityresolver.h QtXml qxmlstream.h)
-katie_generate_obsolete(qxmlstreamentitydeclaration.h QtXml qxmlstream.h)
-katie_generate_obsolete(qdomentityreference.h QtXml qdom.h)
-katie_generate_obsolete(qxmlstreamattributes.h QtXml qxmlstream.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(qxmlstreamnotationdeclarations.h QtXml qxmlstream.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(qxmlstreamreader.h QtXml qxmlstream.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(qxmlstreamnamespacedeclarations.h QtXml qxmlstream.h)
-katie_generate_obsolete(qxmldtdhandler.h QtXml qxml.h)
-katie_generate_obsolete(qxmlerrorhandler.h QtXml qxml.h)
-katie_generate_obsolete(qtextdecoder.h QtCore qtextcodec.h)
-katie_generate_obsolete(qtalgorithms.h QtCore qalgorithms.h)
-katie_generate_obsolete(qlistiterator.h QtCore qlist.h)
-katie_generate_obsolete(qbyteref.h QtCore qbytearray.h)
-katie_generate_obsolete(qshareddatapointer.h QtCore qshareddata.h)
-katie_generate_obsolete(qmutablelinkedlistiterator.h QtCore qlist.h)
-katie_generate_obsolete(qtcontainerfwd.h QtCore qcontainerfwd.h)
-katie_generate_obsolete(qprocessenvironment.h QtCore qprocess.h)
-katie_generate_obsolete(qlatin1char.h QtCore qchar.h)
-katie_generate_obsolete(qbasicatomicint.h QtCore qbasicatomic.h)
-katie_generate_obsolete(qabstracttablemodel.h QtCore qabstractitemmodel.h)
-katie_generate_obsolete(qmetaproperty.h QtCore qmetaobject.h)
-katie_generate_obsolete(qtconfig.h QtCore qconfig.h)
-katie_generate_obsolete(qabstractfileenginehandler.h QtCore qabstractfileengine.h)
-katie_generate_obsolete(qflags.h QtCore qglobal.h)
-katie_generate_obsolete(qscopedarraypointer.h QtCore qscopedpointer.h)
-katie_generate_obsolete(qmutablehashiterator.h QtCore qhash.h)
-katie_generate_obsolete(q_pid.h QtCore qprocess.h)
-katie_generate_obsolete(qmutablesetiterator.h QtCore qset.h)
-katie_generate_obsolete(qmapiterator.h QtCore qmap.h)
-katie_generate_obsolete(qincompatibleflag.h QtCore qglobal.h)
-katie_generate_obsolete(qwritelocker.h QtCore qreadwritelock.h)
-katie_generate_obsolete(qmutablelistiterator.h QtCore qlist.h)
-katie_generate_obsolete(qmutexlocker.h QtCore qmutex.h)
-katie_generate_obsolete(qmetaclassinfo.h QtCore qmetaobject.h)
-katie_generate_obsolete(qmultimap.h QtCore qmap.h)
-katie_generate_obsolete(qgenericargument.h QtCore qobjectdefs.h)
-katie_generate_obsolete(qfutureinterfacebase.h QtCore qfutureinterface.h)
-katie_generate_obsolete(qmetaenum.h QtCore qmetaobject.h)
-katie_generate_obsolete(qtypeinfo.h QtCore qglobal.h)
-katie_generate_obsolete(qvarianthash.h QtCore qvariant.h)
-katie_generate_obsolete(qbitref.h QtCore qbitarray.h)
-katie_generate_obsolete(qvectordata.h QtCore qvector.h)
-katie_generate_obsolete(qlinkedlistnode.h QtCore qlinkedlist.h)
-katie_generate_obsolete(qatomicint.h QtCore qatomic.h)
-katie_generate_obsolete(qchildevent.h QtCore qcoreevent.h)
-katie_generate_obsolete(qargument.h QtCore qobjectdefs.h)
-katie_generate_obsolete(qt.h QtCore qnamespace.h)
-katie_generate_obsolete(qobjectlist.h QtCore qobject.h)
-katie_generate_obsolete(qmutablevectoriterator.h QtCore qvector.h)
-katie_generate_obsolete(qflag.h QtCore qglobal.h)
-katie_generate_obsolete(qfileinfolist.h QtCore qfileinfo.h)
-katie_generate_obsolete(qmodelindex.h QtCore qabstractitemmodel.h)
-katie_generate_obsolete(qtglobal.h QtCore qglobal.h)
-katie_generate_obsolete(qtime.h QtCore qdatetime.h)
-katie_generate_obsolete(qmultihash.h QtCore qhash.h)
-katie_generate_obsolete(qdate.h QtCore qdatetime.h)
-katie_generate_obsolete(qlatin1string.h QtCore qstring.h)
-katie_generate_obsolete(qglobalstatic.h QtCore qglobal.h)
-katie_generate_obsolete(qabstractlistmodel.h QtCore qabstractitemmodel.h)
-katie_generate_obsolete(qpersistentmodelindex.h QtCore qabstractitemmodel.h)
-katie_generate_obsolete(qvariantlist.h QtCore qvariant.h)
-katie_generate_obsolete(qdynamicpropertychangeevent.h QtCore qcoreevent.h)
-katie_generate_obsolete(qjsonparseerror.h QtCore qjsondocument.h)
-katie_generate_obsolete(qreadlocker.h QtCore qreadwritelock.h)
-katie_generate_obsolete(qsysinfo.h QtCore qglobal.h)
-katie_generate_obsolete(qstringlistiterator.h QtCore qstringlist.h)
-katie_generate_obsolete(qpointf.h QtCore qpoint.h)
-katie_generate_obsolete(qhashiterator.h QtCore qhash.h)
-katie_generate_obsolete(qtimerevent.h QtCore qcoreevent.h)
-katie_generate_obsolete(qtdebug.h QtCore qdebug.h)
-katie_generate_obsolete(qtplugin.h QtCore qplugin.h)
-katie_generate_obsolete(qlinkedlistiterator.h QtCore qlinkedlist.h)
-katie_generate_obsolete(qrectf.h QtCore qrect.h)
-katie_generate_obsolete(qsizef.h QtCore qsize.h)
-katie_generate_obsolete(qcontiguouscachedata.h QtCore qcontiguouscache.h)
-katie_generate_obsolete(qmutablestringlistiterator.h QtCore qstringlist.h)
-katie_generate_obsolete(qmetatypeid2.h QtCore qmetatype.h)
-katie_generate_obsolete(qtendian.h QtCore qendian.h)
-katie_generate_obsolete(qtextstreammanipulator.h QtCore qtextstream.h)
-katie_generate_obsolete(qmodelindexlist.h QtCore qabstractitemmodel.h)
-katie_generate_obsolete(qcharref.h QtCore qstring.h)
-katie_generate_obsolete(qfutureiterator.h QtCore qfuture.h)
-katie_generate_obsolete(qexplicitlyshareddatapointer.h QtCore qsharedpointer.h)
-katie_generate_obsolete(qvariantmap.h QtCore qvariant.h)
-katie_generate_obsolete(qbool.h QtCore qglobal.h)
-katie_generate_obsolete(qlinef.h QtCore qline.h)
-katie_generate_obsolete(qmetamethod.h QtCore qmetaobject.h)
-katie_generate_obsolete(qatomicpointer.h QtCore qatomic.h)
-katie_generate_obsolete(qmutablemapiterator.h QtCore qmap.h)
-katie_generate_obsolete(qweakpointer.h QtCore qsharedpointer.h)
-katie_generate_obsolete(qhttprequestheader.h QtNetwork qhttp.h)
-katie_generate_obsolete(qhttppart.h QtNetwork qhttpmultipart.h)
-katie_generate_obsolete(qhttpresponseheader.h QtNetwork qhttp.h)
-katie_generate_obsolete(qnetworkcachemetadata.h QtNetwork qabstractnetworkcache.h)
-katie_generate_obsolete(qnetworkproxyquery.h QtNetwork qnetworkproxy.h)
-katie_generate_obsolete(qnetworkaddressentry.h QtNetwork qnetworkinterface.h)
-katie_generate_obsolete(qnetworkconfigurationmanager.h QtNetwork qnetworkconfigmanager.h)
-katie_generate_obsolete(qnetworkproxyfactory.h QtNetwork qnetworkproxy.h)
-katie_generate_obsolete(qhttpheader.h QtNetwork qhttp.h)
-# aliases are not handled by the incfsck script on purpose
-katie_generate_obsolete(qx11info.h QtGui qx11info_x11.h)
-katie_generate_obsolete(qx11embedcontainer.h QtGui qx11embed_x11.h)
-katie_generate_obsolete(qx11embedwidget.h QtGui qx11embed_x11.h)
+katie_generate_obsolete(QAbstractFileEngineHandler QtCore qabstractfileengine.h)
+katie_generate_obsolete(QAbstractFormBuilder QtDesigner abstractformbuilder.h)
+katie_generate_obsolete(QAbstractGraphicsShapeItem QtGui qgraphicsitem.h)
+katie_generate_obsolete(QAbstractListModel QtCore qabstractitemmodel.h)
+katie_generate_obsolete(QAbstractTableModel QtCore qabstractitemmodel.h)
+katie_generate_obsolete(QAbstractUndoItem QtGui qtextdocument.h)
+katie_generate_obsolete(QAccessible2Interface QtGui qaccessible2.h)
+katie_generate_obsolete(QAccessibleActionInterface QtGui qaccessible2.h)
+katie_generate_obsolete(QAccessibleApplication QtGui qaccessibleobject.h)
+katie_generate_obsolete(QAccessibleBridgeFactoryInterface QtGui qaccessiblebridge.h)
+katie_generate_obsolete(QAccessibleBridgePlugin QtGui qaccessiblebridge.h)
+katie_generate_obsolete(QAccessibleEditableTextInterface QtGui qaccessible2.h)
+katie_generate_obsolete(QAccessibleEvent QtGui qaccessible.h)
+katie_generate_obsolete(QAccessibleFactoryInterface QtGui qaccessibleplugin.h)
+katie_generate_obsolete(QAccessibleImageInterface QtGui qaccessible2.h)
+katie_generate_obsolete(QAccessibleInterfaceEx QtGui qaccessible.h)
+katie_generate_obsolete(QAccessibleInterface QtGui qaccessible.h)
+katie_generate_obsolete(QAccessibleObjectEx QtGui qaccessibleobject.h)
+katie_generate_obsolete(QAccessibleSimpleEditableTextInterface QtGui qaccessible2.h)
+katie_generate_obsolete(QAccessibleTable2CellInterface QtGui qaccessible2.h)
+katie_generate_obsolete(QAccessibleTable2Interface QtGui qaccessible2.h)
+katie_generate_obsolete(QAccessibleTableInterface QtGui qaccessible2.h)
+katie_generate_obsolete(QAccessibleTextInterface QtGui qaccessible2.h)
+katie_generate_obsolete(QAccessibleValueInterface QtGui qaccessible2.h)
+katie_generate_obsolete(QActionEvent QtGui qevent.h)
+katie_generate_obsolete(QAnimationDriver QtGui qabstractanimation.h)
+katie_generate_obsolete(QArgument QtCore qobjectdefs.h)
+katie_generate_obsolete(QAtomicInt QtCore qatomic.h)
+katie_generate_obsolete(QAtomicPointer QtCore qatomic.h)
+katie_generate_obsolete(QBasicAtomicInt QtCore qbasicatomic.h)
+katie_generate_obsolete(QBitRef QtCore qbitarray.h)
+katie_generate_obsolete(QBool QtCore qglobal.h)
+katie_generate_obsolete(QByteRef QtCore qbytearray.h)
+katie_generate_obsolete(QCharRef QtCore qstring.h)
+katie_generate_obsolete(QChildEvent QtCore qcoreevent.h)
+katie_generate_obsolete(QCloseEvent QtGui qevent.h)
+katie_generate_obsolete(QConicalGradient QtGui qbrush.h)
+katie_generate_obsolete(QContextMenuEvent QtGui qevent.h)
+katie_generate_obsolete(QContiguousCacheData QtCore qcontiguouscache.h)
+katie_generate_obsolete(QDateEdit QtGui qdatetimeedit.h)
+katie_generate_obsolete(QDate QtCore qdatetime.h)
+katie_generate_obsolete(QDBusAbstractInterfaceBase QtDBus qdbusabstractinterface.h)
+katie_generate_obsolete(QDBusObjectPath QtDBus qdbusextratypes.h)
+katie_generate_obsolete(QDBusPendingCallWatcher QtDBus qdbuspendingcall.h)
+katie_generate_obsolete(QDBusPendingReplyData QtDBus qdbuspendingreply.h)
+katie_generate_obsolete(QDBusSignature QtDBus qdbusextratypes.h)
+katie_generate_obsolete(QDBusVariant QtDBus qdbusextratypes.h)
+katie_generate_obsolete(QDeclarativeListProperty QtDeclarative qdeclarativelist.h)
+katie_generate_obsolete(QDesignerActionEditorInterface QtDesigner abstractactioneditor.h)
+katie_generate_obsolete(QDesignerBrushManagerInterface QtDesigner abstractbrushmanager.h)
+katie_generate_obsolete(QDesignerComponents QtDesigner qdesigner_components.h)
+katie_generate_obsolete(QDesignerContainerExtension QtDesigner container.h)
+katie_generate_obsolete(QDesignerCustomWidgetCollectionInterface QtDesigner customwidget.h)
+katie_generate_obsolete(QDesignerCustomWidgetInterface QtDesigner customwidget.h)
+katie_generate_obsolete(QDesignerDnDItemInterface QtDesigner abstractdnditem.h)
+katie_generate_obsolete(QDesignerDynamicPropertySheetExtension QtDesigner dynamicpropertysheet.h)
+katie_generate_obsolete(QDesignerExtraInfoExtension QtDesigner extrainfo.h)
+katie_generate_obsolete(QDesignerFormEditorInterface QtDesigner abstractformeditor.h)
+katie_generate_obsolete(QDesignerFormEditorPluginInterface QtDesigner abstractformeditorplugin.h)
+katie_generate_obsolete(QDesignerFormWindowCursorInterface QtDesigner abstractformwindowcursor.h)
+katie_generate_obsolete(QDesignerFormWindowInterface QtDesigner abstractformwindow.h)
+katie_generate_obsolete(QDesignerFormWindowManagerInterface QtDesigner abstractformwindowmanager.h)
+katie_generate_obsolete(QDesignerFormWindowToolInterface QtDesigner abstractformwindowtool.h)
+katie_generate_obsolete(QDesignerIconCacheInterface QtDesigner abstracticoncache.h)
+katie_generate_obsolete(QDesignerIntegrationInterface QtDesigner abstractintegration.h)
+katie_generate_obsolete(QDesignerLanguageExtension QtDesigner abstractlanguage.h)
+katie_generate_obsolete(QDesignerLayoutDecorationExtension QtDesigner layoutdecoration.h)
+katie_generate_obsolete(QDesignerMemberSheetExtension QtDesigner membersheet.h)
+katie_generate_obsolete(QDesignerMetaDataBaseInterface QtDesigner abstractmetadatabase.h)
+katie_generate_obsolete(QDesignerMetaDataBaseItemInterface QtDesigner abstractmetadatabase.h)
+katie_generate_obsolete(QDesignerObjectInspectorInterface QtDesigner abstractobjectinspector.h)
+katie_generate_obsolete(QDesignerPromotionInterface QtDesigner abstractpromotioninterface.h)
+katie_generate_obsolete(QDesignerPropertyEditorInterface QtDesigner abstractpropertyeditor.h)
+katie_generate_obsolete(QDesignerPropertySheetExtension QtDesigner propertysheet.h)
+katie_generate_obsolete(QDesignerResourceBrowserInterface QtDesigner abstractresourcebrowser.h)
+katie_generate_obsolete(QDesignerTaskMenuExtension QtDesigner taskmenu.h)
+katie_generate_obsolete(QDesignerWidgetBoxInterface QtDesigner abstractwidgetbox.h)
+katie_generate_obsolete(QDesignerWidgetDataBaseInterface QtDesigner abstractwidgetdatabase.h)
+katie_generate_obsolete(QDesignerWidgetDataBaseItemInterface QtDesigner abstractwidgetdatabase.h)
+katie_generate_obsolete(QDesignerWidgetFactoryInterface QtDesigner abstractwidgetfactory.h)
+katie_generate_obsolete(QDomAttr QtXml qdom.h)
+katie_generate_obsolete(QDomCDATASection QtXml qdom.h)
+katie_generate_obsolete(QDomCharacterData QtXml qdom.h)
+katie_generate_obsolete(QDomComment QtXml qdom.h)
+katie_generate_obsolete(QDomDocumentFragment QtXml qdom.h)
+katie_generate_obsolete(QDomDocument QtXml qdom.h)
+katie_generate_obsolete(QDomDocumentType QtXml qdom.h)
+katie_generate_obsolete(QDomElement QtXml qdom.h)
+katie_generate_obsolete(QDomEntity QtXml qdom.h)
+katie_generate_obsolete(QDomEntityReference QtXml qdom.h)
+katie_generate_obsolete(QDomImplementation QtXml qdom.h)
+katie_generate_obsolete(QDomNamedNodeMap QtXml qdom.h)
+katie_generate_obsolete(QDomNodeList QtXml qdom.h)
+katie_generate_obsolete(QDomNode QtXml qdom.h)
+katie_generate_obsolete(QDomNotation QtXml qdom.h)
+katie_generate_obsolete(QDomProcessingInstruction QtXml qdom.h)
+katie_generate_obsolete(QDomText QtXml qdom.h)
+katie_generate_obsolete(QDoubleSpinBox QtGui qspinbox.h)
+katie_generate_obsolete(QDoubleValidator QtGui qvalidator.h)
+katie_generate_obsolete(QDragEnterEvent QtGui qevent.h)
+katie_generate_obsolete(QDragLeaveEvent QtGui qevent.h)
+katie_generate_obsolete(QDragMoveEvent QtGui qevent.h)
+katie_generate_obsolete(QDropEvent QtGui qevent.h)
+katie_generate_obsolete(QDynamicPropertyChangeEvent QtCore qcoreevent.h)
+katie_generate_obsolete(QEventSizeOfChecker QtTest qtestspontaneevent.h)
+katie_generate_obsolete(QExplicitlySharedDataPointer QtCore qsharedpointer.h)
+katie_generate_obsolete(QExtensionFactory QtDesigner default_extensionfactory.h)
+katie_generate_obsolete(QFileInfoList QtCore qfileinfo.h)
+katie_generate_obsolete(QFlag QtCore qglobal.h)
+katie_generate_obsolete(QFlags QtCore qglobal.h)
+katie_generate_obsolete(QFocusEvent QtGui qevent.h)
+katie_generate_obsolete(QFontMetricsF QtGui qfontmetrics.h)
+katie_generate_obsolete(QFutureInterfaceBase QtCore qfutureinterface.h)
+katie_generate_obsolete(QFutureIterator QtCore qfuture.h)
+katie_generate_obsolete(QGenericArgument QtCore qobjectdefs.h)
+katie_generate_obsolete(QGestureEvent QtGui qevent.h)
+katie_generate_obsolete(QGlobalStatic QtCore qglobal.h)
+katie_generate_obsolete(QGradient QtGui qbrush.h)
+katie_generate_obsolete(QGraphicsDropShadowEffect QtGui qgraphicseffect.h)
+katie_generate_obsolete(QGraphicsEllipseItem QtGui qgraphicsitem.h)
+katie_generate_obsolete(QGraphicsItemGroup QtGui qgraphicsitem.h)
+katie_generate_obsolete(QGraphicsLineItem QtGui qgraphicsitem.h)
+katie_generate_obsolete(QGraphicsObject QtGui qgraphicsitem.h)
+katie_generate_obsolete(QGraphicsOpacityEffect QtGui qgraphicseffect.h)
+katie_generate_obsolete(QGraphicsPathItem QtGui qgraphicsitem.h)
+katie_generate_obsolete(QGraphicsPixmapItem QtGui qgraphicsitem.h)
+katie_generate_obsolete(QGraphicsPolygonItem QtGui qgraphicsitem.h)
+katie_generate_obsolete(QGraphicsRectItem QtGui qgraphicsitem.h)
+katie_generate_obsolete(QGraphicsRotation QtGui qgraphicstransform.h)
+katie_generate_obsolete(QGraphicsScale QtGui qgraphicstransform.h)
+katie_generate_obsolete(QGraphicsSceneContextMenuEvent QtGui qgraphicssceneevent.h)
+katie_generate_obsolete(QGraphicsSceneDragDropEvent QtGui qgraphicssceneevent.h)
+katie_generate_obsolete(QGraphicsSceneHelpEvent QtGui qgraphicssceneevent.h)
+katie_generate_obsolete(QGraphicsSceneHoverEvent QtGui qgraphicssceneevent.h)
+katie_generate_obsolete(QGraphicsSceneMouseEvent QtGui qgraphicssceneevent.h)
+katie_generate_obsolete(QGraphicsSceneMoveEvent QtGui qgraphicssceneevent.h)
+katie_generate_obsolete(QGraphicsSceneResizeEvent QtGui qgraphicssceneevent.h)
+katie_generate_obsolete(QGraphicsSceneWheelEvent QtGui qgraphicssceneevent.h)
+katie_generate_obsolete(QGraphicsSimpleTextItem QtGui qgraphicsitem.h)
+katie_generate_obsolete(QGraphicsTextItem QtGui qgraphicsitem.h)
+katie_generate_obsolete(QHashIterator QtCore qhash.h)
+katie_generate_obsolete(QHBoxLayout QtGui qboxlayout.h)
+katie_generate_obsolete(QHelpEvent QtGui qevent.h)
+katie_generate_obsolete(QHideEvent QtGui qevent.h)
+katie_generate_obsolete(QHoverEvent QtGui qevent.h)
+katie_generate_obsolete(QHttpHeader QtNetwork qhttp.h)
+katie_generate_obsolete(QHttpPart QtNetwork qhttpmultipart.h)
+katie_generate_obsolete(QHttpRequestHeader QtNetwork qhttp.h)
+katie_generate_obsolete(QHttpResponseHeader QtNetwork qhttp.h)
+katie_generate_obsolete(QIconEngineFactoryInterface QtGui qiconengineplugin.h)
+katie_generate_obsolete(QIconEngineFactoryInterfaceV2 QtGui qiconengineplugin.h)
+katie_generate_obsolete(QIconEnginePluginV2 QtGui qiconengineplugin.h)
+katie_generate_obsolete(QIconEngineV2 QtGui qiconengine.h)
+katie_generate_obsolete(QImageIOHandlerFactoryInterface QtGui qimageiohandler.h)
+katie_generate_obsolete(QImageIOPlugin QtGui qimageiohandler.h)
+katie_generate_obsolete(QIncompatibleFlag QtCore qglobal.h)
+katie_generate_obsolete(QInputContextFactoryInterface QtGui qinputcontextplugin.h)
+katie_generate_obsolete(QInputEvent QtGui qevent.h)
+katie_generate_obsolete(QInputMethodEvent QtGui qevent.h)
+katie_generate_obsolete(QIntValidator QtGui qvalidator.h)
+katie_generate_obsolete(QItemEditorCreatorBase QtGui qitemeditorfactory.h)
+katie_generate_obsolete(QItemEditorCreator QtGui qitemeditorfactory.h)
+katie_generate_obsolete(QItemSelection QtGui qitemselectionmodel.h)
+katie_generate_obsolete(QItemSelectionRange QtGui qitemselectionmodel.h)
+katie_generate_obsolete(QJsonParseError QtCore qjsondocument.h)
+katie_generate_obsolete(QKeyEvent QtGui qevent.h)
+katie_generate_obsolete(QLatin1Char QtCore qchar.h)
+katie_generate_obsolete(QLatin1String QtCore qstring.h)
+katie_generate_obsolete(QLinearGradient QtGui qbrush.h)
+katie_generate_obsolete(QLineF QtCore qline.h)
+katie_generate_obsolete(QLinkedListIterator QtCore qlinkedlist.h)
+katie_generate_obsolete(QLinkedListNode QtCore qlinkedlist.h)
+katie_generate_obsolete(QListIterator QtCore qlist.h)
+katie_generate_obsolete(QListWidgetItem QtGui qlistwidget.h)
+katie_generate_obsolete(QMapIterator QtCore qmap.h)
+katie_generate_obsolete(QMetaClassInfo QtCore qmetaobject.h)
+katie_generate_obsolete(QMetaEnum QtCore qmetaobject.h)
+katie_generate_obsolete(QMetaMethod QtCore qmetaobject.h)
+katie_generate_obsolete(QMetaProperty QtCore qmetaobject.h)
+katie_generate_obsolete(QMetaTypeId2 QtCore qmetatype.h)
+katie_generate_obsolete(QModelIndexList QtCore qabstractitemmodel.h)
+katie_generate_obsolete(QModelIndex QtCore qabstractitemmodel.h)
+katie_generate_obsolete(QMouseEvent QtGui qevent.h)
+katie_generate_obsolete(QMoveEvent QtGui qevent.h)
+katie_generate_obsolete(QMultiHash QtCore qhash.h)
+katie_generate_obsolete(QMultiMap QtCore qmap.h)
+katie_generate_obsolete(QMutableHashIterator QtCore qhash.h)
+katie_generate_obsolete(QMutableLinkedListIterator QtCore qlist.h)
+katie_generate_obsolete(QMutableListIterator QtCore qlist.h)
+katie_generate_obsolete(QMutableMapIterator QtCore qmap.h)
+katie_generate_obsolete(QMutableSetIterator QtCore qset.h)
+katie_generate_obsolete(QMutableStringListIterator QtCore qstringlist.h)
+katie_generate_obsolete(QMutableVectorIterator QtCore qvector.h)
+katie_generate_obsolete(QMutexLocker QtCore qmutex.h)
+katie_generate_obsolete(QNetworkAddressEntry QtNetwork qnetworkinterface.h)
+katie_generate_obsolete(QNetworkCacheMetaData QtNetwork qabstractnetworkcache.h)
+katie_generate_obsolete(QNetworkConfigurationManager QtNetwork qnetworkconfigmanager.h)
+katie_generate_obsolete(QNetworkProxyFactory QtNetwork qnetworkproxy.h)
+katie_generate_obsolete(QNetworkProxyQuery QtNetwork qnetworkproxy.h)
+katie_generate_obsolete(QObjectList QtCore qobject.h)
+katie_generate_obsolete(QPainterPathStroker QtGui qpainterpath.h)
+katie_generate_obsolete(QPaintEvent QtGui qevent.h)
+katie_generate_obsolete(QPersistentModelIndex QtCore qabstractitemmodel.h)
+katie_generate_obsolete(Q_PID QtCore qprocess.h)
+katie_generate_obsolete(QPinchGesture QtGui qgesture.h)
+katie_generate_obsolete(QPlainTextDocumentLayout QtGui qplaintextedit.h)
+katie_generate_obsolete(QPointF QtCore qpoint.h)
+katie_generate_obsolete(QPolygonF QtGui qpolygon.h)
+katie_generate_obsolete(QProcessEnvironment QtCore qprocess.h)
+katie_generate_obsolete(QRadialGradient QtGui qbrush.h)
+katie_generate_obsolete(QReadLocker QtCore qreadwritelock.h)
+katie_generate_obsolete(QRectF QtCore qrect.h)
+katie_generate_obsolete(QRegExpValidator QtGui qvalidator.h)
+katie_generate_obsolete(QResizeEvent QtGui qevent.h)
+katie_generate_obsolete(QScopedArrayPointer QtCore qscopedpointer.h)
+katie_generate_obsolete(QSharedDataPointer QtCore qshareddata.h)
+katie_generate_obsolete(QShortcutEvent QtGui qevent.h)
+katie_generate_obsolete(QShowEvent QtGui qevent.h)
+katie_generate_obsolete(QSizeF QtCore qsize.h)
+katie_generate_obsolete(QSpacerItem QtGui qlayoutitem.h)
+katie_generate_obsolete(QSplitterHandle QtGui qsplitter.h)
+katie_generate_obsolete(QSpontaneKeyEvent QtTest qtestspontaneevent.h)
+katie_generate_obsolete(QSqlDriverCreatorBase QtSql qsqldatabase.h)
+katie_generate_obsolete(QSqlDriverCreator QtSql qsqldatabase.h)
+katie_generate_obsolete(QSqlDriverFactoryInterface QtSql qsqldriverplugin.h)
+katie_generate_obsolete(QSqlRelation QtSql qsqlrelationaltablemodel.h)
+katie_generate_obsolete(QStandardItem QtGui qstandarditemmodel.h)
+katie_generate_obsolete(QStringListIterator QtCore qstringlist.h)
+katie_generate_obsolete(QStyleHintReturnMask QtGui qstyleoption.h)
+katie_generate_obsolete(QStyleOptionButton QtGui qstyleoption.h)
+katie_generate_obsolete(QStyleOptionComboBox QtGui qstyleoption.h)
+katie_generate_obsolete(QStyleOptionComplex QtGui qstyleoption.h)
+katie_generate_obsolete(QStyleOptionDockWidget QtGui qstyleoption.h)
+katie_generate_obsolete(QStyleOptionDockWidgetV2 QtGui qstyleoption.h)
+katie_generate_obsolete(QStyleOptionFocusRect QtGui qstyleoption.h)
+katie_generate_obsolete(QStyleOptionFrame QtGui qstyleoption.h)
+katie_generate_obsolete(QStyleOptionFrameV2 QtGui qstyleoption.h)
+katie_generate_obsolete(QStyleOptionFrameV3 QtGui qstyleoption.h)
+katie_generate_obsolete(QStyleOptionGraphicsItem QtGui qstyleoption.h)
+katie_generate_obsolete(QStyleOptionGroupBox QtGui qstyleoption.h)
+katie_generate_obsolete(QStyleOptionHeader QtGui qstyleoption.h)
+katie_generate_obsolete(QStyleOptionMenuItem QtGui qstyleoption.h)
+katie_generate_obsolete(QStyleOptionProgressBar QtGui qstyleoption.h)
+katie_generate_obsolete(QStyleOptionProgressBarV2 QtGui qstyleoption.h)
+katie_generate_obsolete(QStyleOptionRubberBand QtGui qstyleoption.h)
+katie_generate_obsolete(QStyleOptionSlider QtGui qstyleoption.h)
+katie_generate_obsolete(QStyleOptionSpinBox QtGui qstyleoption.h)
+katie_generate_obsolete(QStyleOptionTabBarBase QtGui qstyleoption.h)
+katie_generate_obsolete(QStyleOptionTab QtGui qstyleoption.h)
+katie_generate_obsolete(QStyleOptionTabV2 QtGui qstyleoption.h)
+katie_generate_obsolete(QStyleOptionTabV3 QtGui qstyleoption.h)
+katie_generate_obsolete(QStyleOptionTabWidgetFrame QtGui qstyleoption.h)
+katie_generate_obsolete(QStyleOptionTabWidgetFrameV2 QtGui qstyleoption.h)
+katie_generate_obsolete(QStyleOptionTitleBar QtGui qstyleoption.h)
+katie_generate_obsolete(QStyleOptionToolBar QtGui qstyleoption.h)
+katie_generate_obsolete(QStyleOptionToolButton QtGui qstyleoption.h)
+katie_generate_obsolete(QStyleOptionViewItem QtGui qstyleoption.h)
+katie_generate_obsolete(QStyleOptionViewItemV2 QtGui qstyleoption.h)
+katie_generate_obsolete(QStyleOptionViewItemV3 QtGui qstyleoption.h)
+katie_generate_obsolete(QStyleOptionViewItemV4 QtGui qstyleoption.h)
+katie_generate_obsolete(QSysInfo QtCore qglobal.h)
+katie_generate_obsolete(QTableWidgetItem QtGui qtablewidget.h)
+katie_generate_obsolete(QtAlgorithms QtCore qalgorithms.h)
+katie_generate_obsolete(QtConfig QtCore qconfig.h)
+katie_generate_obsolete(QtContainerFwd QtCore qcontainerfwd.h)
+katie_generate_obsolete(QtDebug QtCore qdebug.h)
+katie_generate_obsolete(QtEndian QtCore qendian.h)
+katie_generate_obsolete(QTestAccessibilityEvent QtTest qtestaccessible.h)
+katie_generate_obsolete(QTestAccessibility QtTest qtestaccessible.h)
+katie_generate_obsolete(QTestDelayEvent QtTest qtestevent.h)
+katie_generate_obsolete(QTestEventList QtTest qtestevent.h)
+katie_generate_obsolete(QTestKeyClicksEvent QtTest qtestevent.h)
+katie_generate_obsolete(QTestKeyEvent QtTest qtestevent.h)
+katie_generate_obsolete(QTestMouseEvent QtTest qtestevent.h)
+katie_generate_obsolete(QtEvents QtGui qevent.h)
+katie_generate_obsolete(QTextBlockFormat QtGui qtextformat.h)
+katie_generate_obsolete(QTextBlock QtGui qtextobject.h)
+katie_generate_obsolete(QTextBlockUserData QtGui qtextobject.h)
+katie_generate_obsolete(QTextCharFormat QtGui qtextformat.h)
+katie_generate_obsolete(QTextDecoder QtCore qtextcodec.h)
+katie_generate_obsolete(QTextFrame QtGui qtextobject.h)
+katie_generate_obsolete(QTextLength QtGui qtextformat.h)
+katie_generate_obsolete(QTextLine QtGui qtextlayout.h)
+katie_generate_obsolete(QTextListFormat QtGui qtextformat.h)
+katie_generate_obsolete(QTextStreamManipulator QtCore qtextstream.h)
+katie_generate_obsolete(QTextTableCell QtGui qtexttable.h)
+katie_generate_obsolete(QTextTableFormat QtGui qtextformat.h)
+katie_generate_obsolete(QtGlobal QtCore qglobal.h)
+katie_generate_obsolete(QTimeEdit QtGui qdatetimeedit.h)
+katie_generate_obsolete(QTime QtCore qdatetime.h)
+katie_generate_obsolete(QTimerEvent QtCore qcoreevent.h)
+katie_generate_obsolete(QTouchEvent QtGui qevent.h)
+katie_generate_obsolete(QtPlugin QtCore qplugin.h)
+katie_generate_obsolete(Qt QtCore qnamespace.h)
+katie_generate_obsolete(QTreeWidgetItem QtGui qtreewidget.h)
+katie_generate_obsolete(QtTestGui QtTest qtest_gui.h)
+katie_generate_obsolete(QTypeInfo QtCore qglobal.h)
+katie_generate_obsolete(QUndoCommand QtGui qundostack.h)
+katie_generate_obsolete(QVariantHash QtCore qvariant.h)
+katie_generate_obsolete(QVariantList QtCore qvariant.h)
+katie_generate_obsolete(QVariantMap QtCore qvariant.h)
+katie_generate_obsolete(QVBoxLayout QtGui qboxlayout.h)
+katie_generate_obsolete(QVectorData QtCore qvector.h)
+katie_generate_obsolete(QWeakPointer QtCore qsharedpointer.h)
+katie_generate_obsolete(QWheelEvent QtGui qevent.h)
+katie_generate_obsolete(QWidgetItem QtGui qlayoutitem.h)
+katie_generate_obsolete(QWidgetList QtGui qwindowdefs.h)
+katie_generate_obsolete(QWindowStateChangeEvent QtGui qevent.h)
+katie_generate_obsolete(QWizardPage QtGui qwizard.h)
+katie_generate_obsolete(QWriteLocker QtCore qreadwritelock.h)
+katie_generate_obsolete(QX11EmbedContainer QtGui qx11embed_x11.h)
+katie_generate_obsolete(QX11EmbedWidget QtGui qx11embed_x11.h)
+katie_generate_obsolete(QX11Info QtGui qx11info_x11.h)
+katie_generate_obsolete(QXmlAttributes QtXml qxml.h)
+katie_generate_obsolete(QXmlContentHandler QtXml qxml.h)
+katie_generate_obsolete(QXmlDeclHandler QtXml qxml.h)
+katie_generate_obsolete(QXmlDefaultHandler QtXml qxml.h)
+katie_generate_obsolete(QXmlDTDHandler QtXml qxml.h)
+katie_generate_obsolete(QXmlEntityResolver QtXml qxml.h)
+katie_generate_obsolete(QXmlErrorHandler QtXml qxml.h)
+katie_generate_obsolete(QXmlInputSource QtXml qxml.h)
+katie_generate_obsolete(QXmlLexicalHandler QtXml qxml.h)
+katie_generate_obsolete(QXmlLocator QtXml qxml.h)
+katie_generate_obsolete(QXmlNamespaceSupport QtXml qxml.h)
+katie_generate_obsolete(QXmlParseException QtXml qxml.h)
+katie_generate_obsolete(QXmlReader QtXml qxml.h)
+katie_generate_obsolete(QXmlSimpleReader QtXml qxml.h)
+katie_generate_obsolete(QXmlStreamAttribute QtXml qxmlstream.h)
+katie_generate_obsolete(QXmlStreamAttributes QtXml qxmlstream.h)
+katie_generate_obsolete(QXmlStreamEntityDeclaration QtXml qxmlstream.h)
+katie_generate_obsolete(QXmlStreamEntityDeclarations QtXml qxmlstream.h)
+katie_generate_obsolete(QXmlStreamEntityResolver QtXml qxmlstream.h)
+katie_generate_obsolete(QXmlStreamNamespaceDeclaration QtXml qxmlstream.h)
+katie_generate_obsolete(QXmlStreamNamespaceDeclarations QtXml qxmlstream.h)
+katie_generate_obsolete(QXmlStreamNotationDeclaration QtXml qxmlstream.h)
+katie_generate_obsolete(QXmlStreamNotationDeclarations QtXml qxmlstream.h)
+katie_generate_obsolete(QXmlStreamReader QtXml qxmlstream.h)
+katie_generate_obsolete(QXmlStreamWriter QtXml qxmlstream.h)
 # those have shuffled from QtDesigner to QtUiTools
 katie_generate_obsolete(customwidget.h QtDesigner ../QtUiTools/customwidget.h)
 katie_generate_obsolete(qdesignercustomwidgetinterface.h QtDesigner ../QtUiTools/customwidget.h)

diff --git a/cmake/modules/KatieBuildMacros.cmake b/cmake/modules/KatieBuildMacros.cmake
index fe26c53..f171767 100644 (file)
--- a/cmake/modules/KatieBuildMacros.cmake
+++ b/cmake/modules/KatieBuildMacros.cmake
@@ -13,28 +13,31 @@ macro(KATIE_WARNING MESSAGESTR)
     endif()
 endmacro()
 
+# a macro to write data to file, does nothing if the file exists and its
+# content is the same as the data
+macro(KATIE_WRITE_FILE OUTFILE DATA)
+    file(WRITE "${CMAKE_BINARY_DIR}/katie_write_file.tmp" "${DATA}")
+    configure_file("${CMAKE_BINARY_DIR}/katie_write_file.tmp" "${OUTFILE}" COPYONLY)
+endmacro()
+
 # a macro to create camel-case headers pointing to their lower-case alternative
-# with a dev warning for possibly non-existent headers
+# as well as meta header that includes component headers
 macro(KATIE_GENERATE_PUBLIC PUBLIC_INCLUDES SUBDIR)
-    set(metaout ${CMAKE_BINARY_DIR}/include/${SUBDIR}/${SUBDIR})
-    set(metadata "#ifndef Qt${SUBDIR}_META_H\n#define Qt${SUBDIR}_META_H\n\n")
     foreach(pubheader ${PUBLIC_INCLUDES})
         string(TOLOWER ${pubheader} pubname)
-        get_filename_component(pubname ${pubname} NAME_WE)
-        set(pubout ${CMAKE_BINARY_DIR}/include/${SUBDIR}/${pubheader})
-        set(pubcheck ${CMAKE_BINARY_DIR}/include/${SUBDIR}/${pubname}.h)
-        if(NOT EXISTS ${pubout})
-            file(WRITE ${pubout} "#include <${pubname}.h>\n")
-        endif()
-        if(NOT EXISTS ${pubcheck})
-            katie_warning("Bogus public header: ${pubheader} (${pubcheck})")
-        # qttestgui is exception because it requires explicit gui component linkage
-        elseif(NOT "${pubname}" STREQUAL "qttestgui")
-            set(metadata "${metadata}#include <${SUBDIR}/${pubname}.h>\n")
-        endif()
-    endforeach(pubheader)
+        set(pubout "${CMAKE_BINARY_DIR}/include/${SUBDIR}/${pubheader}")
+        katie_write_file("${pubout}" "#include <${pubname}.h>\n")
+    endforeach()
+
+    file(GLOB PUBLIC_LIST "${CMAKE_BINARY_DIR}/include/${SUBDIR}/*.h")
+    set(metaout "${CMAKE_BINARY_DIR}/include/${SUBDIR}/${SUBDIR}")
+    set(metadata "#ifndef ${SUBDIR}_META_H\n#define ${SUBDIR}_META_H\n\n")
+    foreach(pubheader ${PUBLIC_LIST})
+        get_filename_component(pubname ${pubheader} NAME)
+        set(metadata "${metadata}#include <${SUBDIR}/${pubname}>\n")
+    endforeach()
     set(metadata "${metadata}\n#endif\n")
-    file(WRITE ${metaout} "${metadata}")
+    katie_write_file("${metaout}" "${metadata}")
 endmacro()
 
 # a macro to copy headers into specific directory based on their base names
@@ -43,19 +46,17 @@ macro(KATIE_GENERATE_MISC MISC_INCLUDES SUBDIR)
     foreach(mischeader ${MISC_INCLUDES})
         get_filename_component(headername ${mischeader} NAME)
         if("${headername}" MATCHES "(_p.h)")
-            set(headout ${CMAKE_BINARY_DIR}/privateinclude/${SUBDIR}/${headername})
+            set(headout "${CMAKE_BINARY_DIR}/privateinclude/${SUBDIR}/${headername}")
         else()
-            set(headout ${CMAKE_BINARY_DIR}/include/${SUBDIR}/${headername})
+            set(headout "${CMAKE_BINARY_DIR}/include/${SUBDIR}/${headername}")
         endif()
-        configure_file(${mischeader} ${headout} COPYONLY)
+        configure_file("${mischeader}" "${headout}" COPYONLY)
     endforeach(mischeader)
 endmacro()
 
 macro(KATIE_GENERATE_OBSOLETE OBSOLETE_INCLUDE SUBDIR REDIRECT)
-    set(pubout ${CMAKE_BINARY_DIR}/include/${SUBDIR}/${OBSOLETE_INCLUDE})
-    if(NOT EXISTS "${pubout}")
-        file(WRITE "${pubout}" "#include <${SUBDIR}/${REDIRECT}>\n")
-    endif()
+    set(pubout "${CMAKE_BINARY_DIR}/include/${SUBDIR}/${OBSOLETE_INCLUDE}")
+    katie_write_file("${pubout}" "#include <${SUBDIR}/${REDIRECT}>\n")
 endmacro()
 
 # a macro for creating pkgconfig files for major components
@@ -147,9 +148,7 @@ endmacro()
 function(KATIE_SETUP_TARGET FORTARGET)
     # this can be simpler if continue() was supported by old CMake versions
     set(resourcesdep "${CMAKE_CURRENT_BINARY_DIR}/${FORTARGET}_resources.cpp")
-    if(NOT EXISTS "${resourcesdep}")
-        file(WRITE "${resourcesdep}" "enum { CompilersWorkaroundAlaAutomoc = 1 };\n")
-    endif()
+    katie_write_file("${resourcesdep}" "enum { CompilersWorkaroundAlaAutomoc = 1 };\n")
     set(targetresources)
     set(rscpath "${CMAKE_CURRENT_BINARY_DIR}/${FORTARGET}_resources")
     include_directories(${rscpath})
@@ -221,9 +220,6 @@ function(KATIE_SETUP_TARGET FORTARGET)
         endforeach()
         set(${FORTARGET}_SOURCES ${resourcesdep} ${filteredsources} PARENT_SCOPE)
     else()
-        # use temporary file, then configure_file() to avoid all-in-one target rebuilds when the
-        # project is reconfigured
-        set(allinonetemp "${CMAKE_CURRENT_BINARY_DIR}/allinone_temporary.cpp")
         set(allinonesource "${CMAKE_CURRENT_BINARY_DIR}/${FORTARGET}_allinone.cpp")
         set(allinonedata)
         set(excludesources)
@@ -237,8 +233,7 @@ function(KATIE_SETUP_TARGET FORTARGET)
                 set(allinonedata "${allinonedata}#include \"${srcstring}\"\n")
             endif()
         endforeach()
-        file(WRITE "${allinonetemp}" "${allinonedata}")
-        configure_file("${allinonetemp}" "${allinonesource}")
+        katie_write_file("${allinonesource}" "${allinonedata}")
         set(${FORTARGET}_SOURCES ${resourcesdep} ${allinonesource} ${excludesources} PARENT_SCOPE)
     endif()
 endfunction()

diff --git a/scripts/incfsck.py b/scripts/incfsck.py
index df7c3ce..59466c8 100755 (executable)
--- a/scripts/incfsck.py
+++ b/scripts/incfsck.py
@@ -281,6 +281,9 @@ incmap = {
         'QWidgetList': 'qwindowdefs.h',
         'QWindowStateChangeEvent': 'qevent.h',
         'QWizardPage': 'qwizard.h',
+        'QX11EmbedContainer': 'qx11embed_x11.h',
+        'QX11EmbedWidget': 'qx11embed_x11.h',
+        'QX11Info': 'qx11info_x11.h',
         'QtEvents': 'qevent.h',
     },
     'QtNetwork': {
@@ -361,7 +364,7 @@ incmap = {
 if '--printmap' in sys.argv:
     for component in incmap:
         for key in incmap[component]:
-            print('katie_generate_obsolete(%s.h %s %s)' % (key.lower(), component, incmap[component][key]))
+            print('katie_generate_obsolete(%s %s %s)' % (key, component, incmap[component][key]))
     sys.exit(0)
 elif '--sortmap' in sys.argv:
     for component in sorted(incmap):

diff --git a/src/core/CMakeLists.txt b/src/core/CMakeLists.txt
index 1894540..6ea203a 100644 (file)
--- a/src/core/CMakeLists.txt
+++ b/src/core/CMakeLists.txt
@@ -170,50 +170,6 @@ set(CORE_PUBLIC_HEADERS
     QJsonValue
     QCommandLineOption
     QCommandLineParser
-    # aliases
-    QtPlugin
-    QtDebug
-    QtConfig
-    # mixed
-    QAbstractFileEngineHandler
-    QMetaTypeId2
-    QScopedPointerDeleter
-    QTypeInfo
-    QContiguousCacheData
-    QStringListIterator
-    QMutableLinkedListIterator
-    QMutableHashIterator
-    QFutureInterfaceBase
-    QTextStreamManipulator
-    QLinkedListNode
-    QLinkedListIterator
-    QIncompatibleFlag
-    QFutureIterator
-    QVariantMap
-    QVariantList
-    QVariantHash
-    QAbstractListModel
-    QAbstractTableModel
-    QProcessEnvironment
-    QModelIndex
-    QModelIndexList
-    QSizeF
-    QRectF
-    QLineF
-    QWeakPointer
-    QDate
-    QTime
-    QListIterator
-    QMetaMethod
-    QMetaEnum
-    QMutexLocker
-    QScopedArrayPointer
-    QJsonParseError
-    QPersistentModelIndex
-    QVectorData
-    # obsolete
-    QFlags
-    Qt
 )
 
 include(codecs/codecs.cmake)

diff --git a/src/dbus/CMakeLists.txt b/src/dbus/CMakeLists.txt
index ee9b221..8c7e7db 100644 (file)
--- a/src/dbus/CMakeLists.txt
+++ b/src/dbus/CMakeLists.txt
@@ -21,11 +21,6 @@ set(DBUS_PUBLIC_HEADERS
     QDBusServer
     QDBusServiceWatcher
     QDBusUnixFileDescriptor
-    # mixed
-    QDBusObjectPath
-    QDBusPendingCallWatcher
-    # obsolete
-    QDBusVariant
 )
 
 include_directories(

diff --git a/src/gui/CMakeLists.txt b/src/gui/CMakeLists.txt
index 1512e9e..fd8dbe1 100644 (file)
--- a/src/gui/CMakeLists.txt
+++ b/src/gui/CMakeLists.txt
@@ -296,89 +296,6 @@ set(GUI_PUBLIC_HEADERS
     QWizardPage
     QWorkspace
     QGuiPlatformPlugin
-    # those are aliases
-    QX11Info
-    QX11EmbedContainer
-    QX11EmbedWidget
-    # mixed
-    QAccessibleValueInterface
-    QAnimationDriver
-    QUndoCommand
-    QPolygonF
-    QTextLine
-    QTextBlock
-    QTextBlockFormat
-    QListWidgetItem
-    QTreeWidgetItem
-    QStandardItem
-    QActionEvent
-    QShortcutEvent
-    QCloseEvent
-    QResizeEvent
-    QMoveEvent
-    QShowEvent
-    QHideEvent
-    QFocusEvent
-    QMouseEvent
-    QKeyEvent
-    QWheelEvent
-    QTouchEvent
-    QHoverEvent
-    QDragEnterEvent
-    QDragLeaveEvent
-    QDragMoveEvent
-    QPaintEvent
-    QHelpEvent
-    QDropEvent
-    QContextMenuEvent
-    QGraphicsSceneEvent
-    QGraphicsSceneHelpEvent
-    QGraphicsSceneMoveEvent
-    QGraphicsSceneMouseEvent
-    QGraphicsSceneWheelEvent
-    QGraphicsSceneResizeEvent
-    QGraphicsSceneHoverEvent
-    QGraphicsSceneContextMenuEvent
-    QGraphicsSceneDragDropEvent
-    QGraphicsTextItem
-    QGraphicsObject
-    QStyleOptionTitleBar
-    QStyleOptionGraphicsItem
-    QStyleOptionButton
-    QStyleOptionFrame
-    QStyleOptionFrameV2
-    QStyleOptionFrameV3
-    QStyleOptionViewItem
-    QStyleOptionViewItemV2
-    QStyleOptionViewItemV3
-    QStyleOptionViewItemV4
-    QStyleOptionProgressBar
-    QStyleOptionProgressBarV2
-    QStyleOptionDockWidget
-    QStyleOptionDockWidgetV2
-    QStyleOptionFocusRect
-    QStyleOptionMenuItem
-    QStyleOptionTabWidgetFrame
-    QStyleOptionTabWidgetFrameV2
-    QItemSelection
-    QIntValidator
-    QFontMetricsF
-    QStyleOptionSlider
-    QStyleOptionToolButton
-    QDoubleValidator
-    QTextFrame
-    QTextListFormat
-    QTextCharFormat
-    QTextTableFormat
-    QSpacerItem
-    QVBoxLayout
-    QHBoxLayout
-    QDoubleSpinBox
-    QLinearGradient
-    QGradient
-    # pure aliases, but required by UI generator
-    QTimeEdit
-    QDateEdit
 )
 
 include(accessible/accessible.cmake)

diff --git a/src/network/CMakeLists.txt b/src/network/CMakeLists.txt
index fa245c2..ca90b0b 100644 (file)
--- a/src/network/CMakeLists.txt
+++ b/src/network/CMakeLists.txt
@@ -36,16 +36,6 @@ set(NETWORK_PUBLIC_HEADERS
     QUdpSocket
     QUrlInfo
     QHttpMultiPart
-    # mixed
-    QNetworkAddressEntry
-    QNetworkConfigurationManager
-    QNetworkCacheMetaData
-    QHttpHeader
-    QHttpPart
-    QHttpRequestHeader
-    QHttpResponseHeader
-    QNetworkProxyFactory
-    QNetworkProxyQuery
 )
 
 include(access/access.cmake)

diff --git a/src/sql/CMakeLists.txt b/src/sql/CMakeLists.txt
index 90155ba..99a8da7 100644 (file)
--- a/src/sql/CMakeLists.txt
+++ b/src/sql/CMakeLists.txt
@@ -16,11 +16,6 @@ set(SQL_PUBLIC_HEADERS
     QSqlRelationalTableModel
     QSqlResult
     QSqlTableModel
-    # mixed
-    QSqlDriverCreator
-    QSqlDriverCreatorBase
-    QSqlDriverFactoryInterface
-    QSqlRelation
 )
 
 include(kernel/kernel.cmake)

diff --git a/src/test/CMakeLists.txt b/src/test/CMakeLists.txt
index 611b91a..b2247ab 100644 (file)
--- a/src/test/CMakeLists.txt
+++ b/src/test/CMakeLists.txt
@@ -21,8 +21,6 @@ set(TEST_PUBLIC_HEADERS
     QTestLightXmlStreamer
     QTestXmlStreamer
     QTestXunitStreamer
-    # those are aliases
-    QtTestGui
 )
 
 set(TEST_HEADERS

diff --git a/src/xml/CMakeLists.txt b/src/xml/CMakeLists.txt
index 097423c..a740b1f 100644 (file)
--- a/src/xml/CMakeLists.txt
+++ b/src/xml/CMakeLists.txt
@@ -3,49 +3,7 @@ set(EXTRA_XML_LIBS KtCore)
 
 set(XML_PUBLIC_HEADERS
     ${XML_PUBLIC_HEADERS}
-    # mixed
-    QXmlAttributes
-    QXmlSimpleReader
-    QXmlParseException
-    QXmlContentHandler
-    QDomDocument
-    QDomElement
-    QDomNode
-    QDomNodeList
-    QDomCDATASection
-    QDomCharacterData
-    QDomComment
-    QDomDocumentFragment
-    QDomDocumentType
-    QDomEntity
-    QDomEntityReference
-    QDomImplementation
-    QDomNamedNodeMap
-    QDomNotation
-    QDomProcessingInstruction
-    QDomText
-    QDomAttr
-    QXmlDeclHandler
-    QXmlDTDHandler
-    QXmlEntityResolver
-    QXmlErrorHandler
-    QXmlLexicalHandler
-    QXmlLocator
-    QXmlNamespaceSupport
-    QXmlReader
-    QXmlDefaultHandler
-    QXmlInputSource
-    QXmlStreamAttribute
-    QXmlStreamAttributes
-    QXmlStreamNotationDeclaration
-    QXmlStreamNotationDeclarations
-    QXmlStreamEntityDeclaration
-    QXmlStreamEntityDeclarations
-    QXmlStreamNamespaceDeclaration
-    QXmlStreamNamespaceDeclarations
-    QXmlStreamEntityResolver
-    QXmlStreamReader
-    QXmlStreamWriter
+    # all headers are aliases
 )
 
 include(dom/dom.cmake)