diff options
author | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2017-11-02 14:18:03 +0100 |
---|---|---|
committer | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2017-11-06 07:56:25 +0000 |
commit | f2063ee4737f90c5d412a9a328672fde32b033eb (patch) | |
tree | be06749b135fd45a9ca5b0e1d213ef743883dcf5 /sources/pyside2/PySide2/QtScriptTools/typesystem_scripttools.xml | |
parent | 0de4dffa0c5abc80df7063daf6bc9d1754891a9d (diff) |
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>
Diffstat (limited to 'sources/pyside2/PySide2/QtScriptTools/typesystem_scripttools.xml')
-rw-r--r-- | sources/pyside2/PySide2/QtScriptTools/typesystem_scripttools.xml | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/sources/pyside2/PySide2/QtScriptTools/typesystem_scripttools.xml b/sources/pyside2/PySide2/QtScriptTools/typesystem_scripttools.xml index 15bda4059..023e03ba1 100644 --- a/sources/pyside2/PySide2/QtScriptTools/typesystem_scripttools.xml +++ b/sources/pyside2/PySide2/QtScriptTools/typesystem_scripttools.xml @@ -40,9 +40,9 @@ ****************************************************************************/ --> <typesystem package="PySide2.QtScriptTools"> - <load-typesystem name="typesystem_script.xml" generate="no" /> - <load-typesystem name="typesystem_gui.xml" generate="no" /> - <load-typesystem name="typesystem_widgets.xml" generate="no" /> + <load-typesystem name="QtScript/typesystem_script.xml" generate="no" /> + <load-typesystem name="QtGui/typesystem_gui.xml" generate="no" /> + <load-typesystem name="QtWidgets/typesystem_widgets.xml" generate="no" /> <object-type name="QScriptEngineDebugger"> <enum-type name="DebuggerAction"/> |