UIC does not need the XML component

Signed-off-by: Ivailo Monev <xakepa10@gmail.com>

diff --git a/src/tools/uic/CMakeLists.txt b/src/tools/uic/CMakeLists.txt
index 9202dac..a5f5f5b 100644 (file)
--- a/src/tools/uic/CMakeLists.txt
+++ b/src/tools/uic/CMakeLists.txt
@@ -1,13 +1,11 @@
 add_definitions(-DQT_UIC)
-set(EXTRA_UIC_LIBS KtCore KtXml)
+set(EXTRA_UIC_LIBS KtCore)
 
 include_directories(
     ${CMAKE_BINARY_DIR}/include
     ${CMAKE_BINARY_DIR}/privateinclude
     ${CMAKE_BINARY_DIR}/include/QtCore
     ${CMAKE_BINARY_DIR}/privateinclude/QtCore
-    ${CMAKE_BINARY_DIR}/include/QtXml
-    ${CMAKE_BINARY_DIR}/privateinclude/QtXml
     ${CMAKE_CURRENT_SOURCE_DIR}
     ${CMAKE_CURRENT_SOURCE_DIR}/cpp
 )

diff --git a/src/tools/uic/ui4.h b/src/tools/uic/ui4.h
index 8b11771..ad0c03e 100644 (file)
--- a/src/tools/uic/ui4.h
+++ b/src/tools/uic/ui4.h
@@ -58,8 +58,8 @@
 #include <QtCore/QList>
 #include <QtCore/QString>
 #include <QtCore/QStringList>
-#include <QtCore/QXmlStreamReader>
-#include <QtCore/QXmlStreamWriter>
+
+#include <QtCore/qxmlstream.h>
 #include <QtCore/qglobal.h>
 
 QT_BEGIN_NAMESPACE

diff --git a/src/tools/uic/uic.cpp b/src/tools/uic/uic.cpp
index 633a816..7175ee0 100644 (file)
--- a/src/tools/uic/uic.cpp
+++ b/src/tools/uic/uic.cpp
@@ -48,7 +48,7 @@
 #include "cppwriteincludes.h"
 #include "cppwritedeclaration.h"
 
-#include <QtCore/QXmlStreamReader>
+#include <QtCore/qxmlstream.h>
 #include <QtCore/QFileInfo>
 #include <QtCore/QRegExp>
 #include <QtCore/QTextStream>

diff --git a/src/tools/uic/uic.h b/src/tools/uic/uic.h
index 0cb4b6a..5e00792 100644 (file)
--- a/src/tools/uic/uic.h
+++ b/src/tools/uic/uic.h
@@ -48,7 +48,7 @@
 #include <QtCore/QStringList>
 #include <QtCore/QHash>
 #include <QtCore/QStack>
-#include <QtCore/QXmlStreamReader>
+#include <QtCore/qxmlstream.h>
 
 QT_BEGIN_NAMESPACE