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

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

diff --git a/sources/pyside2/PySide2/QtWebKitWidgets/CMakeLists.txt b/sources/pyside2/PySide2/QtWebKitWidgets/CMakeLists.txt
index fa57c8694..cd7aa32dd 100644
--- a/sources/pyside2/PySide2/QtWebKitWidgets/CMakeLists.txt
+++ b/sources/pyside2/PySide2/QtWebKitWidgets/CMakeLists.txt
@@ -29,13 +29,6 @@ ${QtWebKitWidgets_GEN_DIR}/qwebview_wrapper.cpp
 ${QtWebKitWidgets_GEN_DIR}/qtwebkitwidgets_module_wrapper.cpp
 )
 
-make_path(QtWebKitWidgets_typesystem_path 
-                            ${QtCore_SOURCE_DIR} ${QtGui_SOURCE_DIR} ${QtWidgets_SOURCE_DIR}
-                            ${QtCore_BINARY_DIR} ${QtGui_BINARY_DIR} ${QtWidgets_BINARY_DIR}
-                            ${QtWebKit_SOURCE_DIR} ${QtPrintSupport_SOURCE_DIR} ${QtNetwork_SOURCE_DIR}
-                            ${QtWebKit_BINARY_DIR} ${QtPrintSupport_BINARY_DIR} ${QtNetwork_BINARY_DIR}
-                            ${QtWebKitWidgets_SOURCE_DIR})
-
 set(QtWebKitWidgets_include_dirs
                             ${QtWebKitWidgets_SOURCE_DIR}
                             ${QtWebKitWidgets_BINARY_DIR}
@@ -71,7 +64,7 @@ create_pyside_module(QtWebKitWidgets
                      QtWebKitWidgets_include_dirs
                      QtWebKitWidgets_libraries
                      QtWebKitWidgets_deps
-                     QtWebKitWidgets_typesystem_path
+                     QtWebKitWidgets_SOURCE_DIR
                      QtWebKitWidgets_SRC
                      "")
 
diff --git a/sources/pyside2/PySide2/QtWebKitWidgets/typesystem_webkitwidgets.xml b/sources/pyside2/PySide2/QtWebKitWidgets/typesystem_webkitwidgets.xml
index 05061fa6c..945f8ebe0 100644
--- a/sources/pyside2/PySide2/QtWebKitWidgets/typesystem_webkitwidgets.xml
+++ b/sources/pyside2/PySide2/QtWebKitWidgets/typesystem_webkitwidgets.xml
@@ -40,11 +40,11 @@
 ****************************************************************************/
 -->
 <typesystem package="PySide2.QtWebKitWidgets">
-  <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_webkit.xml" generate="no"/>
-  <load-typesystem name="typesystem_network.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="QtWebKit/typesystem_webkit.xml" generate="no"/>
+  <load-typesystem name="QtNetwork/typesystem_network.xml" generate="no"/>
   <load-typesystem name="typesystem_printsupport.xml" generate="no"/>
 
   <value-type name="QWebDatabase"/>
-- 
cgit v1.2.3