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>
---
 .../pyside2/PySide2/QtMultimedia/typesystem_multimedia_common.xml   | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'sources/pyside2/PySide2/QtMultimedia/typesystem_multimedia_common.xml')

diff --git a/sources/pyside2/PySide2/QtMultimedia/typesystem_multimedia_common.xml b/sources/pyside2/PySide2/QtMultimedia/typesystem_multimedia_common.xml
index f708d46ab..8058954a1 100644
--- a/sources/pyside2/PySide2/QtMultimedia/typesystem_multimedia_common.xml
+++ b/sources/pyside2/PySide2/QtMultimedia/typesystem_multimedia_common.xml
@@ -40,9 +40,9 @@
 ****************************************************************************/
 -->
 <typesystem package="PySide2.QtMultimedia">
-  <load-typesystem name="typesystem_core.xml" generate="no" />
-  <load-typesystem name="typesystem_gui.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="QtNetwork/typesystem_network.xml" generate="no" />
 
   <namespace-type name="QAudio">
       <enum-type name="Error"/>
-- 
cgit v1.2.3