diff options
| author | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2017-03-16 15:29:19 +0100 |
|---|---|---|
| committer | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2017-03-16 15:47:33 +0000 |
| commit | 7afa0eff4341b70dc7317dd17e3eb3e7ef58e4ee (patch) | |
| tree | 1759c11e0286ff54aee39b36cca74b222973dd9a /generator | |
| parent | 3813dbae665507eaa5efb3129ced6835895b3fe5 (diff) | |
TypeDatabase: Port to QXmlStreamReader
The old QtXml classes are deprecated.
Change-Id: Icde985d352df5bbaca89b23e0fea1d4efe8e2fb4
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
Diffstat (limited to 'generator')
| -rw-r--r-- | generator/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | generator/main.cpp | 1 | ||||
| -rw-r--r-- | generator/shiboken2/CMakeLists.txt | 2 |
3 files changed, 0 insertions, 5 deletions
diff --git a/generator/CMakeLists.txt b/generator/CMakeLists.txt index 8ececc8..0321186 100644 --- a/generator/CMakeLists.txt +++ b/generator/CMakeLists.txt @@ -23,7 +23,6 @@ include_directories(${CMAKE_CURRENT_SOURCE_DIR}/shiboken2 ${CMAKE_CURRENT_BINARY_DIR} ${apiextractor_SOURCE_DIR} ${Qt5Core_INCLUDE_DIRS} - ${Qt5Xml_INCLUDE_DIRS} ${Qt5XmlPatterns_INCLUDE_DIRS} ) @@ -33,7 +32,6 @@ set_target_properties(shiboken2 PROPERTIES OUTPUT_NAME shiboken2${shiboken2_SUFF target_link_libraries(shiboken2 apiextractor ${Qt5Core_LIBRARIES} - ${Qt5Xml_LIBRARIES} ${Qt5XmlPatterns_LIBRARIES} ) diff --git a/generator/main.cpp b/generator/main.cpp index 72504f7..ac8f77f 100644 --- a/generator/main.cpp +++ b/generator/main.cpp @@ -30,7 +30,6 @@ #include <QElapsedTimer> #include <QLinkedList> #include <QLibrary> -#include <QtXml/QDomDocument> #include <QtCore/QFile> #include <QtCore/QDir> #include <iostream> diff --git a/generator/shiboken2/CMakeLists.txt b/generator/shiboken2/CMakeLists.txt index bbc0e31..5c1b612 100644 --- a/generator/shiboken2/CMakeLists.txt +++ b/generator/shiboken2/CMakeLists.txt @@ -14,7 +14,6 @@ include_directories(${generators_SOURCE_DIR} ${CMAKE_CURRENT_BINARY_DIR} ${APIEXTRACTOR_INCLUDE_DIR} ${Qt5Core_INCLUDE_DIRS} - ${Qt5Xml_INCLUDE_DIRS} ) add_executable(shiboken2 ${shiboken_SRC}) @@ -22,7 +21,6 @@ set_target_properties(shiboken2 PROPERTIES OUTPUT_NAME shiboken2${shiboken_SUFFI target_link_libraries(shiboken2 ${APIEXTRACTOR_LIBRARY} ${Qt5Core_LIBRARIES} - ${Qt5Xml_LIBRARIES} ) configure_file(shibokenconfig.h.in "${CMAKE_CURRENT_BINARY_DIR}/shibokenconfig.h" @ONLY) |