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/QtDataVisualization/CMakeLists.txt       | 9 +--------
 .../PySide2/QtDataVisualization/typesystem_datavisualization.xml | 2 +-
 2 files changed, 2 insertions(+), 9 deletions(-)

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

diff --git a/sources/pyside2/PySide2/QtDataVisualization/CMakeLists.txt b/sources/pyside2/PySide2/QtDataVisualization/CMakeLists.txt
index 54809807c..e61a70234 100644
--- a/sources/pyside2/PySide2/QtDataVisualization/CMakeLists.txt
+++ b/sources/pyside2/PySide2/QtDataVisualization/CMakeLists.txt
@@ -41,13 +41,6 @@ ${QtDataVisualization_GEN_DIR}/qtdatavisualization_wrapper.cpp
 ${QtDataVisualization_GEN_DIR}/qtdatavisualization_module_wrapper.cpp
 )
 
-make_path(QtDataVisualization_typesystem_path
-    ${QtCore_SOURCE_DIR}
-    ${QtCore_BINARY_DIR}
-    ${QtGui_SOURCE_DIR}
-    ${QtGui_BINARY_DIR}
-    ${QtDataVisualization_SOURCE_DIR})
-
 set(QtDataVisualization_include_dirs ${QtDataVisualization_SOURCE_DIR}
                           ${QtDataVisualization_BINARY_DIR}
                           ${Qt5Core_INCLUDE_DIRS}
@@ -72,6 +65,6 @@ create_pyside_module(QtDataVisualization
                      QtDataVisualization_include_dirs
                      QtDataVisualization_libraries
                      QtDataVisualization_deps
-                     QtDataVisualization_typesystem_path
+                     QtDataVisualization_SOURCE_DIR
                      QtDataVisualization_SRC
                      "")
diff --git a/sources/pyside2/PySide2/QtDataVisualization/typesystem_datavisualization.xml b/sources/pyside2/PySide2/QtDataVisualization/typesystem_datavisualization.xml
index bc2d66df4..6b628c9bf 100644
--- a/sources/pyside2/PySide2/QtDataVisualization/typesystem_datavisualization.xml
+++ b/sources/pyside2/PySide2/QtDataVisualization/typesystem_datavisualization.xml
@@ -74,7 +74,7 @@
       result.append(row);
   }
   </template>
-  <load-typesystem name="typesystem_gui.xml" generate="no" />
+  <load-typesystem name="QtGui/typesystem_gui.xml" generate="no" />
   <namespace-type name="QtDataVisualization">
     <primitive-type name="QBarDataArray">
       <include file-name="qbardataproxy.h" location="global"/>
-- 
cgit v1.2.3