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/QtWinExtras | |
| 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/QtWinExtras')
| -rw-r--r-- | sources/pyside2/PySide2/QtWinExtras/CMakeLists.txt | 8 | ||||
| -rw-r--r-- | sources/pyside2/PySide2/QtWinExtras/typesystem_winextras.xml | 4 |
2 files changed, 3 insertions, 9 deletions
diff --git a/sources/pyside2/PySide2/QtWinExtras/CMakeLists.txt b/sources/pyside2/PySide2/QtWinExtras/CMakeLists.txt index 4de437012..5932792e9 100644 --- a/sources/pyside2/PySide2/QtWinExtras/CMakeLists.txt +++ b/sources/pyside2/PySide2/QtWinExtras/CMakeLists.txt @@ -17,12 +17,6 @@ ${QtWinExtras_GEN_DIR}/qwinthumbnailtoolbutton_wrapper.cpp ${QtWinExtras_GEN_DIR}/qtwinextras_module_wrapper.cpp ) -make_path(QtWinExtras_typesystem_path ${QtWinExtras_SOURCE_DIR} - ${QtCore_SOURCE_DIR} - ${QtCore_BINARY_DIR} - ${QtGui_SOURCE_DIR} - ${QtGui_BINARY_DIR}) - set(QtWinExtras_include_dirs ${QtWinExtras_SOURCE_DIR} ${QtWinExtras_BINARY_DIR} ${Qt5WinExtras_INCLUDE_DIRS} @@ -46,6 +40,6 @@ create_pyside_module(QtWinExtras QtWinExtras_include_dirs QtWinExtras_libraries QtWinExtras_deps - QtWinExtras_typesystem_path + QtWinExtras_SOURCE_DIR QtWinExtras_SRC "") diff --git a/sources/pyside2/PySide2/QtWinExtras/typesystem_winextras.xml b/sources/pyside2/PySide2/QtWinExtras/typesystem_winextras.xml index d7d400be9..3aa375ea9 100644 --- a/sources/pyside2/PySide2/QtWinExtras/typesystem_winextras.xml +++ b/sources/pyside2/PySide2/QtWinExtras/typesystem_winextras.xml @@ -40,8 +40,8 @@ ****************************************************************************/ --> <typesystem package="PySide2.QtWinExtras"> - <load-typesystem name="typesystem_core.xml" generate="no"/> - <load-typesystem name="typesystem_gui.xml" generate="no"/> + <load-typesystem name="QtCore/typesystem_core.xml" generate="no"/> + <load-typesystem name="QtGui/typesystem_gui.xml" generate="no"/> <object-type name="QWinEvent" since="5.2"/> <object-type name="QWinColorizationChangeEvent" since="5.2"/> |