From f2063ee4737f90c5d412a9a328672fde32b033eb Mon Sep 17 00:00:00 2001
From: Friedemann Kleint <Friedemann.Kleint@qt.io>
Date: Thu, 2 Nov 2017 14:18:03 +0100
Subject: 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>
---
 sources/pyside2/PySide2/QtWebSockets/CMakeLists.txt            | 5 +----
 sources/pyside2/PySide2/QtWebSockets/typesystem_websockets.xml | 4 ++--
 2 files changed, 3 insertions(+), 6 deletions(-)

(limited to 'sources/pyside2/PySide2/QtWebSockets')

diff --git a/sources/pyside2/PySide2/QtWebSockets/CMakeLists.txt b/sources/pyside2/PySide2/QtWebSockets/CMakeLists.txt
index 9eb402644..495fd4e7b 100644
--- a/sources/pyside2/PySide2/QtWebSockets/CMakeLists.txt
+++ b/sources/pyside2/PySide2/QtWebSockets/CMakeLists.txt
@@ -10,9 +10,6 @@ ${QtWebSockets_GEN_DIR}/qwebsocketserver_wrapper.cpp
 ${QtWebSockets_GEN_DIR}/qtwebsockets_module_wrapper.cpp
 )
 
-make_path(QtWebSockets_typesystem_path ${QtCore_SOURCE_DIR} ${QtCore_BINARY_DIR} ${QtNetwork_SOURCE_DIR}
-                                       ${QtNetwork_BINARY_DIR} ${QtWebSockets_SOURCE_DIR})
-
 set(QtWebSockets_include_dirs ${QtWebSockets_SOURCE_DIR}
                         ${QtWebSockets_BINARY_DIR}
                         ${Qt5Core_INCLUDE_DIRS}
@@ -39,6 +36,6 @@ create_pyside_module(QtWebSockets
                      QtWebSockets_include_dirs
                      QtWebSockets_libraries
                      QtWebSockets_deps
-                     QtWebSockets_typesystem_path
+                     QtWebSockets_SOURCE_DIR
                      QtWebSockets_SRC
                      "")
diff --git a/sources/pyside2/PySide2/QtWebSockets/typesystem_websockets.xml b/sources/pyside2/PySide2/QtWebSockets/typesystem_websockets.xml
index 8671795c0..f528850e2 100644
--- a/sources/pyside2/PySide2/QtWebSockets/typesystem_websockets.xml
+++ b/sources/pyside2/PySide2/QtWebSockets/typesystem_websockets.xml
@@ -40,8 +40,8 @@
 ****************************************************************************/
 -->
 <typesystem package="PySide2.QtWebSockets">
-  <load-typesystem name="typesystem_core.xml" generate="no"/>
-  <load-typesystem name="typesystem_network.xml" generate="no"/>
+  <load-typesystem name="QtCore/typesystem_core.xml" generate="no"/>
+  <load-typesystem name="QtNetwork/typesystem_network.xml" generate="no"/>
 
   <object-type name="QMaskGenerator" />
 
-- 
cgit v1.2.3