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/QtWidgets/CMakeLists.txt                | 6 +-----
 sources/pyside2/PySide2/QtWidgets/typesystem_widgets.xml.in     | 6 +++---
 sources/pyside2/PySide2/QtWidgets/typesystem_widgets_common.xml | 2 +-
 3 files changed, 5 insertions(+), 9 deletions(-)

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

diff --git a/sources/pyside2/PySide2/QtWidgets/CMakeLists.txt b/sources/pyside2/PySide2/QtWidgets/CMakeLists.txt
index e401db47c..a1bcdb023 100644
--- a/sources/pyside2/PySide2/QtWidgets/CMakeLists.txt
+++ b/sources/pyside2/PySide2/QtWidgets/CMakeLists.txt
@@ -212,10 +212,6 @@ ${QtWidgets_GEN_DIR}/qtwidgets_module_wrapper.cpp
 configure_file("${QtWidgets_SOURCE_DIR}/typesystem_widgets.xml.in"
                "${QtWidgets_BINARY_DIR}/typesystem_widgets.xml" @ONLY)
 
-make_path(QtWidgets_typesystem_path ${QtCore_SOURCE_DIR} ${QtGui_SOURCE_DIR}
-                                    ${QtCore_BINARY_DIR} ${QtGui_BINARY_DIR}
-                                    ${QtWidgets_SOURCE_DIR})
-
 set(QtWidgets_include_dirs  ${QtWidgets_SOURCE_DIR}
                             ${QtWidgets_BINARY_DIR}
                             ${pyside2_SOURCE_DIR}
@@ -241,7 +237,7 @@ create_pyside_module(QtWidgets
                      QtWidgets_include_dirs
                      QtWidgets_libraries
                      QtWidgets_deps
-                     QtWidgets_typesystem_path
+                     QtWidgets_SOURCE_DIR
                      QtWidgets_SRC
                      ""
                      ${QtWidgets_BINARY_DIR}/typesystem_widgets.xml)
diff --git a/sources/pyside2/PySide2/QtWidgets/typesystem_widgets.xml.in b/sources/pyside2/PySide2/QtWidgets/typesystem_widgets.xml.in
index e6952c2fe..bad39516c 100644
--- a/sources/pyside2/PySide2/QtWidgets/typesystem_widgets.xml.in
+++ b/sources/pyside2/PySide2/QtWidgets/typesystem_widgets.xml.in
@@ -40,7 +40,7 @@
 ****************************************************************************/
 -->
 <typesystem package="PySide2.QtWidgets">
-    <load-typesystem name="typesystem_gui.xml" generate="no"/>
-    <load-typesystem name="typesystem_widgets_@AUTO_OS@.xml" generate="yes"/>
-    <load-typesystem name="typesystem_widgets_common.xml" generate="yes"/>
+    <load-typesystem name="QtGui/typesystem_gui.xml" generate="no"/>
+    <load-typesystem name="QtWidgets/typesystem_widgets_@AUTO_OS@.xml" generate="yes"/>
+    <load-typesystem name="QtWidgets/typesystem_widgets_common.xml" generate="yes"/>
 </typesystem>
diff --git a/sources/pyside2/PySide2/QtWidgets/typesystem_widgets_common.xml b/sources/pyside2/PySide2/QtWidgets/typesystem_widgets_common.xml
index 624ef591a..d42547cd1 100644
--- a/sources/pyside2/PySide2/QtWidgets/typesystem_widgets_common.xml
+++ b/sources/pyside2/PySide2/QtWidgets/typesystem_widgets_common.xml
@@ -40,7 +40,7 @@
 ****************************************************************************/
 -->
 <typesystem package="PySide2.QtWidgets">
-  <load-typesystem name="typesystem_gui.xml" generate="no"/>
+  <load-typesystem name="QtGui/typesystem_gui.xml" generate="no"/>
 
 
 
-- 
cgit v1.2.3