deal with xml streaming API headers

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

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 744d906..7831a47 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -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)
 

diff --git a/src/core/CMakeLists.txt b/src/core/CMakeLists.txt
index cfe0371..02891e3 100644 (file)
--- a/src/core/CMakeLists.txt
+++ b/src/core/CMakeLists.txt
@@ -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)

diff --git a/src/xml/CMakeLists.txt b/src/xml/CMakeLists.txt
index 7c3d050..90efab4 100644 (file)
--- a/src/xml/CMakeLists.txt
+++ b/src/xml/CMakeLists.txt
@@ -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)