diff options
Diffstat (limited to 'sources/pyside2')
82 files changed, 148 insertions, 589 deletions
diff --git a/sources/pyside2/CMakeLists.txt b/sources/pyside2/CMakeLists.txt index d4bb023a0..e880a3e69 100644 --- a/sources/pyside2/CMakeLists.txt +++ b/sources/pyside2/CMakeLists.txt @@ -230,9 +230,6 @@ macro(COLLECT_MODULE_IF_FOUND shortname) if(${_name_found}) message(STATUS "module ${name} found (${ARGN})") - # Put the module at the end of pyside2_global.h - file(APPEND "${CMAKE_CURRENT_BINARY_DIR}/PySide2/pyside2_global.h.add" - "#include \"Qt${shortname}/Qt${shortname}\"\n") # record the shortnames for the tests list(APPEND all_module_shortnames ${shortname}) else() diff --git a/sources/pyside2/PySide2/CMakeLists.txt b/sources/pyside2/PySide2/CMakeLists.txt index 601c43ed6..0b8210359 100644 --- a/sources/pyside2/PySide2/CMakeLists.txt +++ b/sources/pyside2/PySide2/CMakeLists.txt @@ -30,15 +30,20 @@ else() "${CMAKE_CURRENT_BINARY_DIR}/support/signature/backport_inspect.py" COPYONLY) endif() -# Add the collected includes to the global include -file(READ "${CMAKE_CURRENT_BINARY_DIR}/pyside2_global.h.add" GLOBAL_APPEND) -file(APPEND "${CMAKE_CURRENT_BINARY_DIR}/pyside2_global.h" "${GLOBAL_APPEND}") -file(REMOVE "${CMAKE_CURRENT_BINARY_DIR}/pyside2_global.h.add") - # now compile all modules. +file(READ "${CMAKE_CURRENT_BINARY_DIR}/pyside2_global.h" pyside2_global_contents) + foreach(shortname IN LISTS all_module_shortnames) set(name "Qt5${shortname}") HAS_QT_MODULE(${name}_FOUND Qt${shortname}) + + # Create a module header consisting of pyside2_global.h and the module + # include. Note: The contents of pyside2_global.h must be copied instead of + # just #including it since shiboken will otherwise generate an + # #include <pyside2_global.h> for the the type entries originating from it + # (cf AbstractMetaBuilderPrivate::setInclude()). + set(module_header "${CMAKE_CURRENT_BINARY_DIR}/Qt${shortname}_global.h") + file(WRITE ${module_header} "${pyside2_global_contents}\n#include <Qt${shortname}/Qt${shortname}>\n") endforeach() # install diff --git a/sources/pyside2/PySide2/QtCharts/CMakeLists.txt b/sources/pyside2/PySide2/QtCharts/CMakeLists.txt index 5d6ed6aaf..fa177300d 100644 --- a/sources/pyside2/PySide2/QtCharts/CMakeLists.txt +++ b/sources/pyside2/PySide2/QtCharts/CMakeLists.txt @@ -58,15 +58,6 @@ ${QtCharts_GEN_DIR}/qtcharts_wrapper.cpp ${QtCharts_GEN_DIR}/qtcharts_module_wrapper.cpp ) -make_path(QtCharts_typesystem_path - ${QtCore_SOURCE_DIR} - ${QtCore_BINARY_DIR} - ${QtGui_SOURCE_DIR} - ${QtGui_BINARY_DIR} - ${QtWidgets_SOURCE_DIR} - ${QtWidgets_BINARY_DIR} - ${QtCharts_SOURCE_DIR}) - set(QtCharts_include_dirs ${QtCharts_SOURCE_DIR} ${QtCharts_BINARY_DIR} ${Qt5Core_INCLUDE_DIRS} @@ -94,6 +85,6 @@ create_pyside_module(QtCharts QtCharts_include_dirs QtCharts_libraries QtCharts_deps - QtCharts_typesystem_path + QtCharts_SOURCE_DIR QtCharts_SRC "") diff --git a/sources/pyside2/PySide2/QtCharts/typesystem_charts.xml b/sources/pyside2/PySide2/QtCharts/typesystem_charts.xml index 6c0c02a47..ca7646421 100644 --- a/sources/pyside2/PySide2/QtCharts/typesystem_charts.xml +++ b/sources/pyside2/PySide2/QtCharts/typesystem_charts.xml @@ -40,7 +40,7 @@ ****************************************************************************/ --> <typesystem package="PySide2.QtCharts"> - <load-typesystem name="typesystem_widgets.xml" generate="no" /> + <load-typesystem name="QtWidgets/typesystem_widgets.xml" generate="no" /> <namespace-type name="QtCharts"> <object-type name="QAbstractAxis" since="5.7"> <enum-type name="AxisType"/> diff --git a/sources/pyside2/PySide2/QtConcurrent/CMakeLists.txt b/sources/pyside2/PySide2/QtConcurrent/CMakeLists.txt index 4a7fd53ff..4fb62ee99 100644 --- a/sources/pyside2/PySide2/QtConcurrent/CMakeLists.txt +++ b/sources/pyside2/PySide2/QtConcurrent/CMakeLists.txt @@ -6,10 +6,6 @@ ${QtConcurrent_GEN_DIR}/qtconcurrent_wrapper.cpp ${QtConcurrent_GEN_DIR}/qtconcurrent_module_wrapper.cpp ) -make_path(QtConcurrent_typesystem_path ${QtCore_SOURCE_DIR} - ${QtCore_BINARY_DIR} - ${QtConcurrent_SOURCE_DIR}) - set(QtConcurrent_include_dirs ${QtConcurrent_SOURCE_DIR} ${QtConcurrent_BINARY_DIR} ${Qt5Core_INCLUDE_DIRS} @@ -30,6 +26,6 @@ create_pyside_module(QtConcurrent QtConcurrent_include_dirs QtConcurrent_libraries QtConcurrent_deps - QtConcurrent_typesystem_path + QtConcurrent_SOURCE_DIR QtConcurrent_SRC "") diff --git a/sources/pyside2/PySide2/QtConcurrent/typesystem_concurrent.xml b/sources/pyside2/PySide2/QtConcurrent/typesystem_concurrent.xml index 692e744a1..09f590914 100644 --- a/sources/pyside2/PySide2/QtConcurrent/typesystem_concurrent.xml +++ b/sources/pyside2/PySide2/QtConcurrent/typesystem_concurrent.xml @@ -40,7 +40,7 @@ ****************************************************************************/ --> <typesystem package="PySide2.QtConcurrent"> - <load-typesystem name="typesystem_core.xml" generate="no"/> + <load-typesystem name="QtCore/typesystem_core.xml" generate="no"/> <!-- Qt5: this is currently the minimum possible QtConcurrent support, by just extracting the name space from QtCore --> diff --git a/sources/pyside2/PySide2/QtCore/CMakeLists.txt b/sources/pyside2/PySide2/QtCore/CMakeLists.txt index 384243f7c..dd2e212b0 100644 --- a/sources/pyside2/PySide2/QtCore/CMakeLists.txt +++ b/sources/pyside2/PySide2/QtCore/CMakeLists.txt @@ -164,9 +164,6 @@ ${QtCore_GEN_DIR}/qtcore_module_wrapper.cpp configure_file("${QtCore_SOURCE_DIR}/typesystem_core.xml.in" "${QtCore_BINARY_DIR}/typesystem_core.xml" @ONLY) -make_path(QtCore_typesystem_path ${QtCore_SOURCE_DIR}) - - set(QtCore_include_dirs ${QtCore_SOURCE_DIR} ${QtCore_BINARY_DIR} ${Qt5Core_INCLUDE_DIRS} @@ -183,7 +180,7 @@ create_pyside_module(QtCore QtCore_include_dirs QtCore_libraries "" - QtCore_typesystem_path + QtCore_SOURCE_DIR QtCore_SRC QtCore_gluecode ${QtCore_BINARY_DIR}/typesystem_core.xml) diff --git a/sources/pyside2/PySide2/QtCore/typesystem_core.xml.in b/sources/pyside2/PySide2/QtCore/typesystem_core.xml.in index 4ccf6423f..58caaee55 100644 --- a/sources/pyside2/PySide2/QtCore/typesystem_core.xml.in +++ b/sources/pyside2/PySide2/QtCore/typesystem_core.xml.in @@ -40,6 +40,6 @@ ****************************************************************************/ --> <typesystem package="PySide2.QtCore"> - <load-typesystem name="typesystem_core_@AUTO_OS@.xml" generate="yes"/> - <load-typesystem name="typesystem_core_common.xml" generate="yes"/> + <load-typesystem name="QtCore/typesystem_core_@AUTO_OS@.xml" generate="yes"/> + <load-typesystem name="QtCore/typesystem_core_common.xml" generate="yes"/> </typesystem> diff --git a/sources/pyside2/PySide2/QtCore/typesystem_core_common.xml b/sources/pyside2/PySide2/QtCore/typesystem_core_common.xml index 0695436ed..a8dc54e98 100644 --- a/sources/pyside2/PySide2/QtCore/typesystem_core_common.xml +++ b/sources/pyside2/PySide2/QtCore/typesystem_core_common.xml @@ -354,7 +354,6 @@ </primitive-type> <primitive-type name="QVariant" target-lang-api-name="PyObject"> - <include file-name="typeresolver.h" location="global"/> <conversion-rule> <native-to-target> if (!%in.isValid()) @@ -797,7 +796,8 @@ <container-type name="QHash" type="hash"> <include file-name="QHash" location="global"/> - <include file-name="pysideconversions.h" location="global"/> + <!-- Include to make enum flags work. --> + <include file-name="pysideqflags.h" location="global"/> <conversion-rule> <native-to-target> <insert-template name="cppmap_to_pymap_conversion"/> diff --git a/sources/pyside2/PySide2/QtDataVisualization/CMakeLists.txt b/sources/pyside2/PySide2/QtDataVisualization/CMakeLists.txt index 54809807c..e61a70234 100644 --- a/sources/pyside2/PySide2/QtDataVisualization/CMakeLists.txt +++ b/sources/pyside2/PySide2/QtDataVisualization/CMakeLists.txt @@ -41,13 +41,6 @@ ${QtDataVisualization_GEN_DIR}/qtdatavisualization_wrapper.cpp ${QtDataVisualization_GEN_DIR}/qtdatavisualization_module_wrapper.cpp ) -make_path(QtDataVisualization_typesystem_path - ${QtCore_SOURCE_DIR} - ${QtCore_BINARY_DIR} - ${QtGui_SOURCE_DIR} - ${QtGui_BINARY_DIR} - ${QtDataVisualization_SOURCE_DIR}) - set(QtDataVisualization_include_dirs ${QtDataVisualization_SOURCE_DIR} ${QtDataVisualization_BINARY_DIR} ${Qt5Core_INCLUDE_DIRS} @@ -72,6 +65,6 @@ create_pyside_module(QtDataVisualization QtDataVisualization_include_dirs QtDataVisualization_libraries QtDataVisualization_deps - QtDataVisualization_typesystem_path + QtDataVisualization_SOURCE_DIR QtDataVisualization_SRC "") diff --git a/sources/pyside2/PySide2/QtDataVisualization/typesystem_datavisualization.xml b/sources/pyside2/PySide2/QtDataVisualization/typesystem_datavisualization.xml index bc2d66df4..6b628c9bf 100644 --- a/sources/pyside2/PySide2/QtDataVisualization/typesystem_datavisualization.xml +++ b/sources/pyside2/PySide2/QtDataVisualization/typesystem_datavisualization.xml @@ -74,7 +74,7 @@ result.append(row); } </template> - <load-typesystem name="typesystem_gui.xml" generate="no" /> + <load-typesystem name="QtGui/typesystem_gui.xml" generate="no" /> <namespace-type name="QtDataVisualization"> <primitive-type name="QBarDataArray"> <include file-name="qbardataproxy.h" location="global"/> diff --git a/sources/pyside2/PySide2/QtGui/CMakeLists.txt b/sources/pyside2/PySide2/QtGui/CMakeLists.txt index b0973debe..b21120115 100644 --- a/sources/pyside2/PySide2/QtGui/CMakeLists.txt +++ b/sources/pyside2/PySide2/QtGui/CMakeLists.txt @@ -192,9 +192,6 @@ ${QtGui_GEN_DIR}/qtgui_module_wrapper.cpp configure_file("${QtGui_SOURCE_DIR}/typesystem_gui.xml.in" "${QtGui_BINARY_DIR}/typesystem_gui.xml" @ONLY) -make_path(QtGui_typesystem_path ${QtCore_SOURCE_DIR} ${QtCore_BINARY_DIR} - ${QtGui_SOURCE_DIR}) - set(QtGui_include_dirs ${QtGui_SOURCE_DIR} ${QtGui_BINARY_DIR} ${pyside2_SOURCE_DIR} @@ -215,7 +212,7 @@ create_pyside_module(QtGui QtGui_include_dirs QtGui_libraries QtGui_deps - QtGui_typesystem_path + QtGui_SOURCE_DIR QtGui_SRC QPYTEXTOBJECT_MOC ${QtGui_BINARY_DIR}/typesystem_gui.xml) diff --git a/sources/pyside2/PySide2/QtGui/typesystem_gui.xml.in b/sources/pyside2/PySide2/QtGui/typesystem_gui.xml.in index 0de65876a..ee909875e 100644 --- a/sources/pyside2/PySide2/QtGui/typesystem_gui.xml.in +++ b/sources/pyside2/PySide2/QtGui/typesystem_gui.xml.in @@ -40,7 +40,7 @@ ****************************************************************************/ --> <typesystem package="PySide2.QtGui"> - <load-typesystem name="typesystem_core.xml" generate="no"/> - <load-typesystem name="typesystem_gui_@AUTO_OS@.xml" generate="yes"/> - <load-typesystem name="typesystem_gui_common.xml" generate="yes"/> + <load-typesystem name="QtCore/typesystem_core.xml" generate="no"/> + <load-typesystem name="QtGui/typesystem_gui_@AUTO_OS@.xml" generate="yes"/> + <load-typesystem name="QtGui/typesystem_gui_common.xml" generate="yes"/> </typesystem> diff --git a/sources/pyside2/PySide2/QtGui/typesystem_gui_common.xml b/sources/pyside2/PySide2/QtGui/typesystem_gui_common.xml index 9260b3d38..b316d90ad 100644 --- a/sources/pyside2/PySide2/QtGui/typesystem_gui_common.xml +++ b/sources/pyside2/PySide2/QtGui/typesystem_gui_common.xml @@ -40,7 +40,7 @@ ****************************************************************************/ --> <typesystem package="PySide2.QtGui"> - <load-typesystem name="typesystem_core.xml" generate="no"/> + <load-typesystem name="QtCore/typesystem_core.xml" generate="no"/> <template name="QFontCharFix"> int size = Shiboken::String::len(%PYARG_1); diff --git a/sources/pyside2/PySide2/QtHelp/CMakeLists.txt b/sources/pyside2/PySide2/QtHelp/CMakeLists.txt index ba8b419f3..6e3334a80 100644 --- a/sources/pyside2/PySide2/QtHelp/CMakeLists.txt +++ b/sources/pyside2/PySide2/QtHelp/CMakeLists.txt @@ -16,10 +16,6 @@ ${QtHelp_GEN_DIR}/qhelpsearchresultwidget_wrapper.cpp ${QtHelp_GEN_DIR}/qthelp_module_wrapper.cpp ) -make_path(QtHelp_typesystem_path ${QtCore_SOURCE_DIR} ${QtGui_SOURCE_DIR} ${QtWidgets_SOURCE_DIR} - ${QtCore_BINARY_DIR} ${QtGui_BINARY_DIR} ${QtWidgets_BINARY_DIR} - ${QtHelp_SOURCE_DIR}) - set(QtHelp_include_dirs ${QtHelp_SOURCE_DIR} ${QtHelp_BINARY_DIR} ${Qt5Core_INCLUDE_DIRS} @@ -46,6 +42,6 @@ create_pyside_module(QtHelp QtHelp_include_dirs QtHelp_libraries QtHelp_deps - QtHelp_typesystem_path + QtHelp_SOURCE_DIR QtHelp_SRC "") diff --git a/sources/pyside2/PySide2/QtHelp/typesystem_help.xml b/sources/pyside2/PySide2/QtHelp/typesystem_help.xml index 4d42e7fb9..7668cf8ad 100644 --- a/sources/pyside2/PySide2/QtHelp/typesystem_help.xml +++ b/sources/pyside2/PySide2/QtHelp/typesystem_help.xml @@ -41,7 +41,7 @@ --> <typesystem package="PySide2.QtHelp"> - <load-typesystem name="typesystem_widgets.xml" generate="no" /> + <load-typesystem name="QtWidgets/typesystem_widgets.xml" generate="no" /> <value-type name="QHelpContentItem"> <modify-function signature="parent() const"> diff --git a/sources/pyside2/PySide2/QtMacExtras/CMakeLists.txt b/sources/pyside2/PySide2/QtMacExtras/CMakeLists.txt index b23b20c5f..6c69a784c 100644 --- a/sources/pyside2/PySide2/QtMacExtras/CMakeLists.txt +++ b/sources/pyside2/PySide2/QtMacExtras/CMakeLists.txt @@ -9,12 +9,6 @@ ${QtMacExtras_GEN_DIR}/qmactoolbaritem_wrapper.cpp ${QtMacExtras_GEN_DIR}/qtmacextras_module_wrapper.cpp ) -make_path(QtMacExtras_typesystem_path ${QtMacExtras_SOURCE_DIR} - ${QtCore_SOURCE_DIR} - ${QtCore_BINARY_DIR} - ${QtGui_SOURCE_DIR} - ${QtGui_BINARY_DIR}) - set(QtMacExtras_include_dirs ${QtMacExtras_SOURCE_DIR} ${QtMacExtras_BINARY_DIR} ${Qt5MacExtras_INCLUDE_DIRS} @@ -38,6 +32,6 @@ create_pyside_module(QtMacExtras QtMacExtras_include_dirs QtMacExtras_libraries QtMacExtras_deps - QtMacExtras_typesystem_path + QtMacExtras_SOURCE_DIR QtMacExtras_SRC "") diff --git a/sources/pyside2/PySide2/QtMacExtras/typesystem_macextras.xml b/sources/pyside2/PySide2/QtMacExtras/typesystem_macextras.xml index 55c7d0160..69c9bc963 100644 --- a/sources/pyside2/PySide2/QtMacExtras/typesystem_macextras.xml +++ b/sources/pyside2/PySide2/QtMacExtras/typesystem_macextras.xml @@ -40,8 +40,8 @@ ****************************************************************************/ --> <typesystem package="PySide2.QtMacExtras"> - <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"/> <function signature="qRegisterDraggedTypes(QStringList)" since="5.2"/> diff --git a/sources/pyside2/PySide2/QtMultimedia/CMakeLists.txt b/sources/pyside2/PySide2/QtMultimedia/CMakeLists.txt index a17455eec..cfca07862 100644 --- a/sources/pyside2/PySide2/QtMultimedia/CMakeLists.txt +++ b/sources/pyside2/PySide2/QtMultimedia/CMakeLists.txt @@ -82,10 +82,6 @@ ${QtMultimedia_GEN_DIR}/qvideowindowcontrol_wrapper.cpp ${QtMultimedia_GEN_DIR}/qtmultimedia_module_wrapper.cpp ) -make_path(QtMultimedia_typesystem_path ${QtCore_SOURCE_DIR} ${QtGui_SOURCE_DIR} ${QtNetwork_SOURCE_DIR} - ${QtCore_BINARY_DIR} ${QtGui_BINARY_DIR} ${QtNetwork_BINARY_DIR} - ${QtMultimedia_SOURCE_DIR}) - set(QtMultimedia_include_dirs ${QtMultimedia_SOURCE_DIR} ${QtMultimedia_BINARY_DIR} ${Qt5Core_INCLUDE_DIRS} @@ -113,6 +109,6 @@ create_pyside_module(QtMultimedia QtMultimedia_include_dirs QtMultimedia_libraries QtMultimedia_deps - QtMultimedia_typesystem_path + QtMultimedia_SOURCE_DIR QtMultimedia_SRC "") diff --git a/sources/pyside2/PySide2/QtMultimedia/typesystem_multimedia.xml b/sources/pyside2/PySide2/QtMultimedia/typesystem_multimedia.xml index 275719f59..e89104284 100644 --- a/sources/pyside2/PySide2/QtMultimedia/typesystem_multimedia.xml +++ b/sources/pyside2/PySide2/QtMultimedia/typesystem_multimedia.xml @@ -40,6 +40,6 @@ ****************************************************************************/ --> <typesystem package="PySide2.QtMultimedia"> - <load-typesystem name="typesystem_multimedia_common.xml" generate="yes"/> - <load-typesystem name="typesystem_multimedia_forward_declarations.xml" generate="yes"/> + <load-typesystem name="QtMultimedia/typesystem_multimedia_common.xml" generate="yes"/> + <load-typesystem name="QtMultimedia/typesystem_multimedia_forward_declarations.xml" generate="yes"/> </typesystem> 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"/> diff --git a/sources/pyside2/PySide2/QtMultimediaWidgets/CMakeLists.txt b/sources/pyside2/PySide2/QtMultimediaWidgets/CMakeLists.txt index 1368fc3aa..abae2ceb7 100644 --- a/sources/pyside2/PySide2/QtMultimediaWidgets/CMakeLists.txt +++ b/sources/pyside2/PySide2/QtMultimediaWidgets/CMakeLists.txt @@ -9,11 +9,6 @@ ${QtMultimediaWidgets_GEN_DIR}/qvideowidgetcontrol_wrapper.cpp ${QtMultimediaWidgets_GEN_DIR}/qtmultimediawidgets_module_wrapper.cpp ) -make_path(QtMultimediaWidgets_typesystem_path - ${QtCore_SOURCE_DIR} ${QtGui_SOURCE_DIR} ${QtNetwork_SOURCE_DIR} ${QtWidgets_SOURCE_DIR} ${QtMultimedia_SOURCE_DIR} - ${QtCore_BINARY_DIR} ${QtGui_BINARY_DIR} ${QtNetwork_BINARY_DIR} ${QtWidgets_BINARY_DIR} ${QtMultimedia_BINARY_DIR} - ${QtMultimediaWidgets_SOURCE_DIR}) - set(QtMultimediaWidgets_include_dirs ${QtMultimediaWidgets_SOURCE_DIR} ${QtMultimediaWidgets_BINARY_DIR} ${Qt5Core_INCLUDE_DIRS} @@ -47,6 +42,6 @@ create_pyside_module(QtMultimediaWidgets QtMultimediaWidgets_include_dirs QtMultimediaWidgets_libraries QtMultimediaWidgets_deps - QtMultimediaWidgets_typesystem_path + QtMultimediaWidgets_SOURCE_DIR QtMultimediaWidgets_SRC "") diff --git a/sources/pyside2/PySide2/QtMultimediaWidgets/typesystem_multimediawidgets.xml b/sources/pyside2/PySide2/QtMultimediaWidgets/typesystem_multimediawidgets.xml index 76214baef..07f6f99c3 100644 --- a/sources/pyside2/PySide2/QtMultimediaWidgets/typesystem_multimediawidgets.xml +++ b/sources/pyside2/PySide2/QtMultimediaWidgets/typesystem_multimediawidgets.xml @@ -40,10 +40,10 @@ ****************************************************************************/ --> <typesystem package="PySide2.QtMultimediaWidgets"> - <load-typesystem name="typesystem_core.xml" generate="no" /> - <load-typesystem name="typesystem_gui.xml" generate="no" /> - <load-typesystem name="typesystem_multimedia_common.xml" generate="no" /> - <load-typesystem name="typesystem_widgets.xml" generate="no" /> + <load-typesystem name="QtCore/typesystem_core.xml" generate="no" /> + <load-typesystem name="QtGui/typesystem_gui.xml" generate="no" /> + <load-typesystem name="QtMultimedia/typesystem_multimedia_common.xml" generate="no" /> + <load-typesystem name="QtWidgets/typesystem_widgets.xml" generate="no" /> <object-type name="QCameraViewfinder"/> <object-type name="QGraphicsVideoItem"/> diff --git a/sources/pyside2/PySide2/QtNetwork/CMakeLists.txt b/sources/pyside2/PySide2/QtNetwork/CMakeLists.txt index f01aaf77a..68037017d 100644 --- a/sources/pyside2/PySide2/QtNetwork/CMakeLists.txt +++ b/sources/pyside2/PySide2/QtNetwork/CMakeLists.txt @@ -43,10 +43,6 @@ ${QtNetwork_OPTIONAL_SRC} ${QtNetwork_GEN_DIR}/qtnetwork_module_wrapper.cpp ) -make_path(QtNetwork_typesystem_path ${QtCore_SOURCE_DIR} - ${QtCore_BINARY_DIR} - ${QtNetwork_SOURCE_DIR}) - set(QtNetwork_include_dirs ${QtNetwork_SOURCE_DIR} ${QtNetwork_BINARY_DIR} ${Qt5Core_INCLUDE_DIRS} @@ -67,7 +63,7 @@ create_pyside_module(QtNetwork QtNetwork_include_dirs QtNetwork_libraries QtNetwork_deps - QtNetwork_typesystem_path + QtNetwork_SOURCE_DIR QtNetwork_SRC "" "" diff --git a/sources/pyside2/PySide2/QtNetwork/typesystem_network.xml b/sources/pyside2/PySide2/QtNetwork/typesystem_network.xml index 2f8424ac7..06a402e3c 100644 --- a/sources/pyside2/PySide2/QtNetwork/typesystem_network.xml +++ b/sources/pyside2/PySide2/QtNetwork/typesystem_network.xml @@ -40,7 +40,7 @@ ****************************************************************************/ --> <typesystem package="PySide2.QtNetwork"> - <load-typesystem name="typesystem_core.xml" generate="no"/> + <load-typesystem name="QtCore/typesystem_core.xml" generate="no"/> <namespace-type name="QSsl"> <enum-type name="AlternativeNameEntryType"/> diff --git a/sources/pyside2/PySide2/QtOpenGL/CMakeLists.txt b/sources/pyside2/PySide2/QtOpenGL/CMakeLists.txt index ebc08946c..9a8b64050 100644 --- a/sources/pyside2/PySide2/QtOpenGL/CMakeLists.txt +++ b/sources/pyside2/PySide2/QtOpenGL/CMakeLists.txt @@ -16,10 +16,6 @@ ${QtOpenGL_GEN_DIR}/qglwidget_wrapper.cpp ${QtOpenGL_GEN_DIR}/qtopengl_module_wrapper.cpp ) -make_path(QtOpenGL_typesystem_path ${QtCore_SOURCE_DIR} ${QtGui_SOURCE_DIR} ${QtWidgets_SOURCE_DIR} - ${QtCore_BINARY_DIR} ${QtGui_BINARY_DIR} ${QtWidgets_BINARY_DIR} - ${QtOpenGL_SOURCE_DIR}) - set(QtOpenGL_include_dirs ${QtOpenGL_SOURCE_DIR} ${Qt5Core_INCLUDE_DIRS} ${Qt5Gui_INCLUDE_DIRS} @@ -45,6 +41,6 @@ create_pyside_module(QtOpenGL QtOpenGL_include_dirs QtOpenGL_libraries QtOpenGL_deps - QtOpenGL_typesystem_path + QtOpenGL_SOURCE_DIR QtOpenGL_SRC "") diff --git a/sources/pyside2/PySide2/QtOpenGL/typesystem_opengl.xml b/sources/pyside2/PySide2/QtOpenGL/typesystem_opengl.xml index 8dea5d67c..38cec3188 100644 --- a/sources/pyside2/PySide2/QtOpenGL/typesystem_opengl.xml +++ b/sources/pyside2/PySide2/QtOpenGL/typesystem_opengl.xml @@ -40,7 +40,7 @@ ****************************************************************************/ --> <typesystem package="PySide2.QtOpenGL"> - <load-typesystem name="typesystem_widgets.xml" generate="no" /> + <load-typesystem name="QtWidgets/typesystem_widgets.xml" generate="no" /> <primitive-type name="GLbitfield"/> <primitive-type name="GLboolean"/> diff --git a/sources/pyside2/PySide2/QtPrintSupport/CMakeLists.txt b/sources/pyside2/PySide2/QtPrintSupport/CMakeLists.txt index 023a5ac74..201dd6d69 100644 --- a/sources/pyside2/PySide2/QtPrintSupport/CMakeLists.txt +++ b/sources/pyside2/PySide2/QtPrintSupport/CMakeLists.txt @@ -13,10 +13,6 @@ ${QtPrintSupport_GEN_DIR}/qprintpreviewwidget_wrapper.cpp ${QtPrintSupport_GEN_DIR}/qtprintsupport_module_wrapper.cpp ) -make_path(QtPrintSupport_typesystem_path ${QtCore_SOURCE_DIR} ${QtGui_SOURCE_DIR} ${QtWidgets_SOURCE_DIR} - ${QtCore_BINARY_DIR} ${QtGui_BINARY_DIR} ${QtWidgets_BINARY_DIR} - ${QtPrintSupport_SOURCE_DIR}) - set(QtPrintSupport_include_dirs ${QtPrintSupport_SOURCE_DIR} ${QtPrintSupport_BINARY_DIR} ${Qt5Core_INCLUDE_DIRS} @@ -43,6 +39,6 @@ create_pyside_module(QtPrintSupport QtPrintSupport_include_dirs QtPrintSupport_libraries QtPrintSupport_deps - QtPrintSupport_typesystem_path + QtPrintSupport_SOURCE_DIR QtPrintSupport_SRC "") diff --git a/sources/pyside2/PySide2/QtPrintSupport/typesystem_printsupport.xml b/sources/pyside2/PySide2/QtPrintSupport/typesystem_printsupport.xml index 09f151af5..24f0de1d8 100644 --- a/sources/pyside2/PySide2/QtPrintSupport/typesystem_printsupport.xml +++ b/sources/pyside2/PySide2/QtPrintSupport/typesystem_printsupport.xml @@ -40,7 +40,7 @@ ****************************************************************************/ --> <typesystem package="PySide2.QtPrintSupport"> - <load-typesystem name="typesystem_widgets.xml" generate="no" /> + <load-typesystem name="QtWidgets/typesystem_widgets.xml" generate="no" /> <object-type name="QPageSetupDialog"> <modify-function signature="exec()" rename="exec_" allow-thread="yes"/> diff --git a/sources/pyside2/PySide2/QtQml/CMakeLists.txt b/sources/pyside2/PySide2/QtQml/CMakeLists.txt index 0607e905f..fb09443c1 100644 --- a/sources/pyside2/PySide2/QtQml/CMakeLists.txt +++ b/sources/pyside2/PySide2/QtQml/CMakeLists.txt @@ -34,10 +34,6 @@ ${QtQml_GEN_DIR}/qqmlnetworkaccessmanagerfactory_wrapper.cpp ${QtQml_GEN_DIR}/qtqml_module_wrapper.cpp ) -make_path(QtQml_typesystem_path ${QtCore_SOURCE_DIR} ${QtGui_SOURCE_DIR} ${QtNetwork_SOURCE_DIR} - ${QtCore_BINARY_DIR} ${QtGui_BINARY_DIR} ${QtNetwork_BINARY_DIR} - ${QtQml_SOURCE_DIR}) - set(QtQml_include_dirs ${QtQml_SOURCE_DIR} ${Qt5Core_INCLUDE_DIRS} ${Qt5Gui_INCLUDE_DIRS} @@ -64,6 +60,6 @@ create_pyside_module(QtQml QtQml_include_dirs QtQml_libraries QtQml_deps - QtQml_typesystem_path + QtQml_SOURCE_DIR QtQml_SRC QtQml_registerType) diff --git a/sources/pyside2/PySide2/QtQml/typesystem_qml.xml b/sources/pyside2/PySide2/QtQml/typesystem_qml.xml index 427b82d90..54431a3af 100644 --- a/sources/pyside2/PySide2/QtQml/typesystem_qml.xml +++ b/sources/pyside2/PySide2/QtQml/typesystem_qml.xml @@ -40,9 +40,9 @@ ****************************************************************************/ --> <typesystem package="PySide2.QtQml"> - <load-typesystem name="typesystem_core.xml" generate="no"/> - <load-typesystem name="typesystem_network.xml" generate="no"/> - <load-typesystem name="typesystem_gui.xml" generate="no"/> + <load-typesystem name="QtCore/typesystem_core.xml" generate="no"/> + <load-typesystem name="QtNetwork/typesystem_network.xml" generate="no"/> + <load-typesystem name="QtGui/typesystem_gui.xml" generate="no"/> <!-- This is to inform the generator that the VolatileBool python type exists --> <custom-type name="VolatileBool" /> diff --git a/sources/pyside2/PySide2/QtQuick/CMakeLists.txt b/sources/pyside2/PySide2/QtQuick/CMakeLists.txt index 491fc9d9e..01e369e7a 100644 --- a/sources/pyside2/PySide2/QtQuick/CMakeLists.txt +++ b/sources/pyside2/PySide2/QtQuick/CMakeLists.txt @@ -58,13 +58,6 @@ if (Qt5Quick_VERSION VERSION_GREATER 5.5.1) ) endif() - -make_path(QtQuick_typesystem_path ${QtCore_SOURCE_DIR} ${QtCore_BINARY_DIR} - ${QtGui_SOURCE_DIR} ${QtGui_BINARY_DIR} - ${QtNetwork_SOURCE_DIR} ${QtNetwork_BINARY_DIR} - ${QtQml_SOURCE_DIR} ${QtQml_BINARY_DIR} - ${QtQuick_SOURCE_DIR}) - set(QtQuick_include_dirs ${QtQuick_SOURCE_DIR} ${QtQml_SOURCE_DIR} ${Qt5Core_INCLUDE_DIRS} @@ -95,6 +88,6 @@ create_pyside_module(QtQuick QtQuick_include_dirs QtQuick_libraries QtQuick_deps - QtQuick_typesystem_path + QtQuick_SOURCE_DIR QtQuick_SRC QtQuick_registerType) diff --git a/sources/pyside2/PySide2/QtQuick/typesystem_quick.xml b/sources/pyside2/PySide2/QtQuick/typesystem_quick.xml index 439c0bba7..5183ec798 100644 --- a/sources/pyside2/PySide2/QtQuick/typesystem_quick.xml +++ b/sources/pyside2/PySide2/QtQuick/typesystem_quick.xml @@ -40,10 +40,10 @@ ****************************************************************************/ --> <typesystem package="PySide2.QtQuick"> - <load-typesystem name="typesystem_core.xml" generate="no"/> - <load-typesystem name="typesystem_network.xml" generate="no"/> - <load-typesystem name="typesystem_gui.xml" generate="no"/> - <load-typesystem name="typesystem_qml.xml" generate="no"/> + <load-typesystem name="QtCore/typesystem_core.xml" generate="no"/> + <load-typesystem name="QtNetwork/typesystem_network.xml" generate="no"/> + <load-typesystem name="QtGui/typesystem_gui.xml" generate="no"/> + <load-typesystem name="QtQml/typesystem_qml.xml" generate="no"/> <smart-pointer-type name="QSharedPointer" type="shared" getter="data" /> diff --git a/sources/pyside2/PySide2/QtQuickWidgets/CMakeLists.txt b/sources/pyside2/PySide2/QtQuickWidgets/CMakeLists.txt index 1519d1cfd..86991208a 100644 --- a/sources/pyside2/PySide2/QtQuickWidgets/CMakeLists.txt +++ b/sources/pyside2/PySide2/QtQuickWidgets/CMakeLists.txt @@ -6,12 +6,6 @@ ${QtQuickWidgets_GEN_DIR}/qquickwidget_wrapper.cpp ${QtQuickWidgets_GEN_DIR}/qtquickwidgets_module_wrapper.cpp ) -make_path(QtQuickWidgets_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} ${QtQuick_SOURCE_DIR} - ${QtQuick_BINARY_DIR} ${QtQml_SOURCE_DIR} ${QtQml_BINARY_DIR} - ${QtQuickWidgets_SOURCE_DIR}) - set(QtQuickWidgets_include_dirs ${QtQuickWidgets_SOURCE_DIR} ${QtQml_SOURCE_DIR} ${Qt5Core_INCLUDE_DIRS} @@ -48,6 +42,6 @@ create_pyside_module(QtQuickWidgets QtQuickWidgets_include_dirs QtQuickWidgets_libraries QtQuickWidgets_deps - QtQuickWidgets_typesystem_path + QtQuickWidgets_SOURCE_DIR QtQuickWidgets_SRC "") diff --git a/sources/pyside2/PySide2/QtQuickWidgets/typesystem_quickwidgets.xml b/sources/pyside2/PySide2/QtQuickWidgets/typesystem_quickwidgets.xml index 10a269067..782ca0360 100644 --- a/sources/pyside2/PySide2/QtQuickWidgets/typesystem_quickwidgets.xml +++ b/sources/pyside2/PySide2/QtQuickWidgets/typesystem_quickwidgets.xml @@ -40,15 +40,15 @@ ****************************************************************************/ --> <typesystem package="PySide2.QtQuickWidgets"> - <load-typesystem name="typesystem_core.xml" generate="no"/> - <load-typesystem name="typesystem_gui.xml" generate="no"/> - <load-typesystem name="typesystem_quick.xml" generate="no"/> - <load-typesystem name="typesystem_qml.xml" generate="no"/> - <load-typesystem name="typesystem_widgets.xml" generate="no"/> + <load-typesystem name="QtCore/typesystem_core.xml" generate="no"/> + <load-typesystem name="QtGui/typesystem_gui.xml" generate="no"/> + <load-typesystem name="QtQuick/typesystem_quick.xml" generate="no"/> + <load-typesystem name="QtQml/typesystem_qml.xml" generate="no"/> + <load-typesystem name="QtWidgets/typesystem_widgets.xml" generate="no"/> <object-type name="QQuickWidget"> <enum-type name="ResizeMode" /> <enum-type name="Status" /> </object-type> -</typesystem>
\ No newline at end of file +</typesystem> diff --git a/sources/pyside2/PySide2/QtScript/CMakeLists.txt b/sources/pyside2/PySide2/QtScript/CMakeLists.txt index 5b5d08070..1e06c4644 100644 --- a/sources/pyside2/PySide2/QtScript/CMakeLists.txt +++ b/sources/pyside2/PySide2/QtScript/CMakeLists.txt @@ -18,8 +18,6 @@ ${QtScript_GEN_DIR}/qscriptvalueiterator_wrapper.cpp ${QtScript_GEN_DIR}/qtscript_module_wrapper.cpp ) -make_path(QtScript_typesystem_path ${QtCore_SOURCE_DIR} ${QtCore_BINARY_DIR}) - set(QtScript_include_dirs ${QtScript_SOURCE_DIR} ${QtScript_BINARY_DIR} ${Qt5Core_INCLUDE_DIRS} @@ -39,6 +37,6 @@ create_pyside_module(QtScript QtScript_include_dirs QtScript_libraries QtScript_deps - QtScript_typesystem_path + QtScript_SOURCE_DIR QtScript_SRC "") diff --git a/sources/pyside2/PySide2/QtScript/qscript_value_iterator_glue.cpp b/sources/pyside2/PySide2/QtScript/qscript_value_iterator_glue.cpp new file mode 100644 index 000000000..fd9cd84a3 --- /dev/null +++ b/sources/pyside2/PySide2/QtScript/qscript_value_iterator_glue.cpp @@ -0,0 +1,3 @@ +%PYARG_0 = Shiboken::Object::newObject( + reinterpret_cast<SbkObjectType*>(Shiboken::SbkType< ::QScriptValueIterator >()), + new QScriptValueIterator(*%CPPSELF), true, true); diff --git a/sources/pyside2/PySide2/QtScript/typesystem_script.xml b/sources/pyside2/PySide2/QtScript/typesystem_script.xml index 9dbd107a1..4467f1de9 100644 --- a/sources/pyside2/PySide2/QtScript/typesystem_script.xml +++ b/sources/pyside2/PySide2/QtScript/typesystem_script.xml @@ -40,7 +40,7 @@ ****************************************************************************/ --> <typesystem package="PySide2.QtScript"> - <load-typesystem name="typesystem_core.xml" generate="no" /> + <load-typesystem name="QtCore/typesystem_core.xml" generate="no" /> <object-type name="QScriptable"/> <object-type name="QScriptClass"> @@ -106,9 +106,7 @@ </inject-code> </add-function> <add-function signature="__iter__()" return-type="PyObject*"> - <inject-code> - %PYARG_0 = Shiboken::createWrapper(new QScriptValueIterator(*%CPPSELF), true, true); - </inject-code> + <inject-code file="qscript_value_iterator_glue.cpp" /> </add-function> </value-type> <object-type name="QScriptValueIterator"> diff --git a/sources/pyside2/PySide2/QtScriptTools/CMakeLists.txt b/sources/pyside2/PySide2/QtScriptTools/CMakeLists.txt index 436522070..92bf1a545 100644 --- a/sources/pyside2/PySide2/QtScriptTools/CMakeLists.txt +++ b/sources/pyside2/PySide2/QtScriptTools/CMakeLists.txt @@ -6,11 +6,6 @@ ${QtScriptTools_GEN_DIR}/qscriptenginedebugger_wrapper.cpp ${QtScriptTools_GEN_DIR}/qtscripttools_module_wrapper.cpp ) -make_path(QtScriptTools_typesystem_path ${QtCore_SOURCE_DIR} ${QtGui_SOURCE_DIR} ${QtScript_SOURCE_DIR} - ${QtCore_BINARY_DIR} ${QtGui_BINARY_DIR} ${QtScript_BINARY_DIR} - ${QtWidgets_SOURCE_DIR} ${QtWidgets_BINARY_DIR} - ${QtScriptTools_SOURCE_DIR}) - set(QtScriptTools_include_dirs ${QtScriptTools_SOURCE_DIR} ${QtScriptTools_BINARY_DIR} ${Qt5Core_INCLUDE_DIRS} @@ -41,6 +36,6 @@ create_pyside_module(QtScriptTools QtScriptTools_include_dirs QtScriptTools_libraries QtScriptTools_deps - QtScriptTools_typesystem_path + QtScriptTools_SOURCE_DIR QtScriptTools_SRC "") 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"/> diff --git a/sources/pyside2/PySide2/QtSql/CMakeLists.txt b/sources/pyside2/PySide2/QtSql/CMakeLists.txt index fe05d4679..dd78c2388 100644 --- a/sources/pyside2/PySide2/QtSql/CMakeLists.txt +++ b/sources/pyside2/PySide2/QtSql/CMakeLists.txt @@ -20,10 +20,6 @@ ${QtSql_GEN_DIR}/qsqltablemodel_wrapper.cpp ${QtSql_GEN_DIR}/qtsql_module_wrapper.cpp ) -make_path(QtSql_typesystem_path ${QtCore_SOURCE_DIR} ${QtGui_SOURCE_DIR} ${QtWidgets_SOURCE_DIR} - ${QtCore_BINARY_DIR} ${QtGui_BINARY_DIR} ${QtWidgets_BINARY_DIR} - ${QtSql_SOURCE_DIR}) - set(QtSql_include_dirs ${QtSql_SOURCE_DIR} ${QtSql_BINARY_DIR} ${Qt5Core_INCLUDE_DIRS} @@ -50,6 +46,6 @@ create_pyside_module(QtSql QtSql_include_dirs QtSql_libraries QtSql_deps - QtSql_typesystem_path + QtSql_SOURCE_DIR QtSql_SRC "") diff --git a/sources/pyside2/PySide2/QtSql/typesystem_sql.xml b/sources/pyside2/PySide2/QtSql/typesystem_sql.xml index b3d4f2837..46836ef96 100644 --- a/sources/pyside2/PySide2/QtSql/typesystem_sql.xml +++ b/sources/pyside2/PySide2/QtSql/typesystem_sql.xml @@ -40,7 +40,7 @@ ****************************************************************************/ --> <typesystem package="PySide2.QtSql"> - <load-typesystem name="typesystem_widgets.xml" generate="no"/> + <load-typesystem name="QtWidgets/typesystem_widgets.xml" generate="no"/> <rejection class="QSqlDriverCreator"/> <rejection class="QSqlDriverPlugin"/> diff --git a/sources/pyside2/PySide2/QtSvg/CMakeLists.txt b/sources/pyside2/PySide2/QtSvg/CMakeLists.txt index 62db9e4ce..72914b188 100644 --- a/sources/pyside2/PySide2/QtSvg/CMakeLists.txt +++ b/sources/pyside2/PySide2/QtSvg/CMakeLists.txt @@ -9,10 +9,6 @@ ${QtSvg_GEN_DIR}/qsvgwidget_wrapper.cpp ${QtSvg_GEN_DIR}/qtsvg_module_wrapper.cpp ) -make_path(QtSvg_typesystem_path ${QtCore_SOURCE_DIR} ${QtGui_SOURCE_DIR} ${QtWidgets_SOURCE_DIR} - ${QtCore_BINARY_DIR} ${QtGui_BINARY_DIR} ${QtWidgets_BINARY_DIR} - ${QtSvg_SOURCE_DIR}) - set(QtSvg_include_dirs ${QtSvg_SOURCE_DIR} ${QtSvg_BINARY_DIR} ${Qt5Core_INCLUDE_DIRS} @@ -40,6 +36,6 @@ create_pyside_module(QtSvg QtSvg_include_dirs QtSvg_libraries QtSvg_deps - QtSvg_typesystem_path + QtSvg_SOURCE_DIR QtSvg_SRC "") diff --git a/sources/pyside2/PySide2/QtSvg/typesystem_svg.xml b/sources/pyside2/PySide2/QtSvg/typesystem_svg.xml index 603fe7897..059abb891 100644 --- a/sources/pyside2/PySide2/QtSvg/typesystem_svg.xml +++ b/sources/pyside2/PySide2/QtSvg/typesystem_svg.xml @@ -40,7 +40,7 @@ ****************************************************************************/ --> <typesystem package="PySide2.QtSvg"> - <load-typesystem name="typesystem_widgets.xml" generate="no"/> + <load-typesystem name="QtWidgets/typesystem_widgets.xml" generate="no"/> <object-type name="QSvgRenderer" /> <object-type name="QSvgWidget" /> diff --git a/sources/pyside2/PySide2/QtTest/CMakeLists.txt b/sources/pyside2/PySide2/QtTest/CMakeLists.txt index 118f803ea..5893de7ba 100644 --- a/sources/pyside2/PySide2/QtTest/CMakeLists.txt +++ b/sources/pyside2/PySide2/QtTest/CMakeLists.txt @@ -7,10 +7,6 @@ ${QtTest_GEN_DIR}/qtest_wrapper.cpp ${QtTest_GEN_DIR}/qttest_module_wrapper.cpp ) -make_path(QtTest_typesystem_path ${QtCore_SOURCE_DIR} ${QtGui_SOURCE_DIR} ${QtWidgets_SOURCE_DIR} - ${QtCore_BINARY_DIR} ${QtGui_BINARY_DIR} ${QtWidgets_BINARY_DIR} - ${QtTest_SOURCE_DIR}) - set(QtTest_include_dirs ${QtTest_SOURCE_DIR} ${QtTest_BINARY_DIR} ${Qt5Core_INCLUDE_DIRS} @@ -38,6 +34,6 @@ create_pyside_module(QtTest QtTest_include_dirs QtTest_libraries QtTest_deps - QtTest_typesystem_path + QtTest_SOURCE_DIR QtTest_SRC "") diff --git a/sources/pyside2/PySide2/QtTest/typesystem_test.xml b/sources/pyside2/PySide2/QtTest/typesystem_test.xml index b30a6b5da..da26370a1 100644 --- a/sources/pyside2/PySide2/QtTest/typesystem_test.xml +++ b/sources/pyside2/PySide2/QtTest/typesystem_test.xml @@ -40,9 +40,9 @@ ****************************************************************************/ --> <typesystem package="PySide2.QtTest"> - <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="QtCore/typesystem_core.xml" generate="no"/> + <load-typesystem name="QtGui/typesystem_gui.xml" generate="no"/> + <load-typesystem name="QtWidgets/typesystem_widgets.xml" generate="no"/> <rejection class="QTest" function-name="qCompare<char>"/> <rejection class="QTest" function-name="qCompare<char*>"/> diff --git a/sources/pyside2/PySide2/QtTextToSpeech/CMakeLists.txt b/sources/pyside2/PySide2/QtTextToSpeech/CMakeLists.txt index c616e1234..63b5a3669 100644 --- a/sources/pyside2/PySide2/QtTextToSpeech/CMakeLists.txt +++ b/sources/pyside2/PySide2/QtTextToSpeech/CMakeLists.txt @@ -8,11 +8,6 @@ ${QtTextToSpeech_GEN_DIR}/qvoice_wrapper.cpp ${QtTextToSpeech_GEN_DIR}/qttexttospeech_module_wrapper.cpp ) -make_path(QtTextToSpeech_typesystem_path - ${QtCore_SOURCE_DIR} - ${QtCore_BINARY_DIR} - ${QtTextToSpeech_SOURCE_DIR}) - set(QtTextToSpeech_include_dirs ${QtTextToSpeech_SOURCE_DIR} ${QtTextToSpeech_BINARY_DIR} ${Qt5Core_INCLUDE_DIRS} @@ -35,6 +30,6 @@ create_pyside_module(QtTextToSpeech QtTextToSpeech_include_dirs QtTextToSpeech_libraries QtTextToSpeech_deps - QtTextToSpeech_typesystem_path + QtTextToSpeech_SOURCE_DIR QtTextToSpeech_SRC "") diff --git a/sources/pyside2/PySide2/QtTextToSpeech/typesystem_texttospeech.xml b/sources/pyside2/PySide2/QtTextToSpeech/typesystem_texttospeech.xml index ebe73a0b4..d5006de6f 100644 --- a/sources/pyside2/PySide2/QtTextToSpeech/typesystem_texttospeech.xml +++ b/sources/pyside2/PySide2/QtTextToSpeech/typesystem_texttospeech.xml @@ -40,7 +40,7 @@ ****************************************************************************/ --> <typesystem package="PySide2.QtTextToSpeech"> - <load-typesystem name="typesystem_core.xml" generate="no" /> + <load-typesystem name="QtCore/typesystem_core.xml" generate="no" /> <object-type name="QTextToSpeech"> <enum-type name="State"/> diff --git a/sources/pyside2/PySide2/QtUiTools/CMakeLists.txt b/sources/pyside2/PySide2/QtUiTools/CMakeLists.txt index b7ae6974d..e4de03f49 100644 --- a/sources/pyside2/PySide2/QtUiTools/CMakeLists.txt +++ b/sources/pyside2/PySide2/QtUiTools/CMakeLists.txt @@ -6,11 +6,6 @@ ${QtUiTools_GEN_DIR}/quiloader_wrapper.cpp ${QtUiTools_GEN_DIR}/qtuitools_module_wrapper.cpp ) -make_path(QtUiTools_typesystem_path - ${QtCore_SOURCE_DIR} ${QtGui_SOURCE_DIR} ${QtWidgets_SOURCE_DIR} ${QtXml_SOURCE_DIR} - ${QtCore_BINARY_DIR} ${QtGui_BINARY_DIR} ${QtWidgets_BINARY_DIR} ${QtXml_BINARY_DIR} - ${QtUiTools_SOURCE_DIR}) - set(QtUiTools_include_dirs ${QtUiTools_SOURCE_DIR} ${QtUiTools_BINARY_DIR} ${Qt5Core_INCLUDE_DIRS} @@ -41,6 +36,6 @@ create_pyside_module(QtUiTools QtUiTools_include_dirs QtUiTools_libraries QtUiTools_deps - QtUiTools_typesystem_path + QtUiTools_SOURCE_DIR QtUiTools_SRC "") diff --git a/sources/pyside2/PySide2/QtUiTools/typesystem_uitools.xml b/sources/pyside2/PySide2/QtUiTools/typesystem_uitools.xml index a74af0076..f6dd0333b 100644 --- a/sources/pyside2/PySide2/QtUiTools/typesystem_uitools.xml +++ b/sources/pyside2/PySide2/QtUiTools/typesystem_uitools.xml @@ -41,8 +41,8 @@ --> <typesystem package="PySide2.QtUiTools"> - <load-typesystem name="typesystem_widgets.xml" generate="no" /> - <load-typesystem name="typesystem_xml.xml" generate="no" /> + <load-typesystem name="QtWidgets/typesystem_widgets.xml" generate="no" /> + <load-typesystem name="QtXml/typesystem_xml.xml" generate="no" /> <object-type name="QUiLoader"> <extra-includes> diff --git a/sources/pyside2/PySide2/QtWebChannel/CMakeLists.txt b/sources/pyside2/PySide2/QtWebChannel/CMakeLists.txt index ae292844f..b7fee0d17 100644 --- a/sources/pyside2/PySide2/QtWebChannel/CMakeLists.txt +++ b/sources/pyside2/PySide2/QtWebChannel/CMakeLists.txt @@ -7,8 +7,6 @@ ${QtWebChannel_GEN_DIR}/qwebchannelabstracttransport_wrapper.cpp ${QtWebChannel_GEN_DIR}/qtwebchannel_module_wrapper.cpp ) -make_path(QtWebChannel_typesystem_path ${QtCore_SOURCE_DIR} ${QtCore_BINARY_DIR} ${QtWebChannel_SOURCE_DIR}) - set(QtWebChannel_include_dirs ${QtWebChannel_SOURCE_DIR} ${QtWebChannel_BINARY_DIR} ${Qt5Core_INCLUDE_DIRS} @@ -30,6 +28,6 @@ create_pyside_module(QtWebChannel QtWebChannel_include_dirs QtWebChannel_libraries QtWebChannel_deps - QtWebChannel_typesystem_path + QtWebChannel_SOURCE_DIR QtWebChannel_SRC "") diff --git a/sources/pyside2/PySide2/QtWebChannel/typesystem_webchannel.xml b/sources/pyside2/PySide2/QtWebChannel/typesystem_webchannel.xml index c25d3f30a..153a4da83 100644 --- a/sources/pyside2/PySide2/QtWebChannel/typesystem_webchannel.xml +++ b/sources/pyside2/PySide2/QtWebChannel/typesystem_webchannel.xml @@ -40,7 +40,7 @@ ****************************************************************************/ --> <typesystem package="PySide2.QtWebChannel"> - <load-typesystem name="typesystem_core.xml" generate="no"/> + <load-typesystem name="QtCore/typesystem_core.xml" generate="no"/> <object-type name="QWebChannel" /> <object-type name="QWebChannelAbstractTransport"> 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"> diff --git a/sources/pyside2/PySide2/QtWebKit/CMakeLists.txt b/sources/pyside2/PySide2/QtWebKit/CMakeLists.txt index 6bbcbfd43..78f865cac 100644 --- a/sources/pyside2/PySide2/QtWebKit/CMakeLists.txt +++ b/sources/pyside2/PySide2/QtWebKit/CMakeLists.txt @@ -6,10 +6,6 @@ ${QtWebKit_GEN_DIR}/webcore_wrapper.cpp ${QtWebKit_GEN_DIR}/qtwebkit_module_wrapper.cpp ) -make_path(QtWebKit_typesystem_path ${QtCore_SOURCE_DIR} ${QtGui_SOURCE_DIR} ${QtNetwork_SOURCE_DIR} - ${QtCore_BINARY_DIR} ${QtGui_BINARY_DIR} ${QtNetwork_BINARY_DIR} - ${QtWebKit_SOURCE_DIR}) - set(QtWebKit_include_dirs ${QtWebKit_SOURCE_DIR} ${QtWebKit_BINARY_DIR} ${Qt5Core_INCLUDE_DIRS} @@ -37,7 +33,7 @@ create_pyside_module(QtWebKit QtWebKit_include_dirs QtWebKit_libraries QtWebKit_deps - QtWebKit_typesystem_path + QtWebKit_SOURCE_DIR QtWebKit_SRC "") diff --git a/sources/pyside2/PySide2/QtWebKit/typesystem_webkit.xml b/sources/pyside2/PySide2/QtWebKit/typesystem_webkit.xml index c559c7c02..09b3917e3 100644 --- a/sources/pyside2/PySide2/QtWebKit/typesystem_webkit.xml +++ b/sources/pyside2/PySide2/QtWebKit/typesystem_webkit.xml @@ -40,9 +40,9 @@ ****************************************************************************/ --> <typesystem package="PySide2.QtWebKit"> - <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="WebCore"/> 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"/> diff --git a/sources/pyside2/PySide2/QtWebSockets/CMakeLists.txt b/sources/pyside2/PySide2/QtWebSockets/CMakeLists.txt index 9eb402644..495fd4e7b 100644 --- a/sources/pyside2/PySide2/QtWebSockets/CMakeLists.txt +++ b/sources/pyside2/PySide2/QtWebSockets/CMakeLists.txt @@ -10,9 +10,6 @@ ${QtWebSockets_GEN_DIR}/qwebsocketserver_wrapper.cpp ${QtWebSockets_GEN_DIR}/qtwebsockets_module_wrapper.cpp ) -make_path(QtWebSockets_typesystem_path ${QtCore_SOURCE_DIR} ${QtCore_BINARY_DIR} ${QtNetwork_SOURCE_DIR} - ${QtNetwork_BINARY_DIR} ${QtWebSockets_SOURCE_DIR}) - set(QtWebSockets_include_dirs ${QtWebSockets_SOURCE_DIR} ${QtWebSockets_BINARY_DIR} ${Qt5Core_INCLUDE_DIRS} @@ -39,6 +36,6 @@ create_pyside_module(QtWebSockets QtWebSockets_include_dirs QtWebSockets_libraries QtWebSockets_deps - QtWebSockets_typesystem_path + QtWebSockets_SOURCE_DIR QtWebSockets_SRC "") diff --git a/sources/pyside2/PySide2/QtWebSockets/typesystem_websockets.xml b/sources/pyside2/PySide2/QtWebSockets/typesystem_websockets.xml index 8671795c0..f528850e2 100644 --- a/sources/pyside2/PySide2/QtWebSockets/typesystem_websockets.xml +++ b/sources/pyside2/PySide2/QtWebSockets/typesystem_websockets.xml @@ -40,8 +40,8 @@ ****************************************************************************/ --> <typesystem package="PySide2.QtWebSockets"> - <load-typesystem name="typesystem_core.xml" generate="no"/> - <load-typesystem name="typesystem_network.xml" generate="no"/> + <load-typesystem name="QtCore/typesystem_core.xml" generate="no"/> + <load-typesystem name="QtNetwork/typesystem_network.xml" generate="no"/> <object-type name="QMaskGenerator" /> diff --git a/sources/pyside2/PySide2/QtWidgets/CMakeLists.txt b/sources/pyside2/PySide2/QtWidgets/CMakeLists.txt index e401db47c..a1bcdb023 100644 --- a/sources/pyside2/PySide2/QtWidgets/CMakeLists.txt +++ b/sources/pyside2/PySide2/QtWidgets/CMakeLists.txt @@ -212,10 +212,6 @@ ${QtWidgets_GEN_DIR}/qtwidgets_module_wrapper.cpp configure_file("${QtWidgets_SOURCE_DIR}/typesystem_widgets.xml.in" "${QtWidgets_BINARY_DIR}/typesystem_widgets.xml" @ONLY) -make_path(QtWidgets_typesystem_path ${QtCore_SOURCE_DIR} ${QtGui_SOURCE_DIR} - ${QtCore_BINARY_DIR} ${QtGui_BINARY_DIR} - ${QtWidgets_SOURCE_DIR}) - set(QtWidgets_include_dirs ${QtWidgets_SOURCE_DIR} ${QtWidgets_BINARY_DIR} ${pyside2_SOURCE_DIR} @@ -241,7 +237,7 @@ create_pyside_module(QtWidgets QtWidgets_include_dirs QtWidgets_libraries QtWidgets_deps - QtWidgets_typesystem_path + QtWidgets_SOURCE_DIR QtWidgets_SRC "" ${QtWidgets_BINARY_DIR}/typesystem_widgets.xml) diff --git a/sources/pyside2/PySide2/QtWidgets/typesystem_widgets.xml.in b/sources/pyside2/PySide2/QtWidgets/typesystem_widgets.xml.in index e6952c2fe..bad39516c 100644 --- a/sources/pyside2/PySide2/QtWidgets/typesystem_widgets.xml.in +++ b/sources/pyside2/PySide2/QtWidgets/typesystem_widgets.xml.in @@ -40,7 +40,7 @@ ****************************************************************************/ --> <typesystem package="PySide2.QtWidgets"> - <load-typesystem name="typesystem_gui.xml" generate="no"/> - <load-typesystem name="typesystem_widgets_@AUTO_OS@.xml" generate="yes"/> - <load-typesystem name="typesystem_widgets_common.xml" generate="yes"/> + <load-typesystem name="QtGui/typesystem_gui.xml" generate="no"/> + <load-typesystem name="QtWidgets/typesystem_widgets_@AUTO_OS@.xml" generate="yes"/> + <load-typesystem name="QtWidgets/typesystem_widgets_common.xml" generate="yes"/> </typesystem> diff --git a/sources/pyside2/PySide2/QtWidgets/typesystem_widgets_common.xml b/sources/pyside2/PySide2/QtWidgets/typesystem_widgets_common.xml index 624ef591a..d42547cd1 100644 --- a/sources/pyside2/PySide2/QtWidgets/typesystem_widgets_common.xml +++ b/sources/pyside2/PySide2/QtWidgets/typesystem_widgets_common.xml @@ -40,7 +40,7 @@ ****************************************************************************/ --> <typesystem package="PySide2.QtWidgets"> - <load-typesystem name="typesystem_gui.xml" generate="no"/> + <load-typesystem name="QtGui/typesystem_gui.xml" generate="no"/> 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"/> diff --git a/sources/pyside2/PySide2/QtX11Extras/CMakeLists.txt b/sources/pyside2/PySide2/QtX11Extras/CMakeLists.txt index 0af059ffe..f15f77375 100644 --- a/sources/pyside2/PySide2/QtX11Extras/CMakeLists.txt +++ b/sources/pyside2/PySide2/QtX11Extras/CMakeLists.txt @@ -6,12 +6,6 @@ ${QtX11Extras_GEN_DIR}/qx11info_wrapper.cpp ${QtX11Extras_GEN_DIR}/qtx11extras_module_wrapper.cpp ) -make_path(QtX11Extras_typesystem_path ${QtX11Extras_SOURCE_DIR} - ${QtCore_SOURCE_DIR} - ${QtCore_BINARY_DIR} - ${QtGui_SOURCE_DIR} - ${QtGui_BINARY_DIR}) - set(QtX11Extras_include_dirs ${QtX11Extras_SOURCE_DIR} ${QtX11Extras_BINARY_DIR} ${Qt5X11Extras_INCLUDE_DIRS} @@ -35,6 +29,6 @@ create_pyside_module(QtX11Extras QtX11Extras_include_dirs QtX11Extras_libraries QtX11Extras_deps - QtX11Extras_typesystem_path + QtX11Extras_SOURCE_DIR QtX11Extras_SRC "") diff --git a/sources/pyside2/PySide2/QtX11Extras/typesystem_x11extras.xml b/sources/pyside2/PySide2/QtX11Extras/typesystem_x11extras.xml index 9aa527951..23d578ca6 100644 --- a/sources/pyside2/PySide2/QtX11Extras/typesystem_x11extras.xml +++ b/sources/pyside2/PySide2/QtX11Extras/typesystem_x11extras.xml @@ -41,7 +41,7 @@ ****************************************************************************/ --> <typesystem package="PySide2.QtX11Extras"> - <load-typesystem name="typesystem_core.xml" generate="no"/> + <load-typesystem name="QtCore/typesystem_core.xml" generate="no"/> <object-type name="QX11Info" /> </typesystem> diff --git a/sources/pyside2/PySide2/QtXml/CMakeLists.txt b/sources/pyside2/PySide2/QtXml/CMakeLists.txt index 8dd06cc46..9c724cffb 100644 --- a/sources/pyside2/PySide2/QtXml/CMakeLists.txt +++ b/sources/pyside2/PySide2/QtXml/CMakeLists.txt @@ -36,9 +36,6 @@ ${QtXml_GEN_DIR}/qxmlsimplereader_wrapper.cpp ${QtXml_GEN_DIR}/qtxml_module_wrapper.cpp ) -make_path(QtXml_typesystem_path ${QtCore_SOURCE_DIR} ${QtCore_BINARY_DIR} - ${QtXml_SOURCE_DIR}) - set(QtXml_include_dirs ${QtXml_SOURCE_DIR} ${QtXml_BINARY_DIR} ${CMAKE_SOURCE_DIR} @@ -59,6 +56,6 @@ create_pyside_module(QtXml QtXml_include_dirs QtXml_libraries QtXml_deps - QtXml_typesystem_path + QtXml_SOURCE_DIR QtXml_SRC "") diff --git a/sources/pyside2/PySide2/QtXml/typesystem_xml.xml b/sources/pyside2/PySide2/QtXml/typesystem_xml.xml index ba0248342..d78a1d77c 100644 --- a/sources/pyside2/PySide2/QtXml/typesystem_xml.xml +++ b/sources/pyside2/PySide2/QtXml/typesystem_xml.xml @@ -41,7 +41,7 @@ --> <typesystem package="PySide2.QtXml"> <load-typesystem name="typesystem_templates.xml" generate="no" /> - <load-typesystem name="typesystem_core.xml" generate="no" /> + <load-typesystem name="QtCore/typesystem_core.xml" generate="no" /> <rejection class="QXmlAttributes::Attribute"/> <rejection class="QDomNode" field-name="impl"/> diff --git a/sources/pyside2/PySide2/QtXmlPatterns/CMakeLists.txt b/sources/pyside2/PySide2/QtXmlPatterns/CMakeLists.txt index a10d40bf0..d279f43ae 100644 --- a/sources/pyside2/PySide2/QtXmlPatterns/CMakeLists.txt +++ b/sources/pyside2/PySide2/QtXmlPatterns/CMakeLists.txt @@ -20,9 +20,6 @@ ${QtXmlPatterns_GEN_DIR}/qxmlserializer_wrapper.cpp ${QtXmlPatterns_GEN_DIR}/qtxmlpatterns_module_wrapper.cpp ) -make_path(QtXmlPatterns_typesystem_path ${QtCore_SOURCE_DIR} ${QtCore_BINARY_DIR} - ${QtXmlPatterns_SOURCE_DIR}) - set(QtXmlPatterns_include_dirs ${QtXmlPatterns_SOURCE_DIR} ${QtXmlPatterns_BINARY_DIR} ${Qt5Core_INCLUDE_DIRS} @@ -42,7 +39,7 @@ create_pyside_module(QtXmlPatterns QtXmlPatterns_include_dirs QtXmlPatterns_libraries QtXmlPatterns_deps - QtXmlPatterns_typesystem_path + QtXmlPatterns_SOURCE_DIR QtXmlPatterns_SRC "") diff --git a/sources/pyside2/PySide2/QtXmlPatterns/typesystem_xmlpatterns.xml b/sources/pyside2/PySide2/QtXmlPatterns/typesystem_xmlpatterns.xml index 96970366f..888595ccc 100644 --- a/sources/pyside2/PySide2/QtXmlPatterns/typesystem_xmlpatterns.xml +++ b/sources/pyside2/PySide2/QtXmlPatterns/typesystem_xmlpatterns.xml @@ -40,7 +40,7 @@ ****************************************************************************/ --> <typesystem package="PySide2.QtXmlPatterns"> - <load-typesystem name="typesystem_core.xml" generate="no"/> + <load-typesystem name="QtCore/typesystem_core.xml" generate="no"/> <object-type name="QXmlSchema" since="4.6" /> <!-- Qt scoped pointer does not allow declare this as value type --> <object-type name="QXmlSchemaValidator" since="4.6"> diff --git a/sources/pyside2/PySide2/support/__init__.py b/sources/pyside2/PySide2/support/__init__.py index b2085d892..6a6d267b6 100644 --- a/sources/pyside2/PySide2/support/__init__.py +++ b/sources/pyside2/PySide2/support/__init__.py @@ -37,4 +37,12 @@ ## ############################################################################# -# This file has intentionally no content. +# Import VoidPtr type to expose it under PySide2.support.VoidPtr +try: + # The normal import statement when PySide2 is installed. + from PySide2.shiboken2 import VoidPtr +except ImportError: + # When running make test in shiboken build dir, or when running testrunner.py, + # shiboken2 is not part of the PySide2 module, so it needs to be imported as a standalone + # module. + from shiboken2 import VoidPtr diff --git a/sources/pyside2/cmake/Macros/PySideModules.cmake b/sources/pyside2/cmake/Macros/PySideModules.cmake index c4177a8d7..9c39980cb 100644 --- a/sources/pyside2/cmake/Macros/PySideModules.cmake +++ b/sources/pyside2/cmake/Macros/PySideModules.cmake @@ -54,15 +54,14 @@ macro(create_pyside_module # First add the main file. set(total_type_system_files ${typesystem_path}) - # Transform the path separator list back into a cmake list (so from a:b:c to a;b;c) - unmake_path(list_of_paths ${${module_typesystem_path}}) + get_filename_component(typesystem_root "${CMAKE_CURRENT_SOURCE_DIR}" DIRECTORY) - # Collect all XML files, in each given path, and append them to the final total list. - foreach(type_system_files_path ${list_of_paths}) - set(glob_expression "${type_system_files_path}/*.xml") + set(deps ${module_name} ${${module_deps}}) + foreach(dep ${deps}) + set(glob_expression "${typesystem_root}/${dep}/*.xml") file(GLOB type_system_files ${glob_expression}) set(total_type_system_files ${total_type_system_files} ${type_system_files}) - endforeach(type_system_files_path) + endforeach(dep) # Remove any possible duplicates. list(REMOVE_DUPLICATES total_type_system_files) @@ -81,12 +80,14 @@ macro(create_pyside_module # Transform the path separators into something shiboken understands. make_path(shiboken_include_dirs ${shiboken_include_dirs}) + get_filename_component(pyside_binary_dir ${CMAKE_CURRENT_BINARY_DIR} DIRECTORY) + add_custom_command(OUTPUT ${${module_sources}} COMMAND "${SHIBOKEN_BINARY}" ${GENERATOR_EXTRA_FLAGS} - ${pyside2_BINARY_DIR}/pyside2_global.h + "${pyside2_BINARY_DIR}/${module_name}_global.h" --include-paths=${shiboken_include_dirs} ${shiboken_framework_include_dirs_option} - --typesystem-paths=${pyside2_SOURCE_DIR}${PATH_SEP}${${module_typesystem_path}} + --typesystem-paths=${pyside_binary_dir}${PATH_SEP}${pyside2_SOURCE_DIR}${PATH_SEP}${${module_typesystem_path}} --output-directory=${CMAKE_CURRENT_BINARY_DIR} --license-file=${CMAKE_CURRENT_SOURCE_DIR}/../licensecomment.txt ${typesystem_path} diff --git a/sources/pyside2/libpyside/CMakeLists.txt b/sources/pyside2/libpyside/CMakeLists.txt index 05e383307..1cddebc07 100644 --- a/sources/pyside2/libpyside/CMakeLists.txt +++ b/sources/pyside2/libpyside/CMakeLists.txt @@ -120,7 +120,6 @@ set(libpyside_HEADERS dynamicqmetaobject.h globalreceiver.h pysideclassinfo.h - pysideconversions.h pysidemacros.h signalmanager.h pyside.h diff --git a/sources/pyside2/libpyside/globalreceiver.cpp b/sources/pyside2/libpyside/globalreceiver.cpp index e183e09ba..5e0aa0d66 100644 --- a/sources/pyside2/libpyside/globalreceiver.cpp +++ b/sources/pyside2/libpyside/globalreceiver.cpp @@ -49,7 +49,6 @@ #include <sbkconverter.h> #include <gilstate.h> -#include "typeresolver.h" #include "signalmanager.h" #define RECEIVER_DESTROYED_SLOT_NAME "__receiverDestroyed__(QObject*)" diff --git a/sources/pyside2/libpyside/globalreceiverv2.cpp b/sources/pyside2/libpyside/globalreceiverv2.cpp index a79d43c20..9e9bccbaf 100644 --- a/sources/pyside2/libpyside/globalreceiverv2.cpp +++ b/sources/pyside2/libpyside/globalreceiverv2.cpp @@ -48,7 +48,6 @@ #include <autodecref.h> #include <gilstate.h> -#include "typeresolver.h" #include "signalmanager.h" #define RECEIVER_DESTROYED_SLOT_NAME "__receiverDestroyed__(QObject*)" diff --git a/sources/pyside2/libpyside/pyside.cpp b/sources/pyside2/libpyside/pyside.cpp index d4e867c61..17366ce6e 100644 --- a/sources/pyside2/libpyside/pyside.cpp +++ b/sources/pyside2/libpyside/pyside.cpp @@ -50,14 +50,15 @@ #include "dynamicqmetaobject.h" #include "destroylistener.h" +#include <autodecref.h> #include <qapp_macro.h> #include <basewrapper.h> -#include <conversions.h> #include <sbkconverter.h> +#include <sbkstring.h> #include <gilstate.h> -#include <typeresolver.h> #include <bindingmanager.h> #include <algorithm> +#include <typeinfo> #include <cstring> #include <cctype> #include <QStack> diff --git a/sources/pyside2/libpyside/pysideconversions.h b/sources/pyside2/libpyside/pysideconversions.h deleted file mode 100644 index ed8002fae..000000000 --- a/sources/pyside2/libpyside/pysideconversions.h +++ /dev/null @@ -1,275 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2016 The Qt Company Ltd. -** Contact: https://www.qt.io/licensing/ -** -** This file is part of PySide2. -** -** $QT_BEGIN_LICENSE:LGPL$ -** Commercial License Usage -** Licensees holding valid commercial Qt licenses may use this file in -** accordance with the commercial license agreement provided with the -** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and The Qt Company. For licensing terms -** and conditions see https://www.qt.io/terms-conditions. For further -** information use the contact form at https://www.qt.io/contact-us. -** -** GNU Lesser General Public License Usage -** Alternatively, this file may be used under the terms of the GNU Lesser -** General Public License version 3 as published by the Free Software -** Foundation and appearing in the file LICENSE.LGPL3 included in the -** packaging of this file. Please review the following information to -** ensure the GNU Lesser General Public License version 3 requirements -** will be met: https://www.gnu.org/licenses/lgpl-3.0.html. -** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU -** General Public License version 2.0 or (at your option) the GNU General -** Public license version 3 or any later version approved by the KDE Free -** Qt Foundation. The licenses are as published by the Free Software -** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3 -** included in the packaging of this file. Please review the following -** information to ensure the GNU General Public License requirements will -** be met: https://www.gnu.org/licenses/gpl-2.0.html and -** https://www.gnu.org/licenses/gpl-3.0.html. -** -** $QT_END_LICENSE$ -** -****************************************************************************/ - -#ifndef PYSIDECONVERSIONS_H -#define PYSIDECONVERSIONS_H - -#include <sbkpython.h> -#include <QFlag> -#include <conversions.h> -#include <pysideqflags.h> - -template <typename QtDict> -struct QtDictConverter -{ - static inline bool checkType(PyObject* pyObj) - { - return isConvertible(pyObj); - } - - static inline bool isConvertible(PyObject* pyObj) - { - if (PyObject_TypeCheck(pyObj, Shiboken::SbkType<QtDict>())) - return true; - - if ((Shiboken::SbkType<QtDict>() && Shiboken::Object::checkType(pyObj)) || !PyDict_Check(pyObj)) - return false; - - PyObject* key; - PyObject* value; - Py_ssize_t pos = 0; - - while (PyDict_Next(pyObj, &pos, &key, &value)) { - if (!Shiboken::Converter<typename QtDict::key_type>::isConvertible(key) - && !Shiboken::Converter<typename QtDict::mapped_type>::isConvertible(value)) { - return false; - } - } - return true; - } - - static inline PyObject* toPython(void* cppObj) { return toPython(*reinterpret_cast<QtDict*>(cppObj)); } - static inline PyObject* toPython(const QtDict& cppobj) - { - PyObject* result = PyDict_New(); - typename QtDict::const_iterator it = cppobj.begin(); - - for (; it != cppobj.end(); ++it) { - Shiboken::AutoDecRef keyObj(Shiboken::Converter<typename QtDict::key_type>::toPython(it.key())); - Shiboken::AutoDecRef valueObj(Shiboken::Converter<typename QtDict::mapped_type>::toPython(it.value())); - PyDict_SetItem(result, keyObj, valueObj); - } - - return result; - } - static inline QtDict toCpp(PyObject* pyobj) - { - if (PyObject_TypeCheck(pyobj, Shiboken::SbkType<QtDict>())) - return *reinterpret_cast<QtDict *>(Shiboken::Object::cppPointer(reinterpret_cast<SbkObject *>(pyobj), Shiboken::SbkType<QtDict>())); - - QtDict result; - - PyObject* key; - PyObject* value; - Py_ssize_t pos = 0; - - while (PyDict_Next(pyobj, &pos, &key, &value)) - result[Shiboken::Converter<typename QtDict::key_type>::toCpp(key)] = Shiboken::Converter<typename QtDict::mapped_type>::toCpp(value); - return result; - } -}; - -template <typename MultiMap> -struct QtMultiMapConverter -{ - static inline bool checkType(PyObject* pyObj) - { - return isConvertible(pyObj); - } - - static inline bool isConvertible(PyObject* pyObj) - { - if (PyObject_TypeCheck(pyObj, Shiboken::SbkType<MultiMap>())) - return true; - - if ((Shiboken::SbkType<MultiMap>() && Shiboken::Object::checkType(pyObj)) || !PyDict_Check(pyObj)) - return false; - - PyObject* key; - PyObject* value; - Py_ssize_t pos = 0; - - while (PyDict_Next(pyObj, &pos, &key, &value)) { - if (!Shiboken::Converter<typename MultiMap::key_type>::isConvertible(key)) { - if (PySequence_Check(value)) { - for (int i = 0, max = PySequence_Length(value); i < max; ++i) { - Shiboken::AutoDecRef item(PySequence_GetItem(value, i)); - if (!Shiboken::Converter<typename MultiMap::mapped_type>::isConvertible(value)) - return false; - } - } else if (!Shiboken::Converter<typename MultiMap::mapped_type>::isConvertible(value)) { - return false; - } - } - } - return true; - } - - static inline PyObject* toPython(void* cppObj) { return toPython(*reinterpret_cast<MultiMap*>(cppObj)); } - static inline PyObject* toPython(const MultiMap& cppObj) - { - PyObject* result = PyDict_New(); - typename MultiMap::const_iterator it = cppObj.begin(); - - for (; it != cppObj.end(); ++it) { - Shiboken::AutoDecRef key(Shiboken::Converter<typename MultiMap::key_type>::toPython(it.key())); - Shiboken::AutoDecRef value(Shiboken::Converter<typename MultiMap::mapped_type>::toPython(it.value())); - - PyObject* values = PyDict_GetItem(result, key); - bool decRefValues = !values; - if (!values) - values = PyList_New(0); - PyList_Append(values, value); - PyDict_SetItem(result, key, values); - if (decRefValues) { - Py_DECREF(values); - } - } - - return result; - } - - static inline MultiMap toCpp(PyObject* pyObj) - { - if (PyObject_TypeCheck(pyObj, Shiboken::SbkType<MultiMap>())) - return *reinterpret_cast<MultiMap *>(Shiboken::Object::cppPointer(reinterpret_cast<SbkObject *>(pyObj), Shiboken::SbkType<MultiMap>())); - - MultiMap result; - - PyObject* key; - PyObject* value; - Py_ssize_t pos = 0; - - while (PyDict_Next(pyObj, &pos, &key, &value)) - result[Shiboken::Converter<typename MultiMap::key_type>::toCpp(key)] = Shiboken::Converter<typename MultiMap::mapped_type>::toCpp(value); - return result; - } -}; - -template <typename T> -struct QSequenceConverter -{ - static inline bool checkType(PyObject* pyObj) - { - return isConvertible(pyObj); - } - - static inline bool isConvertible(PyObject* pyObj) - { - if (PyObject_TypeCheck(pyObj, Shiboken::SbkType<T>())) - return true; - if ((Shiboken::SbkType<T>() && Shiboken::Object::checkType(pyObj)) || !PySequence_Check(pyObj)) - return false; - for (int i = 0, max = PySequence_Length(pyObj); i < max; ++i) { - Shiboken::AutoDecRef item(PySequence_GetItem(pyObj, i)); - if (!Shiboken::Converter<typename T::value_type>::isConvertible(item)) - return false; - } - return true; - } - static inline PyObject* toPython(void* cppObj) { return toPython(*reinterpret_cast<T*>(cppObj)); } - static PyObject* toPython(const T& cppobj) - { - PyObject* result = PyList_New((int) cppobj.size()); - typename T::const_iterator it = cppobj.begin(); - for (int idx = 0; it != cppobj.end(); ++it, ++idx) { - typename T::value_type vh(*it); - PyList_SET_ITEM(result, idx, Shiboken::Converter<typename T::value_type>::toPython(vh)); - } - return result; - } - static T toCpp(PyObject* pyobj) - { - if (PyObject_TypeCheck(pyobj, Shiboken::SbkType<T>())) - return *reinterpret_cast<T *>(Shiboken::Object::cppPointer(reinterpret_cast<SbkObject *>(pyobj), Shiboken::SbkType<T>())); - - Shiboken::AutoDecRef fastSequence(PySequence_Fast(pyobj, "Invalid sequence object")); - T result; - for (int i = 0; i < PySequence_Size(pyobj); i++) { - PyObject* pyItem = PySequence_Fast_GET_ITEM(fastSequence.object(), i); - result << Shiboken::Converter<typename T::value_type>::toCpp(pyItem); - } - return result; - } -}; - - -template <typename T> -struct QFlagsConverter -{ - static inline bool checkType(PyObject* pyObj) - { - return PyObject_TypeCheck(pyObj, Shiboken::SbkType<T>()); - } - - static inline bool isConvertible(PyObject* pyObj) - { - return PyObject_TypeCheck(pyObj, Shiboken::SbkType<T>()) - || PyObject_TypeCheck(pyObj, Shiboken::SbkType<typename T::enum_type>()); - } - - static inline PyObject* toPython(void* cppObj) - { - return toPython(*reinterpret_cast<T*>(cppObj)); - } - - static inline PyObject* toPython(const T& cppObj) - { - return reinterpret_cast<PyObject*>(PySide::QFlags::newObject(cppObj, Shiboken::SbkType<T>())); - } - - static inline T toCpp(PyObject* pyObj) - { - /* this was long. Needed int in Qt5 */ - int val = 0; - if (Shiboken::Enum::check(pyObj)) { - val = Shiboken::Enum::getValue(pyObj); - } else if (PyObject_TypeCheck(pyObj, Shiboken::SbkType<T>())) { - val = PySide::QFlags::getValue(reinterpret_cast<PySideQFlagsObject*>(pyObj)); - } else if (PyNumber_Check(pyObj)) { - Shiboken::AutoDecRef pyLong(PyNumber_Long(pyObj)); - val = PyLong_AsLong(pyLong.object()); - } else { - PyErr_BadArgument(); - } - return T(QFlag(val)); - } -}; - -#endif diff --git a/sources/pyside2/libpyside/signalmanager.cpp.in b/sources/pyside2/libpyside/signalmanager.cpp.in index 473057cbc..8ede09610 100644 --- a/sources/pyside2/libpyside/signalmanager.cpp.in +++ b/sources/pyside2/libpyside/signalmanager.cpp.in @@ -55,10 +55,10 @@ #include <QDebug> #include <limits> #include <algorithm> -#include <typeresolver.h> #include <basewrapper.h> +#include <bindingmanager.h> #include <sbkconverter.h> -#include <conversions.h> +#include <sbkstring.h> // These private headers are needed to throw JavaScript exceptions #if @QML_PRIVATE_API_SUPPORT@ @@ -214,30 +214,6 @@ QDataStream &operator>>(QDataStream& in, PyObjectWrapper& myObj) }; -namespace Shiboken { - -template<> -struct Converter<PySide::PyObjectWrapper> -{ - static PySide::PyObjectWrapper toCpp(PyObject* obj) - { - return PySide::PyObjectWrapper(obj); - } - - static PyObject* toPython(void* obj) - { - return toPython(*reinterpret_cast<PySide::PyObjectWrapper*>(obj)); - } - - static PyObject* toPython(const PySide::PyObjectWrapper& obj) - { - Py_INCREF((PyObject*)obj); - return obj; - } -}; - -}; - using namespace PySide; struct SignalManager::SignalManagerPrivate diff --git a/sources/pyside2/tests/QtXml/qxmlsimplereader_test.py b/sources/pyside2/tests/QtXml/qxmlsimplereader_test.py index d5df57953..108fc9b86 100644 --- a/sources/pyside2/tests/QtXml/qxmlsimplereader_test.py +++ b/sources/pyside2/tests/QtXml/qxmlsimplereader_test.py @@ -57,7 +57,6 @@ class QXmlSimpleReaderTest(unittest.TestCase): reader = QXmlSimpleReader() prop, ok = reader.property('foo') self.assertEqual((prop, ok), (None, False)) - reader.setProperty('foo', 'Something') if __name__ == '__main__': unittest.main() diff --git a/sources/pyside2/tests/pysidetest/CMakeLists.txt b/sources/pyside2/tests/pysidetest/CMakeLists.txt index 16380e490..0a367e8a5 100644 --- a/sources/pyside2/tests/pysidetest/CMakeLists.txt +++ b/sources/pyside2/tests/pysidetest/CMakeLists.txt @@ -66,11 +66,8 @@ make_path(testbinding_include_dirs ${pyside2_BINARY_DIR} ${Qt5Widgets_DIRECT_INCLUDE_DIR} ) -make_path(testbinding_typesystem_path ${CMAKE_CURRENT_SOURCE_DIR} - ${pyside2_SOURCE_DIR} - ${QtCore_SOURCE_DIR} ${QtGui_SOURCE_DIR} ${QtWidgets_SOURCE_DIR} - ${QtCore_BINARY_DIR} ${QtGui_BINARY_DIR} ${QtWidgets_BINARY_DIR} - ) +make_path(testbinding_typesystem_path ${pyside2_SOURCE_DIR} + ${pyside2_BINARY_DIR}) add_custom_command(OUTPUT ${testbinding_SRC} COMMAND ${SHIBOKEN_BINARY} ${GENERATOR_EXTRA_FLAGS} diff --git a/sources/pyside2/tests/pysidetest/typesystem_pysidetest.xml b/sources/pyside2/tests/pysidetest/typesystem_pysidetest.xml index 7895e7147..bf9c29386 100644 --- a/sources/pyside2/tests/pysidetest/typesystem_pysidetest.xml +++ b/sources/pyside2/tests/pysidetest/typesystem_pysidetest.xml @@ -1,6 +1,6 @@ <?xml version="1.0"?> <typesystem package="testbinding"> - <load-typesystem name="typesystem_widgets.xml" generate="no"/> + <load-typesystem name="QtWidgets/typesystem_widgets.xml" generate="no"/> <value-type name="IntValue"/> <primitive-type name="TypedefValue"> <!-- |