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/QtWebEngineWidgets/CMakeLists.txt      |  9 +--------
 .../PySide2/QtWebEngineWidgets/typesystem_webenginewidgets.xml | 10 +++++-----
 2 files changed, 6 insertions(+), 13 deletions(-)

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

diff --git a/sources/pyside2/PySide2/QtWebEngineWidgets/CMakeLists.txt b/sources/pyside2/PySide2/QtWebEngineWidgets/CMakeLists.txt
index 1e82819f7..32d0643c8 100644
--- a/sources/pyside2/PySide2/QtWebEngineWidgets/CMakeLists.txt
+++ b/sources/pyside2/PySide2/QtWebEngineWidgets/CMakeLists.txt
@@ -15,13 +15,6 @@ ${QtWebEngineWidgets_GEN_DIR}/qwebengineview_wrapper.cpp
 ${QtWebEngineWidgets_GEN_DIR}/qtwebenginewidgets_module_wrapper.cpp
 )
 
-make_path(QtWebEngineWidgets_typesystem_path 
-                            ${QtCore_SOURCE_DIR} ${QtGui_SOURCE_DIR} ${QtWidgets_SOURCE_DIR}
-                            ${QtCore_BINARY_DIR} ${QtGui_BINARY_DIR} ${QtWidgets_BINARY_DIR}
-                            ${QtNetwork_SOURCE_DIR} ${QtNetwork_BINARY_DIR}
-                            ${QtWebChannel_SOURCE_DIR} ${QtWebChannel_BINARY_DIR}
-                            ${QtWebEngineWidgets_SOURCE_DIR})
-
 set(QtWebEngineWidgets_include_dirs
                             ${QtWebEngineWidgets_SOURCE_DIR}
                             ${QtWebEngineWidgets_BINARY_DIR}
@@ -56,7 +49,7 @@ create_pyside_module(QtWebEngineWidgets
                      QtWebEngineWidgets_include_dirs
                      QtWebEngineWidgets_libraries
                      QtWebEngineWidgets_deps
-                     QtWebEngineWidgets_typesystem_path
+                     QtWebEngineWidgets_SOURCE_DIR
                      QtWebEngineWidgets_SRC
                      "")
 
diff --git a/sources/pyside2/PySide2/QtWebEngineWidgets/typesystem_webenginewidgets.xml b/sources/pyside2/PySide2/QtWebEngineWidgets/typesystem_webenginewidgets.xml
index ad33de4c8..9462c3e41 100644
--- a/sources/pyside2/PySide2/QtWebEngineWidgets/typesystem_webenginewidgets.xml
+++ b/sources/pyside2/PySide2/QtWebEngineWidgets/typesystem_webenginewidgets.xml
@@ -40,11 +40,11 @@
 ****************************************************************************/
 -->
 <typesystem package="PySide2.QtWebEngineWidgets">
-  <load-typesystem name="typesystem_core.xml" generate="no"/>
-  <load-typesystem name="typesystem_gui.xml" generate="no"/>
-  <load-typesystem name="typesystem_widgets.xml" generate="no"/>
-  <load-typesystem name="typesystem_network.xml" generate="no"/>
-  <load-typesystem name="typesystem_webchannel.xml" generate="no"/>
+  <load-typesystem name="QtCore/typesystem_core.xml" generate="no"/>
+  <load-typesystem name="QtGui/typesystem_gui.xml" generate="no"/>
+  <load-typesystem name="QtWidgets/typesystem_widgets.xml" generate="no"/>
+  <load-typesystem name="QtNetwork/typesystem_network.xml" generate="no"/>
+  <load-typesystem name="QtWebChannel/typesystem_webchannel.xml" generate="no"/>
 
 
   <object-type name="QWebEngineCertificateError">
-- 
cgit v1.2.3