Katana_mirror/katie
1
0
Fork 0
mirror of https://bitbucket.org/smil3y/katie.git synced 2025-02-23 18:32:55 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

deal with xml streaming API headers

Browse source 
Signed-off-by: Ivailo Monev <xakepa10@laimg.moc>
This commit is contained in:
Ivailo Monev 2016-08-21 00:53:06 +00:00
parent 245f759bb4
commit be06be1b56
3 changed files with 40 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
CMakeLists.txt
View file

@ -974,7 +974,20 @@ if(KATIE_PLATFORM STREQUAL "mac")
katie_generate_obsolete(qmaccocoaviewcontainer.h QtGui qmaccocoaviewcontainer_mac.h)
endif()
katie_generate_obsolete(qttestgui.h QtTest qtest_gui.h)
# those have shuffled from QtDesginer to QtUiTools
# those have shuffled from QtXml to QtCore
katie_generate_obsolete(qxmlstreamattribute.h QtXml ../QtCore/qxmlstream.h)
katie_generate_obsolete(qxmlstreamattributes.h QtXml ../QtCore/qxmlstream.h)
katie_generate_obsolete(qxmlstreamstringref.h QtXml ../QtCore/qxmlstream.h)
katie_generate_obsolete(qxmlstreamnotationdeclaration.h QtXml ../QtCore/qxmlstream.h)
katie_generate_obsolete(qxmlstreamnotationdeclarations.h QtXml ../QtCore/qxmlstream.h)
katie_generate_obsolete(qxmlstreamentitydeclaration.h QtXml ../QtCore/qxmlstream.h)
katie_generate_obsolete(qxmlstreamentitydeclarations.h QtXml ../QtCore/qxmlstream.h)
katie_generate_obsolete(qxmlstreamnamespacedeclaration.h QtXml ../QtCore/qxmlstream.h)
katie_generate_obsolete(qxmlstreamnamespacedeclarations.h QtXml ../QtCore/qxmlstream.h)
katie_generate_obsolete(qxmlstreamentityresolver.h QtXml ../QtCore/qxmlstream.h)
katie_generate_obsolete(qxmlstreamreader.h QtXml ../QtCore/qxmlstream.h)
katie_generate_obsolete(qxmlstreamwriter.h QtXml ../QtCore/qxmlstream.h)
# and those from QtDesginer to QtUiTools
katie_generate_obsolete(customwidget.h QtDesginer ../QtUiTools/customwidget.h)
katie_generate_obsolete(qdesignercustomwidgetinterface.h QtDesigner ../QtUiTools/customwidget.h)

23
src/core/CMakeLists.txt
View file

@ -12,7 +12,6 @@ set(CORE_PUBLIC_HEADERS
QTextDecoder
QVectorData
QBuffer
QXmlStreamStringRef
QStringMatcher
QFutureIterator
QScopedPointer
@ -24,7 +23,6 @@ set(CORE_PUBLIC_HEADERS
QThreadStorage
QTextStreamManipulator
QMutableMapIterator
QXmlStreamNotationDeclaration
QLinkedListNode
QFutureInterfaceBase
QLibrary
@ -78,7 +76,6 @@ set(CORE_PUBLIC_HEADERS
QHashDummyValue
QFutureWatcherBase
QPoint
QXmlStreamEntityDeclarations
QByteArray
QWriteLocker
QHashData
@ -131,7 +128,6 @@ set(CORE_PUBLIC_HEADERS
QMutableListIterator
QScopedPointerPodDeleter
QTemporaryFile
QXmlStreamNamespaceDeclaration
QQueue
QMutex
QMargins
@ -143,11 +139,8 @@ set(CORE_PUBLIC_HEADERS
QAbstractConcatenable
QReadWriteLock
QFileSystemWatcher
QXmlStreamEntityResolver
QObjectList
QXmlStreamNotationDeclarations
QContiguousCacheTypedData
QXmlStreamReader
QForeachContainer
QtCleanUpFunction
QSharedPointer
@ -163,7 +156,6 @@ set(CORE_PUBLIC_HEADERS
QBasicAtomicPointer
QPauseAnimation
QMapData
QXmlStreamWriter
QByteRef
QIntegerForSize
QStringRef
@ -193,7 +185,6 @@ set(CORE_PUBLIC_HEADERS
QMetaType
QVariant
QFile
QXmlStreamEntityDeclaration
QtConcurrentFilter
QCache
QLatin1String
@ -219,7 +210,6 @@ set(CORE_PUBLIC_HEADERS
QMutexData
QSystemLocale
QVectorTypedData
QXmlStreamNamespaceDeclarations
QMapPayloadNode
QBasicTimer
QThread
@ -254,6 +244,19 @@ set(CORE_PUBLIC_HEADERS
QScopedArrayPointer
# obsolete
QFlags
# both in core and xml
QXmlStreamAttribute
QXmlStreamAttributes
QXmlStreamStringRef
QXmlStreamNotationDeclaration
QXmlStreamNotationDeclarations
QXmlStreamEntityDeclaration
QXmlStreamEntityDeclarations
QXmlStreamNamespaceDeclaration
QXmlStreamNamespaceDeclarations
QXmlStreamEntityResolver
QXmlStreamReader
QXmlStreamWriter
)
include(animation/animation.cmake)

14
src/xml/CMakeLists.txt
View file

@ -28,7 +28,19 @@ set(XML_PUBLIC_HEADERS
QXmlLocator
QXmlNamespaceSupport
QXmlReader
# TODO: figure out what to do with QXmlStream, the classes are now in core
# both in core and xml
QXmlStreamAttribute
QXmlStreamAttributes
QXmlStreamStringRef
QXmlStreamNotationDeclaration
QXmlStreamNotationDeclarations
QXmlStreamEntityDeclaration
QXmlStreamEntityDeclarations
QXmlStreamNamespaceDeclaration
QXmlStreamNamespaceDeclarations
QXmlStreamEntityResolver
QXmlStreamReader
QXmlStreamWriter
)
include(dom/dom.cmake)