diff options
author | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2017-11-02 14:18:03 +0100 |
---|---|---|
committer | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2017-11-06 07:56:25 +0000 |
commit | f2063ee4737f90c5d412a9a328672fde32b033eb (patch) | |
tree | be06749b135fd45a9ca5b0e1d213ef743883dcf5 /sources/pyside2/PySide2/QtNetwork | |
parent | 0de4dffa0c5abc80df7063daf6bc9d1754891a9d (diff) |
PySide2: Simplify typesystem path handling
Modify the typesystem.xml files such that all dependent files
are loaded via module (for example, QtCore/typesystem_core.xml).
As a result, it is no longer necessary to add each dependent directory
to the typesystem path; it is sufficient to pass the binary and source
path of PySide2 and the source directory of the Qt module only.
This requires rewriting the dependency checking for --reuse-build
so that it loops over the source directories of the dependent
Qt modules.
Change-Id: Ib234c2673f4ee93cc8a3282fac69bcfcfaebd0ac
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
Diffstat (limited to 'sources/pyside2/PySide2/QtNetwork')
-rw-r--r-- | sources/pyside2/PySide2/QtNetwork/CMakeLists.txt | 6 | ||||
-rw-r--r-- | sources/pyside2/PySide2/QtNetwork/typesystem_network.xml | 2 |
2 files changed, 2 insertions, 6 deletions
diff --git a/sources/pyside2/PySide2/QtNetwork/CMakeLists.txt b/sources/pyside2/PySide2/QtNetwork/CMakeLists.txt index f01aaf77a..68037017d 100644 --- a/sources/pyside2/PySide2/QtNetwork/CMakeLists.txt +++ b/sources/pyside2/PySide2/QtNetwork/CMakeLists.txt @@ -43,10 +43,6 @@ ${QtNetwork_OPTIONAL_SRC} ${QtNetwork_GEN_DIR}/qtnetwork_module_wrapper.cpp ) -make_path(QtNetwork_typesystem_path ${QtCore_SOURCE_DIR} - ${QtCore_BINARY_DIR} - ${QtNetwork_SOURCE_DIR}) - set(QtNetwork_include_dirs ${QtNetwork_SOURCE_DIR} ${QtNetwork_BINARY_DIR} ${Qt5Core_INCLUDE_DIRS} @@ -67,7 +63,7 @@ create_pyside_module(QtNetwork QtNetwork_include_dirs QtNetwork_libraries QtNetwork_deps - QtNetwork_typesystem_path + QtNetwork_SOURCE_DIR QtNetwork_SRC "" "" diff --git a/sources/pyside2/PySide2/QtNetwork/typesystem_network.xml b/sources/pyside2/PySide2/QtNetwork/typesystem_network.xml index 2f8424ac7..06a402e3c 100644 --- a/sources/pyside2/PySide2/QtNetwork/typesystem_network.xml +++ b/sources/pyside2/PySide2/QtNetwork/typesystem_network.xml @@ -40,7 +40,7 @@ ****************************************************************************/ --> <typesystem package="PySide2.QtNetwork"> - <load-typesystem name="typesystem_core.xml" generate="no"/> + <load-typesystem name="QtCore/typesystem_core.xml" generate="no"/> <namespace-type name="QSsl"> <enum-type name="AlternativeNameEntryType"/> |