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/QtUiTools/CMakeLists.txt         | 7 +------
 sources/pyside2/PySide2/QtUiTools/typesystem_uitools.xml | 4 ++--
 2 files changed, 3 insertions(+), 8 deletions(-)

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

diff --git a/sources/pyside2/PySide2/QtUiTools/CMakeLists.txt b/sources/pyside2/PySide2/QtUiTools/CMakeLists.txt
index b7ae6974d..e4de03f49 100644
--- a/sources/pyside2/PySide2/QtUiTools/CMakeLists.txt
+++ b/sources/pyside2/PySide2/QtUiTools/CMakeLists.txt
@@ -6,11 +6,6 @@ ${QtUiTools_GEN_DIR}/quiloader_wrapper.cpp
 ${QtUiTools_GEN_DIR}/qtuitools_module_wrapper.cpp
 )
 
-make_path(QtUiTools_typesystem_path 
-    ${QtCore_SOURCE_DIR} ${QtGui_SOURCE_DIR} ${QtWidgets_SOURCE_DIR} ${QtXml_SOURCE_DIR}
-    ${QtCore_BINARY_DIR} ${QtGui_BINARY_DIR} ${QtWidgets_BINARY_DIR} ${QtXml_BINARY_DIR}
-    ${QtUiTools_SOURCE_DIR})
-
 set(QtUiTools_include_dirs  ${QtUiTools_SOURCE_DIR}
                             ${QtUiTools_BINARY_DIR}
                             ${Qt5Core_INCLUDE_DIRS}
@@ -41,6 +36,6 @@ create_pyside_module(QtUiTools
                      QtUiTools_include_dirs
                      QtUiTools_libraries
                      QtUiTools_deps
-                     QtUiTools_typesystem_path
+                     QtUiTools_SOURCE_DIR
                      QtUiTools_SRC
                      "")
diff --git a/sources/pyside2/PySide2/QtUiTools/typesystem_uitools.xml b/sources/pyside2/PySide2/QtUiTools/typesystem_uitools.xml
index a74af0076..f6dd0333b 100644
--- a/sources/pyside2/PySide2/QtUiTools/typesystem_uitools.xml
+++ b/sources/pyside2/PySide2/QtUiTools/typesystem_uitools.xml
@@ -41,8 +41,8 @@
 -->
 
 <typesystem package="PySide2.QtUiTools">
-    <load-typesystem name="typesystem_widgets.xml" generate="no" />
-    <load-typesystem name="typesystem_xml.xml" generate="no" />
+    <load-typesystem name="QtWidgets/typesystem_widgets.xml" generate="no" />
+    <load-typesystem name="QtXml/typesystem_xml.xml" generate="no" />
 
     <object-type name="QUiLoader">
       <extra-includes>
-- 
cgit v1.2.3