diff options
Diffstat (limited to 'sources/pyside2')
256 files changed, 5316 insertions, 2781 deletions
diff --git a/sources/pyside2/CMakeLists.txt b/sources/pyside2/CMakeLists.txt index 56eadb844..4db611f0d 100644 --- a/sources/pyside2/CMakeLists.txt +++ b/sources/pyside2/CMakeLists.txt @@ -1,7 +1,7 @@ include(cmake/Macros/icecc.cmake) # this must be the first line! -cmake_minimum_required(VERSION 3.0) -cmake_policy(VERSION 3.0) +cmake_minimum_required(VERSION 3.1) +cmake_policy(VERSION 3.1) # Don't ignore targets that do not exist, inside add_dependencies calls. cmake_policy(SET CMP0046 NEW) @@ -125,6 +125,11 @@ if(CMAKE_HOST_APPLE) endif() endif() +# Force usage of the C++11 standard, without a silent fallback +# to C++98 if the compiler does not support C++11. +set(CMAKE_CXX_STANDARD 11) +set(CMAKE_CXX_STANDARD_REQUIRED ON) + # Qt5: QT_INCLUDE_DIR does no longer exist. # On Windows, macOS, and Linux it can be computed from Qt5Core_INCLUDE_DIRS, which contains # a list of include directories. We take the first one. @@ -142,10 +147,6 @@ if (QtCore_is_framework) # QT_INCLUDE_DIR points to the QtCore.framework directory, so we need to adjust this to point # to the actual include directory, which has include files for non-framework parts of Qt. get_filename_component(QT_INCLUDE_DIR "${QT_INCLUDE_DIR}/../../include" ABSOLUTE) - - # And then we append the framework dir, to mimic the way setup.py passed that in before to - # the old shiboken parser. - set(QT_INCLUDE_DIR "${QT_INCLUDE_DIR}:${QT_FRAMEWORK_INCLUDE_DIR}") endif() if(MSVC) @@ -256,19 +257,51 @@ include(PySideModules) macro(COLLECT_MODULE_IF_FOUND shortname) set(name "Qt5${shortname}") find_package(${name}) + # If package is found, _name_found will be equal to 1 set(_name_found "${name}_FOUND") - if(${_name_found}) - message(STATUS "module ${name} found (${ARGN})") + # _name_dir will keep the path to the directory where the CMake rules were found + # e.g: ~/qt5.9-install/qtbase/lib/cmake/Qt5Core or /usr/lib64/cmake/Qt5Core + set(_name_dir "${name}_DIR") + # Qt5Core will set the base path to check if all the modules are on the same + # directory, to avoid CMake looking in another path. + # This will be saved in a global variable at the beginning of the modules + # collection process. + string(FIND "${name}" "Qt5Core" qtcore_found) + if(("${qtcore_found}" GREATER "0") OR ("${qtcore_found}" EQUAL "0")) + get_filename_component(_core_abs_dir "${${_name_dir}}/../" ABSOLUTE) + # Setting the absolute path where the Qt5Core was found + # e.g: ~/qt5.9-install/qtbase/lib/cmake or /usr/lib64/cmake + message(STATUS "CORE_ABS_DIR:" ${_core_abs_dir}) + endif() + + # Getting the absolute path for each module where the CMake was found, to + # compare it with CORE_ABS_DIR and check if they are in the same source directory + # e.g: ~/qt5.9-install/qtbase/lib/cmake/Qt5Script or /usr/lib64/cmake/Qt5Script + get_filename_component(_module_dir "${${_name_dir}}" ABSOLUTE) + string(FIND "${_module_dir}" "${_core_abs_dir}" found_basepath) + + # Determine essential/optional/missing + set(module_state "missing") + list(FIND ALL_ESSENTIAL_MODULES "${shortname}" essentialIndex) + if(${essentialIndex} EQUAL -1) + list(FIND ALL_OPTIONAL_MODULES "${shortname}" optionalIndex) + if(NOT ${optionalIndex} EQUAL -1) + set(module_state "optional") + endif() + else() + set(module_state "essential") + endif() - # 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") + # If the module was found, and also the module path is the same as the + # Qt5Core base path, we will generate the list with the modules to be install + if("${${_name_found}}" AND (("${found_basepath}" GREATER "0") OR ("${found_basepath}" EQUAL "0"))) + message(STATUS "${module_state} module ${name} found (${ARGN})") # record the shortnames for the tests list(APPEND all_module_shortnames ${shortname}) else() - if("${ARGN}" STREQUAL "opt") + if("${module_state}" STREQUAL "optional") message(STATUS "optional module ${name} skipped") - elseif("${ARGN}" STREQUAL "essential") + elseif("${module_state}" STREQUAL "essential") message(STATUS "skipped module ${name} is essential!\n" " We do not guarantee that all tests are working.") else() @@ -277,56 +310,49 @@ macro(COLLECT_MODULE_IF_FOUND shortname) endif() endmacro() +# Set default values for pyside2_global.h +set (Qt5X11Extras_FOUND "0") +set (Qt5Test_FOUND "0") +set (Qt5Widgets_FOUND "0") + +# Collect all essential modules. # note: the order of this list is relevant for dependencies. # For instance: Qt5Printsupport must come before Qt5WebKitWidgets. -COLLECT_MODULE_IF_FOUND(Core) -COLLECT_MODULE_IF_FOUND(Gui essential) -COLLECT_MODULE_IF_FOUND(Widgets essential) -COLLECT_MODULE_IF_FOUND(PrintSupport essential) -COLLECT_MODULE_IF_FOUND(Sql essential) -COLLECT_MODULE_IF_FOUND(Network essential) -COLLECT_MODULE_IF_FOUND(Test essential) -COLLECT_MODULE_IF_FOUND(Concurrent essential) +set(ALL_ESSENTIAL_MODULES Core Gui Widgets PrintSupport Sql Network Test Concurrent) if(UNIX AND NOT APPLE) - COLLECT_MODULE_IF_FOUND(X11Extras essential) + list(APPEND ALL_ESSENTIAL_MODULES X11Extras) endif() if(WIN32) - COLLECT_MODULE_IF_FOUND(WinExtras essential) + list(APPEND ALL_ESSENTIAL_MODULES WinExtras) endif() if(APPLE) - COLLECT_MODULE_IF_FOUND(MacExtras essential) + list(APPEND ALL_ESSENTIAL_MODULES MacExtras) endif() -COLLECT_MODULE_IF_FOUND(Xml) -COLLECT_MODULE_IF_FOUND(XmlPatterns opt) -COLLECT_MODULE_IF_FOUND(Help opt) -COLLECT_MODULE_IF_FOUND(Multimedia opt) -COLLECT_MODULE_IF_FOUND(MultimediaWidgets opt) -COLLECT_MODULE_IF_FOUND(OpenGL opt) -COLLECT_MODULE_IF_FOUND(Qml opt) -COLLECT_MODULE_IF_FOUND(Quick opt) -COLLECT_MODULE_IF_FOUND(QuickWidgets opt) -COLLECT_MODULE_IF_FOUND(Script opt) -COLLECT_MODULE_IF_FOUND(ScriptTools opt) -COLLECT_MODULE_IF_FOUND(Svg opt) + +# Collect all optional modules. +set(ALL_OPTIONAL_MODULES Xml XmlPatterns Help Multimedia MultimediaWidgets OpenGL Qml Quick QuickWidgets Script ScriptTools TextToSpeech Charts Svg DataVisualization) find_package(Qt5UiTools) if(Qt5UiTools_FOUND) - COLLECT_MODULE_IF_FOUND(UiTools opt) + list(APPEND ALL_OPTIONAL_MODULES UiTools) else() set(DISABLE_QtUiTools 1) endif() -COLLECT_MODULE_IF_FOUND(WebChannel opt) -# still forgotten: -#COLLECT_MODULE_IF_FOUND(WebEngineCore opt) -#COLLECT_MODULE_IF_FOUND(WebEngine opt) -COLLECT_MODULE_IF_FOUND(WebEngineWidgets opt) -COLLECT_MODULE_IF_FOUND(WebKit opt) -if(NOT MSVC) - # right now this does not build on windows - COLLECT_MODULE_IF_FOUND(WebKitWidgets opt) -else() - set(DISABLE_QtWebKitWidgets 1) -ENDIF() -COLLECT_MODULE_IF_FOUND(WebSockets opt) +if(WIN32) + list(APPEND ALL_OPTIONAL_MODULES AxContainer) +endif() +list(APPEND ALL_OPTIONAL_MODULES WebChannel WebEngineWidgets WebKit WebKitWidgets WebSockets) +if (Qt5Core_VERSION VERSION_GREATER 5.9.3) # Depending on fixes in Qt3D + list(APPEND ALL_OPTIONAL_MODULES 3DCore 3DRender 3DInput 3DLogic 3DAnimation 3DExtras) +endif() + +# Modules to be built unless specified by -DMODULES on command line +if (NOT MODULES) + set(MODULES "${ALL_ESSENTIAL_MODULES};${ALL_OPTIONAL_MODULES}") +endif() + +foreach(m ${MODULES}) + COLLECT_MODULE_IF_FOUND(${m}) +endforeach() string(REGEX MATCHALL "[0-9]+" qt_version_helper "${Qt5Core_VERSION}") diff --git a/sources/pyside2/PySide2/CMakeLists.txt b/sources/pyside2/PySide2/CMakeLists.txt index 02b4a7c16..971d0a9ef 100644 --- a/sources/pyside2/PySide2/CMakeLists.txt +++ b/sources/pyside2/PySide2/CMakeLists.txt @@ -35,15 +35,36 @@ else() "${CMAKE_CURRENT_BINARY_DIR}/support/signature/typing.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") + set(module_header_content "") + set(pre_header "${CMAKE_CURRENT_BINARY_DIR}/Qt${shortname}/Qt${shortname}_global.pre.h") + if(EXISTS "${pre_header}") + file(READ "${pre_header}" pre_header_content) + set(module_header_content "${pre_header_content}") + endif() + set(module_header_content "${module_header_content}\n${pyside2_global_contents}") + # AxContainer/AxServer from Active Qt do not have module headers + if(NOT "${shortname}" STREQUAL "AxContainer") + set(module_header_content "${module_header_content}\n#include <Qt${shortname}/Qt${shortname}>") + endif() + set(post_header "${CMAKE_CURRENT_BINARY_DIR}/Qt${shortname}/Qt${shortname}_global.post.h") + if(EXISTS "${post_header}") + file(READ "${post_header}" post_header_content) + set(module_header_content "${module_header_content}\n${post_header_content}") + endif() + file(WRITE ${module_header} "${module_header_content}") endforeach() # install diff --git a/sources/pyside2/PySide2/Qt3DAnimation/CMakeLists.txt b/sources/pyside2/PySide2/Qt3DAnimation/CMakeLists.txt new file mode 100644 index 000000000..9bdf36add --- /dev/null +++ b/sources/pyside2/PySide2/Qt3DAnimation/CMakeLists.txt @@ -0,0 +1,55 @@ +project(Qt3DAnimation) + +set(Qt3DAnimation_SRC +${Qt3DAnimation_GEN_DIR}/qt3danimation_wrapper.cpp +${Qt3DAnimation_GEN_DIR}/qt3danimation_qabstractanimation_wrapper.cpp +${Qt3DAnimation_GEN_DIR}/qt3danimation_qabstractanimationclip_wrapper.cpp +${Qt3DAnimation_GEN_DIR}/qt3danimation_qabstractclipanimator_wrapper.cpp +${Qt3DAnimation_GEN_DIR}/qt3danimation_qabstractclipblendnode_wrapper.cpp +${Qt3DAnimation_GEN_DIR}/qt3danimation_qadditiveclipblend_wrapper.cpp +${Qt3DAnimation_GEN_DIR}/qt3danimation_qanimationaspect_wrapper.cpp +${Qt3DAnimation_GEN_DIR}/qt3danimation_qanimationcontroller_wrapper.cpp +${Qt3DAnimation_GEN_DIR}/qt3danimation_qanimationgroup_wrapper.cpp +${Qt3DAnimation_GEN_DIR}/qt3danimation_qblendedclipanimator_wrapper.cpp +${Qt3DAnimation_GEN_DIR}/qt3danimation_qclipanimator_wrapper.cpp +${Qt3DAnimation_GEN_DIR}/qt3danimation_qkeyframeanimation_wrapper.cpp +${Qt3DAnimation_GEN_DIR}/qt3danimation_qlerpclipblend_wrapper.cpp +${Qt3DAnimation_GEN_DIR}/qt3danimation_qmorphinganimation_wrapper.cpp +${Qt3DAnimation_GEN_DIR}/qt3danimation_qmorphtarget_wrapper.cpp +${Qt3DAnimation_GEN_DIR}/qt3danimation_qvertexblendanimation_wrapper.cpp +# module is always needed +${Qt3DAnimation_GEN_DIR}/qt3danimation_module_wrapper.cpp) + +set(Qt3DAnimation_include_dirs + ${Qt3DAnimation_SOURCE_DIR} + ${Qt3DAnimation_BINARY_DIR} + ${pyside2_SOURCE_DIR} + ${Qt5Core_INCLUDE_DIRS} + ${Qt5Gui_INCLUDE_DIR} + ${Qt53DCore_INCLUDE_DIRS} + ${Qt53DRender_INCLUDE_DIRS} + ${Qt53DAnimation_INCLUDE_DIRS} + ${SHIBOKEN_INCLUDE_DIR} + ${libpyside_SOURCE_DIR} + ${SHIBOKEN_PYTHON_INCLUDE_DIR} + ${QtCore_GEN_DIR} + ${QtGui_GEN_DIR} + ${Qt3DCore_GEN_DIR} + ${Qt3DRender_GEN_DIR} + ${Qt3DAnimation_GEN_DIR}) + +set(Qt3DAnimation_libraries pyside2 + ${SHIBOKEN_PYTHON_LIBRARIES} + ${SHIBOKEN_LIBRARY} + ${Qt53DAnimation_LIBRARIES}) + +set(Qt3DAnimation_deps Qt3DRender) + +create_pyside_module(Qt3DAnimation + Qt3DAnimation_include_dirs + Qt3DAnimation_libraries + Qt3DAnimation_deps + Qt3DAnimation_SOURCE_DIR + Qt3DAnimation_SRC + "" + ${Qt3DAnimation_BINARY_DIR}/typesystem_3danimation.xml) diff --git a/sources/pyside2/PySide2/Qt3DAnimation/typesystem_3danimation.xml b/sources/pyside2/PySide2/Qt3DAnimation/typesystem_3danimation.xml new file mode 100644 index 000000000..99c24c241 --- /dev/null +++ b/sources/pyside2/PySide2/Qt3DAnimation/typesystem_3danimation.xml @@ -0,0 +1,70 @@ +<?xml version="1.0"?> +<!-- +/**************************************************************************** +** +** Copyright (C) 2017 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$ +** +****************************************************************************/ +--> + +<typesystem package="PySide2.Qt3DAnimation"> + <load-typesystem name="Qt3DRender/typesystem_3drender.xml" generate="no"/> + <namespace-type name="Qt3DAnimation"> + <object-type name="QAbstractAnimation"> + <enum-type name="AnimationType"/> + </object-type> + <object-type name="QAbstractAnimationClip"/> + <object-type name="QAbstractClipAnimator"> + <enum-type name="Loops"/> + </object-type> + <object-type name="QAbstractClipBlendNode"/> + <object-type name="QAdditiveClipBlend"/> + <object-type name="QAnimationAspect"/> + <object-type name="QAnimationController"/> + <object-type name="QAnimationGroup"/> + <object-type name="QBlendedClipAnimator"/> + <object-type name="QClipAnimator"/> + <object-type name="QKeyframeAnimation"> + <enum-type name="RepeatMode"/> + </object-type> + <object-type name="QLerpClipBlend"/> + <object-type name="QMorphingAnimation"> + <enum-type name="Method"/> + </object-type> + <object-type name="QMorphTarget"/> + <object-type name="QVertexBlendAnimation"/> + </namespace-type> +</typesystem> diff --git a/sources/pyside2/PySide2/Qt3DCore/CMakeLists.txt b/sources/pyside2/PySide2/Qt3DCore/CMakeLists.txt new file mode 100644 index 000000000..53d3cc634 --- /dev/null +++ b/sources/pyside2/PySide2/Qt3DCore/CMakeLists.txt @@ -0,0 +1,74 @@ +project(Qt3DCore) + +set(Qt3DCore_SRC +${Qt3DCore_GEN_DIR}/qt3dcore_wrapper.cpp +${Qt3DCore_GEN_DIR}/qt3dcore_qabstractaspect_wrapper.cpp +${Qt3DCore_GEN_DIR}/qt3dcore_qaspectengine_wrapper.cpp +${Qt3DCore_GEN_DIR}/qt3dcore_qaspectjob_wrapper.cpp +${Qt3DCore_GEN_DIR}/qt3dcore_qbackendnode_wrapper.cpp +${Qt3DCore_GEN_DIR}/qt3dcore_qcomponent_wrapper.cpp +${Qt3DCore_GEN_DIR}/qt3dcore_qcomponentaddedchange_wrapper.cpp +${Qt3DCore_GEN_DIR}/qt3dcore_qcomponentremovedchange_wrapper.cpp +${Qt3DCore_GEN_DIR}/qt3dcore_qdynamicpropertyupdatedchange_wrapper.cpp +${Qt3DCore_GEN_DIR}/qt3dcore_qentity_wrapper.cpp +${Qt3DCore_GEN_DIR}/qt3dcore_qnode_wrapper.cpp +${Qt3DCore_GEN_DIR}/qt3dcore_qnodecreatedchangebase_wrapper.cpp +${Qt3DCore_GEN_DIR}/qt3dcore_qnodedestroyedchange_wrapper.cpp +${Qt3DCore_GEN_DIR}/qt3dcore_qnodeid_wrapper.cpp +${Qt3DCore_GEN_DIR}/qt3dcore_qnodeidtypepair_wrapper.cpp +${Qt3DCore_GEN_DIR}/qt3dcore_qpropertynodeaddedchange_wrapper.cpp +${Qt3DCore_GEN_DIR}/qt3dcore_qpropertynoderemovedchange_wrapper.cpp +${Qt3DCore_GEN_DIR}/qt3dcore_qpropertyupdatedchange_wrapper.cpp +${Qt3DCore_GEN_DIR}/qt3dcore_qpropertyupdatedchangebase_wrapper.cpp +${Qt3DCore_GEN_DIR}/qt3dcore_qpropertyvalueaddedchange_wrapper.cpp +${Qt3DCore_GEN_DIR}/qt3dcore_qpropertyvalueaddedchangebase_wrapper.cpp +${Qt3DCore_GEN_DIR}/qt3dcore_qpropertyvalueremovedchange_wrapper.cpp +${Qt3DCore_GEN_DIR}/qt3dcore_qpropertyvalueremovedchangebase_wrapper.cpp +${Qt3DCore_GEN_DIR}/qt3dcore_qscenechange_wrapper.cpp +${Qt3DCore_GEN_DIR}/qt3dcore_qstaticpropertyupdatedchangebase_wrapper.cpp +${Qt3DCore_GEN_DIR}/qt3dcore_qstaticpropertyvalueaddedchangebase_wrapper.cpp +${Qt3DCore_GEN_DIR}/qt3dcore_qstaticpropertyvalueremovedchangebase_wrapper.cpp +${Qt3DCore_GEN_DIR}/qt3dcore_qtransform_wrapper.cpp +# module is always needed +${Qt3DCore_GEN_DIR}/qt3dcore_module_wrapper.cpp) + +if (Qt53DCore_VERSION VERSION_EQUAL 5.10.0 OR Qt53DCore_VERSION VERSION_GREATER 5.10.0) + list(APPEND Qt3DCore_SRC + ${Qt3DCore_GEN_DIR}/qt3dcore_qarmature_wrapper.cpp + ${Qt3DCore_GEN_DIR}/qt3dcore_qjoint_wrapper.cpp + ${Qt3DCore_GEN_DIR}/qt3dcore_qabstractskeleton_wrapper.cpp + ${Qt3DCore_GEN_DIR}/qt3dcore_qnodecommand_wrapper.cpp + ${Qt3DCore_GEN_DIR}/qt3dcore_qskeleton_wrapper.cpp + ${Qt3DCore_GEN_DIR}/qt3dcore_qskeletonloader_wrapper.cpp) +endif() + +set(Qt3DCore_include_dirs + ${Qt3DCore_SOURCE_DIR} + ${Qt3DCore_BINARY_DIR} + ${pyside2_SOURCE_DIR} + ${Qt5Core_INCLUDE_DIRS} + ${Qt5Gui_INCLUDE_DIRS} + ${Qt5Network_INCLUDE_DIRS} + ${Qt53DCore_INCLUDE_DIRS} + ${SHIBOKEN_INCLUDE_DIR} + ${libpyside_SOURCE_DIR} + ${SHIBOKEN_PYTHON_INCLUDE_DIR} + ${QtCore_GEN_DIR} + ${QtGui_GEN_DIR} + ${QtNetwork_GEN_DIR}) + +set(Qt3DCore_libraries pyside2 + ${SHIBOKEN_PYTHON_LIBRARIES} + ${SHIBOKEN_LIBRARY} + ${Qt53DCore_LIBRARIES}) + +set(Qt3DCore_deps QtGui QtNetwork) + +create_pyside_module(Qt3DCore + Qt3DCore_include_dirs + Qt3DCore_libraries + Qt3DCore_deps + Qt3DCore_SOURCE_DIR + Qt3DCore_SRC + "" + ${Qt3DCore_BINARY_DIR}/typesystem_3dcore.xml) diff --git a/sources/pyside2/PySide2/Qt3DCore/typesystem_3dcore.xml b/sources/pyside2/PySide2/Qt3DCore/typesystem_3dcore.xml new file mode 100644 index 000000000..62245d6e3 --- /dev/null +++ b/sources/pyside2/PySide2/Qt3DCore/typesystem_3dcore.xml @@ -0,0 +1,90 @@ +<?xml version="1.0"?> +<!-- +/**************************************************************************** +** +** Copyright (C) 2017 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$ +** +****************************************************************************/ +--> + +<typesystem package="PySide2.Qt3DCore"> + <load-typesystem name="QtGui/typesystem_gui.xml" generate="no"/> + <namespace-type name="Qt3DCore"> + <enum-type name="ChangeFlag" flags="ChangeFlags"/> + <object-type name="QAbstractAspect"/> + <object-type name="QAbstractSkeleton" since="5.10"/> + <object-type name="QArmature" since="5.10"/> + <object-type name="QAspectEngine"/> + <object-type name="QAspectJob"/> + <object-type name="QBackendNode"> + <enum-type name="Mode"/> + </object-type> + <object-type name="QComponent"/> + <object-type name="QComponentAddedChange"/> + <object-type name="QComponentRemovedChange"/> + <object-type name="QDynamicPropertyUpdatedChange"/> + <object-type name="QEntity"/> + <object-type name="QJoint" since="5.10"/> + <object-type name="QNode"> + <enum-type name="PropertyTrackingMode"/> + </object-type> + <object-type name="QNodeCommand" since="5.10"/> + <object-type name="QNodeCreatedChangeBase"/> + <object-type name="QNodeDestroyedChange"/> + <value-type name="QNodeId"/> + <value-type name="QNodeIdTypePair"/> + <object-type name="QPropertyNodeAddedChange"/> + <object-type name="QPropertyNodeRemovedChange"/> + <object-type name="QPropertyUpdatedChange"/> + <object-type name="QPropertyUpdatedChangeBase"/> + <object-type name="QPropertyValueAddedChange"/> + <object-type name="QPropertyValueAddedChangeBase"/> + <object-type name="QPropertyValueRemovedChange"/> + <object-type name="QPropertyValueRemovedChangeBase"/> + <object-type name="QSceneChange"> + <enum-type name="DeliveryFlag" flags="DeliveryFlags"/> + </object-type> + <object-type name="QSkeleton" since="5.10"/> + <object-type name="QSkeletonLoader" since="5.10"/> + <object-type name="QStaticPropertyUpdatedChangeBase"/> + <object-type name="QStaticPropertyValueAddedChangeBase"/> + <object-type name="QStaticPropertyValueRemovedChangeBase"/> + <object-type name="QTransform"> + <!-- Disambiguate from QtGui/qtransform.h --> + <include file-name="Qt3DCore/qtransform.h" location="global"/> + </object-type> + </namespace-type> +</typesystem> diff --git a/sources/pyside2/PySide2/Qt3DExtras/CMakeLists.txt b/sources/pyside2/PySide2/Qt3DExtras/CMakeLists.txt new file mode 100644 index 000000000..4bc25d52d --- /dev/null +++ b/sources/pyside2/PySide2/Qt3DExtras/CMakeLists.txt @@ -0,0 +1,81 @@ +project(Qt3DExtras) + +set(Qt3DExtras_SRC +${Qt3DExtras_GEN_DIR}/qt3dextras_wrapper.cpp +${Qt3DExtras_GEN_DIR}/qt3dextras_qconegeometry_wrapper.cpp +${Qt3DExtras_GEN_DIR}/qt3dextras_qconemesh_wrapper.cpp +${Qt3DExtras_GEN_DIR}/qt3dextras_qcuboidgeometry_wrapper.cpp +${Qt3DExtras_GEN_DIR}/qt3dextras_qcuboidmesh_wrapper.cpp +${Qt3DExtras_GEN_DIR}/qt3dextras_qcylindergeometry_wrapper.cpp +${Qt3DExtras_GEN_DIR}/qt3dextras_qcylindermesh_wrapper.cpp +${Qt3DExtras_GEN_DIR}/qt3dextras_qdiffusemapmaterial_wrapper.cpp +${Qt3DExtras_GEN_DIR}/qt3dextras_qdiffusespecularmapmaterial_wrapper.cpp +${Qt3DExtras_GEN_DIR}/qt3dextras_qextrudedtextgeometry_wrapper.cpp +${Qt3DExtras_GEN_DIR}/qt3dextras_qextrudedtextmesh_wrapper.cpp +${Qt3DExtras_GEN_DIR}/qt3dextras_qfirstpersoncameracontroller_wrapper.cpp +${Qt3DExtras_GEN_DIR}/qt3dextras_qforwardrenderer_wrapper.cpp +${Qt3DExtras_GEN_DIR}/qt3dextras_qgoochmaterial_wrapper.cpp +${Qt3DExtras_GEN_DIR}/qt3dextras_qmetalroughmaterial_wrapper.cpp +${Qt3DExtras_GEN_DIR}/qt3dextras_qmorphphongmaterial_wrapper.cpp +${Qt3DExtras_GEN_DIR}/qt3dextras_qnormaldiffusemapmaterial_wrapper.cpp +${Qt3DExtras_GEN_DIR}/qt3dextras_qnormaldiffusespecularmapmaterial_wrapper.cpp +${Qt3DExtras_GEN_DIR}/qt3dextras_qorbitcameracontroller_wrapper.cpp +${Qt3DExtras_GEN_DIR}/qt3dextras_qpervertexcolormaterial_wrapper.cpp +${Qt3DExtras_GEN_DIR}/qt3dextras_qphongmaterial_wrapper.cpp +${Qt3DExtras_GEN_DIR}/qt3dextras_qphongalphamaterial_wrapper.cpp +${Qt3DExtras_GEN_DIR}/qt3dextras_qplanegeometry_wrapper.cpp +${Qt3DExtras_GEN_DIR}/qt3dextras_qplanemesh_wrapper.cpp +${Qt3DExtras_GEN_DIR}/qt3dextras_qskyboxentity_wrapper.cpp +${Qt3DExtras_GEN_DIR}/qt3dextras_qspheregeometry_wrapper.cpp +${Qt3DExtras_GEN_DIR}/qt3dextras_qspheremesh_wrapper.cpp +${Qt3DExtras_GEN_DIR}/qt3dextras_qtext2dentity_wrapper.cpp +${Qt3DExtras_GEN_DIR}/qt3dextras_qtexturematerial_wrapper.cpp +${Qt3DExtras_GEN_DIR}/qt3dextras_qtorusgeometry_wrapper.cpp +${Qt3DExtras_GEN_DIR}/qt3dextras_qtorusmesh_wrapper.cpp +${Qt3DExtras_GEN_DIR}/qt3dextras_qt3dwindow_wrapper.cpp +# module is always needed +${Qt3DExtras_GEN_DIR}/qt3dextras_module_wrapper.cpp) + +if (Qt53DExtras_VERSION VERSION_EQUAL 5.10.0 OR Qt53DExtras_VERSION VERSION_GREATER 5.10.0) + list(APPEND Qt3DExtras_SRC + ${Qt3DExtras_GEN_DIR}/qt3dextras_qabstractcameracontroller_wrapper.cpp + ${Qt3DExtras_GEN_DIR}/qt3dextras_qabstractcameracontroller_inputstate_wrapper.cpp + ${Qt3DExtras_GEN_DIR}/qt3dextras_qabstractspritesheet_wrapper.cpp + ${Qt3DExtras_GEN_DIR}/qt3dextras_qdiffusespecularmaterial_wrapper.cpp + ${Qt3DExtras_GEN_DIR}/qt3dextras_qspritegrid_wrapper.cpp + ${Qt3DExtras_GEN_DIR}/qt3dextras_qspritesheet_wrapper.cpp + ${Qt3DExtras_GEN_DIR}/qt3dextras_qspritesheetitem_wrapper.cpp) +endif() + +set(Qt3DExtras_include_dirs + ${Qt3DExtras_SOURCE_DIR} + ${Qt3DExtras_BINARY_DIR} + ${pyside2_SOURCE_DIR} + ${Qt5Core_INCLUDE_DIRS} + ${Qt5Gui_INCLUDE_DIRS} + ${Qt53DCore_INCLUDE_DIRS} + ${Qt53DRender_INCLUDE_DIRS} + ${Qt53DExtras_INCLUDE_DIRS} + ${SHIBOKEN_INCLUDE_DIR} + ${libpyside_SOURCE_DIR} + ${SHIBOKEN_PYTHON_INCLUDE_DIR} + ${QtCore_GEN_DIR} + ${QtGui_GEN_DIR} + ${Qt3DCore_GEN_DIR} + ${Qt3DRender_GEN_DIR}) + +set(Qt3DExtras_libraries pyside2 + ${SHIBOKEN_PYTHON_LIBRARIES} + ${SHIBOKEN_LIBRARY} + ${Qt53DExtras_LIBRARIES}) + +set(Qt3DExtras_deps Qt3DRender) + +create_pyside_module(Qt3DExtras + Qt3DExtras_include_dirs + Qt3DExtras_libraries + Qt3DExtras_deps + Qt3DExtras_SOURCE_DIR + Qt3DExtras_SRC + "" + ${Qt3DExtras_BINARY_DIR}/typesystem_3dextras.xml) diff --git a/sources/pyside2/PySide2/Qt3DExtras/typesystem_3dextras.xml b/sources/pyside2/PySide2/Qt3DExtras/typesystem_3dextras.xml new file mode 100644 index 000000000..9bcaa6705 --- /dev/null +++ b/sources/pyside2/PySide2/Qt3DExtras/typesystem_3dextras.xml @@ -0,0 +1,86 @@ +<?xml version="1.0"?> +<!-- +/**************************************************************************** +** +** Copyright (C) 2017 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$ +** +****************************************************************************/ +--> + +<typesystem package="PySide2.Qt3DExtras"> + <load-typesystem name="Qt3DRender/typesystem_3drender.xml" generate="no"/> + <namespace-type name="Qt3DExtras"> + <object-type name="QAbstractCameraController" since="5.10"> + <value-type name="InputState"/> + </object-type> + <object-type name="QAbstractSpriteSheet" since="5.10"/> + <object-type name="QConeGeometry"/> + <object-type name="QConeMesh"/> + <object-type name="QCuboidGeometry"/> + <object-type name="QCuboidMesh"/> + <object-type name="QCylinderGeometry"/> + <object-type name="QCylinderMesh"/> + <object-type name="QDiffuseMapMaterial"/> + <object-type name="QDiffuseSpecularMaterial" since="5.10"/> + <object-type name="QDiffuseSpecularMapMaterial"/> + <object-type name="QExtrudedTextGeometry"/> + <object-type name="QExtrudedTextMesh"/> + <object-type name="QFirstPersonCameraController"/> + <object-type name="QForwardRenderer"/> + <object-type name="QGoochMaterial"/> + <object-type name="QMetalRoughMaterial"/> + <object-type name="QMorphPhongMaterial"/> + <object-type name="QNormalDiffuseMapMaterial"/> + <object-type name="QNormalDiffuseSpecularMapMaterial"/> + <object-type name="QOrbitCameraController"/> + <object-type name="QPerVertexColorMaterial"/> + <object-type name="QPhongMaterial"/> + <object-type name="QPhongAlphaMaterial"/> + <object-type name="QPlaneGeometry"/> + <object-type name="QPlaneMesh"/> + <object-type name="QSkyboxEntity"/> + <object-type name="QSphereGeometry"/> + <object-type name="QSphereMesh"/> + <object-type name="QSpriteGrid" since="5.10"/> + <object-type name="QSpriteSheet" since="5.10"/> + <object-type name="QSpriteSheetItem" since="5.10"/> + <object-type name="QText2DEntity"/> + <object-type name="QTextureMaterial"/> + <object-type name="QTorusGeometry"/> + <object-type name="QTorusMesh"/> + <object-type name="Qt3DWindow"/> + </namespace-type> +</typesystem> diff --git a/sources/pyside2/PySide2/Qt3DInput/CMakeLists.txt b/sources/pyside2/PySide2/Qt3DInput/CMakeLists.txt new file mode 100644 index 000000000..694f373f8 --- /dev/null +++ b/sources/pyside2/PySide2/Qt3DInput/CMakeLists.txt @@ -0,0 +1,56 @@ +project(Qt3DInput) + +set(Qt3DInput_SRC +${Qt3DInput_GEN_DIR}/qt3dinput_wrapper.cpp +${Qt3DInput_GEN_DIR}/qt3dinput_qabstractactioninput_wrapper.cpp +${Qt3DInput_GEN_DIR}/qt3dinput_qabstractaxisinput_wrapper.cpp +${Qt3DInput_GEN_DIR}/qt3dinput_qabstractphysicaldevice_wrapper.cpp +${Qt3DInput_GEN_DIR}/qt3dinput_qaction_wrapper.cpp +${Qt3DInput_GEN_DIR}/qt3dinput_qactioninput_wrapper.cpp +${Qt3DInput_GEN_DIR}/qt3dinput_qanalogaxisinput_wrapper.cpp +${Qt3DInput_GEN_DIR}/qt3dinput_qaxis_wrapper.cpp +${Qt3DInput_GEN_DIR}/qt3dinput_qaxisaccumulator_wrapper.cpp +${Qt3DInput_GEN_DIR}/qt3dinput_qaxissetting_wrapper.cpp +${Qt3DInput_GEN_DIR}/qt3dinput_qbuttonaxisinput_wrapper.cpp +${Qt3DInput_GEN_DIR}/qt3dinput_qinputaspect_wrapper.cpp +${Qt3DInput_GEN_DIR}/qt3dinput_qinputchord_wrapper.cpp +${Qt3DInput_GEN_DIR}/qt3dinput_qinputsequence_wrapper.cpp +${Qt3DInput_GEN_DIR}/qt3dinput_qinputsettings_wrapper.cpp +${Qt3DInput_GEN_DIR}/qt3dinput_qkeyboardhandler_wrapper.cpp +${Qt3DInput_GEN_DIR}/qt3dinput_qkeyevent_wrapper.cpp +${Qt3DInput_GEN_DIR}/qt3dinput_qlogicaldevice_wrapper.cpp +${Qt3DInput_GEN_DIR}/qt3dinput_qkeyboarddevice_wrapper.cpp +${Qt3DInput_GEN_DIR}/qt3dinput_qmousedevice_wrapper.cpp +${Qt3DInput_GEN_DIR}/qt3dinput_qmouseevent_wrapper.cpp +${Qt3DInput_GEN_DIR}/qt3dinput_qwheelevent_wrapper.cpp +${Qt3DInput_GEN_DIR}/qt3dinput_qmousehandler_wrapper.cpp +# module is always needed +${Qt3DInput_GEN_DIR}/qt3dinput_module_wrapper.cpp) + +set(Qt3DInput_include_dirs + ${Qt3DInput_SOURCE_DIR} + ${Qt3DInput_BINARY_DIR} + ${pyside2_SOURCE_DIR} + ${Qt5Core_INCLUDE_DIRS} + ${SHIBOKEN_INCLUDE_DIR} + ${libpyside_SOURCE_DIR} + ${SHIBOKEN_PYTHON_INCLUDE_DIR} + ${QtCore_GEN_DIR} + ${QtGui_GEN_DIR} + ${Qt3DCore_GEN_DIR}) + +set(Qt3DInput_libraries pyside2 + ${SHIBOKEN_PYTHON_LIBRARIES} + ${SHIBOKEN_LIBRARY} + ${Qt53DInput_LIBRARIES}) + +set(Qt3DInput_deps Qt3DCore) + +create_pyside_module(Qt3DInput + Qt3DInput_include_dirs + Qt3DInput_libraries + Qt3DInput_deps + Qt3DInput_SOURCE_DIR + Qt3DInput_SRC + "" + ${Qt3DInput_BINARY_DIR}/typesystem_3dinput.xml) diff --git a/sources/pyside2/PySide2/Qt3DInput/typesystem_3dinput.xml b/sources/pyside2/PySide2/Qt3DInput/typesystem_3dinput.xml new file mode 100644 index 000000000..b26e5d7fe --- /dev/null +++ b/sources/pyside2/PySide2/Qt3DInput/typesystem_3dinput.xml @@ -0,0 +1,85 @@ +<?xml version="1.0"?> +<!-- +/**************************************************************************** +** +** Copyright (C) 2017 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$ +** +****************************************************************************/ +--> + +<typesystem package="PySide2.Qt3DInput"> + <load-typesystem name="Qt3DCore/typesystem_3dcore.xml" generate="no"/> + <namespace-type name="Qt3DInput"> + <object-type name="QAbstractActionInput"/> + <object-type name="QAbstractAxisInput"/> + <object-type name="QAbstractPhysicalDevice"/> + <object-type name="QAction"/> + <object-type name="QActionInput"/> + <object-type name="QAnalogAxisInput"/> + <object-type name="QAxis"/> + <object-type name="QAxisAccumulator"> + <enum-type name="SourceAxisType"/> + </object-type> + <object-type name="QAxisSetting"/> + <object-type name="QButtonAxisInput"/> + <object-type name="QInputAspect"/> + <object-type name="QInputChord"/> + <object-type name="QInputSequence"/> + <object-type name="QInputSettings"/> + <object-type name="QKeyboardHandler"/> + <object-type name="QKeyEvent"> + <modify-function signature="QKeyEvent(const Qt3DInput::QKeyEvent&)" remove="all"/> + </object-type> + <object-type name="QLogicalDevice"/> + <object-type name="QKeyboardDevice"/> + <object-type name="QMouseDevice"> + <enum-type name="Axis"/> + </object-type> + <!-- Fixme: shiboken2 mistakenly thinks that Qt3DInput::QMouseEvent(::QMouseEvent) + is a copy constructor of Qt3DInput::QMouseEvent. Work around by suppressing them --> + <object-type name="QMouseEvent"> + <enum-type name="Buttons"/> + <enum-type name="Modifiers"/> + <modify-function signature="QMouseEvent(const Qt3DInput::QMouseEvent&)" remove="all"/> + </object-type> + <object-type name="QWheelEvent"> + <enum-type name="Buttons"/> + <enum-type name="Modifiers"/> + <modify-function signature="QWheelEvent(const Qt3DInput::QWheelEvent&)" remove="all"/> + </object-type> + <object-type name="QMouseHandler"/> + </namespace-type> +</typesystem> diff --git a/sources/pyside2/PySide2/Qt3DLogic/CMakeLists.txt b/sources/pyside2/PySide2/Qt3DLogic/CMakeLists.txt new file mode 100644 index 000000000..23cde8804 --- /dev/null +++ b/sources/pyside2/PySide2/Qt3DLogic/CMakeLists.txt @@ -0,0 +1,37 @@ +project(Qt3DLogic) + +set(Qt3DLogic_SRC +${Qt3DLogic_GEN_DIR}/qt3dlogic_wrapper.cpp +${Qt3DLogic_GEN_DIR}/qt3dlogic_qframeaction_wrapper.cpp +${Qt3DLogic_GEN_DIR}/qt3dlogic_qlogicaspect_wrapper.cpp +# module is always needed +${Qt3DLogic_GEN_DIR}/qt3dlogic_module_wrapper.cpp) + +set(Qt3DLogic_include_dirs + ${Qt3DLogic_SOURCE_DIR} + ${Qt3DLogic_BINARY_DIR} + ${pyside2_SOURCE_DIR} + ${Qt5Core_INCLUDE_DIRS} + ${Qt5Gui_INCLUDE_DIRS} + ${SHIBOKEN_INCLUDE_DIR} + ${libpyside_SOURCE_DIR} + ${SHIBOKEN_PYTHON_INCLUDE_DIR} + ${QtCore_GEN_DIR} + ${QtGui_GEN_DIR} + ${Qt3DCore_GEN_DIR}) + +set(Qt3DLogic_libraries pyside2 + ${SHIBOKEN_PYTHON_LIBRARIES} + ${SHIBOKEN_LIBRARY} + ${Qt53DLogic_LIBRARIES}) + +set(Qt3DLogic_deps Qt3DCore) + +create_pyside_module(Qt3DLogic + Qt3DLogic_include_dirs + Qt3DLogic_libraries + Qt3DLogic_deps + Qt3DLogic_SOURCE_DIR + Qt3DLogic_SRC + "" + ${Qt3DLogic_BINARY_DIR}/typesystem_3dlogic.xml) diff --git a/sources/pyside2/header.LGPL-NOGPL2 b/sources/pyside2/PySide2/Qt3DLogic/typesystem_3dlogic.xml index 80b4449cb..d448fd29a 100644 --- a/sources/pyside2/header.LGPL-NOGPL2 +++ b/sources/pyside2/PySide2/Qt3DLogic/typesystem_3dlogic.xml @@ -1,11 +1,13 @@ +<?xml version="1.0"?> +<!-- /**************************************************************************** ** -** Copyright (C) 2016 The Qt Company Ltd. +** Copyright (C) 2017 The Qt Company Ltd. ** Contact: https://www.qt.io/licensing/ ** -** This file is part of the FOO module of the Qt Toolkit. +** This file is part of PySide2. ** -** $QT_BEGIN_LICENSE:LGPL-NOGPL2$ +** $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 @@ -24,14 +26,24 @@ ** ** GNU General Public License Usage ** Alternatively, this file may be used under the terms of the GNU -** General Public License version 3 or (at your option) 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.GPL3 +** 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-3.0.html. +** be met: https://www.gnu.org/licenses/gpl-2.0.html and +** https://www.gnu.org/licenses/gpl-3.0.html. ** ** $QT_END_LICENSE$ ** ****************************************************************************/ +--> +<typesystem package="PySide2.Qt3DLogic"> + <load-typesystem name="Qt3DCore/typesystem_3dcore.xml" generate="no"/> + <namespace-type name="Qt3DLogic"> + <object-type name="QFrameAction"/> + <object-type name="QLogicAspect"/> + </namespace-type> +</typesystem> diff --git a/sources/pyside2/PySide2/Qt3DRender/CMakeLists.txt b/sources/pyside2/PySide2/Qt3DRender/CMakeLists.txt new file mode 100644 index 000000000..07bd3d89f --- /dev/null +++ b/sources/pyside2/PySide2/Qt3DRender/CMakeLists.txt @@ -0,0 +1,147 @@ +project(Qt3DRender) + +set(Qt3DRender_SRC +${Qt3DRender_GEN_DIR}/qt3drender_wrapper.cpp +${Qt3DRender_GEN_DIR}/qt3drender_propertyreaderinterface_wrapper.cpp +${Qt3DRender_GEN_DIR}/qt3drender_qabstractfunctor_wrapper.cpp +${Qt3DRender_GEN_DIR}/qt3drender_qabstractlight_wrapper.cpp +${Qt3DRender_GEN_DIR}/qt3drender_qabstracttexture_wrapper.cpp +${Qt3DRender_GEN_DIR}/qt3drender_qabstracttextureimage_wrapper.cpp +${Qt3DRender_GEN_DIR}/qt3drender_qalphacoverage_wrapper.cpp +${Qt3DRender_GEN_DIR}/qt3drender_qalphatest_wrapper.cpp +${Qt3DRender_GEN_DIR}/qt3drender_qattribute_wrapper.cpp +${Qt3DRender_GEN_DIR}/qt3drender_qblendequation_wrapper.cpp +${Qt3DRender_GEN_DIR}/qt3drender_qblendequationarguments_wrapper.cpp +${Qt3DRender_GEN_DIR}/qt3drender_qbuffer_wrapper.cpp +${Qt3DRender_GEN_DIR}/qt3drender_qbuffercapture_wrapper.cpp +${Qt3DRender_GEN_DIR}/qt3drender_qbufferdatagenerator_wrapper.cpp +${Qt3DRender_GEN_DIR}/qt3drender_qcamera_wrapper.cpp +${Qt3DRender_GEN_DIR}/qt3drender_qcameralens_wrapper.cpp +${Qt3DRender_GEN_DIR}/qt3drender_qcameraselector_wrapper.cpp +${Qt3DRender_GEN_DIR}/qt3drender_qclearbuffers_wrapper.cpp +${Qt3DRender_GEN_DIR}/qt3drender_qclipplane_wrapper.cpp +${Qt3DRender_GEN_DIR}/qt3drender_qcolormask_wrapper.cpp +${Qt3DRender_GEN_DIR}/qt3drender_qcomputecommand_wrapper.cpp +${Qt3DRender_GEN_DIR}/qt3drender_qcullface_wrapper.cpp +${Qt3DRender_GEN_DIR}/qt3drender_qdepthtest_wrapper.cpp +${Qt3DRender_GEN_DIR}/qt3drender_qdirectionallight_wrapper.cpp +${Qt3DRender_GEN_DIR}/qt3drender_qdispatchcompute_wrapper.cpp +${Qt3DRender_GEN_DIR}/qt3drender_qdithering_wrapper.cpp +${Qt3DRender_GEN_DIR}/qt3drender_qeffect_wrapper.cpp +${Qt3DRender_GEN_DIR}/qt3drender_qenvironmentlight_wrapper.cpp +${Qt3DRender_GEN_DIR}/qt3drender_qfilterkey_wrapper.cpp +${Qt3DRender_GEN_DIR}/qt3drender_qframegraphnode_wrapper.cpp +${Qt3DRender_GEN_DIR}/qt3drender_qframegraphnodecreatedchangebase_wrapper.cpp +${Qt3DRender_GEN_DIR}/qt3drender_qfrontface_wrapper.cpp +${Qt3DRender_GEN_DIR}/qt3drender_qfrustumculling_wrapper.cpp +${Qt3DRender_GEN_DIR}/qt3drender_qgeometry_wrapper.cpp +${Qt3DRender_GEN_DIR}/qt3drender_qgeometryfactory_wrapper.cpp +${Qt3DRender_GEN_DIR}/qt3drender_qgeometryrenderer_wrapper.cpp +${Qt3DRender_GEN_DIR}/qt3drender_qgraphicsapifilter_wrapper.cpp +${Qt3DRender_GEN_DIR}/qt3drender_qlayer_wrapper.cpp +${Qt3DRender_GEN_DIR}/qt3drender_qlayerfilter_wrapper.cpp +${Qt3DRender_GEN_DIR}/qt3drender_qlevelofdetail_wrapper.cpp +${Qt3DRender_GEN_DIR}/qt3drender_qlevelofdetailboundingsphere_wrapper.cpp +${Qt3DRender_GEN_DIR}/qt3drender_qlevelofdetailswitch_wrapper.cpp +${Qt3DRender_GEN_DIR}/qt3drender_qmaterial_wrapper.cpp +${Qt3DRender_GEN_DIR}/qt3drender_qmemorybarrier_wrapper.cpp +${Qt3DRender_GEN_DIR}/qt3drender_qmesh_wrapper.cpp +${Qt3DRender_GEN_DIR}/qt3drender_qmultisampleantialiasing_wrapper.cpp +${Qt3DRender_GEN_DIR}/qt3drender_qnodepthmask_wrapper.cpp +${Qt3DRender_GEN_DIR}/qt3drender_qnodraw_wrapper.cpp +${Qt3DRender_GEN_DIR}/qt3drender_qobjectpicker_wrapper.cpp +${Qt3DRender_GEN_DIR}/qt3drender_qpaintedtextureimage_wrapper.cpp +${Qt3DRender_GEN_DIR}/qt3drender_qparameter_wrapper.cpp +${Qt3DRender_GEN_DIR}/qt3drender_qpickevent_wrapper.cpp +${Qt3DRender_GEN_DIR}/qt3drender_qpicktriangleevent_wrapper.cpp +${Qt3DRender_GEN_DIR}/qt3drender_qpickingsettings_wrapper.cpp +${Qt3DRender_GEN_DIR}/qt3drender_qpointlight_wrapper.cpp +${Qt3DRender_GEN_DIR}/qt3drender_qpointsize_wrapper.cpp +${Qt3DRender_GEN_DIR}/qt3drender_qpolygonoffset_wrapper.cpp +${Qt3DRender_GEN_DIR}/qt3drender_qrenderaspect_wrapper.cpp +${Qt3DRender_GEN_DIR}/qt3drender_qrendercapture_wrapper.cpp +${Qt3DRender_GEN_DIR}/qt3drender_qrendercapturereply_wrapper.cpp +${Qt3DRender_GEN_DIR}/qt3drender_qrenderpass_wrapper.cpp +${Qt3DRender_GEN_DIR}/qt3drender_qrenderpassfilter_wrapper.cpp +${Qt3DRender_GEN_DIR}/qt3drender_qrendersettings_wrapper.cpp +${Qt3DRender_GEN_DIR}/qt3drender_qrenderstate_wrapper.cpp +${Qt3DRender_GEN_DIR}/qt3drender_qrenderstateset_wrapper.cpp +${Qt3DRender_GEN_DIR}/qt3drender_qrendersurfaceselector_wrapper.cpp +${Qt3DRender_GEN_DIR}/qt3drender_qrendertarget_wrapper.cpp +${Qt3DRender_GEN_DIR}/qt3drender_qrendertargetoutput_wrapper.cpp +${Qt3DRender_GEN_DIR}/qt3drender_qrendertargetselector_wrapper.cpp +${Qt3DRender_GEN_DIR}/qt3drender_qsceneloader_wrapper.cpp +${Qt3DRender_GEN_DIR}/qt3drender_qscissortest_wrapper.cpp +${Qt3DRender_GEN_DIR}/qt3drender_qseamlesscubemap_wrapper.cpp +${Qt3DRender_GEN_DIR}/qt3drender_qshaderdata_wrapper.cpp +${Qt3DRender_GEN_DIR}/qt3drender_qshaderprogram_wrapper.cpp +${Qt3DRender_GEN_DIR}/qt3drender_qsortpolicy_wrapper.cpp +${Qt3DRender_GEN_DIR}/qt3drender_qspotlight_wrapper.cpp +${Qt3DRender_GEN_DIR}/qt3drender_qstencilmask_wrapper.cpp +${Qt3DRender_GEN_DIR}/qt3drender_qstenciloperation_wrapper.cpp +${Qt3DRender_GEN_DIR}/qt3drender_qstenciloperationarguments_wrapper.cpp +${Qt3DRender_GEN_DIR}/qt3drender_qstenciltest_wrapper.cpp +${Qt3DRender_GEN_DIR}/qt3drender_qstenciltestarguments_wrapper.cpp +${Qt3DRender_GEN_DIR}/qt3drender_qtechnique_wrapper.cpp +${Qt3DRender_GEN_DIR}/qt3drender_qtechniquefilter_wrapper.cpp +${Qt3DRender_GEN_DIR}/qt3drender_qtexture1d_wrapper.cpp +${Qt3DRender_GEN_DIR}/qt3drender_qtexture1darray_wrapper.cpp +${Qt3DRender_GEN_DIR}/qt3drender_qtexture2d_wrapper.cpp +${Qt3DRender_GEN_DIR}/qt3drender_qtexture2darray_wrapper.cpp +${Qt3DRender_GEN_DIR}/qt3drender_qtexture2dmultisample_wrapper.cpp +${Qt3DRender_GEN_DIR}/qt3drender_qtexture2dmultisamplearray_wrapper.cpp +${Qt3DRender_GEN_DIR}/qt3drender_qtexture3d_wrapper.cpp +${Qt3DRender_GEN_DIR}/qt3drender_qtexturebuffer_wrapper.cpp +${Qt3DRender_GEN_DIR}/qt3drender_qtexturecubemap_wrapper.cpp +${Qt3DRender_GEN_DIR}/qt3drender_qtexturecubemaparray_wrapper.cpp +${Qt3DRender_GEN_DIR}/qt3drender_qtexturedata_wrapper.cpp +${Qt3DRender_GEN_DIR}/qt3drender_qtexturegenerator_wrapper.cpp +${Qt3DRender_GEN_DIR}/qt3drender_qtextureimage_wrapper.cpp +${Qt3DRender_GEN_DIR}/qt3drender_qtextureimagedata_wrapper.cpp +${Qt3DRender_GEN_DIR}/qt3drender_qtextureimagedatagenerator_wrapper.cpp +${Qt3DRender_GEN_DIR}/qt3drender_qtextureloader_wrapper.cpp +${Qt3DRender_GEN_DIR}/qt3drender_qtexturerectangle_wrapper.cpp +${Qt3DRender_GEN_DIR}/qt3drender_qtexturewrapmode_wrapper.cpp +${Qt3DRender_GEN_DIR}/qt3drender_qviewport_wrapper.cpp +# module is always needed +${Qt3DRender_GEN_DIR}/qt3drender_module_wrapper.cpp) + +if (Qt53DRender_VERSION VERSION_EQUAL 5.10.0 OR Qt53DRender_VERSION VERSION_GREATER 5.10.0) + list(APPEND Qt3DRender_SRC + ${Qt3DRender_GEN_DIR}/qt3drender_qblitframebuffer_wrapper.cpp + ${Qt3DRender_GEN_DIR}/qt3drender_qlinewidth_wrapper.cpp + ${Qt3DRender_GEN_DIR}/qt3drender_qpicklineevent_wrapper.cpp + ${Qt3DRender_GEN_DIR}/qt3drender_qpickpointevent_wrapper.cpp + ${Qt3DRender_GEN_DIR}/qt3drender_qproximityfilter_wrapper.cpp + ${Qt3DRender_GEN_DIR}/qt3drender_qshaderprogrambuilder_wrapper.cpp +) +endif() + +set(Qt3DRender_include_dirs + ${Qt3DRender_SOURCE_DIR} + ${Qt3DRender_BINARY_DIR} + ${pyside2_SOURCE_DIR} + ${Qt5Core_INCLUDE_DIRS} + ${Qt5Gui_INCLUDE_DIRS} + ${SHIBOKEN_INCLUDE_DIR} + ${libpyside_SOURCE_DIR} + ${SHIBOKEN_PYTHON_INCLUDE_DIR} + ${QtCore_GEN_DIR} + ${QtGui_GEN_DIR} + ${Qt3DCore_GEN_DIR}) + +set(Qt3DRender_libraries pyside2 + ${SHIBOKEN_PYTHON_LIBRARIES} + ${SHIBOKEN_LIBRARY} + ${Qt53DRender_LIBRARIES}) + +set(Qt3DRender_deps Qt3DCore) + +create_pyside_module(Qt3DRender + Qt3DRender_include_dirs + Qt3DRender_libraries + Qt3DRender_deps + Qt3DRender_SOURCE_DIR + Qt3DRender_SRC + "" + ${Qt3DRender_BINARY_DIR}/typesystem_3drender.xml) diff --git a/sources/pyside2/PySide2/Qt3DRender/typesystem_3drender.xml b/sources/pyside2/PySide2/Qt3DRender/typesystem_3drender.xml new file mode 100644 index 000000000..cfa332742 --- /dev/null +++ b/sources/pyside2/PySide2/Qt3DRender/typesystem_3drender.xml @@ -0,0 +1,243 @@ +<?xml version="1.0"?> +<!-- +/**************************************************************************** +** +** Copyright (C) 2017 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$ +** +****************************************************************************/ +--> + +<typesystem package="PySide2.Qt3DRender"> + <load-typesystem name="Qt3DCore/typesystem_3dcore.xml" generate="no"/> + <namespace-type name="Qt3DRender"> + <object-type name="PropertyReaderInterface"/> + <object-type name="QAbstractFunctor"/> + <object-type name="QAbstractLight"> + <enum-type name="Type"/> + </object-type> + <object-type name="QAbstractTexture"> + <enum-type name="CubeMapFace"/> + <enum-type name="ComparisonFunction"/> + <enum-type name="ComparisonMode"/> + <enum-type name="Filter"/> + <enum-type name="Status"/> + <enum-type name="Target"/> + <enum-type name="TextureFormat"/> + </object-type> + <object-type name="QAbstractTextureImage"> + <modify-function signature="QAbstractTextureImage(Qt3DCore::QNode*)" remove="all"/> + </object-type> + <object-type name="QAlphaCoverage"/> + <object-type name="QAlphaTest"> + <enum-type name="AlphaFunction"/> + </object-type> + <object-type name="QAttribute"> + <enum-type name="AttributeType"/> + <enum-type name="VertexBaseType"/> + </object-type> + <object-type name="QBlendEquation"> + <enum-type name="BlendFunction"/> + </object-type> + <object-type name="QBlendEquationArguments"> + <enum-type name="Blending"/> + </object-type> + <object-type name="QBlitFramebuffer" since="5.10"/> + <object-type name="QBuffer"> + <enum-type name="AccessType"/> + <enum-type name="BufferType"/> + <enum-type name="UsageType"/> + </object-type> + <object-type name="QBufferCapture"/> + <object-type name="QBufferDataGenerator"> + <modify-function signature="operator()()" remove="all"/> + </object-type> + <object-type name="QCamera"> + <enum-type name="CameraTranslationOption"/> + </object-type> + <object-type name="QCameraLens"> + <enum-type name="ProjectionType"/> + </object-type> + <object-type name="QCameraSelector"/> + <object-type name="QClearBuffers"> + <enum-type name="BufferType"/> + </object-type> + <object-type name="QClipPlane"/> + <object-type name="QColorMask"/> + <object-type name="QComputeCommand"/> + <object-type name="QCullFace"> + <enum-type name="CullingMode"/> + </object-type> + <object-type name="QDepthTest"> + <enum-type name="DepthFunction"/> + </object-type> + <object-type name="QDirectionalLight"/> + <object-type name="QDispatchCompute"/> + <object-type name="QDithering"/> + <object-type name="QEffect"/> + <object-type name="QEnvironmentLight"/> + <object-type name="QFilterKey"/> + <object-type name="QFrameGraphNode"/> + <object-type name="QFrameGraphNodeCreatedChangeBase"/> + <object-type name="QFrontFace"> + <enum-type name="WindingDirection"/> + </object-type> + <object-type name="QFrustumCulling"/> + <object-type name="QGeometry"/> + <object-type name="QGeometryFactory"> + <modify-function signature="operator()()" remove="all"/> + </object-type> + <object-type name="QGeometryRenderer"> + <enum-type name="PrimitiveType"/> + </object-type> + <object-type name="QGraphicsApiFilter"> + <enum-type name="Api"/> + <enum-type name="OpenGLProfile"/> + </object-type> + <object-type name="QLayer"/> + <object-type name="QLayerFilter"/> + <object-type name="QLevelOfDetail"> + <enum-type name="ThresholdType"/> + </object-type> + <object-type name="QLevelOfDetailBoundingSphere"/> + <object-type name="QLevelOfDetailSwitch"/> + <object-type name="QLineWidth" since="5.10"/> + <object-type name="QMaterial"/> + <object-type name="QMemoryBarrier"> + <enum-type name="Operation"/> + </object-type> + <object-type name="QMesh"/> + <object-type name="QMultiSampleAntiAliasing"/> + <object-type name="QNoDepthMask"/> + <object-type name="QNoDraw"/> + <object-type name="QObjectPicker"/> + <object-type name="QPaintedTextureImage"/> + <object-type name="QParameter"/> + <object-type name="QPickEvent"> + <enum-type name="Buttons"/> + <enum-type name="Modifiers"/> + </object-type> + <object-type name="QPickLineEvent" since="5.10"/> + <object-type name="QPickPointEvent" since="5.10"/> + <object-type name="QPickTriangleEvent"/> + <object-type name="QPickingSettings"> + <enum-type name="FaceOrientationPickingMode"/> + <enum-type name="PickMethod"/> + <enum-type name="PickResultMode"/> + </object-type> + <object-type name="QPointLight"/> + <object-type name="QPointSize"> + <enum-type name="SizeMode"/> + </object-type> + <object-type name="QPolygonOffset"/> + <object-type name="QProximityFilter" since="5.10"/> + <object-type name="QRenderAspect"> + <enum-type name="RenderType"/> + </object-type> + <object-type name="QRenderCapture"/> + <object-type name="QRenderCaptureReply"/> + <object-type name="QRenderPass"/> + <object-type name="QRenderPassFilter"/> + <object-type name="QRenderSettings"> + <enum-type name="RenderPolicy"/> + </object-type> + <object-type name="QRenderState"/> + <object-type name="QRenderStateSet"/> + <object-type name="QRenderSurfaceSelector"/> + <object-type name="QRenderTarget"/> + <object-type name="QRenderTargetOutput"> + <enum-type name="AttachmentPoint"/> + </object-type> + <object-type name="QRenderTargetSelector"/> + <object-type name="QSceneLoader"> + <enum-type name="Status"/> + <enum-type name="ComponentType"/> + </object-type> + <object-type name="QScissorTest"/> + <object-type name="QSeamlessCubemap"/> + <object-type name="QShaderData"/> + <object-type name="QShaderProgram"> + <enum-type name="ShaderType"/> + <enum-type name="Status"/> + </object-type> + <object-type name="QShaderProgramBuilder" since="5.10"/> + <object-type name="QSortPolicy"> + <enum-type name="SortType"/> + </object-type> + <object-type name="QSpotLight"> + <modify-function signature="attenuation() const" remove="all"/> + </object-type> + <object-type name="QStencilMask"/> + <object-type name="QStencilOperation"/> + <object-type name="QStencilOperationArguments"> + <enum-type name="FaceMode"/> + <enum-type name="Operation"/> + </object-type> + <object-type name="QStencilTest"/> + <object-type name="QStencilTestArguments"> + <enum-type name="StencilFaceMode"/> + <enum-type name="StencilFunction"/> + </object-type> + <object-type name="QTechnique"/> + <object-type name="QTechniqueFilter"/> + <object-type name="QTexture1D"/> + <object-type name="QTexture1DArray"/> + <object-type name="QTexture2D"/> + <object-type name="QTexture2DArray"/> + <object-type name="QTexture2DMultisample"/> + <object-type name="QTexture2DMultisampleArray"/> + <object-type name="QTexture3D"/> + <object-type name="QTextureBuffer"/> + <object-type name="QTextureCubeMap"/> + <object-type name="QTextureCubeMapArray"/> + <object-type name="QTextureData"/> + <object-type name="QTextureGenerator"> + <modify-function signature="QTextureGenerator()" remove="all"/> + </object-type> + <object-type name="QTextureImage"> + <enum-type name="Status"/> + </object-type> + <object-type name="QTextureImageData"/> + <object-type name="QTextureImageDataGenerator"> + <modify-function signature="QTextureImageDataGenerator()" remove="all"/> + </object-type> + <object-type name="QTextureLoader"/> + <object-type name="QTextureRectangle"/> + <object-type name="QTextureWrapMode"> + <enum-type name="WrapMode"/> + </object-type> + <object-type name="QViewport"/> + </namespace-type> +</typesystem> diff --git a/sources/pyside2/PySide2/QtAxContainer/CMakeLists.txt b/sources/pyside2/PySide2/QtAxContainer/CMakeLists.txt new file mode 100644 index 000000000..a3971786b --- /dev/null +++ b/sources/pyside2/PySide2/QtAxContainer/CMakeLists.txt @@ -0,0 +1,46 @@ +project(QtAxContainer) + +set(QtAxContainer_SRC +${QtAxContainer_GEN_DIR}/qaxbase_wrapper.cpp +${QtAxContainer_GEN_DIR}/qaxobject_wrapper.cpp +${QtAxContainer_GEN_DIR}/qaxscript_wrapper.cpp +${QtAxContainer_GEN_DIR}/qaxscriptengine_wrapper.cpp +${QtAxContainer_GEN_DIR}/qaxscriptmanager_wrapper.cpp +${QtAxContainer_GEN_DIR}/qaxselect_wrapper.cpp +${QtAxContainer_GEN_DIR}/qaxwidget_wrapper.cpp +# module is always needed +${QtAxContainer_GEN_DIR}/qtaxcontainer_module_wrapper.cpp) + +configure_file("${QtAxContainer_SOURCE_DIR}/QtAxContainer_global.post.h.in" + "${QtAxContainer_BINARY_DIR}/QtAxContainer_global.post.h" @ONLY) + +set(QtAxContainer_include_dirs + ${QtAxContainer_SOURCE_DIR} + ${QtAxContainer_BINARY_DIR} + ${pyside2_SOURCE_DIR} + ${Qt5Core_INCLUDE_DIRS} + ${Qt5Gui_INCLUDE_DIRS} + ${Qt5Widgets_INCLUDE_DIRS} + ${SHIBOKEN_INCLUDE_DIR} + ${libpyside_SOURCE_DIR} + ${SHIBOKEN_PYTHON_INCLUDE_DIR} + ${QtCore_GEN_DIR} + ${QtGui_GEN_DIR} + ${QtWidgets_GEN_DIR}) + +set(QtAxContainer_libraries pyside2 + ${SHIBOKEN_PYTHON_LIBRARIES} + ${SHIBOKEN_LIBRARY} + ${Qt5AxContainer_LIBRARIES} + ${Qt5AxBase_LIBRARIES}) + +set(QtAxContainer_deps QtWidgets) + +create_pyside_module(QtAxContainer + QtAxContainer_include_dirs + QtAxContainer_libraries + QtAxContainer_deps + QtAxContainer_SOURCE_DIR + QtAxContainer_SRC + "" + ${QtAxContainer_BINARY_DIR}/typesystem_axcontainer.xml) diff --git a/sources/pyside2/PySide2/QtAxContainer/QtAxContainer_global.post.h.in b/sources/pyside2/PySide2/QtAxContainer/QtAxContainer_global.post.h.in new file mode 100644 index 000000000..22e1b0119 --- /dev/null +++ b/sources/pyside2/PySide2/QtAxContainer/QtAxContainer_global.post.h.in @@ -0,0 +1,5 @@ +#include <ActiveQt/QAxSelect> +#include <ActiveQt/QAxScript> +#include <ActiveQt/QAxScriptEngine> +#include <ActiveQt/QAxScriptManager> +#include <ActiveQt/QAxWidget> diff --git a/sources/pyside2/PySide2/QtAxContainer/typesystem_axcontainer.xml b/sources/pyside2/PySide2/QtAxContainer/typesystem_axcontainer.xml new file mode 100644 index 000000000..a6648f612 --- /dev/null +++ b/sources/pyside2/PySide2/QtAxContainer/typesystem_axcontainer.xml @@ -0,0 +1,63 @@ +<?xml version="1.0"?> +<!-- +/**************************************************************************** +** +** Copyright (C) 2017 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$ +** +****************************************************************************/ +--> + +<typesystem package="PySide2.QtAxContainer"> + <load-typesystem name="QtWidgets/typesystem_widgets.xml" generate="no"/> + <rejection class="*" function-name="connectNotify"/> + <rejection class="*" function-name="queryInterface"/> + <rejection class="*" function-name="qt_metacall"/> + <rejection class="*" function-name="qt_static_metacall"/> + <rejection class="*" field-name="qt_meta_stringdata_QAxBase"/> + <rejection class="*" field-name="qt_meta_data_QAxBase"/> + <object-type name="QAxBase"/> + <object-type name="QAxObject"/> + <object-type name="QAxScript"> + <enum-type name="FunctionFlags"/> + </object-type> + <object-type name="QAxScriptEngine"/> + <object-type name="QAxScriptManager"> + <!-- Ax Servers only --> + <modify-function signature="addObject(QObject*)" remove="all"/> + </object-type> + <object-type name="QAxSelect"/> + <object-type name="QAxWidget"/> +</typesystem> diff --git a/sources/pyside2/PySide2/QtCharts/CMakeLists.txt b/sources/pyside2/PySide2/QtCharts/CMakeLists.txt new file mode 100644 index 000000000..fa177300d --- /dev/null +++ b/sources/pyside2/PySide2/QtCharts/CMakeLists.txt @@ -0,0 +1,90 @@ +project(QtCharts) + +set(QtCharts_SRC +${QtCharts_GEN_DIR}/qtcharts_qabstractaxis_wrapper.cpp +${QtCharts_GEN_DIR}/qtcharts_qabstractbarseries_wrapper.cpp +${QtCharts_GEN_DIR}/qtcharts_qabstractseries_wrapper.cpp +${QtCharts_GEN_DIR}/qtcharts_qarealegendmarker_wrapper.cpp +${QtCharts_GEN_DIR}/qtcharts_qareaseries_wrapper.cpp +${QtCharts_GEN_DIR}/qtcharts_qbarcategoryaxis_wrapper.cpp +${QtCharts_GEN_DIR}/qtcharts_qbarlegendmarker_wrapper.cpp +${QtCharts_GEN_DIR}/qtcharts_qbarmodelmapper_wrapper.cpp +${QtCharts_GEN_DIR}/qtcharts_qbarseries_wrapper.cpp +${QtCharts_GEN_DIR}/qtcharts_qbarset_wrapper.cpp +${QtCharts_GEN_DIR}/qtcharts_qboxplotlegendmarker_wrapper.cpp +${QtCharts_GEN_DIR}/qtcharts_qboxplotmodelmapper_wrapper.cpp +${QtCharts_GEN_DIR}/qtcharts_qboxplotseries_wrapper.cpp +${QtCharts_GEN_DIR}/qtcharts_qboxset_wrapper.cpp +${QtCharts_GEN_DIR}/qtcharts_qcandlesticklegendmarker_wrapper.cpp +${QtCharts_GEN_DIR}/qtcharts_qcandlestickmodelmapper_wrapper.cpp +${QtCharts_GEN_DIR}/qtcharts_qcandlestickseries_wrapper.cpp +${QtCharts_GEN_DIR}/qtcharts_qcandlestickset_wrapper.cpp +${QtCharts_GEN_DIR}/qtcharts_qcategoryaxis_wrapper.cpp +${QtCharts_GEN_DIR}/qtcharts_qchart_wrapper.cpp +${QtCharts_GEN_DIR}/qtcharts_qchartview_wrapper.cpp +${QtCharts_GEN_DIR}/qtcharts_qdatetimeaxis_wrapper.cpp +${QtCharts_GEN_DIR}/qtcharts_qhbarmodelmapper_wrapper.cpp +${QtCharts_GEN_DIR}/qtcharts_qhboxplotmodelmapper_wrapper.cpp +${QtCharts_GEN_DIR}/qtcharts_qhcandlestickmodelmapper_wrapper.cpp +${QtCharts_GEN_DIR}/qtcharts_qhorizontalbarseries_wrapper.cpp +${QtCharts_GEN_DIR}/qtcharts_qhorizontalpercentbarseries_wrapper.cpp +${QtCharts_GEN_DIR}/qtcharts_qhorizontalstackedbarseries_wrapper.cpp +${QtCharts_GEN_DIR}/qtcharts_qhpiemodelmapper_wrapper.cpp +${QtCharts_GEN_DIR}/qtcharts_qhxymodelmapper_wrapper.cpp +${QtCharts_GEN_DIR}/qtcharts_qlegend_wrapper.cpp +${QtCharts_GEN_DIR}/qtcharts_qlegendmarker_wrapper.cpp +${QtCharts_GEN_DIR}/qtcharts_qlineseries_wrapper.cpp +${QtCharts_GEN_DIR}/qtcharts_qlogvalueaxis_wrapper.cpp +${QtCharts_GEN_DIR}/qtcharts_qpercentbarseries_wrapper.cpp +${QtCharts_GEN_DIR}/qtcharts_qpielegendmarker_wrapper.cpp +${QtCharts_GEN_DIR}/qtcharts_qpiemodelmapper_wrapper.cpp +${QtCharts_GEN_DIR}/qtcharts_qpieseries_wrapper.cpp +${QtCharts_GEN_DIR}/qtcharts_qpieslice_wrapper.cpp +${QtCharts_GEN_DIR}/qtcharts_qpolarchart_wrapper.cpp +${QtCharts_GEN_DIR}/qtcharts_qscatterseries_wrapper.cpp +${QtCharts_GEN_DIR}/qtcharts_qsplineseries_wrapper.cpp +${QtCharts_GEN_DIR}/qtcharts_qstackedbarseries_wrapper.cpp +${QtCharts_GEN_DIR}/qtcharts_qvalueaxis_wrapper.cpp +${QtCharts_GEN_DIR}/qtcharts_qvbarmodelmapper_wrapper.cpp +${QtCharts_GEN_DIR}/qtcharts_qvboxplotmodelmapper_wrapper.cpp +${QtCharts_GEN_DIR}/qtcharts_qvcandlestickmodelmapper_wrapper.cpp +${QtCharts_GEN_DIR}/qtcharts_qvpiemodelmapper_wrapper.cpp +${QtCharts_GEN_DIR}/qtcharts_qvxymodelmapper_wrapper.cpp +${QtCharts_GEN_DIR}/qtcharts_qxylegendmarker_wrapper.cpp +${QtCharts_GEN_DIR}/qtcharts_qxymodelmapper_wrapper.cpp +${QtCharts_GEN_DIR}/qtcharts_qxyseries_wrapper.cpp +${QtCharts_GEN_DIR}/qtcharts_wrapper.cpp +# module is always needed +${QtCharts_GEN_DIR}/qtcharts_module_wrapper.cpp +) + +set(QtCharts_include_dirs ${QtCharts_SOURCE_DIR} + ${QtCharts_BINARY_DIR} + ${Qt5Core_INCLUDE_DIRS} + ${Qt5Gui_INCLUDE_DIRS} + ${Qt5Widgets_INCLUDE_DIRS} + ${Qt5Charts_INCLUDE_DIRS} + ${SHIBOKEN_INCLUDE_DIR} + ${libpyside_SOURCE_DIR} + ${SHIBOKEN_PYTHON_INCLUDE_DIR} + ${QtCore_GEN_DIR} + ${QtGui_GEN_DIR} + ${QtWidgets_GEN_DIR}) + +set(QtCharts_libraries pyside2 + ${SHIBOKEN_PYTHON_LIBRARIES} + ${SHIBOKEN_LIBRARY} + ${Qt5Charts_LIBRARIES} + ${Qt5Core_LIBRARIES} + ${Qt5Gui_LIBRARIES} + ${Qt5Widgets_LIBRARIES}) + +set(QtCharts_deps QtCore QtGui QtWidgets) + +create_pyside_module(QtCharts + QtCharts_include_dirs + QtCharts_libraries + QtCharts_deps + QtCharts_SOURCE_DIR + QtCharts_SRC + "") diff --git a/sources/pyside2/PySide2/QtCharts/typesystem_charts.xml b/sources/pyside2/PySide2/QtCharts/typesystem_charts.xml new file mode 100644 index 000000000..ca7646421 --- /dev/null +++ b/sources/pyside2/PySide2/QtCharts/typesystem_charts.xml @@ -0,0 +1,129 @@ +<?xml version="1.0"?> +<!-- +/**************************************************************************** +** +** Copyright (C) 2017 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$ +** +****************************************************************************/ +--> +<typesystem package="PySide2.QtCharts"> + <load-typesystem name="QtWidgets/typesystem_widgets.xml" generate="no" /> + <namespace-type name="QtCharts"> + <object-type name="QAbstractAxis" since="5.7"> + <enum-type name="AxisType"/> + </object-type> + <object-type name="QAbstractBarSeries" since="5.7"> + <enum-type name="LabelsPosition"/> + </object-type> + <object-type name="QAbstractSeries" since="5.7"> + <enum-type name="SeriesType"/> + </object-type> + <object-type name="QAreaLegendMarker" since="5.7"/> + <object-type name="QAreaSeries" since="5.7"/> + <object-type name="QBarCategoryAxis" since="5.7"/> + <object-type name="QBarLegendMarker" since="5.7"/> + <object-type name="QBarModelMapper" since="5.7"/> + <object-type name="QBarSeries" since="5.7"/> + <object-type name="QBarSet" since="5.7"/> + <object-type name="QBoxPlotLegendMarker" since="5.7"/> + <object-type name="QBoxPlotModelMapper" since="5.7"/> + <object-type name="QBoxPlotSeries" since="5.7"/> + <object-type name="QBoxSet" since="5.7"> + <enum-type name="ValuePositions"/> + </object-type> + <object-type name="QCandlestickLegendMarker" since="5.7"/> + <object-type name="QCandlestickModelMapper" since="5.7"/> + <object-type name="QCandlestickSeries" since="5.7"/> + <object-type name="QCandlestickSet" since="5.7"/> + <object-type name="QCategoryAxis" since="5.7"/> + <object-type name="QChart" since="5.7"> + <enum-type name="ChartType"/> + <enum-type name="ChartTheme"/> + <enum-type name="AnimationOption"/> + <modify-function signature="addSeries(QAbstractSeries*)"> + <modify-argument index="1"> + <parent index="this" action="add"/> + </modify-argument> + </modify-function> + </object-type> + <object-type name="QChartView" since="5.7"> + <enum-type name="RubberBand"/> + </object-type> + <object-type name="QDateTimeAxis" since="5.7"/> + <object-type name="QHBarModelMapper" since="5.7"/> + <object-type name="QHBoxPlotModelMapper" since="5.7"/> + <object-type name="QHCandlestickModelMapper" since="5.7"/> + <object-type name="QHorizontalBarSeries" since="5.7"/> + <object-type name="QHorizontalPercentBarSeries" since="5.7"/> + <object-type name="QHorizontalStackedBarSeries" since="5.7"/> + <object-type name="QHPieModelMapper" since="5.7"/> + <object-type name="QHXYModelMapper" since="5.7"/> + <object-type name="QLegend" since="5.7"> + <enum-type name="MarkerShape"/> + </object-type> + <object-type name="QLegendMarker" since="5.7"> + <enum-type name="LegendMarkerType"/> + </object-type> + <object-type name="QLineSeries" since="5.7"/> + <object-type name="QLogValueAxis" since="5.7"/> + <object-type name="QPercentBarSeries" since="5.7"/> + <object-type name="QPieLegendMarker" since="5.7"/> + <object-type name="QPieModelMapper" since="5.7"/> + <object-type name="QPieSeries" since="5.7"/> + <object-type name="QPieSlice" since="5.7"> + <enum-type name="LabelPosition"/> + </object-type> + <object-type name="QPolarChart" since="5.7"> + <enum-type name="PolarOrientation" flags="PolarOrientations"/> + <!-- Compile error assigning default flags value --> + <modify-function signature="axes(QFlags<QtCharts::QPolarChart::PolarOrientation>,QtCharts::QAbstractSeries*)const" remove="all"/> + </object-type> + <object-type name="QScatterSeries" since="5.7"> + <enum-type name="MarkerShape"/> + </object-type> + <object-type name="QSplineSeries" since="5.7"/> + <object-type name="QStackedBarSeries" since="5.7"/> + <object-type name="QValueAxis" since="5.7"/> + <object-type name="QVBarModelMapper" since="5.7"/> + <object-type name="QVBoxPlotModelMapper" since="5.7"/> + <object-type name="QVCandlestickModelMapper" since="5.7"/> + <object-type name="QVPieModelMapper" since="5.7"/> + <object-type name="QVXYModelMapper" since="5.7"/> + <object-type name="QXYLegendMarker" since="5.7"/> + <object-type name="QXYModelMapper" since="5.7"/> + <object-type name="QXYSeries" since="5.7"/> + </namespace-type> +</typesystem> 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 5e3c16a08..dd2e212b0 100644 --- a/sources/pyside2/PySide2/QtCore/CMakeLists.txt +++ b/sources/pyside2/PySide2/QtCore/CMakeLists.txt @@ -10,9 +10,6 @@ else() set(SPECIFIC_OS_FILES "") endif() -# TODO: Fix cycling dependency when generating QDataStream operator<< for QUuid -set (QtCore_SRC_FIXED_ME ${QtCore_GEN_DIR}/quuid_wrapper.cpp) - set(QtCore_SRC ${QtCore_GEN_DIR}/qabstractanimation_wrapper.cpp ${QtCore_GEN_DIR}/qabstracteventdispatcher_timerinfo_wrapper.cpp @@ -100,6 +97,9 @@ ${QtCore_GEN_DIR}/qreadwritelock_wrapper.cpp ${QtCore_GEN_DIR}/qrect_wrapper.cpp ${QtCore_GEN_DIR}/qrectf_wrapper.cpp ${QtCore_GEN_DIR}/qregexp_wrapper.cpp +${QtCore_GEN_DIR}/qregularexpression_wrapper.cpp +${QtCore_GEN_DIR}/qregularexpressionmatch_wrapper.cpp +${QtCore_GEN_DIR}/qregularexpressionmatchiterator_wrapper.cpp ${QtCore_GEN_DIR}/qresource_wrapper.cpp ${QtCore_GEN_DIR}/qrunnable_wrapper.cpp ${QtCore_GEN_DIR}/qsavefile_wrapper.cpp @@ -140,7 +140,10 @@ ${QtCore_GEN_DIR}/qtimezone_wrapper.cpp ${QtCore_GEN_DIR}/qtimezone_offsetdata_wrapper.cpp ${QtCore_GEN_DIR}/qtranslator_wrapper.cpp ${QtCore_GEN_DIR}/qurl_wrapper.cpp +${QtCore_GEN_DIR}/qurlquery_wrapper.cpp +${QtCore_GEN_DIR}/quuid_wrapper.cpp ${QtCore_GEN_DIR}/qvariantanimation_wrapper.cpp +${QtCore_GEN_DIR}/qversionnumber_wrapper.cpp ${QtCore_GEN_DIR}/qwaitcondition_wrapper.cpp ${QtCore_GEN_DIR}/qwritelocker_wrapper.cpp ${QtCore_GEN_DIR}/qxmlstreamattribute_wrapper.cpp @@ -161,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} @@ -180,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 65f68882d..3b9986bab 100644 --- a/sources/pyside2/PySide2/QtCore/typesystem_core_common.xml +++ b/sources/pyside2/PySide2/QtCore/typesystem_core_common.xml @@ -141,6 +141,35 @@ <rejection class="*" function-name="qFreeAligned"/> <rejection class="QMetaMethod" enum-name="Attributes" /> + <rejection class="*" argument-type="QByteArrayDataPtr"/> + <rejection class="*" argument-type="^qfloat16&?$"/> + <rejection class="*" argument-type="QHashData"/> + <rejection class="*" argument-type="QHashData::Node*"/> + <rejection class="*" argument-type="QLatin1String"/> + <rejection class="*" argument-type="QLinkedListData*"/> + <rejection class="*" argument-type="QListData::ArrayCompatibleLayout"/> + <rejection class="*" argument-type="QListData::Data*"/> + <rejection class="*" argument-type="QListData::NotArrayCompatibleLayout"/> + <rejection class="*" argument-type="QList::Node*"/> + <rejection class="*" argument-type="QTSMFI"/> + <rejection class="*" argument-type="QTSMFC"/> + <rejection class="*" argument-type="QMutexData*"/> + <rejection class="*" argument-type="QObjectUserData*"/> + <rejection class="*" argument-type="QtPrivate::QSlotObjectBase*"/> + <rejection class="*" argument-type="^Q\w+Private( const)?\&$"/> + <!-- Note: "QHelpModel(QHelpEnginePrivate*)" is needed --> + <rejection class="*" argument-type="^Q[^H]\w+Private( const)?\*$"/> + <rejection class="*" argument-type="^.*::QPrivateSignal$"/> + <rejection class="*" argument-type="Qt::Initialization"/> + + <rejection class="*" argument-type="FILE*"/> + <rejection class="*" argument-type="std::chrono::milliseconds"/> + <rejection class="*" argument-type="^std::nullptr_t&?$"/> + <rejection class="*" argument-type="^std::initializer_list<.*$"/> + <rejection class="*" argument-type="^std::list<[^>]> const&$"/> + <rejection class="*" argument-type="std::string const&"/> + <rejection class="*" argument-type="^std::vector<[^>]> const&$"/> + <!-- From Qt4.6 ^^^ --> @@ -186,6 +215,7 @@ <!-- FIXME APIExtractor or shiboken do not support multiple includes by primitive type --> <include file-name="signalmanager.h" location="global"/> </primitive-type> + <primitive-type name="bool" target-lang-api-name="PyBool"> <conversion-rule> <native-to-target> @@ -238,7 +268,7 @@ </primitive-type> <inject-code class="native" position="beginning"> - bool py2kStrCheck(PyObject* obj) + bool py2kStrCheck(PyObject *obj) { #ifdef IS_PY3K return false; @@ -253,15 +283,15 @@ <conversion-rule> <native-to-target> const int N = %in.length(); - wchar_t* str = new wchar_t[N]; + wchar_t *str = new wchar_t[N]; %in.toWCharArray(str); - PyObject* %out = PyUnicode_FromWideChar(str, N); + PyObject *%out = PyUnicode_FromWideChar(str, N); delete[] str; return %out; </native-to-target> <target-to-native> <add-conversion type="PyUnicode"> - Py_UNICODE* unicode = PyUnicode_AS_UNICODE(%in); + Py_UNICODE *unicode = PyUnicode_AS_UNICODE(%in); #if defined(Py_UNICODE_WIDE) // cast as Py_UNICODE can be a different type %out = QString::fromUcs4((const uint*)unicode); @@ -286,9 +316,9 @@ <conversion-rule> <native-to-target> const int N = %in.toString().length(); - wchar_t* str = new wchar_t[N]; + wchar_t *str = new wchar_t[N]; %in.toString().toWCharArray(str); - PyObject* %out = PyUnicode_FromWideChar(str, N); + PyObject *%out = PyUnicode_FromWideChar(str, N); delete[] str; return %out; </native-to-target> @@ -339,7 +369,7 @@ Shiboken::Conversions::SpecificConverter converter(cppInRef.typeName()); if (converter) { - void* ptr = cppInRef.data(); + void *ptr = cppInRef.data(); return converter.toPython(ptr); } PyErr_Format(PyExc_RuntimeError, "Can't find converter for '%s'.", %in.typeName()); @@ -379,7 +409,7 @@ <add-conversion type="SbkObject"> // a class supported by QVariant? int typeCode; - const char* typeName = QVariant_resolveMetaType(%in->ob_type, &typeCode); + const char *typeName = QVariant_resolveMetaType(%in->ob_type, &typeCode); if (!typeCode || !typeName) return; QVariant var(typeCode, (void*)0); @@ -402,11 +432,11 @@ </conversion-rule> </primitive-type> <inject-code class="native" position="beginning"> - static const char* QVariant_resolveMetaType(PyTypeObject* type, int* typeId) + static const char *QVariant_resolveMetaType(PyTypeObject *type, int *typeId) { if (PyObject_TypeCheck(type, &SbkObjectType_Type)) { - SbkObjectType* sbkType = (SbkObjectType*)type; - const char* typeName = Shiboken::ObjectType::getOriginalName(sbkType); + SbkObjectType *sbkType = (SbkObjectType*)type; + const char *typeName = Shiboken::ObjectType::getOriginalName(sbkType); if (!typeName) return 0; bool valueType = '*' != typeName[qstrlen(typeName) - 1]; @@ -426,8 +456,8 @@ // that has added any python fields or slots to its object layout. // See https://mail.python.org/pipermail/python-list/2009-January/520733.html if (type->tp_bases) { - for(int i = 0; i < PyTuple_GET_SIZE(type->tp_bases); ++i) { - const char* derivedName = QVariant_resolveMetaType((PyTypeObject*)PyTuple_GET_ITEM(type->tp_bases, i), typeId); + for (int i = 0; i < PyTuple_GET_SIZE(type->tp_bases); ++i) { + const char *derivedName = QVariant_resolveMetaType((PyTypeObject*)PyTuple_GET_ITEM(type->tp_bases, i), typeId); if (derivedName) return derivedName; } @@ -439,13 +469,13 @@ *typeId = 0; return 0; } - static QVariant QVariant_convertToValueList(PyObject* list) + static QVariant QVariant_convertToValueList(PyObject *list) { if (PySequence_Size(list) < 1) return QVariant(); Shiboken::AutoDecRef element(PySequence_GetItem(list, 0)); int typeId; - const char* typeName = QVariant_resolveMetaType(element.cast<PyTypeObject*>(), &typeId); + const char *typeName = QVariant_resolveMetaType(element.cast<PyTypeObject*>(), &typeId); if (typeName) { QByteArray listTypeName("QList<"); listTypeName += typeName; @@ -468,8 +498,8 @@ bool allString = true; Shiboken::AutoDecRef fast(PySequence_Fast(list, "Failed to convert QVariantList")); Py_ssize_t size = PySequence_Fast_GET_SIZE(fast.object()); - for(int i = 0; i < size; ++i) { - PyObject* item = PySequence_Fast_GET_ITEM(fast.object(), i); + for (int i = 0; i < size; ++i) { + PyObject *item = PySequence_Fast_GET_ITEM(fast.object(), i); if (!%CHECKTYPE[QString](item)) { allString = false; break; @@ -477,14 +507,14 @@ } return allString; } - static QVariant QVariant_convertToVariantMap(PyObject* map) + static QVariant QVariant_convertToVariantMap(PyObject *map) { Py_ssize_t pos = 0; Shiboken::AutoDecRef keys(PyDict_Keys(map)); if (!QVariant_isStringList(keys)) return QVariant(); - PyObject* key; - PyObject* value; + PyObject *key; + PyObject *value; QMap<QString,QVariant> ret; while (PyDict_Next(map, &pos, &key, &value)) { QString cppKey = %CONVERTTOCPP[QString](key); @@ -493,7 +523,7 @@ } return QVariant(ret); } - static QVariant QVariant_convertToVariantList(PyObject* list) + static QVariant QVariant_convertToVariantList(PyObject *list) { if (QVariant_isStringList(list)) { QList<QString > lst = %CONVERTTOCPP[QList<QString>](list); @@ -506,7 +536,7 @@ Shiboken::AutoDecRef fast(PySequence_Fast(list, "Failed to convert QVariantList")); Py_ssize_t size = PySequence_Fast_GET_SIZE(fast.object()); for (int i = 0; i < size; ++i) { - PyObject* pyItem = PySequence_Fast_GET_ITEM(fast.object(), i); + PyObject *pyItem = PySequence_Fast_GET_ITEM(fast.object(), i); QVariant item = %CONVERTTOCPP[QVariant](pyItem); lst.append(item); } @@ -517,12 +547,12 @@ <primitive-type name="QVariant::Type" default-constructor="QVariant::Invalid"> <conversion-rule> <native-to-target> - const char* typeName = QVariant::typeToName(%in); - PyObject* %out; - PyTypeObject* pyType = 0; + const char *typeName = QVariant::typeToName(%in); + PyObject *%out; + PyTypeObject *pyType = nullptr; if (typeName) pyType = Shiboken::Conversions::getPythonTypeObject(typeName); - %out = pyType ? ((PyObject*)pyType) : Py_None; + %out = pyType ? (reinterpret_cast<PyObject*>(pyType)) : Py_None; Py_INCREF(%out); return %out; </native-to-target> @@ -531,17 +561,17 @@ %out = QVariant::Invalid; </add-conversion> <add-conversion type="PyTypeObject"> - const char* typeName; + const char *typeName; if (Shiboken::String::checkType((PyTypeObject*)%in)) typeName = "QString"; - else if (%in == (PyObject*)&PyFloat_Type) + else if (%in == reinterpret_cast<PyObject*>(&PyFloat_Type)) typeName = "double"; // float is a UserType in QVariant. - else if (%in == (PyObject*)&PyLong_Type) + else if (%in == reinterpret_cast<PyObject*>(&PyLong_Type)) typeName = "int"; // long is a UserType in QVariant. else if (%in->ob_type == &SbkObjectType_Type) typeName = Shiboken::ObjectType::getOriginalName((SbkObjectType*)%in); else - typeName = ((PyTypeObject*)%in)->tp_name; + typeName = (reinterpret_cast<PyTypeObject*>(%in))->tp_name; %out = QVariant::nameToType(typeName); </add-conversion> <add-conversion type="PyString" check="Shiboken::String::check(%in)"> @@ -551,12 +581,7 @@ %out = QVariant::nameToType("QVariantMap"); </add-conversion> <add-conversion type="PySequence"> - const char* typeName; - if (QVariantType_isStringList(%in)) - typeName = "QStringList"; - else - typeName = "QVariantList"; - %out = QVariant::nameToType(typeName); + %out = QVariantType_isStringList(%in) ? QVariant::StringList : QVariant::List; </add-conversion> </target-to-native> </conversion-rule> @@ -568,13 +593,13 @@ </inject-code> <inject-code class="native" position="beginning"> - static bool QVariantType_isStringList(PyObject* list) + static bool QVariantType_isStringList(PyObject *list) { bool allString = true; Shiboken::AutoDecRef fast(PySequence_Fast(list, "Failed to convert QVariantList")); Py_ssize_t size = PySequence_Fast_GET_SIZE(fast.object()); - for(int i=0; i < size; i++) { - PyObject* item = PySequence_Fast_GET_ITEM(fast.object(), i); + for (int i=0; i < size; i++) { + PyObject *item = PySequence_Fast_GET_ITEM(fast.object(), i); if (!%CHECKTYPE[QString](item)) { allString = false; break; @@ -582,7 +607,7 @@ } return allString; } - static bool QVariantType_checkAllStringKeys(PyObject* dict) + static bool QVariantType_checkAllStringKeys(PyObject *dict) { Shiboken::AutoDecRef keys(PyDict_Keys(dict)); return QVariantType_isStringList(keys); @@ -733,13 +758,12 @@ </container-type> <template name="cppmap_to_pymap_conversion"> - PyObject* %out = PyDict_New(); - %INTYPE::const_iterator it = %in.begin(); - for (; it != %in.end(); ++it) { + PyObject *%out = PyDict_New(); + for (%INTYPE::const_iterator it = %in.begin(), end = %in.end(); it != end; ++it) { %INTYPE_0 key = it.key(); %INTYPE_1 value = it.value(); - PyObject* pyKey = %CONVERTTOPYTHON[%INTYPE_0](key); - PyObject* pyValue = %CONVERTTOPYTHON[%INTYPE_1](value); + PyObject *pyKey = %CONVERTTOPYTHON[%INTYPE_0](key); + PyObject *pyValue = %CONVERTTOPYTHON[%INTYPE_1](value); PyDict_SetItem(%out, pyKey, pyValue); Py_DECREF(pyKey); Py_DECREF(pyValue); @@ -747,8 +771,8 @@ return %out; </template> <template name="pydict_to_cppmap_conversion"> - PyObject* key; - PyObject* value; + PyObject *key; + PyObject *value; Py_ssize_t pos = 0; while (PyDict_Next(%in, &pos, &key, &value)) { %OUTTYPE_0 cppKey = %CONVERTTOCPP[%OUTTYPE_0](key); @@ -803,7 +827,7 @@ <include file-name="QPair" location="global"/> <conversion-rule> <native-to-target> - PyObject* %out = PyTuple_New(2); + PyObject *%out = PyTuple_New(2); PyTuple_SET_ITEM(%out, 0, %CONVERTTOPYTHON[%INTYPE_0](%in.first)); PyTuple_SET_ITEM(%out, 1, %CONVERTTOPYTHON[%INTYPE_1](%in.second)); return %out; @@ -864,6 +888,8 @@ <rejection class="QFile" function-name="setEncodingFunction"/> <rejection class="QRegion" function-name="cleanUp"/> <rejection class="QSettings" function-name="registerFormat"/> + <rejection class="Qt" function-name="qt_getEnumMetaObject"/> + <rejection class="Qt" function-name="qt_getEnumName"/> <namespace-type name="Qt"> <enum-type name="AlignmentFlag" flags="Alignment" /> @@ -972,13 +998,13 @@ void globalPostRoutineCallback() { Shiboken::GilState state; - foreach(PyObject* callback, globalPostRoutineFunctions) { + foreach(PyObject *callback, globalPostRoutineFunctions) { Shiboken::AutoDecRef result(PyObject_CallObject(callback, NULL)); Py_DECREF(callback); } globalPostRoutineFunctions.clear(); } - void addPostRoutine(PyObject* callback) + void addPostRoutine(PyObject *callback) { if (PyCallable_Check(callback)) { globalPostRoutineFunctions << callback; @@ -1000,7 +1026,7 @@ <inject-code class="target" position="end"> QList<QByteArray> version = QByteArray(qVersion()).split('.'); - PyObject* pyQtVersion = PyTuple_New(3); + PyObject *pyQtVersion = PyTuple_New(3); for (int i = 0; i < 3; ++i) PyTuple_SET_ITEM(pyQtVersion, i, PyInt_FromLong(version[i].toInt())); PyModule_AddObject(module, "__version_info__", pyQtVersion); @@ -1022,7 +1048,7 @@ } } if (!atexit.isNull() && !regFunc.isNull()){ - PyObject* shutDownFunc = PyObject_GetAttrString(module, "__moduleShutdown"); + PyObject *shutDownFunc = PyObject_GetAttrString(module, "__moduleShutdown"); Shiboken::AutoDecRef args(PyTuple_New(1)); PyTuple_SET_ITEM(args, 0, shutDownFunc); Shiboken::AutoDecRef retval(PyObject_Call(regFunc, args, 0)); @@ -1050,9 +1076,9 @@ <inject-code class="native" position="beginning"> // Define a global variable to handle qInstallMessageHandler callback - static PyObject* qtmsghandler = 0; + static PyObject *qtmsghandler = nullptr; - static void msgHandlerCallback(QtMsgType type, const QMessageLogContext & ctx, const QString &msg) + static void msgHandlerCallback(QtMsgType type, const QMessageLogContext &ctx, const QString &msg) { Shiboken::GilState state; Shiboken::AutoDecRef arglist(PyTuple_New(3)); @@ -1119,7 +1145,7 @@ </add-function> <inject-code class="native" position="beginning"> namespace PySide { - template<> inline uint hash(const QLine& v) { + template<> inline uint hash(const QLine &v) { return qHash(qMakePair(qMakePair(v.x1(), v.y1()), qMakePair(v.x2(), v.y2()))); } }; @@ -1187,7 +1213,7 @@ <replace-type modified-type="PyObject" /> </modify-argument> <inject-code> - const void* d = %CPPSELF.%FUNCTION_NAME(); + const void *d = %CPPSELF.%FUNCTION_NAME(); if (d) { %PYARG_0 = Shiboken::Buffer::newObject(d, %CPPSELF.size()); } else { @@ -1197,8 +1223,8 @@ </inject-code> </modify-function> <template name="QResource_registerResource"> - uchar* ptr = (uchar*) Shiboken::Buffer::getPointer(%PYARG_1); - %RETURN_TYPE %0 = %CPPSELF.%FUNCTION_NAME(const_cast<const uchar*>(ptr), %2); + uchar *ptr = reinterpret_cast<uchar*>(Shiboken::Buffer::getPointer(%PYARG_1)); + %RETURN_TYPE %0 = %CPPSELF.%FUNCTION_NAME(const_cast<const uchar*>(ptr), %2); %PYARG_0 = %CONVERTTOPYTHON[%RETURN_TYPE](%0); </template> @@ -1231,7 +1257,7 @@ (PyDateTimeAPI = (PyDateTime_CAPI*) PyCObject_Import((char*)"datetime", \ (char*)"datetime_CAPI")) #endif - static bool PyDateTime_ImportAndCheck(PyObject* pyIn) { + static bool PyDateTime_ImportAndCheck(PyObject *pyIn) { if (!PyDateTimeAPI) PySideDateTime_IMPORT; return $DATETIMETYPE_Check(pyIn); } @@ -1277,7 +1303,8 @@ </add-function> <add-function signature="toPython()" return-type="PyObject"> <inject-code class="target" position="beginning"> - if (!PyDateTimeAPI) PySideDateTime_IMPORT; + if (!PyDateTimeAPI) + PySideDateTime_IMPORT; %PYARG_0 = PyDate_FromDate(%CPPSELF.year(), %CPPSELF.month(), %CPPSELF.day()); </inject-code> </add-function> @@ -1425,7 +1452,7 @@ </add-function> <inject-code class="native" position="beginning"> namespace PySide { - template<> inline uint hash(const QPoint& v) { + template<> inline uint hash(const QPoint &v) { return qHash(qMakePair(v.x(), v.y())); } }; @@ -1497,7 +1524,7 @@ </add-function> <inject-code class="native" position="beginning"> namespace PySide { - template<> inline uint hash(const QRect& v) { + template<> inline uint hash(const QRect &v) { return qHash(qMakePair(qMakePair(v.x(), v.y()), qMakePair(v.width(), v.height()))); } }; @@ -1635,7 +1662,7 @@ </add-function> <inject-code class="native" position="beginning"> namespace PySide { - template<> inline uint hash(const QSize& v) { + template<> inline uint hash(const QSize &v) { return qHash(qMakePair(v.width(), v.height())); } }; @@ -1732,7 +1759,8 @@ </add-function> <add-function signature="toPython()" return-type="PyObject"> <inject-code class="target" position="beginning"> - if (!PyDateTimeAPI) PySideDateTime_IMPORT; + if (!PyDateTimeAPI) + PySideDateTime_IMPORT; %PYARG_0 = PyTime_FromTime(%CPPSELF.hour(), %CPPSELF.minute(), %CPPSELF.second(), %CPPSELF.msec()*1000); </inject-code> </add-function> @@ -1756,9 +1784,7 @@ <value-type name="OffsetData"/> </value-type> - <!-- FIXME QT5: Remove QUuid because cyclic dependency found on overloaddata QUuid(), - this lead to cyclic dependency in <<(QDataStream &, QUUid) and incorrect QDataStream code generation (Windows only)--> - <!-- <value-type name="QUuid"> + <value-type name="QUuid"> <enum-type name="Variant"/> <enum-type name="Version"/> <add-function signature="__repr__" return-type="PyObject*"> @@ -1777,7 +1803,7 @@ </insert-template> </inject-code> </add-function> - </value-type> --> + </value-type> <value-type name="QMimeType" since="5.0" /> <object-type name="QMimeDatabase" since="5.0"> @@ -1939,8 +1965,8 @@ </add-function> <add-function signature="__setitem__"> <inject-code class="target" position="beginning"> - PyObject* args = Py_BuildValue("(iiO)", _i, 1, _value); - PyObject* result = Sbk_QBitArrayFunc_setBit(self, args); + PyObject *args = Py_BuildValue("(iiO)", _i, 1, _value); + PyObject *result = Sbk_QBitArrayFunc_setBit(self, args); Py_DECREF(args); Py_XDECREF(result); return !result ? -1 : 0; @@ -2239,7 +2265,7 @@ <inject-code class="native" file="glue/qobject_findchild.cpp"/> <add-function signature="findChild(PyTypeObject*, const QString&)" return-type="PyObject*"> <inject-code class="target" position="beginning"> - QObject* child = _findChildHelper(%CPPSELF, %2, (PyTypeObject*)%PYARG_1); + QObject *child = _findChildHelper(%CPPSELF, %2, (PyTypeObject*)%PYARG_1); %PYARG_0 = %CONVERTTOPYTHON[QObject*](child); </inject-code> <modify-argument index="return"> @@ -2302,7 +2328,7 @@ // Avoid return +1 because SignalManager connect to "destroyed()" signal to control object timelife int ret = %CPPSELF.%FUNCTION_NAME(%1); if (ret > 0 && ((strcmp(%1, SIGNAL(destroyed())) == 0) || (strcmp(%1, SIGNAL(destroyed(QObject*))) == 0))) - ret -= PySide::SignalManager::instance().countConnectionsWith(%CPPSELF); + ret -= PySide::SignalManager::instance().countConnectionsWith(%CPPSELF); %PYARG_0 = %CONVERTTOPYTHON[int](ret); </inject-code> @@ -2339,6 +2365,7 @@ <include file-name="QSize" location="global"/> </extra-includes> </object-type> + <value-type name="QUrlQuery" since="5.0" /> <value-type name="QUrl" hash-function="PySide::hash"> <!-- Qt5: lots of changes --> <enum-type name="ComponentFormattingOption" flags="ComponentFormattingOptions,FormattingOptions"/> @@ -2429,6 +2456,15 @@ </inject-code> </add-function> </value-type> + + <value-type name="QRegularExpression"> + <enum-type name="MatchOption" flags="MatchOptions"/> + <enum-type name="MatchType"/> + <enum-type name="PatternOption" flags="PatternOptions"/> + </value-type> + <value-type name="QRegularExpressionMatch"/> + <value-type name="QRegularExpressionMatchIterator"/> + <value-type name="QFileInfo"> <extra-includes> <include file-name="QDateTime" location="global"/> @@ -2548,10 +2584,10 @@ <add-function signature="__repr__" return-type="PyObject*"> <inject-code class="target" position="beginning"> - QByteArray b(((PyObject*)%PYSELF)->ob_type->tp_name); - PyObject* aux = Shiboken::String::fromStringAndSize(%CPPSELF.constData(), %CPPSELF.size()); + QByteArray b((reinterpret_cast<PyObject*>(%PYSELF))->ob_type->tp_name); + PyObject *aux = Shiboken::String::fromStringAndSize(%CPPSELF.constData(), %CPPSELF.size()); if (PyUnicode_CheckExact(aux)) { - PyObject* tmp = PyUnicode_AsASCIIString(aux); + PyObject *tmp = PyUnicode_AsASCIIString(aux); Py_DECREF(aux); aux = tmp; } @@ -2762,8 +2798,8 @@ <add-function signature="__setitem__"> <inject-code class="target" position="beginning"> %CPPSELF.remove(_i, 1); - PyObject* args = Py_BuildValue("(nO)", _i, _value); - PyObject* result = Sbk_QByteArrayFunc_insert(self, args); + PyObject *args = Py_BuildValue("(nO)", _i, _value); + PyObject *result = Sbk_QByteArrayFunc_insert(self, args); Py_DECREF(args); Py_XDECREF(result); return !result ? -1 : 0; @@ -2810,7 +2846,7 @@ <replace-type modified-type="PyBuffer"/> </modify-argument> <inject-code> - uchar* ptr = (uchar*) Shiboken::Buffer::getPointer(%PYARG_1); + uchar *ptr = reinterpret_cast<uchar*>(Shiboken::Buffer::getPointer(%PYARG_1)); %RETURN_TYPE %0 = %CPPSELF.%FUNCTION_NAME(ptr); %PYARG_0 = %CONVERTTOPYTHON[%RETURN_TYPE](%0); </inject-code> @@ -2871,7 +2907,7 @@ QByteArray ba; ba.resize(%2); %CPPSELF.%FUNCTION_NAME(ba.data(), ba.size()); - %PYARG_0 = %CONVERTTOPYTHON[QByteArray](ba); + %PYARG_0 = Shiboken::String::fromCString(ba.constData()); </inject-code> <modify-argument index="1"> <remove-argument /> @@ -2895,7 +2931,7 @@ QByteArray ba; ba.resize(%2); %CPPSELF.%FUNCTION_NAME(ba.data(), ba.size()); - %PYARG_0 = %CONVERTTOPYTHON[QByteArray](ba); + %PYARG_0 = Shiboken::String::fromCString(ba.constData()); </inject-code> <modify-argument index="1"> <remove-argument /> @@ -2903,12 +2939,13 @@ <modify-argument index="return"> <replace-type modified-type="PyObject"/> <conversion-rule class="native"> - %RETURN_TYPE %out; - if (!PyBytes_Check(%PYARG_0)) { - %out = -1; - } else { + %RETURN_TYPE %out = 0; + if (PyBytes_Check(%PYARG_0)) { %out = PyBytes_GET_SIZE((PyObject*)%PYARG_0); memcpy(%1, PyBytes_AS_STRING((PyObject*)%PYARG_0), %out); + } else if (Shiboken::String::check(%PYARG_0)) { + %out = Shiboken::String::len((PyObject*)%PYARG_0); + memcpy(%1, Shiboken::String::toCString((PyObject*)%PYARG_0), %out); } </conversion-rule> </modify-argument> @@ -3050,7 +3087,7 @@ </modify-argument> <inject-code> Py_ssize_t size; - uchar* ptr = (uchar*) Shiboken::Buffer::getPointer(%PYARG_1, &size); + uchar *ptr = reinterpret_cast<uchar*>(Shiboken::Buffer::getPointer(%PYARG_1, &size)); %RETURN_TYPE %0 = %CPPSELF.%FUNCTION_NAME(const_cast<const uchar*>(ptr), size); %PYARG_0 = %CONVERTTOPYTHON[%RETURN_TYPE](%0); </inject-code> @@ -3068,6 +3105,8 @@ <object-type name="QBuffer"> <!-- ### setData(QByteArray) do the job --> <modify-function signature="setData(const char*,int)" remove="all"/> + <!-- Disambiguate from Qt3DRender/qbuffer.h --> + <include file-name="QtCore/qbuffer.h" location="global"/> </object-type> <object-type name="QTimer"> <modify-function signature="singleShot(int,const QObject*,const char*)"> @@ -3075,14 +3114,14 @@ // %FUNCTION_NAME() - disable generation of c++ function call (void) %2; // remove warning about unused variable Shiboken::AutoDecRef emptyTuple(PyTuple_New(0)); - PyObject* pyTimer = Shiboken::SbkType<QTimer>()->tp_new(Shiboken::SbkType<QTimer>(), emptyTuple, 0); + PyObject *pyTimer = Shiboken::SbkType<QTimer>()->tp_new(Shiboken::SbkType<QTimer>(), emptyTuple, 0); Shiboken::SbkType<QTimer>()->tp_init(pyTimer, emptyTuple, 0); QTimer* timer = %CONVERTTOCPP[QTimer*](pyTimer); Shiboken::AutoDecRef result( PyObject_CallMethod(pyTimer, - const_cast<char*>("connect"), - const_cast<char*>("OsOs"), + const_cast<char*>("connect"), + const_cast<char*>("OsOs"), pyTimer, SIGNAL(timeout()), %PYARG_2, @@ -3105,12 +3144,12 @@ timer->setSingleShot(true); if (PyObject_TypeCheck(%2, &PySideSignalInstanceType)) { - PySideSignalInstance* signalInstance = reinterpret_cast<PySideSignalInstance*>(%2); + PySideSignalInstance *signalInstance = reinterpret_cast<PySideSignalInstance*>(%2); Shiboken::AutoDecRef signalSignature(Shiboken::String::fromFormat("2%s", PySide::Signal::getSignature(signalInstance))); Shiboken::AutoDecRef result( PyObject_CallMethod(pyTimer, - const_cast<char*>("connect"), - const_cast<char*>("OsOO"), + const_cast<char*>("connect"), + const_cast<char*>("OsOO"), pyTimer, SIGNAL(timeout()), PySide::Signal::getObject(signalInstance), @@ -3119,8 +3158,8 @@ } else { Shiboken::AutoDecRef result( PyObject_CallMethod(pyTimer, - const_cast<char*>("connect"), - const_cast<char*>("OsO"), + const_cast<char*>("connect"), + const_cast<char*>("OsO"), pyTimer, SIGNAL(timeout()), %PYARG_2) @@ -3170,7 +3209,7 @@ <inject-code> long result; #ifdef WIN32 - _PROCESS_INFORMATION* procInfo = %CPPSELF.%FUNCTION_NAME(); + _PROCESS_INFORMATION *procInfo = %CPPSELF.%FUNCTION_NAME(); result = procInfo ? procInfo->dwProcessId : 0; #else result = %CPPSELF.%FUNCTION_NAME(); @@ -3249,7 +3288,7 @@ <modify-function signature="notify(QObject*,QEvent*)" allow-thread="yes"> <modify-argument index="2" invalidate-after-use="yes"/> </modify-function> - <modify-function signature="QCoreApplication(int &, char **)" access="private"/> + <modify-function signature="QCoreApplication(int &, char **, int)" access="private"/> <inject-code class="native" file="glue/qcoreapplication_init.cpp" position="beginning" /> <modify-function signature="postEvent(QObject*,QEvent*, int)"> <modify-argument index="2"> @@ -3593,8 +3632,8 @@ <modify-function signature="operator<<(float)" remove="all"/> <modify-function signature="operator<<(qlonglong)" remove="all"/> <modify-function signature="operator<<(qulonglong)" remove="all"/> - <modify-function signature="operator<<(signed short)" remove="all"/> - <modify-function signature="operator<<(signed int)" remove="all"/> + <modify-function signature="operator<<(short)" remove="all"/> + <modify-function signature="operator<<(int)" remove="all"/> <modify-function signature="operator<<(unsigned int)" remove="all"/> <modify-function signature="operator<<(unsigned short)" remove="all"/> <modify-function signature="operator<<(const char*)" remove="all"/> @@ -3605,9 +3644,9 @@ <modify-function signature="operator>>(double&)" remove="all"/> <modify-function signature="operator>>(qlonglong&)" remove="all"/> <modify-function signature="operator>>(qulonglong&)" remove="all"/> - <modify-function signature="operator>>(signed long&)" remove="all"/> - <modify-function signature="operator>>(signed int&)" remove="all"/> - <modify-function signature="operator>>(signed short&)" remove="all"/> + <modify-function signature="operator>>(long&)" remove="all"/> + <modify-function signature="operator>>(int&)" remove="all"/> + <modify-function signature="operator>>(short&)" remove="all"/> <modify-function signature="operator>>(unsigned long&)" remove="all"/> <modify-function signature="operator>>(unsigned int&)" remove="all"/> <modify-function signature="operator>>(unsigned short&)" remove="all"/> @@ -3620,7 +3659,7 @@ <modify-argument index="return"> <!--<replace-type modified-type="QString" />--> <conversion-rule class="target"> - QString& res = *%0; + QString &res = *%0; %PYARG_0 = %CONVERTTOPYTHON[QString](res); </conversion-rule> </modify-argument> @@ -3854,9 +3893,9 @@ <modify-function signature="clear()" > <inject-code class="target" position="beginning"> - for(int counter = 0; counter < %CPPSELF.animationCount(); ++counter ) { - QAbstractAnimation* animation = %CPPSELF.animationAt(counter); - PyObject* obj = %CONVERTTOPYTHON[QAbstractAnimation*](animation); + for (int counter = 0; counter < %CPPSELF.animationCount(); ++counter ) { + QAbstractAnimation *animation = %CPPSELF.animationAt(counter); + PyObject *obj = %CONVERTTOPYTHON[QAbstractAnimation*](animation); Shiboken::Object::setParent(NULL, obj); Py_DECREF(obj); } @@ -3980,11 +4019,11 @@ s1.addTransition(button.clicked, s1h)</code> </modify-argument> <inject-code> if (PyObject_TypeCheck(%1, &PySideSignalInstanceType)) { - PyObject* dataSource = PySide::Signal::getObject((PySideSignalInstance*) %PYARG_1); + PyObject *dataSource = PySide::Signal::getObject((PySideSignalInstance*)%PYARG_1); Shiboken::AutoDecRef obType(PyObject_Type(dataSource)); QObject* sender = %CONVERTTOCPP[QObject*](dataSource); if (sender) { - const char* dataSignature = PySide::Signal::getSignature((PySideSignalInstance*) %PYARG_1); + const char *dataSignature = PySide::Signal::getSignature((PySideSignalInstance*)%PYARG_1); QByteArray signature(dataSignature); // Append SIGNAL flag (2) %0 = new QSignalTransitionWrapper(sender, "2" + signature, %2); } @@ -4009,7 +4048,7 @@ s1.addTransition(button.clicked, s1h)</code> <inject-code class="target" position="beginning"> QString signalName(%2); if (PySide::SignalManager::registerMetaMethod(%1, signalName.mid(1).toLatin1().data(), QMetaMethod::Signal)) { - QSignalTransition* %0 = %CPPSELF->addTransition(%1, %2, %3); + QSignalTransition *%0 = %CPPSELF->addTransition(%1, %2, %3); %PYARG_0 = %CONVERTTOPYTHON[QSignalTransition*](%0); } else { Py_INCREF(Py_None); @@ -4037,9 +4076,9 @@ s1.addTransition(button.clicked, s1h)</code> // http://bugs.openbossa.org/show_bug.cgi?id=362 if (!PyObject_TypeCheck(%1, &PySideSignalInstanceType)) goto Sbk_%TYPEFunc_%FUNCTION_NAME_TypeError; - PySideSignalInstance* signalInstance = reinterpret_cast<PySideSignalInstance*>(%1); + PySideSignalInstance *signalInstance = reinterpret_cast<PySideSignalInstance*>(%1); QObject* sender = %CONVERTTOCPP[QObject*](PySide::Signal::getObject(signalInstance)); - QSignalTransition* %0 = %CPPSELF->%FUNCTION_NAME(sender, PySide::Signal::getSignature(signalInstance), %2); + QSignalTransition *%0 = %CPPSELF->%FUNCTION_NAME(sender, PySide::Signal::getSignature(signalInstance), %2); %PYARG_0 = %CONVERTTOPYTHON[QSignalTransition*](%0); </inject-code> </add-function> @@ -4072,7 +4111,7 @@ s1.addTransition(button.clicked, s1h)</code> <add-function signature="configuration()" return-type="list of QAbstractState" > <inject-code class="target" position="beginning"> %PYARG_0 = PySet_New(0); - foreach(QAbstractState* abs_state, %CPPSELF.configuration()) { + foreach(QAbstractState *abs_state, %CPPSELF.configuration()) { Shiboken::AutoDecRef obj(%CONVERTTOPYTHON[QAbstractState*](abs_state)); Shiboken::Object::setParent(self, obj); PySet_Add(%PYARG_0, obj); @@ -4085,7 +4124,7 @@ s1.addTransition(button.clicked, s1h)</code> <add-function signature="defaultAnimations()" return-type="list of QAbstractAnimation" > <inject-code class="target" position="beginning"> %PYARG_0 = PyList_New(0); - foreach(QAbstractAnimation* abs_anim, %CPPSELF.defaultAnimations()) { + foreach(QAbstractAnimation *abs_anim, %CPPSELF.defaultAnimations()) { Shiboken::AutoDecRef obj(%CONVERTTOPYTHON[QAbstractAnimation*](abs_anim)); Shiboken::Object::setParent(self, obj); PyList_Append(%PYARG_0, obj); @@ -4096,6 +4135,14 @@ s1.addTransition(button.clicked, s1h)</code> <object-type name="QVariantAnimation" since="4.6"/> + <value-type name="QVersionNumber" since="5.6"> + <modify-function signature="fromString(const QString &,int*)"> + <modify-argument index="2"> + <remove-argument/> + </modify-argument> + </modify-function> + </value-type> + <!-- From Qt4.6 ^^^ --> <add-function signature="SIGNAL(const char*)" return-type="str"> @@ -4151,17 +4198,17 @@ s1.addTransition(button.clicked, s1h)</code> </inject-code> <add-function signature="qRegisterResourceData(int, PyBytes, PyBytes, PyBytes)" return-type="bool"> <inject-code class="target" position="beginning"> - %RETURN_TYPE %0 = %FUNCTION_NAME(%1, (uchar*)PyBytes_AS_STRING(%PYARG_2), - (uchar*)PyBytes_AS_STRING(%PYARG_3), - (uchar*)PyBytes_AS_STRING(%PYARG_4)); + %RETURN_TYPE %0 = %FUNCTION_NAME(%1, reinterpret_cast<uchar*>(PyBytes_AS_STRING(%PYARG_2)), + reinterpret_cast<uchar*>(PyBytes_AS_STRING(%PYARG_3)), + reinterpret_cast<uchar*>(PyBytes_AS_STRING(%PYARG_4))); %PYARG_0 = %CONVERTTOPYTHON[%RETURN_TYPE](%0); </inject-code> </add-function> <add-function signature="qUnregisterResourceData(int, PyBytes, PyBytes, PyBytes)" return-type="bool"> <inject-code class="target" position="beginning"> - %RETURN_TYPE %0 = %FUNCTION_NAME(%1, (uchar*)PyBytes_AS_STRING(%PYARG_2), - (uchar*)PyBytes_AS_STRING(%PYARG_3), - (uchar*)PyBytes_AS_STRING(%PYARG_4)); + %RETURN_TYPE %0 = %FUNCTION_NAME(%1, reinterpret_cast<uchar*>(PyBytes_AS_STRING(%PYARG_2)), + reinterpret_cast<uchar*>(PyBytes_AS_STRING(%PYARG_3)), + reinterpret_cast<uchar*>(PyBytes_AS_STRING(%PYARG_4))); %PYARG_0 = %CONVERTTOPYTHON[%RETURN_TYPE](%0); </inject-code> </add-function> @@ -4213,7 +4260,7 @@ s1.addTransition(button.clicked, s1h)</code> <!-- TODO: this need be removed --> <suppress-warning text="skipping function '*', unmatched return type '*'"/> - <suppress-warning text="skipping function '*', unmatched parameter type '*'"/> + <suppress-warning text="skipping function '*', unmatched type '*"/> <suppress-warning text="enum 'q_static_assert_result39' does not have a type entry or is not an enum"/> <suppress-warning text="horribly broken type ''"/> @@ -4231,4 +4278,16 @@ s1.addTransition(button.clicked, s1h)</code> <suppress-warning text="enum 'RelationFlag' does not have a type entry or is not an enum" /> <suppress-warning text="enum 'Role' does not have a type entry or is not an enum" /> + <!-- Anonymous enum in qtbase/src/corelib/global/qtypeinfo.h --> + <suppress-warning text="enum 'Q_RELOCATABLE_TYPE' does not have a type entry or is not an enum" /> + + <!-- Another anonymous enum / value pair in in qtbase/src/corelib/kernel/qcoreapplication.h --> + <suppress-warning text="no matching enum 'QT_VERSION'" /> + <suppress-warning text="unhandled enum value: QT_VERSION in QCoreApplication::ApplicationFlags from header 'qcoreapplication.h'" /> + <suppress-warning text="unmatched enum QT_VERSION from header 'qcoreapplication.h'" /> + + <suppress-warning text="skipping field 'QSysInfo::WindowsVersion' with unmatched type 'const QSysInfo::WinVersion'" /> + <suppress-warning text="template baseclass 'QListSpecialMethods<T>' of 'QList' is not known" /> + + </typesystem> diff --git a/sources/pyside2/PySide2/QtDataVisualization/CMakeLists.txt b/sources/pyside2/PySide2/QtDataVisualization/CMakeLists.txt new file mode 100644 index 000000000..e61a70234 --- /dev/null +++ b/sources/pyside2/PySide2/QtDataVisualization/CMakeLists.txt @@ -0,0 +1,70 @@ +project(QtDataVisualization) + +set(QtDataVisualization_SRC +${QtDataVisualization_GEN_DIR}/qtdatavisualization_qabstract3daxis_wrapper.cpp +${QtDataVisualization_GEN_DIR}/qtdatavisualization_qcategory3daxis_wrapper.cpp +${QtDataVisualization_GEN_DIR}/qtdatavisualization_qlogvalue3daxisformatter_wrapper.cpp +${QtDataVisualization_GEN_DIR}/qtdatavisualization_qvalue3daxis_wrapper.cpp +${QtDataVisualization_GEN_DIR}/qtdatavisualization_qvalue3daxisformatter_wrapper.cpp +${QtDataVisualization_GEN_DIR}/qtdatavisualization_qabstract3dseries_wrapper.cpp +${QtDataVisualization_GEN_DIR}/qtdatavisualization_qabstractdataproxy_wrapper.cpp +${QtDataVisualization_GEN_DIR}/qtdatavisualization_qbar3dseries_wrapper.cpp +${QtDataVisualization_GEN_DIR}/qtdatavisualization_qbardataitem_wrapper.cpp +${QtDataVisualization_GEN_DIR}/qtdatavisualization_qbardataproxy_wrapper.cpp +${QtDataVisualization_GEN_DIR}/qtdatavisualization_qcustom3ditem_wrapper.cpp +${QtDataVisualization_GEN_DIR}/qtdatavisualization_qcustom3dlabel_wrapper.cpp +${QtDataVisualization_GEN_DIR}/qtdatavisualization_qcustom3dvolume_wrapper.cpp +${QtDataVisualization_GEN_DIR}/qtdatavisualization_qheightmapsurfacedataproxy_wrapper.cpp +${QtDataVisualization_GEN_DIR}/qtdatavisualization_qitemmodelbardataproxy_wrapper.cpp +${QtDataVisualization_GEN_DIR}/qtdatavisualization_qitemmodelscatterdataproxy_wrapper.cpp +${QtDataVisualization_GEN_DIR}/qtdatavisualization_qitemmodelsurfacedataproxy_wrapper.cpp +${QtDataVisualization_GEN_DIR}/qtdatavisualization_qscatter3dseries_wrapper.cpp +${QtDataVisualization_GEN_DIR}/qtdatavisualization_qscatterdataitem_wrapper.cpp +${QtDataVisualization_GEN_DIR}/qtdatavisualization_qscatterdataproxy_wrapper.cpp +${QtDataVisualization_GEN_DIR}/qtdatavisualization_qsurface3dseries_wrapper.cpp +${QtDataVisualization_GEN_DIR}/qtdatavisualization_qsurfacedataitem_wrapper.cpp +${QtDataVisualization_GEN_DIR}/qtdatavisualization_qsurfacedataproxy_wrapper.cpp +${QtDataVisualization_GEN_DIR}/qtdatavisualization_q3dbars_wrapper.cpp +${QtDataVisualization_GEN_DIR}/qtdatavisualization_q3dcamera_wrapper.cpp +${QtDataVisualization_GEN_DIR}/qtdatavisualization_q3dlight_wrapper.cpp +${QtDataVisualization_GEN_DIR}/qtdatavisualization_q3dobject_wrapper.cpp +${QtDataVisualization_GEN_DIR}/qtdatavisualization_q3dscatter_wrapper.cpp +${QtDataVisualization_GEN_DIR}/qtdatavisualization_q3dscene_wrapper.cpp +${QtDataVisualization_GEN_DIR}/qtdatavisualization_q3dsurface_wrapper.cpp +${QtDataVisualization_GEN_DIR}/qtdatavisualization_qabstract3dgraph_wrapper.cpp +${QtDataVisualization_GEN_DIR}/qtdatavisualization_q3dinputhandler_wrapper.cpp +${QtDataVisualization_GEN_DIR}/qtdatavisualization_qabstract3dinputhandler_wrapper.cpp +${QtDataVisualization_GEN_DIR}/qtdatavisualization_qtouch3dinputhandler_wrapper.cpp +${QtDataVisualization_GEN_DIR}/qtdatavisualization_q3dtheme_wrapper.cpp +${QtDataVisualization_GEN_DIR}/qtdatavisualization_wrapper.cpp +# module is always needed +${QtDataVisualization_GEN_DIR}/qtdatavisualization_module_wrapper.cpp +) + +set(QtDataVisualization_include_dirs ${QtDataVisualization_SOURCE_DIR} + ${QtDataVisualization_BINARY_DIR} + ${Qt5Core_INCLUDE_DIRS} + ${Qt5Gui_INCLUDE_DIRS} + ${Qt5DataVisualization_INCLUDE_DIRS} + ${SHIBOKEN_INCLUDE_DIR} + ${libpyside_SOURCE_DIR} + ${SHIBOKEN_PYTHON_INCLUDE_DIR} + ${QtCore_GEN_DIR} + ${QtGui_GEN_DIR}) + +set(QtDataVisualization_libraries pyside2 + ${SHIBOKEN_PYTHON_LIBRARIES} + ${SHIBOKEN_LIBRARY} + ${Qt5DataVisualization_LIBRARIES} + ${Qt5Core_LIBRARIES} + ${Qt5Gui_LIBRARIES}) + +set(QtDataVisualization_deps QtCore QtGui) + +create_pyside_module(QtDataVisualization + QtDataVisualization_include_dirs + QtDataVisualization_libraries + QtDataVisualization_deps + QtDataVisualization_SOURCE_DIR + QtDataVisualization_SRC + "") diff --git a/sources/pyside2/PySide2/QtDataVisualization/typesystem_datavisualization.xml b/sources/pyside2/PySide2/QtDataVisualization/typesystem_datavisualization.xml new file mode 100644 index 000000000..6b628c9bf --- /dev/null +++ b/sources/pyside2/PySide2/QtDataVisualization/typesystem_datavisualization.xml @@ -0,0 +1,179 @@ +<?xml version="1.0"?> +<!-- +/**************************************************************************** +** +** Copyright (C) 2017 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$ +** +****************************************************************************/ +--> +<typesystem package="PySide2.QtDataVisualization"> + <rejection class="^.*Proxy.*$" argument-type="^Q.*(DataRow|DataArray)\*.*$"/> + + <template name="cppqlistofptrtoqvectors_to_py_conversion"> + const int rowCount = %in.size(); + PyObject* %out = PyList_New(rowCount); + for (int r = 0; r < rowCount; ++r) { + const QVector<%INTYPE_0> *row = %in.at(r); + const int columnCount = row->size(); + PyObject *pyRow = PyList_New(columnCount); + for (int c = 0; c < columnCount; ++c) { + const %INTYPE_0 &cppItem = row->at(c); + PyList_SET_ITEM(pyRow, c, %CONVERTTOPYTHON[%INTYPE_0](cppItem)); + } + PyList_SET_ITEM(%out, r, pyRow); + } + return %out; + </template> + <template name="py_to_cppqlistofptrtoqvectors_conversion"> + const int rowCount = int(PySequence_Size(%in)); + %OUTTYPE &result = %out; + result.reserve(rowCount); + for (int r = 0; r < rowCount; ++r) { + Shiboken::AutoDecRef rowItem(PySequence_GetItem(%in, r)); + const int columnCount = int(PySequence_Size(rowItem)); + QVector<%OUTTYPE_0> *row = new QVector<%OUTTYPE_0>; + row->reserve(columnCount); + for (int c = 0; c < columnCount; ++c) { + Shiboken::AutoDecRef pyItem(PySequence_GetItem(rowItem, c)); + %OUTTYPE_0 v = %CONVERTTOCPP[%OUTTYPE_0](pyItem); + row->append(v); + } + result.append(row); + } + </template> + <load-typesystem name="QtGui/typesystem_gui.xml" generate="no" /> + <namespace-type name="QtDataVisualization"> + <primitive-type name="QBarDataArray"> + <include file-name="qbardataproxy.h" location="global"/> + <conversion-rule> + <native-to-target> + <insert-template name="cppqlistofptrtoqvectors_to_py_conversion"> + <replace from="%INTYPE_0" to="QtDataVisualization::QBarDataItem"/> + </insert-template> + </native-to-target> + <target-to-native> + <add-conversion type="PySequence"> + <insert-template name="py_to_cppqlistofptrtoqvectors_conversion"> + <replace from="%OUTTYPE_0" to="QtDataVisualization::QBarDataItem"/> + </insert-template> + </add-conversion> + </target-to-native> + </conversion-rule> + </primitive-type> + <primitive-type name="QSurfaceDataArray"> + <include file-name="qsurfacedataproxy.h" location="global"/> + <conversion-rule> + <native-to-target> + <insert-template name="cppqlistofptrtoqvectors_to_py_conversion"> + <replace from="%INTYPE_0" to="QtDataVisualization::QSurfaceDataItem"/> + </insert-template> + </native-to-target> + <target-to-native> + <add-conversion type="PySequence"> + <insert-template name="py_to_cppqlistofptrtoqvectors_conversion"> + <replace from="%OUTTYPE_0" to="QtDataVisualization::QSurfaceDataItem"/> + </insert-template> + </add-conversion> + </target-to-native> + </conversion-rule> + </primitive-type> + + <object-type name="QAbstract3DAxis"> + <enum-type name="AxisOrientation"/> + <enum-type name="AxisType"/> + </object-type> + <object-type name="QCategory3DAxis"/> + <object-type name="QLogValue3DAxisFormatter"/> + <object-type name="QValue3DAxis"/> + <object-type name="QValue3DAxisFormatter"/> + <object-type name="QAbstract3DSeries"> + <enum-type name="Mesh"/> + <enum-type name="SeriesType"/> + </object-type> + <object-type name="QAbstractDataProxy"> + <enum-type name="DataType"/> + </object-type> + <object-type name="QBar3DSeries"/> + <value-type name="QBarDataItem"/> + <object-type name="QBarDataProxy"/> + <object-type name="QCustom3DItem"/> + <object-type name="QCustom3DLabel"/> + <object-type name="QCustom3DVolume"/> + <object-type name="QHeightMapSurfaceDataProxy"/> + <object-type name="QItemModelBarDataProxy"> + <enum-type name="MultiMatchBehavior"/> + </object-type> + <object-type name="QItemModelScatterDataProxy"/> + <object-type name="QItemModelSurfaceDataProxy"> + <enum-type name="MultiMatchBehavior"/> + </object-type> + <object-type name="QScatter3DSeries"/> + <value-type name="QScatterDataItem"/> + <object-type name="QScatterDataProxy"/> + <object-type name="QSurface3DSeries"> + <enum-type name="DrawFlag" flags="DrawFlags"/> + </object-type> + <value-type name="QSurfaceDataItem"/> + <object-type name="QSurfaceDataProxy"/> + <object-type name="Q3DBars"/> + <object-type name="Q3DCamera"> + <enum-type name="CameraPreset"/> + </object-type> + <object-type name="Q3DLight"/> + <object-type name="Q3DObject"/> + <object-type name="Q3DScatter"/> + <object-type name="Q3DScene"/> + <object-type name="Q3DSurface"/> + <object-type name="QAbstract3DGraph"> + <enum-type name="ElementType"/> + <enum-type name="OptimizationHint" flags="OptimizationHints"/> + <enum-type name="SelectionFlag" flags="SelectionFlags"/> + <enum-type name="ShadowQuality"/> + </object-type> + <object-type name="Q3DInputHandler"/> + <object-type name="QAbstract3DInputHandler"> + <enum-type name="InputView"/> + </object-type> + <object-type name="QTouch3DInputHandler"/> + <object-type name="Q3DTheme"> + <enum-type name="ColorStyle"/> + <enum-type name="Theme"/> + </object-type> + <extra-includes> + <include file-name="qutils.h" location="global"/> + </extra-includes> + </namespace-type> +</typesystem> diff --git a/sources/pyside2/PySide2/QtGui/CMakeLists.txt b/sources/pyside2/PySide2/QtGui/CMakeLists.txt index a6a8c1049..784280ca6 100644 --- a/sources/pyside2/PySide2/QtGui/CMakeLists.txt +++ b/sources/pyside2/PySide2/QtGui/CMakeLists.txt @@ -3,6 +3,7 @@ project(QtGui) qt5_wrap_cpp(QPYTEXTOBJECT_MOC "${pyside2_SOURCE_DIR}/qpytextobject.h") set(QtGui_SRC +${QtGui_GEN_DIR}/qabstractopenglfunctions_wrapper.cpp ${QtGui_GEN_DIR}/qabstracttextdocumentlayout_paintcontext_wrapper.cpp ${QtGui_GEN_DIR}/qabstracttextdocumentlayout_selection_wrapper.cpp ${QtGui_GEN_DIR}/qabstracttextdocumentlayout_wrapper.cpp @@ -66,6 +67,23 @@ ${QtGui_GEN_DIR}/qmatrix4x4_wrapper.cpp ${QtGui_GEN_DIR}/qmouseevent_wrapper.cpp ${QtGui_GEN_DIR}/qmoveevent_wrapper.cpp ${QtGui_GEN_DIR}/qmovie_wrapper.cpp +${QtGui_GEN_DIR}/qoffscreensurface_wrapper.cpp +${QtGui_GEN_DIR}/qopenglcontextgroup_wrapper.cpp +${QtGui_GEN_DIR}/qopengldebuglogger_wrapper.cpp +${QtGui_GEN_DIR}/qopengldebugmessage_wrapper.cpp +${QtGui_GEN_DIR}/qopenglextrafunctions_wrapper.cpp +${QtGui_GEN_DIR}/qopenglframebufferobjectformat_wrapper.cpp +${QtGui_GEN_DIR}/qopenglfunctions_wrapper.cpp +# Compile error on Windows: ${QtGui_GEN_DIR}/qopenglpaintdevice_wrapper.cpp +${QtGui_GEN_DIR}/qopenglpixeltransferoptions_wrapper.cpp +${QtGui_GEN_DIR}/qopenglshaderprogram_wrapper.cpp +${QtGui_GEN_DIR}/qopengltexture_wrapper.cpp +${QtGui_GEN_DIR}/qopengltimemonitor_wrapper.cpp +${QtGui_GEN_DIR}/qopengltimerquery_wrapper.cpp +${QtGui_GEN_DIR}/qopenglversionprofile_wrapper.cpp +${QtGui_GEN_DIR}/qopenglvertexarrayobject_wrapper.cpp +${QtGui_GEN_DIR}/qopenglvertexarrayobject_binder_wrapper.cpp +${QtGui_GEN_DIR}/qopenglwindow_wrapper.cpp ${QtGui_GEN_DIR}/qpagedpaintdevice_margins_wrapper.cpp ${QtGui_GEN_DIR}/qpagedpaintdevice_wrapper.cpp ${QtGui_GEN_DIR}/qpagelayout_wrapper.cpp @@ -174,8 +192,8 @@ ${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}) +configure_file("${QtGui_SOURCE_DIR}/QtGui_global.post.h.in" + "${QtGui_BINARY_DIR}/QtGui_global.post.h" @ONLY) set(QtGui_include_dirs ${QtGui_SOURCE_DIR} ${QtGui_BINARY_DIR} @@ -197,7 +215,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/QtGui_global.post.h.in b/sources/pyside2/PySide2/QtGui/QtGui_global.post.h.in new file mode 100644 index 000000000..6d3a3eeac --- /dev/null +++ b/sources/pyside2/PySide2/QtGui/QtGui_global.post.h.in @@ -0,0 +1 @@ +#include "qpytextobject.h" // PySide class 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 2578a1aa9..0f6d48968 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); @@ -54,6 +54,7 @@ } </template> + <rejection class="^Q.*$" argument-type="^QPlatform.*$"/> <function signature="qAlpha(uint)" /> <function signature="qBlue(uint)" /> <function signature="qGray(int,int,int)" /> @@ -96,6 +97,21 @@ <rejection class="*" function-name="d_func"/> <rejection class="*" field-name="d_ptr"/> <rejection class="*" field-name="d"/> + <rejection class="^QOpenGL.*$" argument-type="^GLboolean( const)?\*$"/> + <rejection class="^QOpenGL.*$" argument-type="^GLchar\*$"/> + <rejection class="^QOpenGL.*$" argument-type="GLchar *const const*"/> + <rejection class="^QOpenGL.*$" argument-type="^char\*$"/> + <rejection class="^QOpenGL.*$" argument-type="^char( const)?\*\*$"/> + <rejection class="^QOpenGL.*$" argument-type="GLintptr"/> + <rejection class="^QOpenGL.*$" argument-type="GLsizeiptr"/> + <rejection class="^QOpenGL.*$" argument-type="GLsync"/> + <rejection class="^QOpenGL.*$" argument-type="^GLubyte( const)?\*$"/> + <rejection class="^QOpenGL.*$" argument-type="^QMatrix.x.( const)?\*$"/> + <rejection class="^QOpenGL.*$" argument-type="qopengl_GLintptr"/> + <rejection class="^QOpenGL.*$" argument-type="qopengl_GLsizeiptr"/> + <rejection class="^QOpenGL.*$" argument-type="QOpenGLTextureHelper*"/> + <rejection class="^QOpenGL.*$" argument-type="^QVector.D( const)?\*$"/> + <rejection class="^QOpenGL.*$" argument-type="^void( const)?\*\*$"/> <!-- Event classes have a lot of non-documented protected fields, those fields @@ -293,6 +309,8 @@ } </inject-code> </add-function> + <!-- Disambiguate from Qt3DCore/qtransform.h --> + <include file-name="QtGui/qtransform.h" location="global"/> </value-type> <value-type name="QStaticText"> @@ -305,7 +323,7 @@ <replace-type modified-type="PyBuffer"/> </modify-argument> <inject-code> - uchar* buffer = (uchar*) Shiboken::Buffer::getPointer(%PYARG_2); + uchar *buffer = reinterpret_cast<uchar*>(Shiboken::Buffer::getPointer(%PYARG_2)); QBitmap %0 = QBitmap::fromData(%1, buffer, %3); %PYARG_0 = %CONVERTTOPYTHON[QBitmap](%0); </inject-code> @@ -422,11 +440,11 @@ <modify-argument index="1"> <replace-type modified-type="PyBuffer"/> <conversion-rule class="target"> - PyObject* %out = Shiboken::Buffer::newObject(%in, size); + PyObject *%out = Shiboken::Buffer::newObject(%in, size); </conversion-rule> <conversion-rule class="native"> Py_ssize_t bufferLen; - char* %out = (char*) Shiboken::Buffer::getPointer(%PYARG_1, &bufferLen); + char *%out = reinterpret_cast<char*>(Shiboken::Buffer::getPointer(%PYARG_1, &bufferLen)); </conversion-rule> </modify-argument> <modify-argument index="2"> @@ -475,7 +493,7 @@ </add-function> <modify-function signature="setUserData(QTextBlockUserData*)"> <inject-code class="target" position="end"> - const QTextDocument* doc = %CPPSELF.document(); + const QTextDocument *doc = %CPPSELF.document(); if (doc) { Shiboken::AutoDecRef pyDocument(%CONVERTTOPYTHON[QTextDocument*](doc)); Shiboken::Object::setParent(pyDocument, %PYARG_1); @@ -487,7 +505,7 @@ <define-ownership class="target" owner="default"/> </modify-argument> <inject-code class="target" position="end"> - const QTextDocument* doc = %CPPSELF.document(); + const QTextDocument *doc = %CPPSELF.document(); if (doc) { Shiboken::AutoDecRef pyDocument(%CONVERTTOPYTHON[QTextDocument*](doc)); Shiboken::Object::setParent(pyDocument, %PYARG_0); @@ -522,7 +540,7 @@ </extra-includes> <add-function signature="__reduce__" return-type="PyObject*"> <inject-code class="target" position="beginning"> - PyObject* points = PyList_New(%CPPSELF.count()); + PyObject *points = PyList_New(%CPPSELF.count()); for (int i = 0, max = %CPPSELF.count(); i < max; ++i){ int x, y; %CPPSELF.point(i, &x, &y); @@ -590,7 +608,7 @@ } } - const char** xpm = (const char**) malloc (lineCount * sizeof(const char**)); + const char **xpm = reinterpret_cast<const char**>(malloc(lineCount * sizeof(const char**))); for (int line = 0; line < lineCount; ++line) xpm[line] = Shiboken::String::toCString(PySequence_Fast_GET_ITEM(strList.object(), line)); @@ -617,7 +635,7 @@ %0 = new %TYPE(QPixmap::fromImage(%1)); </inject-code> </add-function> - <modify-function signature="QPixmap(const char **)"> + <modify-function signature="QPixmap(const char*[])"> <modify-argument index="1"> <replace-type modified-type="PySequence" /> </modify-argument> @@ -633,7 +651,7 @@ <modify-argument index="1"> <replace-type modified-type="PyBytes"/> <conversion-rule class="native"> - const uchar* %out = reinterpret_cast<const uchar*>(PyBytes_AS_STRING(%PYARG_1)); + const uchar *%out = reinterpret_cast<const uchar*>(PyBytes_AS_STRING(%PYARG_1)); </conversion-rule> </modify-argument> <modify-argument index="2"> @@ -802,7 +820,7 @@ </extra-includes> <template name="qimage_buffer_constructor"> - uchar* ptr = (uchar*) Shiboken::Buffer::getPointer(%PYARG_1); + uchar *ptr = reinterpret_cast<uchar*>(Shiboken::Buffer::getPointer(%PYARG_1)); %0 = new %TYPE(ptr, %ARGS); </template> <modify-function signature="QImage(uchar *,int,int,int,QImage::Format,QImageCleanupFunction, void *)"> @@ -846,7 +864,7 @@ <modify-function signature="QImage(const uchar*,int,int,QImage::Format,QImageCleanupFunction, void *)" remove="all" /> <!-- ### --> - <modify-function signature="QImage(const char**)"> + <modify-function signature="QImage(const char*[])"> <modify-argument index="1"> <replace-type modified-type="PySequence" /> </modify-argument> @@ -985,7 +1003,7 @@ <add-function signature="__setstate__(PyObject*)" return-type="PyObject"> <inject-code> Shiboken::AutoDecRef func(PyObject_GetAttr(%PYSELF, PyTuple_GET_ITEM(%1, 0))); - PyObject* args = PyTuple_GET_ITEM(%1, 1); + PyObject *args = PyTuple_GET_ITEM(%1, 1); %PYARG_0 = PyObject_Call(func, args, NULL); </inject-code> </add-function> @@ -1300,7 +1318,7 @@ <replace-type modified-type="PyObject"/> </modify-argument> <inject-code class="target" position="beginning"> - int* array = NULL; + int *array = nullptr; bool errorOccurred = false; if (numArgs == 5) { @@ -1328,7 +1346,7 @@ <replace-type modified-type="PyObject"/> </modify-argument> <inject-code class="target" position="beginning"> - int* array = NULL; + int *array = nullptr; bool errorOccurred = false; if (numArgs == 4) { @@ -1376,7 +1394,7 @@ <replace-type modified-type="PyObject"/> </modify-argument> <inject-code class="target" position="beginning"> - int* array = NULL; + int *array = nullptr; bool errorOccurred = false; if (numArgs == 8) { @@ -1404,7 +1422,7 @@ <replace-type modified-type="PyObject"/> </modify-argument> <inject-code class="target" position="beginning"> - int* array = NULL; + int *array = nullptr; bool errorOccurred = false; if (numArgs == 5) { @@ -1432,7 +1450,7 @@ <replace-type modified-type="PyObject"/> </modify-argument> <inject-code class="target" position="beginning"> - int* array = NULL; + int *array = nullptr; bool errorOccurred = false; if (numArgs == 4) { @@ -1597,9 +1615,9 @@ <modify-function signature="setChild(int, int, QStandardItem *)"> <inject-code class="target" position="beginning"> // Clear parent from the old child - QStandardItem* _i = %CPPSELF->child(%1, %2); + QStandardItem *_i = %CPPSELF->child(%1, %2); if (_i) { - PyObject* _pyI = %CONVERTTOPYTHON[QStandardItem*](_i); + PyObject *_pyI = %CONVERTTOPYTHON[QStandardItem*](_i); Shiboken::Object::setParent(0, _pyI); } </inject-code> @@ -1610,9 +1628,9 @@ <modify-function signature="setChild(int, QStandardItem *)"> <inject-code class="target" position="beginning"> // Clear parent from the old child - QStandardItem* _i = %CPPSELF->child(%1); + QStandardItem *_i = %CPPSELF->child(%1); if (_i) { - PyObject* _pyI = %CONVERTTOPYTHON[QStandardItem*](_i); + PyObject *_pyI = %CONVERTTOPYTHON[QStandardItem*](_i); Shiboken::Object::setParent(0, _pyI); } </inject-code> @@ -1990,9 +2008,9 @@ <modify-function signature="setItem(int, int, QStandardItem*)"> <inject-code class="target" position="beginning"> // Clear parent from the old child - QStandardItem* _i = %CPPSELF->item(%1, %2); + QStandardItem *_i = %CPPSELF->item(%1, %2); if (_i) { - PyObject* _pyI = %CONVERTTOPYTHON[QStandardItem*](_i); + PyObject *_pyI = %CONVERTTOPYTHON[QStandardItem*](_i); Shiboken::Object::setParent(0, _pyI); } </inject-code> @@ -2003,9 +2021,9 @@ <modify-function signature="setItem(int, QStandardItem*)"> <inject-code class="target" position="beginning"> // Clear parent from the old child - QStandardItem* _i = %CPPSELF->item(%1); + QStandardItem *_i = %CPPSELF->item(%1); if (_i) { - PyObject* _pyI = %CONVERTTOPYTHON[QStandardItem*](_i); + PyObject *_pyI = %CONVERTTOPYTHON[QStandardItem*](_i); Shiboken::Object::setParent(0, _pyI); } </inject-code> @@ -2022,9 +2040,9 @@ <modify-function signature="setVerticalHeaderItem(int, QStandardItem*)"> <inject-code class="target" position="beginning"> // Clear parent from the old child - QStandardItem* _i = %CPPSELF->verticalHeaderItem(%1); + QStandardItem *_i = %CPPSELF->verticalHeaderItem(%1); if (_i) { - PyObject* _pyI = %CONVERTTOPYTHON[QStandardItem*](_i); + PyObject *_pyI = %CONVERTTOPYTHON[QStandardItem*](_i); Shiboken::Object::setParent(0, _pyI); } </inject-code> @@ -2071,13 +2089,13 @@ <modify-function signature="clear()"> <inject-code class="target" position="beginning"> - Shiboken::BindingManager& bm = Shiboken::BindingManager::instance(); - SbkObject* pyRoot = bm.retrieveWrapper(%CPPSELF.invisibleRootItem()); + Shiboken::BindingManager &bm = Shiboken::BindingManager::instance(); + SbkObject *pyRoot = bm.retrieveWrapper(%CPPSELF.invisibleRootItem()); if (pyRoot) { Shiboken::Object::destroy(pyRoot, %CPPSELF.invisibleRootItem()); } - for(int r=0, r_max = %CPPSELF.rowCount(); r < r_max; r++) { + for (int r=0, r_max = %CPPSELF.rowCount(); r < r_max; r++) { QList<QStandardItem *> ri = %CPPSELF.takeRow(0); PyObject *pyResult = %CONVERTTOPYTHON[QList<QStandardItem * >](ri); @@ -2968,7 +2986,7 @@ <inject-code class="target" position="beginning"> if (PySequence_Size(%PYARG_1) == 16) { float values[16]; - for(int i=0; i < 16; i++) { + for (int i=0; i < 16; i++) { PyObject *pv = PySequence_Fast_GET_ITEM(%PYARG_1, i); values[i] = PyFloat_AsDouble(pv); } @@ -2998,7 +3016,7 @@ float values[16]; %CPPSELF.%FUNCTION_NAME(values); %PYARG_0 = PyTuple_New(16); - for(int i=0; i < 16; i++) { + for (int i = 0; i < 16; i++) { PyObject *v = PyFloat_FromDouble(values[i]); PyTuple_SET_ITEM(%PYARG_0, i, v); } @@ -3028,8 +3046,8 @@ if (PySequence_Check(_key)) { Shiboken::AutoDecRef key(PySequence_Fast(_key, "Invalid matrix index.")); if (PySequence_Fast_GET_SIZE(key.object()) == 2) { - PyObject* posx = PySequence_Fast_GET_ITEM(key.object(), 0); - PyObject* posy = PySequence_Fast_GET_ITEM(key.object(), 1); + PyObject *posx = PySequence_Fast_GET_ITEM(key.object(), 0); + PyObject *posy = PySequence_Fast_GET_ITEM(key.object(), 1); Py_ssize_t x = PyInt_AsSsize_t(posx); Py_ssize_t y = PyInt_AsSsize_t(posy); float ret = (*%CPPSELF)(x,y); @@ -3210,6 +3228,7 @@ <enum-type name="RenderableType"/> <enum-type name="SwapBehavior"/> </value-type> + <object-type name="QOffscreenSurface" since="5.1"/> <primitive-type name="QPlatformSurface"> <extra-includes> <include file-name="QtGui/qpa/qplatformsurface.h" location="global"/> @@ -3263,19 +3282,400 @@ <object-type name="QOpenGLContext"> <enum-type name="OpenGLModuleType" /> </object-type> - <object-type name="QOpenGLFramebufferObject"> + <object-type name="QOpenGLContextGroup" since="5.0"/> + <object-type name="QOpenGLDebugLogger" since="5.1"> + <enum-type name="LoggingMode"/> + </object-type> + <value-type name="QOpenGLDebugMessage" since="5.1"> + <enum-type name="Source" flags="Sources"/> + <enum-type name="Type" flags="Types"/> + <enum-type name="Severity" flags="Severities"/> + </value-type> + <object-type name="QOpenGLFramebufferObject" since="5.0"> <enum-type name="Attachment" /> <enum-type name="FramebufferRestorePolicy" since="5.7"/> </object-type> - <object-type name="QOpenGLShader" > - <enum-type name="ShaderTypeBit" flags="ShaderType" /> + <value-type name="QOpenGLFramebufferObjectFormat"/> + <!-- Compile error on Windows: QOpenGLPaintDevice::QOpenGLPaintDevice(const QOpenGLPaintDevice &)': attempting to reference a deleted function + <object-type name="QOpenGLPaintDevice" since="5.0"/> + --> + <object-type name="QOpenGLExtraFunctions" since="5.6"> + <!-- Exlusions due to compile errors --> + <modify-function signature="glEndTransformFeedback()" remove="all"/> + <modify-function signature="glPauseTransformFeedback()" remove="all"/> + <modify-function signature="glResumeTransformFeedback()" remove="all"/> + <modify-function signature="^glClearBuffer.*\(.*$"> + <modify-argument index="3"><array/></modify-argument> + </modify-function> + <modify-function signature="glDeleteProgramPipelines(int,const unsigned int*)"> + <modify-argument index="2"><array/></modify-argument> + </modify-function> + <modify-function signature="glDeleteQueries(int,const unsigned int*)"> + <modify-argument index="2"><array/></modify-argument> + </modify-function> + <modify-function signature="glDeleteSamplers(int,const unsigned int*)"> + <modify-argument index="2"><array/></modify-argument> + </modify-function> + <modify-function signature="glDeleteTransformFeedbacks(int,const unsigned int *)"> + <modify-argument index="2"><array/></modify-argument> + </modify-function> + <modify-function signature="glDeleteVertexArrays(int,const unsigned int*)"> + <modify-argument index="2"><array/></modify-argument> + </modify-function> + <modify-function signature="glDrawBuffers(int,const unsigned int*)"> + <modify-argument index="2"><array/></modify-argument> + </modify-function> + <modify-function signature="glGenProgramPipelines(int,unsigned int*)"> + <modify-argument index="2"><array/></modify-argument> + </modify-function> + <modify-function signature="glGenQueries(int,unsigned int*)"> + <modify-argument index="2"><array/></modify-argument> + </modify-function> + <modify-function signature="glGenSamplers(int,unsigned int*)"> + <modify-argument index="2"><array/></modify-argument> + </modify-function> + <modify-function signature="glGenTransformFeedbacks(int,unsigned int*)"> + <modify-argument index="2"><array/></modify-argument> + </modify-function> + <modify-function signature="glGenVertexArrays(int,unsigned int*)"> + <modify-argument index="2"><array/></modify-argument> + </modify-function> + <modify-function signature="glGetActiveUniformBlockiv(unsigned int,unsigned int,unsigned int,int*)"> + <modify-argument index="4"><array/></modify-argument> + </modify-function> + <modify-function signature="glGetActiveUniformsiv(unsigned int,int,const unsigned int*,unsigned int,int*)"> + <modify-argument index="3"><array/></modify-argument> + <modify-argument index="5"><array/></modify-argument> + </modify-function> + <modify-function signature="glGetFramebufferParameteriv(unsigned int,unsigned int,int*)"> + <modify-argument index="3"><array/></modify-argument> + </modify-function> + <modify-function signature="glGetIntegeri_v(unsigned int,unsigned int,int*)"> + <modify-argument index="3"><array/></modify-argument> + </modify-function> + <modify-function signature="glGetInternalformativ(unsigned int,unsigned int,unsigned int,int,int*)"> + <modify-argument index="5"><array/></modify-argument> + </modify-function> + <modify-function signature="glGetMultisamplefv(unsigned int,unsigned int,float*)"> + <modify-argument index="3"><array/></modify-argument> + </modify-function> + <modify-function signature="glGetProgramInterfaceiv(unsigned int,unsigned int,unsigned int,int*)"> + <modify-argument index="4"><array/></modify-argument> + </modify-function> + <modify-function signature="glGetProgramPipelineiv(unsigned int,unsigned int,int*)"> + <modify-argument index="3"><array/></modify-argument> + </modify-function> + <modify-function signature="glGetProgramResourceiv(unsigned int,unsigned int,unsigned int,int,const unsigned int*,int,int*,int*)"> + <modify-argument index="5"><array/></modify-argument> + <modify-argument index="7"><array/></modify-argument> + <modify-argument index="8"><array/></modify-argument> + </modify-function> + <modify-function signature="glGetQueryObjectuiv(unsigned int,unsigned int,unsigned int*)"> + <modify-argument index="3"><array/></modify-argument> + </modify-function> + <modify-function signature="glGetQueryiv(unsigned int,unsigned int,int*)"> + <modify-argument index="3"><array/></modify-argument> + </modify-function> + <modify-function signature="glGetSamplerParameterfv(unsigned int,unsigned int,float*)"> + <modify-argument index="3"><array/></modify-argument> + </modify-function> + <modify-function signature="glGetSamplerParameteriv(unsigned int,unsigned int,int*)"> + <modify-argument index="3"><array/></modify-argument> + </modify-function> + <modify-function signature="glGetTexLevelParameteriv(unsigned int,int,unsigned int,int*)"> + <modify-argument index="4"><array/></modify-argument> + </modify-function> + <modify-function signature="glGetTexLevelParameterfv(unsigned int,int,unsigned int,float*)"> + <modify-argument index="4"><array/></modify-argument> + </modify-function> + <modify-function signature="glGetUniformuiv(unsigned int,int,unsigned int*)"> + <modify-argument index="3"><array/></modify-argument> + </modify-function> + <modify-function signature="glGetVertexAttribIiv(unsigned int,unsigned int,int*)"> + <modify-argument index="3"><array/></modify-argument> + </modify-function> + <modify-function signature="glGetVertexAttribIuiv(unsigned int,unsigned int,unsigned int*)"> + <modify-argument index="3"><array/></modify-argument> + </modify-function> + <modify-function signature="glInvalidateFramebuffer(unsigned int,int,const unsigned int*)"> + <modify-argument index="3"><array/></modify-argument> + </modify-function> + <modify-function signature="glInvalidateSubFramebuffer(unsigned int,int,const unsigned int*,int,int,int,int)"> + <modify-argument index="3"><array/></modify-argument> + </modify-function> + <modify-function signature="glProgramUniform1fv(unsigned int,int,int,const float*)"> + <modify-argument index="4"><array/></modify-argument> + </modify-function> + <modify-function signature="glProgramUniform1iv(unsigned int,int,int,const int*)"> + <modify-argument index="4"><array/></modify-argument> + </modify-function> + <modify-function signature="glProgramUniform1uiv(unsigned int,int,int,const unsigned int*)"> + <modify-argument index="4"><array/></modify-argument> + </modify-function> + <modify-function signature="glProgramUniform2fv(unsigned int,int,int,const float*)"> + <modify-argument index="4"><array/></modify-argument> + </modify-function> + <modify-function signature="glProgramUniform2iv(unsigned int,int,int,const int*)"> + <modify-argument index="4"><array/></modify-argument> + </modify-function> + <modify-function signature="glProgramUniform2uiv(unsigned int,int,int,const unsigned int*)"> + <modify-argument index="4"><array/></modify-argument> + </modify-function> + <modify-function signature="glProgramUniform3fv(unsigned int,int,int,const float*)"> + <modify-argument index="4"><array/></modify-argument> + </modify-function> + <modify-function signature="glProgramUniform3iv(unsigned int,int,int,const int*)"> + <modify-argument index="4"><array/></modify-argument> + </modify-function> + <modify-function signature="glProgramUniform3uiv(unsigned int,int,int,const unsigned int*)"> + <modify-argument index="4"><array/></modify-argument> + </modify-function> + <modify-function signature="glProgramUniform4fv(unsigned int,int,int,const float*)"> + <modify-argument index="4"><array/></modify-argument> + </modify-function> + <modify-function signature="glProgramUniform4iv(unsigned int,int,int,const int*)"> + <modify-argument index="4"><array/></modify-argument> + </modify-function> + <modify-function signature="glProgramUniform4uiv(unsigned int,int,int,const unsigned int*)"> + <modify-argument index="4"><array/></modify-argument> + </modify-function> + <modify-function signature="glProgramUniformMatrix2fv(unsigned int,int,int,unsigned char,const float*)"> + <modify-argument index="5"><array/></modify-argument> + </modify-function> + <modify-function signature="glProgramUniformMatrix2x3fv(unsigned int,int,int,unsigned char,const float*)"> + <modify-argument index="5"><array/></modify-argument> + </modify-function> + <modify-function signature="glProgramUniformMatrix2x4fv(unsigned int,int,int,unsigned char,const float*)"> + <modify-argument index="5"><array/></modify-argument> + </modify-function> + <modify-function signature="glProgramUniformMatrix3fv(unsigned int,int,int,unsigned char,const float*)"> + <modify-argument index="5"><array/></modify-argument> + </modify-function> + <modify-function signature="glProgramUniformMatrix3x2fv(unsigned int,int,int,unsigned char,const float*)"> + <modify-argument index="5"><array/></modify-argument> + </modify-function> + <modify-function signature="glProgramUniformMatrix3x4fv(unsigned int,int,int,unsigned char,const float*)"> + <modify-argument index="5"><array/></modify-argument> + </modify-function> + <modify-function signature="glProgramUniformMatrix4fv(unsigned int,int,int,unsigned char,const float*)"> + <modify-argument index="5"><array/></modify-argument> + </modify-function> + <modify-function signature="glProgramUniformMatrix4x2fv(unsigned int,int,int,unsigned char,const float*)"> + <modify-argument index="5"><array/></modify-argument> + </modify-function> + <modify-function signature="glProgramUniformMatrix4x3fv(unsigned int,int,int,unsigned char,const float*)"> + <modify-argument index="5"><array/></modify-argument> + </modify-function> + <modify-function signature="glSamplerParameterfv(unsigned int,unsigned int,const float*)"> + <modify-argument index="3"><array/></modify-argument> + </modify-function> + <modify-function signature="glSamplerParameteriv(unsigned int,unsigned int,const int*)"> + <modify-argument index="3"><array/></modify-argument> + </modify-function> + <modify-function signature="glUniform1uiv(int,int,const unsigned int*)"> + <modify-argument index="3"><array/></modify-argument> + </modify-function> + <modify-function signature="glUniform2uiv(int,int,const unsigned int*)"> + <modify-argument index="3"><array/></modify-argument> + </modify-function> + <modify-function signature="glUniform3uiv(int,int,const unsigned int*)"> + <modify-argument index="3"><array/></modify-argument> + </modify-function> + <modify-function signature="glUniform4uiv(int,int,const unsigned int*)"> + <modify-argument index="3"><array/></modify-argument> + </modify-function> + <modify-function signature="glUniformMatrix2x3fv(int,int,unsigned char,const float*)"> + <modify-argument index="4"><array/></modify-argument> + </modify-function> + <modify-function signature="glUniformMatrix2x4fv(int,int,unsigned char,const float*)"> + <modify-argument index="4"><array/></modify-argument> + </modify-function> + <modify-function signature="glUniformMatrix3x2fv(int,int,unsigned char,const float*)"> + <modify-argument index="4"><array/></modify-argument> + </modify-function> + <modify-function signature="glUniformMatrix3x4fv(int,int,unsigned char,const float*)"> + <modify-argument index="4"><array/></modify-argument> + </modify-function> + <modify-function signature="glUniformMatrix4x2fv(int,int,unsigned char,const float*)"> + <modify-argument index="4"><array/></modify-argument> + </modify-function> + <modify-function signature="glUniformMatrix4x3fv(int,int,unsigned char,const float*)"> + <modify-argument index="4"><array/></modify-argument> + </modify-function> + <modify-function signature="glVertexAttribI4iv(unsigned int,const int*)"> + <modify-argument index="2"><array/></modify-argument> + </modify-function> + <modify-function signature="glVertexAttribI4uiv(unsigned int,const unsigned int*)"> + <modify-argument index="2"><array/></modify-argument> + </modify-function> + <modify-function signature="glGetStringi(unsigned int,unsigned int)"> + <modify-argument index="return"> + <replace-type modified-type="QString" /> + </modify-argument> + <inject-code class="target" position="beginning"> + <insert-template name="glGetString_return_QString"/> + </inject-code> + </modify-function> + </object-type> + <object-type name="QOpenGLFunctions" since="5.0"> + <enum-type name="OpenGLFeature" flags="OpenGLFeatures"/> + <modify-function signature="glGetAttachedShaders(unsigned int,int,int*,unsigned int*)"> + <modify-argument index="3"><array/></modify-argument> + <modify-argument index="4"><array/></modify-argument> + </modify-function> + <modify-function signature="glGetBufferParameteriv(unsigned int,unsigned int,int*)"> + <modify-argument index="3"><array/></modify-argument> + </modify-function> + <modify-function signature="glGetFloatv(unsigned int,float*)"> + <modify-argument index="2"><array/></modify-argument> + </modify-function> + <modify-function signature="glGetFramebufferAttachmentParameteriv(unsigned int,unsigned int,unsigned int,int*)"> + <modify-argument index="4"><array/></modify-argument> + </modify-function> + <modify-function signature="glGetIntegerv(unsigned int,int*)"> + <modify-argument index="2"><array/></modify-argument> + </modify-function> + <modify-function signature="glGetProgramiv(unsigned int,unsigned int,int*)"> + <modify-argument index="3"><array/></modify-argument> + </modify-function> + <modify-function signature="glGetRenderbufferParameteriv(unsigned int,unsigned int,int*)"> + <modify-argument index="3"><array/></modify-argument> + </modify-function> + <modify-function signature="glGetShaderiv(unsigned int,unsigned int,int*)"> + <modify-argument index="3"><array/></modify-argument> + </modify-function> + <modify-function signature="glGetShaderPrecisionFormat(unsigned int,unsigned int,int*,int*)"> + <modify-argument index="3"><array/></modify-argument> + <modify-argument index="4"><array/></modify-argument> + </modify-function> + <modify-function signature="^glDelete.*s\(.*$"> + <modify-argument index="2"><array/></modify-argument> + </modify-function> + <modify-function signature="^glGen[A-Z].*s\(.*$"> + <modify-argument index="2"><array/></modify-argument> + </modify-function> + <modify-function signature="^gl(Get)?TexParameter[fi]v\(.*$"> + <modify-argument index="3"><array/></modify-argument> + </modify-function> + <modify-function signature="^glUniformMatrix\dfv\(.*$"> + <modify-argument index="4"><array/></modify-argument> + </modify-function> + <modify-function signature="^gl(Get)?Uniform\d?.v\(.*$"> + <modify-argument index="3"><array/></modify-argument> + </modify-function> + <modify-function signature="^glVertexAttrib\dfv\(.*$"> + <modify-argument index="2"><array/></modify-argument> + </modify-function> + <modify-function signature="^glGetVertexAttrib[fi]v\(.*$"> + <modify-argument index="3"><array/></modify-argument> + </modify-function> + <modify-function signature="glGetString(unsigned int)"> + <modify-argument index="return"> + <replace-type modified-type="QString" /> + </modify-argument> + <inject-code class="target" position="beginning"> + <insert-template name="glGetString_return_QString"/> + </inject-code> + </modify-function> </object-type> - <!-- Temporarily disable type, because it causes segfault on Linux due to incorrect parsing - of the void setUniformValue(const char *name, const GLfloat value[2][2]); method. - The float[][] ends up with an "Array" cpp signature, which obviously can't be found in the - typesystem. - <object-type name="QOpenGLShaderProgram" /> + <object-type name="QAbstractOpenGLFunctions" since="5.1"/> + <!-- Classes are result of a macro expansion in src/gui/opengl/qopenglversionfunctions.h + <object-type name="QOpenGLFunctions_1_0" since="5.1"/> + <object-type name="QOpenGLFunctions_1_1" since="5.1"/> + <object-type name="QOpenGLFunctions_1_2" since="5.1"/> + <object-type name="QOpenGLFunctions_1_3" since="5.1"/> + <object-type name="QOpenGLFunctions_1_4" since="5.1"/> + <object-type name="QOpenGLFunctions_1_5" since="5.1"/> + <object-type name="QOpenGLFunctions_2_0" since="5.1"> + <object-type name="QOpenGLFunctions_2_1" since="5.1"/> + <object-type name="QOpenGLFunctions_3_0" since="5.1"/> + <object-type name="QOpenGLFunctions_3_1" since="5.1"/> + <object-type name="QOpenGLFunctions_3_2_Compatibility" since="5.1"/> + <object-type name="QOpenGLFunctions_3_2_Core" since="5.1"/> + <object-type name="QOpenGLFunctions_3_3_Compatibility" since="5.1"/> + <object-type name="QOpenGLFunctions_3_3_Core" since="5.1"/> + <object-type name="QOpenGLFunctions_4_0_Compatibility" since="5.1"/> + <object-type name="QOpenGLFunctions_4_0_Core" since="5.1"/> + <object-type name="QOpenGLFunctions_4_1_Compatibility" since="5.1"/> + <object-type name="QOpenGLFunctions_4_1_Core" since="5.1"/> + <object-type name="QOpenGLFunctions_4_2_Compatibility" since="5.1"/> + <object-type name="QOpenGLFunctions_4_2_Core" since="5.1"/> + <object-type name="QOpenGLFunctions_4_3_Compatibility" since="5.1"/> + <object-type name="QOpenGLFunctions_4_3_Core" since="5.1"/> + <object-type name="QOpenGLFunctions_4_4_Compatibility" since="5.5/> + <object-type name="QOpenGLFunctions_4_4_Core" since="5.5"/> + <object-type name="QOpenGLFunctions_4_5_Compatibility since="5.5""/> + <object-type name="QOpenGLFunctions_4_5_Core" since="5.5"/> + <object-type name="QOpenGLFunctions_ES2" since="5.1"/> --> + <value-type name="QOpenGLPixelTransferOptions"/> + <object-type name="QOpenGLShader" since="5.0"> + <enum-type name="ShaderTypeBit" flags="ShaderType" /> + </object-type> + <object-type name="QOpenGLShaderProgram" since="5.0"> + <modify-function signature="setAttributeArray(int,const float*,int,int)"> + <modify-argument index="2"><array/></modify-argument> + </modify-function> + <modify-function signature="setAttributeArray(const char*,const float*,int,int)"> + <modify-argument index="2"><array/></modify-argument> + </modify-function> + <modify-function signature="setAttributeValue(int,const float*,int,int)"> + <modify-argument index="2"><array/></modify-argument> + </modify-function> + <modify-function signature="setAttributeValue(const char*,const float*,int,int)"> + <modify-argument index="2"><array/></modify-argument> + </modify-function> + <modify-function signature="setUniformValueArray(int,const float*,int,int)"> + <modify-argument index="2"><array/></modify-argument> + </modify-function> + <modify-function signature="setUniformValueArray(int,const int*,int)"> + <modify-argument index="2"><array/></modify-argument> + </modify-function> + <modify-function signature="setUniformValueArray(int,const unsigned int*,int)"> + <modify-argument index="2"><array/></modify-argument> + </modify-function> + <modify-function signature="setUniformValueArray(const char*,const float *,int,int)"> + <modify-argument index="2"><array/></modify-argument> + </modify-function> + <modify-function signature="setUniformValueArray(const char*,const int*,int)"> + <modify-argument index="2"><array/></modify-argument> + </modify-function> + <modify-function signature="setUniformValueArray(const char *,const unsigned int*,int)"> + <modify-argument index="2"><array/></modify-argument> + </modify-function> + </object-type> + <object-type name="QOpenGLTexture" since="5.2"> + <enum-type name="BindingTarget"/> + <enum-type name="CoordinateDirection"/> + <enum-type name="ComparisonFunction"/> + <enum-type name="ComparisonMode"/> + <enum-type name="CubeMapFace"/> + <enum-type name="DepthStencilMode"/> + <enum-type name="Feature" flags="Features"/> + <enum-type name="Filter"/> + <enum-type name="MipMapGeneration"/> + <enum-type name="PixelFormat"/> + <enum-type name="PixelType"/> + <enum-type name="SwizzleComponent"/> + <enum-type name="SwizzleValue"/> + <enum-type name="Target"/> + <enum-type name="TextureFormat"/> + <enum-type name="TextureFormatClass"/> + <enum-type name="TextureUnitReset"/> + <enum-type name="WrapMode"/> + <modify-function signature="borderColor(unsigned int*)const" remove="all"/> + <modify-function signature="borderColor(int*)const" remove="all"/> + <modify-function signature="borderColor(float*)const" remove="all"/> + </object-type> + <object-type name="QOpenGLTimeMonitor" since="5.1"/> + <object-type name="QOpenGLTimerQuery" since="5.1"/> + <object-type name="QOpenGLWindow" since="5.4"> + <enum-type name="UpdateBehavior"/> + </object-type> + <value-type name="QOpenGLVersionProfile" since="5.1"/> + <object-type name="QOpenGLVertexArrayObject"> + <object-type name="Binder"/> + </object-type> <value-type name="QPageLayout"> <enum-type name="Mode"/> <enum-type name="Orientation"/> diff --git a/sources/pyside2/PySide2/QtHelp/CMakeLists.txt b/sources/pyside2/PySide2/QtHelp/CMakeLists.txt index ba8b419f3..342863a4f 100644 --- a/sources/pyside2/PySide2/QtHelp/CMakeLists.txt +++ b/sources/pyside2/PySide2/QtHelp/CMakeLists.txt @@ -11,15 +11,12 @@ ${QtHelp_GEN_DIR}/qhelpindexwidget_wrapper.cpp ${QtHelp_GEN_DIR}/qhelpsearchengine_wrapper.cpp ${QtHelp_GEN_DIR}/qhelpsearchquerywidget_wrapper.cpp ${QtHelp_GEN_DIR}/qhelpsearchquery_wrapper.cpp +${QtHelp_GEN_DIR}/qhelpsearchresult_wrapper.cpp ${QtHelp_GEN_DIR}/qhelpsearchresultwidget_wrapper.cpp # module is always needed ${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 +43,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..6bd5dd364 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"> @@ -61,5 +61,6 @@ <enum-type name="FieldName"/> </value-type> <object-type name="QHelpSearchQueryWidget"/> + <object-type name="QHelpSearchResult"/> <object-type name="QHelpSearchResultWidget"/> </typesystem> 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 9565b4334..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"/> @@ -77,7 +77,7 @@ </modify-function> --> <!-- TODO: PYSIDE-354, arrays are not supported --> - <modify-function signature="mapPlanes(QAbstractVideoBuffer::MapMode,int*,Array,Array)" remove="all"/> + <modify-function signature="mapPlanes(QAbstractVideoBuffer::MapMode,int*,int[4],uchar*[4])" remove="all"/> </object-type> <object-type name="QAbstractVideoSurface"> <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 2643f1ca9..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"/> @@ -181,8 +181,10 @@ <enum-type name="SpecialAddress"/> <!-- ### QHostAddress(QIPv6Address) does this --> <modify-function signature="QHostAddress(quint8*)" remove="all" /> - <!-- ### --> + <modify-function signature="QHostAddress(const quint8*)" remove="all" /> + <!-- ### --> <modify-function signature="setAddress(quint8*)" remove="all" /> + <modify-function signature="setAddress(const quint8*)" remove="all" /> </value-type> <value-type name="QHostInfo"> 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 d5c701b6f..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"/> @@ -59,6 +59,16 @@ <rejection class="QGLColormap::QGLColormapData"/> <rejection class="QGLContext" field-name="currentCtx"/> + <rejection class="^QGL.*$" argument-type="^GLboolean( const)?\*$"/> + <rejection class="^QGL.*$" argument-type="^GLchar( const)?\*$"/> + <rejection class="^QGL.*$" argument-type="GLchar *const const*"/> + <rejection class="^QGL.*$" argument-type="^GLenum( const)?\*$"/> + <rejection class="^QGL.*$" argument-type="^GLfloat( const)?\*$"/> + <rejection class="^QGL.*$" argument-type="^GLfloat( const)?\[.*$"/> + <rejection class="^QGL.*$" argument-type="^GLdouble( const)?\*$"/> + <rejection class="^QGL.*$" argument-type="GLintptr"/> + <rejection class="^QGL.*$" argument-type="^GLint64( const)?\*$"/> + <rejection class="^QGL.*$" argument-type="^GLsizei( const)?\*$"/> <namespace-type name="QGL"> <enum-type name="FormatOption" flags="FormatOptions" force-integer="yes"/> @@ -681,8 +691,6 @@ <!-- ### --> <!-- ### Use QMatrixZxY overloads --> - <modify-function signature="setUniformValue(int,Array)" remove="all" /> - <modify-function signature="setUniformValue(const char*,Array)" remove="all" /> <modify-function signature="setAttributeValue(int,const GLfloat*,int,int)" remove="all" /> <modify-function signature="setAttributeValue(const char*,const GLfloat*,int,int)" remove="all" /> <modify-function signature="setAttributeArray(int, GLenum, const void*, int, int)" remove="all" since="4.7" /> 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 4cee02eec..5183ec798 100644 --- a/sources/pyside2/PySide2/QtQuick/typesystem_quick.xml +++ b/sources/pyside2/PySide2/QtQuick/typesystem_quick.xml @@ -40,12 +40,11 @@ ****************************************************************************/ --> <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"/> - <primitive-type name="GLuint"/> <smart-pointer-type name="QSharedPointer" type="shared" getter="data" /> <extra-includes> 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/typesystem_script.xml b/sources/pyside2/PySide2/QtScript/typesystem_script.xml index 46ee824c1..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"> 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..0573ab5cd 100644 --- a/sources/pyside2/PySide2/QtSql/CMakeLists.txt +++ b/sources/pyside2/PySide2/QtSql/CMakeLists.txt @@ -20,9 +20,8 @@ ${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}) +configure_file("${QtSql_SOURCE_DIR}/QtSql_global.pre.h.in" + "${QtSql_BINARY_DIR}/QtSql_global.pre.h" @ONLY) set(QtSql_include_dirs ${QtSql_SOURCE_DIR} ${QtSql_BINARY_DIR} @@ -50,6 +49,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/QtSql_global.pre.h.in b/sources/pyside2/PySide2/QtSql/QtSql_global.pre.h.in new file mode 100644 index 000000000..0c20c1888 --- /dev/null +++ b/sources/pyside2/PySide2/QtSql/QtSql_global.pre.h.in @@ -0,0 +1,5 @@ +// QT_WIDGETS_LIB must be defined for QSqlRelationalDelegate to become visible. + +#if @Qt5Widgets_FOUND@ +# define QT_WIDGETS_LIB +#endif 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..6d2630f10 100644 --- a/sources/pyside2/PySide2/QtTest/CMakeLists.txt +++ b/sources/pyside2/PySide2/QtTest/CMakeLists.txt @@ -7,9 +7,11 @@ ${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}) +configure_file("${QtTest_SOURCE_DIR}/QtTest_global.pre.h.in" + "${QtTest_BINARY_DIR}/QtTest_global.pre.h" @ONLY) + +configure_file("${QtTest_SOURCE_DIR}/QtTest_global.post.h.in" + "${QtTest_BINARY_DIR}/QtTest_global.post.h" @ONLY) set(QtTest_include_dirs ${QtTest_SOURCE_DIR} ${QtTest_BINARY_DIR} @@ -38,6 +40,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/QtTest_global.post.h.in b/sources/pyside2/PySide2/QtTest/QtTest_global.post.h.in new file mode 100644 index 000000000..ccd18153c --- /dev/null +++ b/sources/pyside2/PySide2/QtTest/QtTest_global.post.h.in @@ -0,0 +1 @@ +#include "pysideqtesttouch.h" diff --git a/sources/pyside2/PySide2/QtTest/QtTest_global.pre.h.in b/sources/pyside2/PySide2/QtTest/QtTest_global.pre.h.in new file mode 100644 index 000000000..65daf1b84 --- /dev/null +++ b/sources/pyside2/PySide2/QtTest/QtTest_global.pre.h.in @@ -0,0 +1,5 @@ +// QT_WIDGETS_LIB changes code generation in pysideqtesttouch.h + +#if @Qt5Widgets_FOUND@ +# define QT_WIDGETS_LIB +#endif diff --git a/sources/pyside2/PySide2/QtTest/typesystem_test.xml b/sources/pyside2/PySide2/QtTest/typesystem_test.xml index 61a3ee850..c976704b8 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*>"/> @@ -51,6 +51,7 @@ <rejection class="QTest" function-name="qCompare<double,qreal>"/> <rejection class="QTest" function-name="qCompare<qreal,double>"/> <rejection class="QTest" function-name="qCompare"/> + <rejection class="QTest" function-name="qInit"/> <rejection class="QTest" function-name="qVerify"/> <rejection class="QTest" function-name="qSleep"/> <rejection class="QTest" function-name="toHexRepresentation"/> diff --git a/sources/pyside2/PySide2/QtTextToSpeech/CMakeLists.txt b/sources/pyside2/PySide2/QtTextToSpeech/CMakeLists.txt new file mode 100644 index 000000000..63b5a3669 --- /dev/null +++ b/sources/pyside2/PySide2/QtTextToSpeech/CMakeLists.txt @@ -0,0 +1,35 @@ +project(QtTextToSpeech) + +set(QtTextToSpeech_SRC +${QtTextToSpeech_GEN_DIR}/qtexttospeech_wrapper.cpp +${QtTextToSpeech_GEN_DIR}/qtexttospeechengine_wrapper.cpp +${QtTextToSpeech_GEN_DIR}/qvoice_wrapper.cpp +# module is always needed +${QtTextToSpeech_GEN_DIR}/qttexttospeech_module_wrapper.cpp +) + +set(QtTextToSpeech_include_dirs ${QtTextToSpeech_SOURCE_DIR} + ${QtTextToSpeech_BINARY_DIR} + ${Qt5Core_INCLUDE_DIRS} + ${Qt5TextToSpeech_INCLUDE_DIRS} + ${SHIBOKEN_INCLUDE_DIR} + ${libpyside_SOURCE_DIR} + ${SHIBOKEN_PYTHON_INCLUDE_DIR} + ${QtCore_GEN_DIR}) + +set(QtTextToSpeech_libraries pyside2 + ${SHIBOKEN_PYTHON_LIBRARIES} + ${SHIBOKEN_LIBRARY} + ${Qt5Multimedia_LIBRARIES} + ${Qt5TextToSpeech_LIBRARIES} + ${Qt5Core_LIBRARIES}) + +set(QtTextToSpeech_deps QtCore QtMultimedia) + +create_pyside_module(QtTextToSpeech + QtTextToSpeech_include_dirs + QtTextToSpeech_libraries + QtTextToSpeech_deps + QtTextToSpeech_SOURCE_DIR + QtTextToSpeech_SRC + "") diff --git a/sources/pyside2/PySide2/QtTextToSpeech/typesystem_texttospeech.xml b/sources/pyside2/PySide2/QtTextToSpeech/typesystem_texttospeech.xml new file mode 100644 index 000000000..d5006de6f --- /dev/null +++ b/sources/pyside2/PySide2/QtTextToSpeech/typesystem_texttospeech.xml @@ -0,0 +1,53 @@ +<?xml version="1.0"?> +<!-- +/**************************************************************************** +** +** Copyright (C) 2017 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$ +** +****************************************************************************/ +--> +<typesystem package="PySide2.QtTextToSpeech"> + <load-typesystem name="QtCore/typesystem_core.xml" generate="no" /> + + <object-type name="QTextToSpeech"> + <enum-type name="State"/> + </object-type> + <object-type name="QTextToSpeechEngine"/> + <value-type name="QVoice"> + <enum-type name="Gender"/> + <enum-type name="Age"/> + </value-type> +</typesystem> 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 f8255db07..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"> @@ -54,11 +54,11 @@ <object-type name="QWebEngineDownloadItem"> <enum-type name="DownloadState" /> </object-type> - + <!-- TODO: Deal with private constructor <value-type name="QWebEngineHistory" /> --> - <value-type name="QWebEngineHistoryItem" /> + <object-type name="QWebEngineHistoryItem" /> <object-type name="QWebEnginePage"> <enum-type name="WebAction" /> 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..0f8d8da4e 100644 --- a/sources/pyside2/PySide2/QtWebKitWidgets/typesystem_webkitwidgets.xml +++ b/sources/pyside2/PySide2/QtWebKitWidgets/typesystem_webkitwidgets.xml @@ -40,12 +40,12 @@ ****************************************************************************/ --> <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="typesystem_printsupport.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="QtPrintSupport/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..27dff2912 100644 --- a/sources/pyside2/PySide2/QtWidgets/CMakeLists.txt +++ b/sources/pyside2/PySide2/QtWidgets/CMakeLists.txt @@ -23,6 +23,7 @@ ${QtWidgets_GEN_DIR}/qbuttongroup_wrapper.cpp ${QtWidgets_GEN_DIR}/qcalendarwidget_wrapper.cpp ${QtWidgets_GEN_DIR}/qcheckbox_wrapper.cpp ${QtWidgets_GEN_DIR}/qcolordialog_wrapper.cpp +${QtWidgets_GEN_DIR}/qcolormap_wrapper.cpp ${QtWidgets_GEN_DIR}/qcolumnview_wrapper.cpp ${QtWidgets_GEN_DIR}/qcombobox_wrapper.cpp ${QtWidgets_GEN_DIR}/qcommandlinkbutton_wrapper.cpp @@ -212,10 +213,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 +238,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 1663e4f4e..0555d9a53 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"/> @@ -190,6 +190,9 @@ <enum-type name="ViewItemPosition"/> </value-type> + <value-type name="QColormap"> + <enum-type name="Mode"/> + </value-type> <value-type name="QSizePolicy"> <enum-type name="ControlType" flags="ControlTypes"/> <enum-type name="Policy"/> @@ -212,7 +215,7 @@ <add-function signature="__next__()" return-type="PyObject*"> <inject-code class="target" position="beginning"> if (**%CPPSELF) { - QTreeWidgetItemIterator* %0 = new QTreeWidgetItemIterator((*%CPPSELF)++); + QTreeWidgetItemIterator *%0 = new QTreeWidgetItemIterator((*%CPPSELF)++); %PYARG_0 = %CONVERTTOPYTHON[QTreeWidgetItemIterator*](%0); } </inject-code> @@ -220,7 +223,7 @@ <add-function signature="value()" return-type="QTreeWidgetItem*"> <inject-code> - QTreeWidgetItem* %0 = %CPPSELF.operator*(); + QTreeWidgetItem *%0 = %CPPSELF.operator*(); %PYARG_0 = %CONVERTTOPYTHON[QTreeWidgetItem*](%0); Shiboken::Object::releaseOwnership(%PYARG_0); </inject-code> @@ -264,7 +267,7 @@ <enum-type name="GraphicsItemFlag" flags="GraphicsItemFlags"/> <enum-type name="PanelModality" since="4.6"/> <inject-code class="target" position="end"> - PyObject* userTypeConstant = PyInt_FromLong(QGraphicsItem::UserType); + PyObject *userTypeConstant = PyInt_FromLong(QGraphicsItem::UserType); PyDict_SetItemString(Sbk_QGraphicsItem_Type.super.ht_type.tp_dict, "UserType", userTypeConstant); </inject-code> <modify-function signature="setParentItem(QGraphicsItem *)"> @@ -274,7 +277,7 @@ </modify-function> <template name="scene_return_parenting"> if (%0) { - QObject* parent = %0->parent(); + QObject *parent = %0->parent(); Shiboken::AutoDecRef pyParent(%CONVERTTOPYTHON[QObject*](parent)); Shiboken::Object::setParent(pyParent, %PYARG_0); } @@ -432,6 +435,16 @@ <reference-count action="set"/> </modify-argument> </modify-function> + <modify-function signature="setItemDelegateForColumn(int, QAbstractItemDelegate*)"> + <modify-argument index="2"> + <reference-count action="set"/> + </modify-argument> + </modify-function> + <modify-function signature="setItemDelegateForRow(int, QAbstractItemDelegate*)"> + <modify-argument index="2"> + <reference-count action="set"/> + </modify-argument> + </modify-function> <modify-function signature="viewOptions()const"> <modify-argument index="return"> <replace-default-expression with="QStyleOptionViewItem()" /> @@ -1576,7 +1589,7 @@ </modify-function> <!-- TODO: Support conversions on virtual function --> - <modify-function signature="drawItems(QPainter*, int, QGraphicsItem**, const QStyleOptionGraphicsItem*)"> + <modify-function signature="drawItems(QPainter*, int, QGraphicsItem*[], const QStyleOptionGraphicsItem[])"> <modify-argument index="2"> <remove-argument/> <conversion-rule class="native"> @@ -1688,7 +1701,7 @@ <enum-type name="SceneLayer" flags="SceneLayers"/> <!-- Qt5: note: this was called 'obsolete'. Is that true? --> - <modify-function signature="drawItems(QPainter*,int,QGraphicsItem**,const QStyleOptionGraphicsItem*,QWidget*)" remove="all" /> + <modify-function signature="drawItems(QPainter*,int,QGraphicsItem*[],const QStyleOptionGraphicsItem[],QWidget*)" remove="all" /> <modify-function signature="createItemGroup(const QList<QGraphicsItem*>&)"> <modify-argument index="1"> @@ -2146,6 +2159,22 @@ <parent index="this" action="remove"/> </modify-argument> </modify-function> + <modify-function signature="clear()"> + <inject-code class="target" position="beginning"> + Shiboken::BindingManager &bm = Shiboken::BindingManager::instance(); + PyObject *pyObj; + for (int i = 0; i < %CPPSELF.count(); i++) { + QListWidgetItem *item = %CPPSELF.item(i); + if ((pyObj = reinterpret_cast<PyObject*>(bm.retrieveWrapper(item))) != 0) { + Py_INCREF(pyObj); + Shiboken::Object::setParent(NULL, pyObj); + Shiboken::Object::invalidate(pyObj); + Py_DECREF(pyObj); + } + } + %CPPSELF.%FUNCTION_NAME(); + </inject-code> + </modify-function> </object-type> <object-type name="QWidget"> @@ -2402,7 +2431,7 @@ </modify-argument> </modify-function> </object-type> - + <object-type name="QMessageBox"> <enum-type name="ButtonRole"/> <enum-type name="Icon"/> @@ -2608,7 +2637,7 @@ <insert-template name="return_for_QFileDialog"/> </inject-code> </modify-function> - + <modify-function signature="getOpenFileUrl(QWidget*, const QString&, const QUrl&, const QString&, QString*, QFlags<QFileDialog::Option>, const QStringList&)" allow-thread="yes"> <modify-argument index="return"> <replace-type modified-type="(fileName, selectedFilter)"/> @@ -2973,7 +3002,7 @@ </modify-argument> <inject-code> - QAction* action = %CPPSELF.addAction(%1, %2); + QAction *action = %CPPSELF.addAction(%1, %2); %PYARG_0 = %CONVERTTOPYTHON[QAction*](action); Shiboken::AutoDecRef result(PyObject_CallMethod(%PYARG_0, "connect", "OsO", %PYARG_0, SIGNAL(triggered()), %PYARG_3)); </inject-code> @@ -2989,7 +3018,7 @@ <parent index="this" action="add"/> </modify-argument> <inject-code> - QAction* action = %CPPSELF.addAction(%1); + QAction *action = %CPPSELF.addAction(%1); %PYARG_0 = %CONVERTTOPYTHON[QAction*](action); Shiboken::AutoDecRef result(PyObject_CallMethod(%PYARG_0, "connect", "OsO", %PYARG_0, SIGNAL(triggered()), %PYARG_2)); </inject-code> 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..4f0111905 100644 --- a/sources/pyside2/PySide2/QtX11Extras/CMakeLists.txt +++ b/sources/pyside2/PySide2/QtX11Extras/CMakeLists.txt @@ -6,11 +6,8 @@ ${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}) +configure_file("${QtX11Extras_SOURCE_DIR}/QtX11Extras_global.post.h.in" + "${QtX11Extras_BINARY_DIR}/QtX11Extras_global.post.h" @ONLY) set(QtX11Extras_include_dirs ${QtX11Extras_SOURCE_DIR} ${QtX11Extras_BINARY_DIR} @@ -35,6 +32,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/QtX11Extras_global.post.h.in b/sources/pyside2/PySide2/QtX11Extras/QtX11Extras_global.post.h.in new file mode 100644 index 000000000..abdaf3d5f --- /dev/null +++ b/sources/pyside2/PySide2/QtX11Extras/QtX11Extras_global.post.h.in @@ -0,0 +1 @@ +#include <QtX11Extras/QX11Info> 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/global.h.in b/sources/pyside2/PySide2/global.h.in index 6bddcfcce..60afc1744 100644 --- a/sources/pyside2/PySide2/global.h.in +++ b/sources/pyside2/PySide2/global.h.in @@ -37,345 +37,13 @@ ** ****************************************************************************/ -#undef QT_NO_STL - -#undef QT_NO_STL_WCHAR -#define Q_BYTE_ORDER // used to enable QSysInfo.Endian detection on MacOSX - -#if defined(__OBJC__) && !defined(__cplusplus) -# warning "File built in Objective-C mode (.m), but using Qt requires Objective-C++ (.mm)" -#endif - #include <QtCore/qnamespace.h> -QT_BEGIN_NAMESPACE - - -class QByteArray; -struct QArrayData; -typedef QArrayData QByteArrayData; - -class QString; - -#ifndef Q_MOC_OUTPUT_REVISION -#define Q_MOC_OUTPUT_REVISION 67 -#endif - -// The following macros are our "extensions" to C++ -// They are used, strictly speaking, only by the moc. - - -#ifndef QT_NO_META_MACROS -// macro for onaming members -#ifdef METHOD -#undef METHOD -#endif -#ifdef SLOT -#undef SLOT -#endif -#ifdef SIGNAL -#undef SIGNAL -#endif -#endif // QT_NO_META_MACROS - -Q_CORE_EXPORT const char *qFlagLocation(const char *method); - -#ifndef QT_NO_META_MACROS -#ifndef QT_NO_DEBUG -# define QLOCATION "\0" __FILE__ ":" QT_STRINGIFY(__LINE__) -# ifndef QT_NO_KEYWORDS -# define METHOD(a) qFlagLocation("0"#a QLOCATION) -# endif -# define SLOT(a) qFlagLocation("1"#a QLOCATION) -# define SIGNAL(a) qFlagLocation("2"#a QLOCATION) -#else -# ifndef QT_NO_KEYWORDS -# define METHOD(a) "0"#a -# endif -# define SLOT(a) "1"#a -# define SIGNAL(a) "2"#a -#endif - -#define QMETHOD_CODE 0 // member type codes -#define QSLOT_CODE 1 -#define QSIGNAL_CODE 2 -#endif // QT_NO_META_MACROS - -#define Q_ARG(type, data) QArgument<type >(#type, data) -#define Q_RETURN_ARG(type, data) QReturnArgument<type >(#type, data) - -class QObject; -class QMetaMethod; -class QMetaEnum; -class QMetaProperty; -class QMetaClassInfo; - - -class Q_CORE_EXPORT QGenericArgument -{ -public: - inline QGenericArgument(const char *aName = 0, const void *aData = 0) - : _data(aData), _name(aName) {} - inline void *data() const { return const_cast<void *>(_data); } - inline const char *name() const { return _name; } - -private: - const void *_data; - const char *_name; -}; - -class Q_CORE_EXPORT QGenericReturnArgument: public QGenericArgument -{ -public: - inline QGenericReturnArgument(const char *aName = 0, void *aData = 0) - : QGenericArgument(aName, aData) - {} -}; - -template <class T> -class QArgument: public QGenericArgument -{ -public: - inline QArgument(const char *aName, const T &aData) - : QGenericArgument(aName, static_cast<const void *>(&aData)) - {} -}; -template <class T> -class QArgument<T &>: public QGenericArgument -{ -public: - inline QArgument(const char *aName, T &aData) - : QGenericArgument(aName, static_cast<const void *>(&aData)) - {} -}; - - -template <typename T> -class QReturnArgument: public QGenericReturnArgument -{ -public: - inline QReturnArgument(const char *aName, T &aData) - : QGenericReturnArgument(aName, static_cast<void *>(&aData)) - {} -}; - -struct Q_CORE_EXPORT QMetaObject -{ - class Connection; - const char *className() const; - const QMetaObject *superClass() const; - - QObject *cast(QObject *obj) const; - const QObject *cast(const QObject *obj) const; - -#ifndef QT_NO_TRANSLATION - QString tr(const char *s, const char *c, int n = -1) const; -#endif // QT_NO_TRANSLATION - - int methodOffset() const; - int enumeratorOffset() const; - int propertyOffset() const; - int classInfoOffset() const; - - int constructorCount() const; - int methodCount() const; - int enumeratorCount() const; - int propertyCount() const; - int classInfoCount() const; - - int indexOfConstructor(const char *constructor) const; - int indexOfMethod(const char *method) const; - int indexOfSignal(const char *signal) const; - int indexOfSlot(const char *slot) const; - int indexOfEnumerator(const char *name) const; - int indexOfProperty(const char *name) const; - int indexOfClassInfo(const char *name) const; - - QMetaMethod constructor(int index) const; - QMetaMethod method(int index) const; - QMetaEnum enumerator(int index) const; - QMetaProperty property(int index) const; - QMetaClassInfo classInfo(int index) const; - QMetaProperty userProperty() const; - - static bool checkConnectArgs(const char *signal, const char *method); - static bool checkConnectArgs(const QMetaMethod &signal, - const QMetaMethod &method); - static QByteArray normalizedSignature(const char *method); - static QByteArray normalizedType(const char *type); - - // internal index-based connect - static Connection connect(const QObject *sender, int signal_index, - const QObject *receiver, int method_index, - int type = 0, int *types = 0); - // internal index-based disconnect - static bool disconnect(const QObject *sender, int signal_index, - const QObject *receiver, int method_index); - static bool disconnectOne(const QObject *sender, int signal_index, - const QObject *receiver, int method_index); - // internal slot-name based connect - static void connectSlotsByName(QObject *o); - - // internal index-based signal activation - static void activate(QObject *sender, int signal_index, void **argv); - static void activate(QObject *sender, const QMetaObject *, int local_signal_index, void **argv); - static void activate(QObject *sender, int signal_offset, int local_signal_index, void **argv); - - static bool invokeMethod(QObject *obj, const char *member, - Qt::ConnectionType, - QGenericReturnArgument ret, - QGenericArgument val0 = QGenericArgument(0), - QGenericArgument val1 = QGenericArgument(), - QGenericArgument val2 = QGenericArgument(), - QGenericArgument val3 = QGenericArgument(), - QGenericArgument val4 = QGenericArgument(), - QGenericArgument val5 = QGenericArgument(), - QGenericArgument val6 = QGenericArgument(), - QGenericArgument val7 = QGenericArgument(), - QGenericArgument val8 = QGenericArgument(), - QGenericArgument val9 = QGenericArgument()); - - static inline bool invokeMethod(QObject *obj, const char *member, - QGenericReturnArgument ret, - QGenericArgument val0 = QGenericArgument(0), - QGenericArgument val1 = QGenericArgument(), - QGenericArgument val2 = QGenericArgument(), - QGenericArgument val3 = QGenericArgument(), - QGenericArgument val4 = QGenericArgument(), - QGenericArgument val5 = QGenericArgument(), - QGenericArgument val6 = QGenericArgument(), - QGenericArgument val7 = QGenericArgument(), - QGenericArgument val8 = QGenericArgument(), - QGenericArgument val9 = QGenericArgument()) - { - return invokeMethod(obj, member, Qt::AutoConnection, ret, val0, val1, val2, val3, - val4, val5, val6, val7, val8, val9); - } - - static inline bool invokeMethod(QObject *obj, const char *member, - Qt::ConnectionType type, - QGenericArgument val0 = QGenericArgument(0), - QGenericArgument val1 = QGenericArgument(), - QGenericArgument val2 = QGenericArgument(), - QGenericArgument val3 = QGenericArgument(), - QGenericArgument val4 = QGenericArgument(), - QGenericArgument val5 = QGenericArgument(), - QGenericArgument val6 = QGenericArgument(), - QGenericArgument val7 = QGenericArgument(), - QGenericArgument val8 = QGenericArgument(), - QGenericArgument val9 = QGenericArgument()) - { - return invokeMethod(obj, member, type, QGenericReturnArgument(), val0, val1, val2, - val3, val4, val5, val6, val7, val8, val9); - } - - static inline bool invokeMethod(QObject *obj, const char *member, - QGenericArgument val0 = QGenericArgument(0), - QGenericArgument val1 = QGenericArgument(), - QGenericArgument val2 = QGenericArgument(), - QGenericArgument val3 = QGenericArgument(), - QGenericArgument val4 = QGenericArgument(), - QGenericArgument val5 = QGenericArgument(), - QGenericArgument val6 = QGenericArgument(), - QGenericArgument val7 = QGenericArgument(), - QGenericArgument val8 = QGenericArgument(), - QGenericArgument val9 = QGenericArgument()) - { - return invokeMethod(obj, member, Qt::AutoConnection, QGenericReturnArgument(), val0, - val1, val2, val3, val4, val5, val6, val7, val8, val9); - } - - QObject *newInstance(QGenericArgument val0 = QGenericArgument(0), - QGenericArgument val1 = QGenericArgument(), - QGenericArgument val2 = QGenericArgument(), - QGenericArgument val3 = QGenericArgument(), - QGenericArgument val4 = QGenericArgument(), - QGenericArgument val5 = QGenericArgument(), - QGenericArgument val6 = QGenericArgument(), - QGenericArgument val7 = QGenericArgument(), - QGenericArgument val8 = QGenericArgument(), - QGenericArgument val9 = QGenericArgument()) const; - - enum Call { - InvokeMetaMethod, - ReadProperty, - WriteProperty, - ResetProperty, - QueryPropertyDesignable, - QueryPropertyScriptable, - QueryPropertyStored, - QueryPropertyEditable, - QueryPropertyUser, - CreateInstance, - IndexOfMethod, - RegisterPropertyMetaType, - RegisterMethodArgumentMetaType - }; - - int static_metacall(Call, int, void **) const; - static int metacall(QObject *, Call, int, void **); - - struct { // private data - const QMetaObject *superdata; - const QByteArrayData *stringdata; - const uint *data; - typedef void (*StaticMetacallFunction)(QObject *, QMetaObject::Call, int, void **); - StaticMetacallFunction static_metacall; - const QMetaObject * const *relatedMetaObjects; - void *extradata; //reserved for future use - } d; -}; - -class Q_CORE_EXPORT QMetaObject::Connection { - void *d_ptr; //QObjectPrivate::Connection* - explicit Connection(void *data) : d_ptr(data) { } - friend class QObject; - friend class QObjectPrivate; - friend struct QMetaObject; -public: - ~Connection(); - Connection(); - Connection(const Connection &other); - Connection &operator=(const Connection &other); -#ifdef Q_QDOC - operator bool() const; -#else - typedef void *Connection::*RestrictedBool; - operator RestrictedBool() const { return d_ptr ? &Connection::d_ptr : 0; } -#endif - -#ifdef Q_COMPILER_RVALUE_REFS - inline Connection(Connection &&o) : d_ptr(o.d_ptr) { o.d_ptr = 0; } - inline Connection &operator=(Connection &&other) - { qSwap(d_ptr, other.d_ptr); return *this; } -#endif -}; - -inline const QMetaObject *QMetaObject::superClass() const -{ return d.superdata; } - -namespace QtPrivate { - /* Trait that tells is a the Object has a Q_OBJECT macro */ - template <typename Object> struct HasQ_OBJECT_Macro { - template <typename T> - static char test(int (T::*)(QMetaObject::Call, int, void **)); - static int test(int (Object::*)(QMetaObject::Call, int, void **)); - enum { Value = sizeof(test(&Object::qt_metacall)) == sizeof(int) }; - }; -} - -QT_END_NAMESPACE - -// This Q_QDOC definition is only a convenience, since the shiboken parser is -// happier with the simplified constructions. XXX remove this for Qt 5.7. -#define Q_QDOC - #if @ENABLE_X11@ #define Q_OS_X11 #elif @ENABLE_MAC@ #define Q_OS_MAC #elif @ENABLE_WIN@ - #include "pysidewtypes.h" #define Q_OS_WIN #endif @@ -383,46 +51,7 @@ QT_END_NAMESPACE // not in release #define QT_NO_DEBUG -#include <QtCore/QtCore> -#if @ENABLE_MAC@ || @ENABLE_WIN@ || @ENABLE_X11@ - // Workaround to parse the QApplication header - #define Q_INTERNAL_QAPP_SRC - #undef Q_QDOC -#endif -#if @Qt5Gui_FOUND@ -# include <QtGui/QtGui> -#endif -#if @Qt5Widgets_FOUND@ -# include <QtWidgets/QtWidgets> -#endif -#ifndef Q_QDOC -// Make sure that Q_QDOC is defined for as much modules as possible. -// This creates more wrappers without extra work. -// Will disappear when we have a really good parser! -# define Q_QDOC -#endif - -#include "qpytextobject.h" // PySide class - -#if @ENABLE_X11@ -# if @Qt5X11Extras_FOUND@ -# include <QtX11Extras/QX11Info> -# endif -#elif @ENABLE_MAC@ -# include <QtGui/qmacstyle_mac.h> -#endif - -// QT_WIDGETS_LIB must be defined to QSqlRelationalDelegate become visible. -// It also changes code generation in pysideqtesttouch.h -#define QT_WIDGETS_LIB -#undef Q_DECLARE_INTERFACE - -#if @Qt5Test_FOUND@ -# include "pysideqtesttouch.h" -#endif - -#ifndef QT_NO_OPENGL -# include <@GL_H@> -#endif // QT_NO_OPENGL +// Make "signals:", "slots:" visible as access specifiers +#define QT_ANNOTATE_ACCESS_SPECIFIER(a) __attribute__((annotate(#a))) // Here are now all configured modules appended: diff --git a/sources/pyside2/PySide2/support/signature/mapping.py b/sources/pyside2/PySide2/support/signature/mapping.py index a04a9e921..2bedbb1bf 100644 --- a/sources/pyside2/PySide2/support/signature/mapping.py +++ b/sources/pyside2/PySide2/support/signature/mapping.py @@ -283,6 +283,8 @@ def init_QtCore(): "zero(PySide2.QtCore.QPoint)": Default("PySide2.QtCore.QPoint"), "zero(unsigned char)": 0, "zero(PySide2.QtCore.QEvent.Type)": None, + "CheckIndexOption.NoOption": Instance( + "PySide2.QtCore.QAbstractItemModel.CheckIndexOptions.NoOption"), # 5.11 }) try: type_map.update({ diff --git a/sources/pyside2/PySide2/typesystem_templates.xml b/sources/pyside2/PySide2/typesystem_templates.xml index e0b47b6e3..11a384263 100644 --- a/sources/pyside2/PySide2/typesystem_templates.xml +++ b/sources/pyside2/PySide2/typesystem_templates.xml @@ -167,6 +167,14 @@ %PYARG_0 = %CONVERTTOPYTHON[QRectF](rect_); </template> + <template name="glGetString_return_QString"> + %BEGIN_ALLOW_THREADS + const GLubyte *us = %CPPSELF.%FUNCTION_NAME(%ARGUMENT_NAMES); + const QString s = QString::fromLocal8Bit(reinterpret_cast<const char *>(us)); + %END_ALLOW_THREADS + %PYARG_0 = %CONVERTTOPYTHON[QString](s); + </template> + <template name="fix_args,QRect*"> QRect rect_; %BEGIN_ALLOW_THREADS diff --git a/sources/pyside2/cmake/Macros/PySideModules.cmake b/sources/pyside2/cmake/Macros/PySideModules.cmake index 0bef89b0c..36488912d 100644 --- a/sources/pyside2/cmake/Macros/PySideModules.cmake +++ b/sources/pyside2/cmake/Macros/PySideModules.cmake @@ -54,34 +54,38 @@ 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) # Contains include directories to pass to shiboken's preprocessor. set(shiboken_include_dirs ${pyside2_SOURCE_DIR}${PATH_SEP}${QT_INCLUDE_DIR}) + set(shiboken_framework_include_dirs_option "") if(CMAKE_HOST_APPLE) - # On macOS, provide the framework paths for OpenGL headers. - set(shiboken_include_dirs ${shiboken_include_dirs} ${CMAKE_SYSTEM_FRAMEWORK_PATH}) + set(shiboken_framework_include_dirs "${QT_FRAMEWORK_INCLUDE_DIR}") + make_path(shiboken_framework_include_dirs ${shiboken_framework_include_dirs}) + set(shiboken_framework_include_dirs_option "--framework-include-paths=${shiboken_framework_include_dirs}") endif() # 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} - --typesystem-paths=${pyside2_SOURCE_DIR}${PATH_SEP}${${module_typesystem_path}} + ${shiboken_framework_include_dirs_option} + --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} @@ -100,6 +104,8 @@ macro(create_pyside_module LIBRARY_OUTPUT_DIRECTORY ${pyside2_BINARY_DIR}) if(WIN32) set_target_properties(${module_name} PROPERTIES SUFFIX ".pyd") + # Sanitize windows.h as pulled by gl.h to prevent clashes with QAbstract3dAxis::min(), etc. + set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DNOMINMAX") endif() target_link_libraries(${module_name} ${${module_libraries}}) @@ -113,7 +119,19 @@ macro(create_pyside_module install(FILES ${CMAKE_CURRENT_BINARY_DIR}/PySide2/${module_name}/pyside2_${lower_module_name}_python.h DESTINATION include/PySide2${pyside2_SUFFIX}/${module_name}/) file(GLOB typesystem_files ${CMAKE_CURRENT_SOURCE_DIR}/typesystem_*.xml ${typesystem_path}) - install(FILES ${typesystem_files} DESTINATION share/PySide2${pyside2_SUFFIX}/typesystems) + +# Copy typesystem files and remove module names from the <load-typesystem> element +# so that it works in a flat directory: +# <load-typesystem name="QtWidgets/typesystem_widgets.xml" ... -> +# <load-typesystem name="typesystem_widgets.xml" + foreach(typesystem_file ${typesystem_files}) + get_filename_component(typesystem_file_name "${typesystem_file}" NAME) + file(READ "${typesystem_file}" typesystemXml) + string(REGEX REPLACE "<load-typesystem name=\"[^/\"]+/" "<load-typesystem name=\"" typesystemXml "${typesystemXml}") + set (typesystem_target_file "${CMAKE_CURRENT_BINARY_DIR}/PySide2/typesystems/${typesystem_file_name}") + file(WRITE "${typesystem_target_file}" "${typesystemXml}") + install(FILES "${typesystem_target_file}" DESTINATION share/PySide2${pyside2_SUFFIX}/typesystems) + endforeach() endmacro() #macro(check_qt_class_with_namespace module namespace class optional_source_files dropped_entries [namespace] [module]) @@ -161,7 +179,11 @@ macro(check_qt_class module class optional_source_files dropped_entries) # Don't add version tagging, because for some reason linker fails with: # (.qtversion[qt_version_tag]+0x0): undefined reference to `qt_version_tag' - set(ADDITIONAL_FLAGS "${ADDITIONAL_FLAGS} -DQT_NO_VERSION_TAGGING") + # Force usage of the C++11 standard. CMAKE_CXX_STANDARD does not work with try_compile + # but the issue has a fix in CMake 3.9. Thus we use a terrible workaround, we pass the C++ + # standard flag the way CheckCXXSourceCompiles.cmake does it. + + set(ADDITIONAL_FLAGS "${ADDITIONAL_FLAGS} -DQT_NO_VERSION_TAGGING ${CMAKE_CXX11_EXTENSION_COMPILE_OPTION}") try_compile(Q_WORKS ${CMAKE_BINARY_DIR} ${SRC_FILE} diff --git a/sources/pyside2/doc/CMakeLists.txt b/sources/pyside2/doc/CMakeLists.txt index 14af9735b..326e5ae7d 100644 --- a/sources/pyside2/doc/CMakeLists.txt +++ b/sources/pyside2/doc/CMakeLists.txt @@ -1,11 +1,79 @@ +cmake_minimum_required(VERSION 3.1) +cmake_policy(VERSION 3.1) + project(doc) -set(DOC_DATA_DIR "${CMAKE_CURRENT_BINARY_DIR}/qdoc3-output") +if (WIN32) + set(PATH_SEP "\;") +else() + set(PATH_SEP ":") +endif() + +set(DOC_DATA_DIR "${CMAKE_CURRENT_BINARY_DIR}/qdoc-output") +configure_file("pyside-config.qdocconf.in" "${CMAKE_CURRENT_LIST_DIR}/pyside-config.qdocconf" @ONLY) + +get_filename_component(ROOT ${CMAKE_CURRENT_BINARY_DIR} DIRECTORY) +set(TS_ROOT "${ROOT}/PySide2") + +file(REMOVE ${CMAKE_CURRENT_LIST_DIR}/pyside.qdocconf ${CMAKE_CURRENT_LIST_DIR}/pyside.qdocconf.in) + +# For Qt modules that are part of the documentation build: +# - Configure the module docconf file +# - Write shiboken header consisting of pyside2_global.h and module includes +# - Build include path for qdoc for shiboken + +# The last element of the include list is the mkspec directory containing qplatformdefs.h +list(GET Qt5Core_INCLUDE_DIRS -1 mkspecInclude) +set(QDOC_INCPATH -I "${QT_INCLUDE_DIR}" -I "${mkspecInclude}") + +file(READ "${pyside2_BINARY_DIR}/pyside2_global.h" docHeaderContents) +file(READ "typesystem_doc.xml.in" typeSystemDocXmlContents) + +foreach(moduleIn ${all_module_shortnames}) + string(TOLOWER "${moduleIn}" lowerModuleIn) + set(docConf "${CMAKE_CURRENT_LIST_DIR}/qtmodules/pyside-qt${lowerModuleIn}.qdocconf.in") + if(EXISTS "${docConf}") + string(REGEX REPLACE "(^.*)\.in" "\\1" OUTFILE ${docConf}) + get_filename_component(BASENAME ${OUTFILE} NAME) + configure_file(${docConf} "${CMAKE_CURRENT_LIST_DIR}/qtmodules/${BASENAME}" @ONLY) + file(APPEND "pyside.qdocconf.in" "\@CMAKE_CURRENT_LIST_DIR\@/qtmodules/${BASENAME}\n") + # Handle docconf files in Qt that contain multiple modules + if ("${moduleIn}" STREQUAL "3DExtras") + set(modules 3DCore 3DRender 3DInput 3DLogic 3DAnimation "${moduleIn}") + elseif ("${moduleIn}" STREQUAL "QuickWidgets") + set(modules Qml Quick "${moduleIn}") + else() + set(modules "${moduleIn}") + endif() + foreach(module ${modules}) + string(TOLOWER "${module}" lowerModule) + # -- @TODO fix this for macOS frameworks. + list(APPEND QDOC_INCPATH + -I "${QT_INCLUDE_DIR}Qt${module}" + -I "${QT_INCLUDE_DIR}Qt${module}/${Qt5Core_VERSION}" + -I "${QT_INCLUDE_DIR}Qt${module}/${Qt5Core_VERSION}/Qt${module}") + + set(docHeaderContents "${docHeaderContents}\n#include <Qt${module}/Qt${module}>") + set(typeSystemDocXmlContents "${typeSystemDocXmlContents}\n<load-typesystem name=\"Qt${module}/typesystem_${lowerModule}.xml\" generate=\"yes\"/>") + endforeach() + endif() +endforeach() + +set(typeSystemDocXmlContents "${typeSystemDocXmlContents}\n</typesystem>\n") +file(WRITE "${CMAKE_CURRENT_BINARY_DIR}/typesystem_doc.xml" "${typeSystemDocXmlContents}") + +set(docHeader "${pyside2_BINARY_DIR}/qdoc.h") +file(WRITE ${docHeader} "${docHeaderContents}") + configure_file("pyside.qdocconf.in" "pyside.qdocconf" @ONLY) -add_custom_target(qdoc3 - COMMAND qdoc3 pyside.qdocconf - COMMENT "Running qdoc3 against Qt source code..." +set(QDOC_TYPESYSTEM_PATH "${pyside2_SOURCE_DIR}${PATH_SEP}${pyside2_BINARY_DIR}") + +add_custom_target(qdoc + # Use dummy Qt version information, QDoc needs it but has no effect on WebXML output + COMMAND ${CMAKE_COMMAND} -E env BUILDDIR=${CMAKE_CURRENT_LIST_DIR}/src QT_INSTALL_DOCS=${QT_SRC_DIR}/doc QT_VERSION=1.0.0 QT_VER=1.0 QT_VERSION_TAG=100 + qdoc pyside.qdocconf ${QDOC_INCPATH} -single-exec -installdir ${DOC_DATA_DIR} -outputdir ${DOC_DATA_DIR} + COMMENT "Running qdoc against Qt source code..." SOURCE "pyside.qdocconf") add_custom_target(apidoc @@ -15,25 +83,23 @@ add_custom_target(apidoc # create conf.py based on conf.py.in configure_file("conf.py.in" "rst/conf.py" @ONLY) -configure_file(typesystem_doc.xml.in typesystem_doc.xml @ONLY) add_custom_target("docrsts" - COMMAND ${SHIBOKEN_BINARY} --generator-set=qtdoc - ${pyside2_BINARY_DIR}/pyside_global.h - --include-paths="${QT_INCLUDE_DIR}${PATH_SEP}${pyside2_SOURCE_DIR}" + COMMAND ${SHIBOKEN_BINARY} --generator-set=qtdoc ${docHeader} + --include-paths="${QT_INCLUDE_DIR}${PATH_SEP}${pyside2_SOURCE_DIR}${PATH_SEP}${TS_ROOT}" --api-version=${SUPPORTED_QT_VERSION} - --typesystem-paths="${pyside2_SOURCE_DIR}${PATH_SEP}${QtCore_SOURCE_DIR}${PATH_SEP}${QtGui_SOURCE_DIR}${PATH_SEP}${QtGui_BINARY_DIR}${PATH_SEP}${QtHelp_SOURCE_DIR}${PATH_SEP}${QtMultimedia_SOURCE_DIR}${PATH_SEP}${QtNetwork_SOURCE_DIR}${PATH_SEP}${QtOpenGL_SOURCE_DIR}${PATH_SEP}${QtScript_SOURCE_DIR}${PATH_SEP}${QtScriptTools_SOURCE_DIR}${PATH_SEP}${QtSql_SOURCE_DIR}${PATH_SEP}${QtSvg_SOURCE_DIR}${PATH_SEP}${QtTest_SOURCE_DIR}${PATH_SEP}${QtUiTools_SOURCE_DIR}${PATH_SEP}${QtWebKit_SOURCE_DIR}${PATH_SEP}${QtXml_SOURCE_DIR}${PATH_SEP}${QtXmlPatterns_SOURCE_DIR}" + --typesystem-paths="${QDOC_TYPESYSTEM_PATH}" --library-source-dir=${QT_SRC_DIR} - --documentation-data-dir=${DOC_DATA_DIR} + --documentation-data-dir=${DOC_DATA_DIR}/webxml --output-directory=${CMAKE_CURRENT_BINARY_DIR}/rst - --documentation-code-snippets-dir=${CMAKE_CURRENT_SOURCE_DIR}/codesnippets${PATH_SEP}${CMAKE_CURRENT_SOURCE_DIR}/codesnippets/examples + --documentation-code-snippets-dir=${CMAKE_CURRENT_SOURCE_DIR}/codesnippets/doc/src/snippets${PATH_SEP}${CMAKE_CURRENT_SOURCE_DIR}/codesnippets/examples --documentation-extra-sections-dir=${CMAKE_CURRENT_SOURCE_DIR}/extras ${CMAKE_CURRENT_BINARY_DIR}/typesystem_doc.xml WORKING_DIRECTORY ${${module}_SOURCE_DIR} COMMENT "Running generator to generate documentation..." ) add_dependencies(apidoc docrsts) -add_dependencies(docrsts qdoc3) +add_dependencies(docrsts qdoc) # #create devhelp file # add_custom_target(apidevhelp diff --git a/sources/pyside2/doc/_templates/index.html b/sources/pyside2/doc/_templates/index.html index 8da417682..901ddc496 100644 --- a/sources/pyside2/doc/_templates/index.html +++ b/sources/pyside2/doc/_templates/index.html @@ -4,18 +4,19 @@ <div class="section"> <h1>PySide {{ version }} Reference</h1> - <p><a href="http://www.qtsoftware.com/">Qt</a> is a cross-platform application framework from Qt Software (owned by Nokia). - It features a large number of libraries providing services like network abstraction and XML handling, along with a very rich - GUI package, allowing C++ developers to write their applications once and run them unmodified in different systems. + <p><a href="http://www.qt.io/">Qt</a> is a complete cross-platform software framework. PySide aims to provide Python developers access to the Qt libraries in the most natural way.</p> - <p>PySide is built using the <a href="http://www.pyside.org/docs/shiboken">Shiboken</a> binding generator.</p> + <p>PySide is built using the Shiboken binding generator.</p> <h2>Notes</h2> <h3>About 0 vs None</h3> - <p>The PySide class reference documentation is automatically generated from the original Qt documentation for C++, some parts were tuned to fit the Python world. However, it's not possible to rewrite all Qt docs as it would require a really huge effort, so if the documentation says you can use 0 on an QObject argument, interpret it as None.</p> + <p>The PySide class reference documentation is automatically generated from the original + Qt documentation for C++, some parts were tuned to fit the Python world. However, it's not + possible to rewrite all Qt docs as it would require a really huge effort, so if the + documentation says you can use 0 on an QObject argument, interpret it as None.</p> <h3>About keyword arguments</h3> @@ -25,34 +26,83 @@ <table class="contentstable" align="center" ><tr> <td width="50%"> - <p class="biglink"><a class="biglink" href="{{ pathto("PySide/QtCore/index") }}">QtCore</a><br/> + <p class="biglink"><a class="biglink" href="{{ pathto("PySide2/Qt3DAnimation/index") }}">Qt3DAnimation</a><br/> + <span class="linkdescr">provides a set of prebuilt elements to help you get started with Qt 3D</span></p> + <p class="biglink"><a class="biglink" href="{{ pathto("PySide2/Qt3DCore/index") }}">Qt3DCore</a><br/> + <span class="linkdescr">contains functionality to support near-realtime simulation systems</span></p> + <p class="biglink"><a class="biglink" href="{{ pathto("PySide2/Qt3DExtras/index") }}">Qt3DExtras</a><br/> + <span class="linkdescr"> provides a set of prebuilt elements to help you get started with Qt 3D</span></p> + <p class="biglink"><a class="biglink" href="{{ pathto("PySide2/Qt3DInput/index") }}">Qt3DInput</a><br/> + <span class="linkdescr"></span>provides classes for handling user input in applications using Qt3D</p> + <p class="biglink"><a class="biglink" href="{{ pathto("PySide2/Qt3DLogic/index") }}">Qt3DLogic</a><br/> + <span class="linkdescr">enables synchronizing frames with the Qt 3D backend</span></p> + <p class="biglink"><a class="biglink" href="{{ pathto("PySide2/Qt3DRender/index") }}">Qt3DRender</a><br/> + <span class="linkdescr"></span>contains functionality to support 2D and 3D rendering using Qt 3D</p> + <p class="biglink"><a class="biglink" href="{{ pathto("PySide2/QtAxContainer/index") }}">QtAxContainer</a><br/> + <span class="linkdescr">provides QAxObject and QAxWidget which act as + containers for COM objects and ActiveX controls</span></p> + <p class="biglink"><a class="biglink" href="{{ pathto("PySide2/QtCharts/index") }}">QtCharts</a><br/> + <span class="linkdescr">provides a set of easy to use chart components</span></p> + <p class="biglink"><a class="biglink" href="{{ pathto("PySide2/QtConcurrent/index") }}">QtConcurrent</a><br/> + <span class="linkdescr">provides high-level APIs that make it possible + to write multi-threaded programs without using low-level threading + primitives such as mutexes, read-write locks, wait conditions, or semaphores</span></p> + <p class="biglink"><a class="biglink" href="{{ pathto("PySide2/QtCore/index") }}">QtCore</a><br/> <span class="linkdescr">core non-GUI functionality</span></p> - <p class="biglink"><a class="biglink" href="{{ pathto("PySide/QtGui/index") }}">QtGui</a><br/> + <p class="biglink"><a class="biglink" href="{{ pathto("PySide2/QtDataVisualization/index") }}">QtDataVisualization</a><br/> + <span class="linkdescr">provides a way to visualize data in 3D as bar, scatter, and surface graphs</span></p> + <p class="biglink"><a class="biglink" href="{{ pathto("PySide2/QtGui/index") }}">QtGui</a><br/> <span class="linkdescr">extends QtCore with GUI functionality.</span></p> - <p class="biglink"><a class="biglink" href="{{ pathto("PySide/QtHelp/index") }}">QtHelp</a><br/> + <p class="biglink"><a class="biglink" href="{{ pathto("PySide2/QtMacExtras/index") }}">QtMacExtras</a><br/> + <span class="linkdescr">provides classes and functions specific to + macOS and iOS operating systems</span></p> + <p class="biglink"><a class="biglink" href="{{ pathto("PySide2/QtHelp/index") }}">QtHelp</a><br/> <span class="linkdescr">provides classes for integrating online documentation in applications</span></p> - <p class="biglink"><a class="biglink" href="{{ pathto("PySide/QtMultimedia/index") }}">QtMultimedia</a><br/> + <p class="biglink"><a class="biglink" href="{{ pathto("PySide2/QtMultimedia/index") }}">QtMultimedia</a><br/> <span class="linkdescr">provides low-level multimedia functionality</span></p> - <p class="biglink"><a class="biglink" href="{{ pathto("PySide/QtNetwork/index") }}">QtNetwork</a><br/> + <p class="biglink"><a class="biglink" href="{{ pathto("PySide2/QtMultimediaWidgets/index") }}">QtMultimediaWidgets</a><br/> + <span class="linkdescr">provides the widget-based multimedia API</span></p> + <p class="biglink"><a class="biglink" href="{{ pathto("PySide2/QtNetwork/index") }}">QtNetwork</a><br/> <span class="linkdescr">offers classes that allow you to write TCP/IP clients and servers</span></p> - <p class="biglink"><a class="biglink" href="{{ pathto("PySide/QtOpenGL/index") }}">QtOpenGL</a><br/> - <span class="linkdescr">offers classes that make it easy to use OpenGL in Qt applications</span></p> - <p class="biglink"><a class="biglink" href="{{ pathto("PySide/QtScript/index") }}">QtScript</a><br/> - <span class="linkdescr">provides classes for making Qt applications scriptable</span></p> </td> <td width="50%"> - <p class="biglink"><a class="biglink" href="{{ pathto("PySide/QtScriptTools/index") }}">QtScriptTools</a><br/> - <span class="linkdescr">provides additional components for applications that use Qt Script</span></p> - <p class="biglink"><a class="biglink" href="{{ pathto("PySide/QtSql/index") }}">QtSql</a><br/> + <p class="biglink"><a class="biglink" href="{{ pathto("PySide2/QtOpenGL/index") }}">QtOpenGL</a><br/> + <span class="linkdescr">offers classes that make it easy to use OpenGL in Qt applications</span></p> + <p class="biglink"><a class="biglink" href="{{ pathto("PySide2/QtPrintSupport/index") }}">QtPrintSupport</a><br/> + <span class="linkdescr">provides cross-platform support for printing</span></p> + <p class="biglink"><a class="biglink" href="{{ pathto("PySide2/QtQml/index") }}">QtQml</a><br/> + <span class="linkdescr">Python API for Qt QML</span></p> + <p class="biglink"><a class="biglink" href="{{ pathto("PySide2/QtQuick/index") }}">QtQuick</a><br/> + <span class="linkdescr">provides classes for embedding Qt Quick in Qt applications</span></p> + <p class="biglink"><a class="biglink" href="{{ pathto("PySide2/QtQuickWidgets/index") }}">QtQuickWidgets</a><br/> + <span class="linkdescr">provides the QQuickWidget class for embedding Qt Quick in widget-based applications</span></p> + <p class="biglink"><a class="biglink" href="{{ pathto("PySide2/QtTextToSpeech/index") }}">QtTextToSpeech</a><br/> + <span class="linkdescr">provides C++ API to access text-to-speech engines</span></p> + <p class="biglink"><a class="biglink" href="{{ pathto("PySide2/QtSql/index") }}">QtSql</a><br/> <span class="linkdescr">helps you provide seamless database integration to your Qt applications</span></p> - <p class="biglink"><a class="biglink" href="{{ pathto("PySide/QtSvg/index") }}">QtSvg</a><br/> + <p class="biglink"><a class="biglink" href="{{ pathto("PySide2/QtSvg/index") }}">QtSvg</a><br/> <span class="linkdescr">provides classes for displaying the contents of SVG files</span></p> - <p class="biglink"><a class="biglink" href="{{ pathto("PySide/QtUiTools/index") }}">QtUiTools</a><br/> + <p class="biglink"><a class="biglink" href="{{ pathto("PySide2/QtTest/index") }}">QtTest</a><br/> + <span class="linkdescr">provides classes for unit testing Qt applications and libraries</span></p> + <p class="biglink"><a class="biglink" href="{{ pathto("PySide2/QtUiTools/index") }}">QtUiTools</a><br/> <span class="linkdescr">provides classes to handle forms created with Qt Designer</span></p> - <p class="biglink"><a class="biglink" href="{{ pathto("PySide/QtXml/index") }}">QtXml</a><br/> + <p class="biglink"><a class="biglink" href="{{ pathto("PySide2/QtWebChannel/index") }}">QtWebChannel</a><br/> + <span class="linkdescr">enables peer-to-peer communication between a server and a client + (HTML/JavaScript or QML application)</span></p> + <p class="biglink"><a class="biglink" href="{{ pathto("PySide2/QtWebSockets/index") }}">QtWebSockets</a><br/> + <span class="linkdescr"></span>provides interfaces that enable Qt applications + to act as a server that can process WebSocket requests, or a client that + can consume data received from the server, or both</p> + <p class="biglink"><a class="biglink" href="{{ pathto("PySide2/QtWidgets/index") }}">QtWidgets</a><br/> + <span class="linkdescr">extends Qt GUI with C++ widget functionality.</span></p> + <p class="biglink"><a class="biglink" href="{{ pathto("PySide2/QtWinExtras/index") }}">QtWinExtras</a><br/> + <span class="linkdescr">provides classes and functions for using some Windows APIs in a Qt way</span></p> + <p class="biglink"><a class="biglink" href="{{ pathto("PySide2/QtX11Extras/index") }}">QtX11Extras</a><br/> + <span class="linkdescr">provides information about the X display configuration</span></p> + <p class="biglink"><a class="biglink" href="{{ pathto("PySide2/QtXml/index") }}">QtXml</a><br/> <span class="linkdescr">provides a stream reader and writer for XML documents</span></p> - <p class="biglink"><a class="biglink" href="{{ pathto("PySide/QtWebKit/index") }}">QtWebkit</a><br/> - <span class="linkdescr">provides a Web browser engine</span></p> + <p class="biglink"><a class="biglink" href="{{ pathto("PySide2/QtXmlPatterns/index") }}">QtXmlPatterns</a><br/> + <span class="linkdescr">provides support for XPath, XQuery, XSLT and XML Schema validation</span></p> </td></tr> </table> diff --git a/sources/pyside2/doc/_templates/layout.html b/sources/pyside2/doc/_templates/layout.html index 9dc53722d..d2eb1d08d 100644 --- a/sources/pyside2/doc/_templates/layout.html +++ b/sources/pyside2/doc/_templates/layout.html @@ -26,9 +26,7 @@ {%- block footer %} <div class="footer"> - <a href="http://www.indt.org.br"><img src="{{ pathto('_static/logo_indt.jpg', 1) }}" alt="Indt" border="0" /></a> - <a href="http://www.openbossa.org"><img src="{{ pathto('_static/logo_openbossa.png', 1) }}" alt="Openbossa" border="0" /></a> - <a href="http://qt.nokia.com/"><img src="{{ pathto('_static/logo_qt.png', 1) }}" alt="Qt" border="0" /></a> + <a href="http://www.qt.io/"><img src="{{ pathto('_static/logo_qt.png', 1) }}" alt="Qt" border="0" /></a> <a href="http://www.python.org"><img src="{{ pathto('_static/logo_python.jpg', 1) }}" alt="Python" border="0" /></a> </div> </div> diff --git a/sources/pyside2/doc/_themes/pysidedocs/static/logo_indt.jpg b/sources/pyside2/doc/_themes/pysidedocs/static/logo_indt.jpg Binary files differdeleted file mode 100644 index 2a1fbe7a1..000000000 --- a/sources/pyside2/doc/_themes/pysidedocs/static/logo_indt.jpg +++ /dev/null diff --git a/sources/pyside2/doc/_themes/pysidedocs/static/logo_openbossa.png b/sources/pyside2/doc/_themes/pysidedocs/static/logo_openbossa.png Binary files differdeleted file mode 100644 index 51e868d6e..000000000 --- a/sources/pyside2/doc/_themes/pysidedocs/static/logo_openbossa.png +++ /dev/null diff --git a/sources/pyside2/doc/codesnippets/doc/src/snippets/alphachannel.cpp b/sources/pyside2/doc/codesnippets/doc/src/snippets/alphachannel.cpp index 4606ce7b5..df5430bb0 100644 --- a/sources/pyside2/doc/codesnippets/doc/src/snippets/alphachannel.cpp +++ b/sources/pyside2/doc/codesnippets/doc/src/snippets/alphachannel.cpp @@ -21,13 +21,13 @@ ## "Redistribution and use in source and binary forms, with or without ## modification, are permitted provided that the following conditions are ## met: -## # Redistributions of source code must retain the above copyright +## * Redistributions of source code must retain the above copyright ## notice, this list of conditions and the following disclaimer. -## # Redistributions in binary form must reproduce the above copyright +## * Redistributions in binary form must reproduce the above copyright ## notice, this list of conditions and the following disclaimer in ## the documentation and/or other materials provided with the ## distribution. -## # Neither the name of The Qt Company Ltd nor the names of its +## * Neither the name of The Qt Company Ltd nor the names of its ## contributors may be used to endorse or promote products derived ## from this software without specific prior written permission. ## diff --git a/sources/pyside2/doc/codesnippets/doc/src/snippets/clipboard/clipwindow.cpp b/sources/pyside2/doc/codesnippets/doc/src/snippets/clipboard/clipwindow.cpp index 42ff004ac..2e4c967e2 100644 --- a/sources/pyside2/doc/codesnippets/doc/src/snippets/clipboard/clipwindow.cpp +++ b/sources/pyside2/doc/codesnippets/doc/src/snippets/clipboard/clipwindow.cpp @@ -21,13 +21,13 @@ ## "Redistribution and use in source and binary forms, with or without ## modification, are permitted provided that the following conditions are ## met: -## # Redistributions of source code must retain the above copyright +## * Redistributions of source code must retain the above copyright ## notice, this list of conditions and the following disclaimer. -## # Redistributions in binary form must reproduce the above copyright +## * Redistributions in binary form must reproduce the above copyright ## notice, this list of conditions and the following disclaimer in ## the documentation and/or other materials provided with the ## distribution. -## # Neither the name of The Qt Company Ltd nor the names of its +## * Neither the name of The Qt Company Ltd nor the names of its ## contributors may be used to endorse or promote products derived ## from this software without specific prior written permission. ## diff --git a/sources/pyside2/doc/codesnippets/doc/src/snippets/code/src_corelib_io_qsettings.cpp b/sources/pyside2/doc/codesnippets/doc/src/snippets/code/src_corelib_io_qsettings.cpp index 2297e6894..9ddf2d602 100644 --- a/sources/pyside2/doc/codesnippets/doc/src/snippets/code/src_corelib_io_qsettings.cpp +++ b/sources/pyside2/doc/codesnippets/doc/src/snippets/code/src_corelib_io_qsettings.cpp @@ -92,11 +92,8 @@ settings.value("HKEY_CURRENT_USER\\MySoft\\Star Runner\\Galaxy\\Default") # re //! [7] -#ifdef Q_WS_MAC - settings = QSettings("grenoullelogique.fr", "Squash") -#else - settings = QSettings("Grenoulle Logique", "Squash") -#endif + organizationName = "grenoullelogique.fr" if sys.platform.startswith('darwin') else "Grenoulle Logique" + settings = QSettings(organizationName, "Squash") //! [7] diff --git a/sources/pyside2/doc/codesnippets/doc/src/snippets/code/src_corelib_tools_qbytearray.cpp b/sources/pyside2/doc/codesnippets/doc/src/snippets/code/src_corelib_tools_qbytearray.cpp index 5910bc67b..7328a41c0 100644 --- a/sources/pyside2/doc/codesnippets/doc/src/snippets/code/src_corelib_tools_qbytearray.cpp +++ b/sources/pyside2/doc/codesnippets/doc/src/snippets/code/src_corelib_tools_qbytearray.cpp @@ -253,7 +253,7 @@ ba.lastIndexOf("X") # returns -1 //! [25] -url = QByteArray("ftp://ftp.trolltech.com/") +url = QByteArray("ftp://ftp.qt-project.org/") if url.startsWith("ftp:"): ... //! [25] @@ -288,16 +288,16 @@ z = x.mid(5) # z == "pineapples" //! [30] -x = QByteArray("TROlltECH") +x = QByteArray("Qt by THE QT COMPANY") y = x.toLower() -# y == "trolltech" +# y == "qt by the qt company" //! [30] //! [31] -x = QByteArray("TROlltECH") +x = QByteArray("Qt by THE QT COMPANY") y = x.toUpper() -# y == "TROLLTECH" +# y == "QT BY THE QT COMPANY" //! [31] diff --git a/sources/pyside2/doc/codesnippets/doc/src/snippets/code/src_corelib_tools_qregexp.cpp b/sources/pyside2/doc/codesnippets/doc/src/snippets/code/src_corelib_tools_qregexp.cpp index 338582651..7afefee7c 100644 --- a/sources/pyside2/doc/codesnippets/doc/src/snippets/code/src_corelib_tools_qregexp.cpp +++ b/sources/pyside2/doc/codesnippets/doc/src/snippets/code/src_corelib_tools_qregexp.cpp @@ -136,7 +136,7 @@ while pos >= 0: //! [10] -txt = "Nokia Corporation and/or its subsidiary(-ies)\tqtsoftware.com\tNorway" +txt = "The Qt Company Ltd\tqt.io\tFinland" rx.setPattern("^([^\t]+)\t([^\t]+)\t([^\t]+)$"); if rx.indexIn(txt) != -1: company = rx.cap(1) diff --git a/sources/pyside2/doc/codesnippets/doc/src/snippets/code/src_gui_kernel_qapplication.cpp b/sources/pyside2/doc/codesnippets/doc/src/snippets/code/src_gui_kernel_qapplication.cpp index d3e371b1e..3ea9bb495 100644 --- a/sources/pyside2/doc/codesnippets/doc/src/snippets/code/src_gui_kernel_qapplication.cpp +++ b/sources/pyside2/doc/codesnippets/doc/src/snippets/code/src_gui_kernel_qapplication.cpp @@ -50,19 +50,9 @@ //! [0] def main(): - if Qt.Q_WS_X11 - useGUI = getenv("DISPLAY") != 0 - else: - useGUI = True - - app = QApplication(sys.argv, useGUI) - - if useGUI: - # start GUI version - ... - else: - # start non-GUI version - ... + useGUI = not '-no-gui' in sys.argv + app = QApplication(sys.argv) if useGUI else QCoreApplication(sys.argv) + ... return app.exec_() //! [0] diff --git a/sources/pyside2/doc/codesnippets/doc/src/snippets/code/src_gui_kernel_qclipboard.cpp b/sources/pyside2/doc/codesnippets/doc/src/snippets/code/src_gui_kernel_qclipboard.cpp index e69152401..47369ee8b 100644 --- a/sources/pyside2/doc/codesnippets/doc/src/snippets/code/src_gui_kernel_qclipboard.cpp +++ b/sources/pyside2/doc/codesnippets/doc/src/snippets/code/src_gui_kernel_qclipboard.cpp @@ -49,7 +49,7 @@ ****************************************************************************/ //! [0] -clipboard = QApplication.clipboard() +clipboard = QGuiApplication.clipboard() originalText = clipboard.text() ... clipboard.setText(newText) diff --git a/sources/pyside2/doc/codesnippets/doc/src/snippets/code/src_gui_painting_qpainter.cpp b/sources/pyside2/doc/codesnippets/doc/src/snippets/code/src_gui_painting_qpainter.cpp index e702214f7..0d0807971 100644 --- a/sources/pyside2/doc/codesnippets/doc/src/snippets/code/src_gui_painting_qpainter.cpp +++ b/sources/pyside2/doc/codesnippets/doc/src/snippets/code/src_gui_painting_qpainter.cpp @@ -216,7 +216,7 @@ painter.drawPixmap(target, image, source) //! [17] painter = QPainter(self) -painter.drawText(rect, Qt.AlignCenter, tr("Qt by\nTrolltech")) +painter.drawText(rect, Qt.AlignCenter, tr("Qt\nProject")) //! [17] diff --git a/sources/pyside2/doc/codesnippets/doc/src/snippets/code/src_gui_styles_qstyle.cpp b/sources/pyside2/doc/codesnippets/doc/src/snippets/code/src_gui_styles_qstyle.cpp index ba8719dc3..bdbdbad73 100644 --- a/sources/pyside2/doc/codesnippets/doc/src/snippets/code/src_gui_styles_qstyle.cpp +++ b/sources/pyside2/doc/codesnippets/doc/src/snippets/code/src_gui_styles_qstyle.cpp @@ -49,7 +49,7 @@ ****************************************************************************/ //! [0] -python myapplication.py -style motif +python myapplication.py -style windows //! [0] diff --git a/sources/pyside2/doc/codesnippets/doc/src/snippets/code/src_gui_widgets_qvalidator.cpp b/sources/pyside2/doc/codesnippets/doc/src/snippets/code/src_gui_util_qvalidator.cpp index b366dc2ab..b366dc2ab 100644 --- a/sources/pyside2/doc/codesnippets/doc/src/snippets/code/src_gui_widgets_qvalidator.cpp +++ b/sources/pyside2/doc/codesnippets/doc/src/snippets/code/src_gui_util_qvalidator.cpp diff --git a/sources/pyside2/doc/codesnippets/doc/src/snippets/code/src_network_access_qftp.cpp b/sources/pyside2/doc/codesnippets/doc/src/snippets/code/src_network_access_qftp.cpp index b227b5797..26177869a 100644 --- a/sources/pyside2/doc/codesnippets/doc/src/snippets/code/src_network_access_qftp.cpp +++ b/sources/pyside2/doc/codesnippets/doc/src/snippets/code/src_network_access_qftp.cpp @@ -50,13 +50,13 @@ //! [0] ftp = QFtp(parent) -ftp.connectToHost("ftp.trolltech.com") +ftp.connectToHost("ftp.qt-project.org") ftp.login() //! [0] //! [1] -ftp.connectToHost("ftp.trolltech.com") # id == 1 +ftp.connectToHost("ftp.qt-project.org") # id == 1 ftp.login() # id == 2 ftp.cd("qt") # id == 3 ftp.get("INSTALL") # id == 4 diff --git a/sources/pyside2/doc/codesnippets/doc/src/snippets/code/src_network_access_qnetworkaccessmanager.cpp b/sources/pyside2/doc/codesnippets/doc/src/snippets/code/src_network_access_qnetworkaccessmanager.cpp index 0c7afec10..962733aa6 100644 --- a/sources/pyside2/doc/codesnippets/doc/src/snippets/code/src_network_access_qnetworkaccessmanager.cpp +++ b/sources/pyside2/doc/codesnippets/doc/src/snippets/code/src_network_access_qnetworkaccessmanager.cpp @@ -52,13 +52,13 @@ manager = QNetworkAccessManager(self) manager.finished[QNetworkReply].connect(self.replyFinished) -manager.get(QNetworkRequest(QUrl("http://qt.nokia.com"))) +manager.get(QNetworkRequest(QUrl("http://qt-project.org"))) //! [0] //! [1] request = QNetworkRequest() -request.setUrl(QUrl("http://qt.nokia.com")) +request.setUrl(QUrl("http://qt-project.org")) request.setRawHeader("User-Agent", "MyOwnBrowser 1.0") reply = manager.get(request) diff --git a/sources/pyside2/doc/codesnippets/doc/src/snippets/code/src_network_access_qnetworkdiskcache.cpp b/sources/pyside2/doc/codesnippets/doc/src/snippets/code/src_network_access_qnetworkdiskcache.cpp index 7e2aea326..53d0de06e 100644 --- a/sources/pyside2/doc/codesnippets/doc/src/snippets/code/src_network_access_qnetworkdiskcache.cpp +++ b/sources/pyside2/doc/codesnippets/doc/src/snippets/code/src_network_access_qnetworkdiskcache.cpp @@ -57,11 +57,11 @@ manager.setCache(diskCache) //! [1] # do a normal request (preferred from network, as this is the default) -request = QNetworkRequest(QUrl("http://qt.nokia.com")) +request = QNetworkRequest(QUrl("http://qt-project.org")) manager.get(request) # do a request preferred from cache -request2 = QNetworkRequest(QUrl("http://qt.nokia.com")) +request2 = QNetworkRequest(QUrl("http://qt-project.org")) request2.setAttribute(QNetworkRequest.CacheLoadControlAttribute, QNetworkRequest.PreferCache) manager.get(request2) //! [1] diff --git a/sources/pyside2/doc/codesnippets/doc/src/snippets/code/src_network_kernel_qhostinfo.cpp b/sources/pyside2/doc/codesnippets/doc/src/snippets/code/src_network_kernel_qhostinfo.cpp index c1971b0ba..87e773863 100644 --- a/sources/pyside2/doc/codesnippets/doc/src/snippets/code/src_network_kernel_qhostinfo.cpp +++ b/sources/pyside2/doc/codesnippets/doc/src/snippets/code/src_network_kernel_qhostinfo.cpp @@ -49,8 +49,8 @@ ****************************************************************************/ //! [0] -# To find the IP address of qtsoftware.com -QHostInfo.lookupHost("qtsoftware.com", self, SLOT("printResults(QHostInfo)")) +# To find the IP address of qt-project.org +QHostInfo.lookupHost("qt-project.org", self, SLOT("printResults(QHostInfo)")) # To find the host name for 4.2.2.1 QHostInfo.lookupHost("4.2.2.1", self, SLOT("printResults(QHostInfo)")) @@ -58,7 +58,7 @@ QHostInfo.lookupHost("4.2.2.1", self, SLOT("printResults(QHostInfo)")) //! [1] -info = QHostInfo.fromName("qtsoftware.com") +info = QHostInfo.fromName("qt-project.org") //! [1] diff --git a/sources/pyside2/doc/codesnippets/doc/src/snippets/code/src_xml_dom_qdom.cpp b/sources/pyside2/doc/codesnippets/doc/src/snippets/code/src_xml_dom_qdom.cpp index 741a75245..33f639c84 100644 --- a/sources/pyside2/doc/codesnippets/doc/src/snippets/code/src_xml_dom_qdom.cpp +++ b/sources/pyside2/doc/codesnippets/doc/src/snippets/code/src_xml_dom_qdom.cpp @@ -116,7 +116,7 @@ QDomElement element4 = document.createElement("MyElement") //! [7] -<link href="http://qtsoftware.com" color="red" /> +<link href="http://qt-project.org" color="red" /> //! [7] @@ -124,10 +124,10 @@ QDomElement element4 = document.createElement("MyElement") e = # some QDomElement... #... a = e.attributeNode("href") -print a.value() # prints "http://qtsoftware.com" -a.setValue("http://doc.trolltech.com") # change the node's attribute +print a.value() # prints "http://qt-project.org.com" +a.setValue("http://qt-project.org/doc") # change the node's attribute a2 = e.attributeNode("href") -print a2.value() # prints "http://doc.trolltech.com" +print a2.value() # prints "http://qt-project.org/doc" //! [8] diff --git a/sources/pyside2/doc/codesnippets/doc/src/snippets/customstyle/customstyle.h b/sources/pyside2/doc/codesnippets/doc/src/snippets/customstyle/customstyle.h index a89c621a1..89e324cb3 100644 --- a/sources/pyside2/doc/codesnippets/doc/src/snippets/customstyle/customstyle.h +++ b/sources/pyside2/doc/codesnippets/doc/src/snippets/customstyle/customstyle.h @@ -51,10 +51,10 @@ #ifndef CUSTOMSTYLE_H #define CUSTOMSTYLE_H -#include <QWindowsStyle> +#include <QProxyStyle> //! [0] -class CustomStyle(QWindowsStyle): +class CustomStyle(QProxyStyle): ... def drawPrimitive(PrimitiveElement element, const QStyleOption *option, diff --git a/sources/pyside2/doc/codesnippets/doc/src/snippets/customviewstyle.cpp b/sources/pyside2/doc/codesnippets/doc/src/snippets/customviewstyle.cpp index 240f9ab88..f21ec7c89 100644 --- a/sources/pyside2/doc/codesnippets/doc/src/snippets/customviewstyle.cpp +++ b/sources/pyside2/doc/codesnippets/doc/src/snippets/customviewstyle.cpp @@ -73,7 +73,7 @@ void CustomViewStyle::drawPrimitive(PrimitiveElement element, const QStyleOption break; } default: - QWindowsStyle::drawPrimitive(element, option, painter, widget); + QProxyStyle::drawPrimitive(element, option, painter, widget); } //![0] } diff --git a/sources/pyside2/doc/codesnippets/doc/src/snippets/dialogs/dialogs.cpp b/sources/pyside2/doc/codesnippets/doc/src/snippets/dialogs/dialogs.cpp index f926bbc03..58fb5653b 100644 --- a/sources/pyside2/doc/codesnippets/doc/src/snippets/dialogs/dialogs.cpp +++ b/sources/pyside2/doc/codesnippets/doc/src/snippets/dialogs/dialogs.cpp @@ -21,13 +21,13 @@ ## "Redistribution and use in source and binary forms, with or without ## modification, are permitted provided that the following conditions are ## met: -## # Redistributions of source code must retain the above copyright +## * Redistributions of source code must retain the above copyright ## notice, this list of conditions and the following disclaimer. -## # Redistributions in binary form must reproduce the above copyright +## * Redistributions in binary form must reproduce the above copyright ## notice, this list of conditions and the following disclaimer in ## the documentation and/or other materials provided with the ## distribution. -## # Neither the name of The Qt Company Ltd nor the names of its +## * Neither the name of The Qt Company Ltd nor the names of its ## contributors may be used to endorse or promote products derived ## from this software without specific prior written permission. ## diff --git a/sources/pyside2/doc/codesnippets/doc/src/snippets/dragging/mainwindow.cpp b/sources/pyside2/doc/codesnippets/doc/src/snippets/dragging/mainwindow.cpp index 739e70799..45b08af63 100644 --- a/sources/pyside2/doc/codesnippets/doc/src/snippets/dragging/mainwindow.cpp +++ b/sources/pyside2/doc/codesnippets/doc/src/snippets/dragging/mainwindow.cpp @@ -21,13 +21,13 @@ ## "Redistribution and use in source and binary forms, with or without ## modification, are permitted provided that the following conditions are ## met: -## # Redistributions of source code must retain the above copyright +## * Redistributions of source code must retain the above copyright ## notice, this list of conditions and the following disclaimer. -## # Redistributions in binary form must reproduce the above copyright +## * Redistributions in binary form must reproduce the above copyright ## notice, this list of conditions and the following disclaimer in ## the documentation and/or other materials provided with the ## distribution. -## # Neither the name of The Qt Company Ltd nor the names of its +## * Neither the name of The Qt Company Ltd nor the names of its ## contributors may be used to endorse or promote products derived ## from this software without specific prior written permission. ## diff --git a/sources/pyside2/doc/codesnippets/doc/src/snippets/droparea.cpp b/sources/pyside2/doc/codesnippets/doc/src/snippets/droparea.cpp index ce25fd693..954feb402 100644 --- a/sources/pyside2/doc/codesnippets/doc/src/snippets/droparea.cpp +++ b/sources/pyside2/doc/codesnippets/doc/src/snippets/droparea.cpp @@ -21,13 +21,13 @@ ## "Redistribution and use in source and binary forms, with or without ## modification, are permitted provided that the following conditions are ## met: -## # Redistributions of source code must retain the above copyright +## * Redistributions of source code must retain the above copyright ## notice, this list of conditions and the following disclaimer. -## # Redistributions in binary form must reproduce the above copyright +## * Redistributions in binary form must reproduce the above copyright ## notice, this list of conditions and the following disclaimer in ## the documentation and/or other materials provided with the ## distribution. -## # Neither the name of The Qt Company Ltd nor the names of its +## * Neither the name of The Qt Company Ltd nor the names of its ## contributors may be used to endorse or promote products derived ## from this software without specific prior written permission. ## @@ -98,7 +98,7 @@ void DropArea.dropEvent(QDropEvent *event) //![0] def paste(self): - clipboard = QApplication.clipboard() + clipboard = QGuiApplication.clipboard() mimeData = clipboard.mimeData() if mimeData.hasImage(): diff --git a/sources/pyside2/doc/codesnippets/doc/src/snippets/layouts/layouts.cpp b/sources/pyside2/doc/codesnippets/doc/src/snippets/layouts/layouts.cpp index 1211ccbc5..d98d91f39 100644 --- a/sources/pyside2/doc/codesnippets/doc/src/snippets/layouts/layouts.cpp +++ b/sources/pyside2/doc/codesnippets/doc/src/snippets/layouts/layouts.cpp @@ -21,13 +21,13 @@ ## "Redistribution and use in source and binary forms, with or without ## modification, are permitted provided that the following conditions are ## met: -## # Redistributions of source code must retain the above copyright +## * Redistributions of source code must retain the above copyright ## notice, this list of conditions and the following disclaimer. -## # Redistributions in binary form must reproduce the above copyright +## * Redistributions in binary form must reproduce the above copyright ## notice, this list of conditions and the following disclaimer in ## the documentation and/or other materials provided with the ## distribution. -## # Neither the name of The Qt Company Ltd nor the names of its +## * Neither the name of The Qt Company Ltd nor the names of its ## contributors may be used to endorse or promote products derived ## from this software without specific prior written permission. ## diff --git a/sources/pyside2/doc/codesnippets/doc/src/snippets/mainwindowsnippet.cpp b/sources/pyside2/doc/codesnippets/doc/src/snippets/mainwindowsnippet.cpp index fb2440426..615d26aee 100644 --- a/sources/pyside2/doc/codesnippets/doc/src/snippets/mainwindowsnippet.cpp +++ b/sources/pyside2/doc/codesnippets/doc/src/snippets/mainwindowsnippet.cpp @@ -21,13 +21,13 @@ ## "Redistribution and use in source and binary forms, with or without ## modification, are permitted provided that the following conditions are ## met: -## # Redistributions of source code must retain the above copyright +## * Redistributions of source code must retain the above copyright ## notice, this list of conditions and the following disclaimer. -## # Redistributions in binary form must reproduce the above copyright +## * Redistributions in binary form must reproduce the above copyright ## notice, this list of conditions and the following disclaimer in ## the documentation and/or other materials provided with the ## distribution. -## # Neither the name of The Qt Company Ltd nor the names of its +## * Neither the name of The Qt Company Ltd nor the names of its ## contributors may be used to endorse or promote products derived ## from this software without specific prior written permission. ## diff --git a/sources/pyside2/doc/codesnippets/doc/src/snippets/matrix/matrix.cpp b/sources/pyside2/doc/codesnippets/doc/src/snippets/matrix/matrix.cpp index 0f5b5f441..c0512f538 100644 --- a/sources/pyside2/doc/codesnippets/doc/src/snippets/matrix/matrix.cpp +++ b/sources/pyside2/doc/codesnippets/doc/src/snippets/matrix/matrix.cpp @@ -21,13 +21,13 @@ ## "Redistribution and use in source and binary forms, with or without ## modification, are permitted provided that the following conditions are ## met: -## # Redistributions of source code must retain the above copyright +## * Redistributions of source code must retain the above copyright ## notice, this list of conditions and the following disclaimer. -## # Redistributions in binary form must reproduce the above copyright +## * Redistributions in binary form must reproduce the above copyright ## notice, this list of conditions and the following disclaimer in ## the documentation and/or other materials provided with the ## distribution. -## # Neither the name of The Qt Company Ltd nor the names of its +## * Neither the name of The Qt Company Ltd nor the names of its ## contributors may be used to endorse or promote products derived ## from this software without specific prior written permission. ## diff --git a/sources/pyside2/doc/codesnippets/doc/src/snippets/mdiareasnippets.cpp b/sources/pyside2/doc/codesnippets/doc/src/snippets/mdiareasnippets.cpp index a20f70fc2..e7dd80fe9 100644 --- a/sources/pyside2/doc/codesnippets/doc/src/snippets/mdiareasnippets.cpp +++ b/sources/pyside2/doc/codesnippets/doc/src/snippets/mdiareasnippets.cpp @@ -21,13 +21,13 @@ ## "Redistribution and use in source and binary forms, with or without ## modification, are permitted provided that the following conditions are ## met: -## # Redistributions of source code must retain the above copyright +## * Redistributions of source code must retain the above copyright ## notice, this list of conditions and the following disclaimer. -## # Redistributions in binary form must reproduce the above copyright +## * Redistributions in binary form must reproduce the above copyright ## notice, this list of conditions and the following disclaimer in ## the documentation and/or other materials provided with the ## distribution. -## # Neither the name of The Qt Company Ltd nor the names of its +## * Neither the name of The Qt Company Ltd nor the names of its ## contributors may be used to endorse or promote products derived ## from this software without specific prior written permission. ## diff --git a/sources/pyside2/doc/codesnippets/doc/src/snippets/picture/picture.cpp b/sources/pyside2/doc/codesnippets/doc/src/snippets/picture/picture.cpp index 1dba7c686..a46954197 100644 --- a/sources/pyside2/doc/codesnippets/doc/src/snippets/picture/picture.cpp +++ b/sources/pyside2/doc/codesnippets/doc/src/snippets/picture/picture.cpp @@ -21,13 +21,13 @@ ## "Redistribution and use in source and binary forms, with or without ## modification, are permitted provided that the following conditions are ## met: -## # Redistributions of source code must retain the above copyright +## * Redistributions of source code must retain the above copyright ## notice, this list of conditions and the following disclaimer. -## # Redistributions in binary form must reproduce the above copyright +## * Redistributions in binary form must reproduce the above copyright ## notice, this list of conditions and the following disclaimer in ## the documentation and/or other materials provided with the ## distribution. -## # Neither the name of The Qt Company Ltd nor the names of its +## * Neither the name of The Qt Company Ltd nor the names of its ## contributors may be used to endorse or promote products derived ## from this software without specific prior written permission. ## diff --git a/sources/pyside2/doc/codesnippets/doc/src/snippets/polygon/polygon.cpp b/sources/pyside2/doc/codesnippets/doc/src/snippets/polygon/polygon.cpp index 5641dbdbe..393ab5a70 100644 --- a/sources/pyside2/doc/codesnippets/doc/src/snippets/polygon/polygon.cpp +++ b/sources/pyside2/doc/codesnippets/doc/src/snippets/polygon/polygon.cpp @@ -21,13 +21,13 @@ ## "Redistribution and use in source and binary forms, with or without ## modification, are permitted provided that the following conditions are ## met: -## # Redistributions of source code must retain the above copyright +## * Redistributions of source code must retain the above copyright ## notice, this list of conditions and the following disclaimer. -## # Redistributions in binary form must reproduce the above copyright +## * Redistributions in binary form must reproduce the above copyright ## notice, this list of conditions and the following disclaimer in ## the documentation and/or other materials provided with the ## distribution. -## # Neither the name of The Qt Company Ltd nor the names of its +## * Neither the name of The Qt Company Ltd nor the names of its ## contributors may be used to endorse or promote products derived ## from this software without specific prior written permission. ## diff --git a/sources/pyside2/doc/codesnippets/doc/src/snippets/qfontdatabase/main.cpp b/sources/pyside2/doc/codesnippets/doc/src/snippets/qfontdatabase/main.cpp index a7abf4584..02bd2441a 100644 --- a/sources/pyside2/doc/codesnippets/doc/src/snippets/qfontdatabase/main.cpp +++ b/sources/pyside2/doc/codesnippets/doc/src/snippets/qfontdatabase/main.cpp @@ -21,13 +21,13 @@ ## "Redistribution and use in source and binary forms, with or without ## modification, are permitted provided that the following conditions are ## met: -## # Redistributions of source code must retain the above copyright +## * Redistributions of source code must retain the above copyright ## notice, this list of conditions and the following disclaimer. -## # Redistributions in binary form must reproduce the above copyright +## * Redistributions in binary form must reproduce the above copyright ## notice, this list of conditions and the following disclaimer in ## the documentation and/or other materials provided with the ## distribution. -## # Neither the name of The Qt Company Ltd nor the names of its +## * Neither the name of The Qt Company Ltd nor the names of its ## contributors may be used to endorse or promote products derived ## from this software without specific prior written permission. ## diff --git a/sources/pyside2/doc/codesnippets/doc/src/snippets/qprocess/qprocess-simpleexecution.cpp b/sources/pyside2/doc/codesnippets/doc/src/snippets/qprocess/qprocess-simpleexecution.cpp index 03ce62bea..8236ec6c5 100644 --- a/sources/pyside2/doc/codesnippets/doc/src/snippets/qprocess/qprocess-simpleexecution.cpp +++ b/sources/pyside2/doc/codesnippets/doc/src/snippets/qprocess/qprocess-simpleexecution.cpp @@ -65,7 +65,7 @@ int main(int argc, char *argv[]) program = "./../../../../examples/widgets/analogclock/analogclock"; //! [2] - arguments = ["-style", "motif"] + arguments = ["-style", "fusion"] myProcess = QProcess(parent) myProcess.start(program, arguments) diff --git a/sources/pyside2/doc/codesnippets/doc/src/snippets/qsortfilterproxymodel-details/main.cpp b/sources/pyside2/doc/codesnippets/doc/src/snippets/qsortfilterproxymodel-details/main.cpp index bea97889f..d951c9465 100644 --- a/sources/pyside2/doc/codesnippets/doc/src/snippets/qsortfilterproxymodel-details/main.cpp +++ b/sources/pyside2/doc/codesnippets/doc/src/snippets/qsortfilterproxymodel-details/main.cpp @@ -21,13 +21,13 @@ ## "Redistribution and use in source and binary forms, with or without ## modification, are permitted provided that the following conditions are ## met: -## # Redistributions of source code must retain the above copyright +## * Redistributions of source code must retain the above copyright ## notice, this list of conditions and the following disclaimer. -## # Redistributions in binary form must reproduce the above copyright +## * Redistributions in binary form must reproduce the above copyright ## notice, this list of conditions and the following disclaimer in ## the documentation and/or other materials provided with the ## distribution. -## # Neither the name of The Qt Company Ltd nor the names of its +## * Neither the name of The Qt Company Ltd nor the names of its ## contributors may be used to endorse or promote products derived ## from this software without specific prior written permission. ## diff --git a/sources/pyside2/doc/codesnippets/doc/src/snippets/qsplashscreen/main.cpp b/sources/pyside2/doc/codesnippets/doc/src/snippets/qsplashscreen/main.cpp index d24d11e11..cb1888da8 100644 --- a/sources/pyside2/doc/codesnippets/doc/src/snippets/qsplashscreen/main.cpp +++ b/sources/pyside2/doc/codesnippets/doc/src/snippets/qsplashscreen/main.cpp @@ -21,13 +21,13 @@ ## "Redistribution and use in source and binary forms, with or without ## modification, are permitted provided that the following conditions are ## met: -## # Redistributions of source code must retain the above copyright +## * Redistributions of source code must retain the above copyright ## notice, this list of conditions and the following disclaimer. -## # Redistributions in binary form must reproduce the above copyright +## * Redistributions in binary form must reproduce the above copyright ## notice, this list of conditions and the following disclaimer in ## the documentation and/or other materials provided with the ## distribution. -## # Neither the name of The Qt Company Ltd nor the names of its +## * Neither the name of The Qt Company Ltd nor the names of its ## contributors may be used to endorse or promote products derived ## from this software without specific prior written permission. ## diff --git a/sources/pyside2/doc/codesnippets/doc/src/snippets/qstackedwidget/main.cpp b/sources/pyside2/doc/codesnippets/doc/src/snippets/qstackedwidget/main.cpp index b391bcc90..f43744ed7 100644 --- a/sources/pyside2/doc/codesnippets/doc/src/snippets/qstackedwidget/main.cpp +++ b/sources/pyside2/doc/codesnippets/doc/src/snippets/qstackedwidget/main.cpp @@ -21,13 +21,13 @@ ## "Redistribution and use in source and binary forms, with or without ## modification, are permitted provided that the following conditions are ## met: -## # Redistributions of source code must retain the above copyright +## * Redistributions of source code must retain the above copyright ## notice, this list of conditions and the following disclaimer. -## # Redistributions in binary form must reproduce the above copyright +## * Redistributions in binary form must reproduce the above copyright ## notice, this list of conditions and the following disclaimer in ## the documentation and/or other materials provided with the ## distribution. -## # Neither the name of The Qt Company Ltd nor the names of its +## * Neither the name of The Qt Company Ltd nor the names of its ## contributors may be used to endorse or promote products derived ## from this software without specific prior written permission. ## diff --git a/sources/pyside2/doc/codesnippets/doc/src/snippets/qtreewidget-using/mainwindow.cpp b/sources/pyside2/doc/codesnippets/doc/src/snippets/qtreewidget-using/mainwindow.cpp index 1c85cf7cf..64b4f0a16 100644 --- a/sources/pyside2/doc/codesnippets/doc/src/snippets/qtreewidget-using/mainwindow.cpp +++ b/sources/pyside2/doc/codesnippets/doc/src/snippets/qtreewidget-using/mainwindow.cpp @@ -21,13 +21,13 @@ ## "Redistribution and use in source and binary forms, with or without ## modification, are permitted provided that the following conditions are ## met: -## # Redistributions of source code must retain the above copyright +## * Redistributions of source code must retain the above copyright ## notice, this list of conditions and the following disclaimer. -## # Redistributions in binary form must reproduce the above copyright +## * Redistributions in binary form must reproduce the above copyright ## notice, this list of conditions and the following disclaimer in ## the documentation and/or other materials provided with the ## distribution. -## # Neither the name of The Qt Company Ltd nor the names of its +## * Neither the name of The Qt Company Ltd nor the names of its ## contributors may be used to endorse or promote products derived ## from this software without specific prior written permission. ## diff --git a/sources/pyside2/doc/codesnippets/doc/src/snippets/qtreewidgetitemiterator-using/mainwindow.cpp b/sources/pyside2/doc/codesnippets/doc/src/snippets/qtreewidgetitemiterator-using/mainwindow.cpp index a3579b789..97e6ce164 100644 --- a/sources/pyside2/doc/codesnippets/doc/src/snippets/qtreewidgetitemiterator-using/mainwindow.cpp +++ b/sources/pyside2/doc/codesnippets/doc/src/snippets/qtreewidgetitemiterator-using/mainwindow.cpp @@ -21,13 +21,13 @@ ## "Redistribution and use in source and binary forms, with or without ## modification, are permitted provided that the following conditions are ## met: -## # Redistributions of source code must retain the above copyright +## * Redistributions of source code must retain the above copyright ## notice, this list of conditions and the following disclaimer. -## # Redistributions in binary form must reproduce the above copyright +## * Redistributions in binary form must reproduce the above copyright ## notice, this list of conditions and the following disclaimer in ## the documentation and/or other materials provided with the ## distribution. -## # Neither the name of The Qt Company Ltd nor the names of its +## * Neither the name of The Qt Company Ltd nor the names of its ## contributors may be used to endorse or promote products derived ## from this software without specific prior written permission. ## diff --git a/sources/pyside2/doc/codesnippets/doc/src/snippets/qxmlstreamwriter/main.cpp b/sources/pyside2/doc/codesnippets/doc/src/snippets/qxmlstreamwriter/main.cpp index 9838dab1d..e3a24968e 100644 --- a/sources/pyside2/doc/codesnippets/doc/src/snippets/qxmlstreamwriter/main.cpp +++ b/sources/pyside2/doc/codesnippets/doc/src/snippets/qxmlstreamwriter/main.cpp @@ -71,7 +71,7 @@ int main(int argc, char *argv[]) stream.writeAttribute("folded", "no"); //! [write element] stream.writeStartElement("bookmark"); - stream.writeAttribute("href", "http://www.qtsoftware.com/"); + stream.writeAttribute("href", "http://qt-project.org/"); stream.writeTextElement("title", "Qt Home"); stream.writeEndElement(); // bookmark //! [write element] diff --git a/sources/pyside2/doc/codesnippets/doc/src/snippets/shareddirmodel/main.cpp b/sources/pyside2/doc/codesnippets/doc/src/snippets/shareddirmodel/main.cpp index 187acde31..531660469 100644 --- a/sources/pyside2/doc/codesnippets/doc/src/snippets/shareddirmodel/main.cpp +++ b/sources/pyside2/doc/codesnippets/doc/src/snippets/shareddirmodel/main.cpp @@ -21,13 +21,13 @@ ## "Redistribution and use in source and binary forms, with or without ## modification, are permitted provided that the following conditions are ## met: -## # Redistributions of source code must retain the above copyright +## * Redistributions of source code must retain the above copyright ## notice, this list of conditions and the following disclaimer. -## # Redistributions in binary form must reproduce the above copyright +## * Redistributions in binary form must reproduce the above copyright ## notice, this list of conditions and the following disclaimer in ## the documentation and/or other materials provided with the ## distribution. -## # Neither the name of The Qt Company Ltd nor the names of its +## * Neither the name of The Qt Company Ltd nor the names of its ## contributors may be used to endorse or promote products derived ## from this software without specific prior written permission. ## diff --git a/sources/pyside2/doc/codesnippets/doc/src/snippets/xml/simpleparse/handler.cpp b/sources/pyside2/doc/codesnippets/doc/src/snippets/simpleparse/handler.cpp index 6f18c7786..6f18c7786 100644 --- a/sources/pyside2/doc/codesnippets/doc/src/snippets/xml/simpleparse/handler.cpp +++ b/sources/pyside2/doc/codesnippets/doc/src/snippets/simpleparse/handler.cpp diff --git a/sources/pyside2/doc/codesnippets/doc/src/snippets/xml/simpleparse/handler.h b/sources/pyside2/doc/codesnippets/doc/src/snippets/simpleparse/handler.h index 1d3ec1144..1d3ec1144 100644 --- a/sources/pyside2/doc/codesnippets/doc/src/snippets/xml/simpleparse/handler.h +++ b/sources/pyside2/doc/codesnippets/doc/src/snippets/simpleparse/handler.h diff --git a/sources/pyside2/doc/codesnippets/doc/src/snippets/xml/simpleparse/main.cpp b/sources/pyside2/doc/codesnippets/doc/src/snippets/simpleparse/main.cpp index f16891533..f16891533 100644 --- a/sources/pyside2/doc/codesnippets/doc/src/snippets/xml/simpleparse/main.cpp +++ b/sources/pyside2/doc/codesnippets/doc/src/snippets/simpleparse/main.cpp diff --git a/sources/pyside2/doc/codesnippets/doc/src/snippets/splitter/splitter.cpp b/sources/pyside2/doc/codesnippets/doc/src/snippets/splitter/splitter.cpp index 269ca02da..3ca90077e 100644 --- a/sources/pyside2/doc/codesnippets/doc/src/snippets/splitter/splitter.cpp +++ b/sources/pyside2/doc/codesnippets/doc/src/snippets/splitter/splitter.cpp @@ -21,13 +21,13 @@ ## "Redistribution and use in source and binary forms, with or without ## modification, are permitted provided that the following conditions are ## met: -## # Redistributions of source code must retain the above copyright +## * Redistributions of source code must retain the above copyright ## notice, this list of conditions and the following disclaimer. -## # Redistributions in binary form must reproduce the above copyright +## * Redistributions in binary form must reproduce the above copyright ## notice, this list of conditions and the following disclaimer in ## the documentation and/or other materials provided with the ## distribution. -## # Neither the name of The Qt Company Ltd nor the names of its +## * Neither the name of The Qt Company Ltd nor the names of its ## contributors may be used to endorse or promote products derived ## from this software without specific prior written permission. ## diff --git a/sources/pyside2/doc/codesnippets/doc/src/snippets/splitterhandle/splitter.h b/sources/pyside2/doc/codesnippets/doc/src/snippets/splitterhandle/splitter.h index f067f2249..1022e56b3 100644 --- a/sources/pyside2/doc/codesnippets/doc/src/snippets/splitterhandle/splitter.h +++ b/sources/pyside2/doc/codesnippets/doc/src/snippets/splitterhandle/splitter.h @@ -21,13 +21,13 @@ ## "Redistribution and use in source and binary forms, with or without ## modification, are permitted provided that the following conditions are ## met: -## # Redistributions of source code must retain the above copyright +## * Redistributions of source code must retain the above copyright ## notice, this list of conditions and the following disclaimer. -## # Redistributions in binary form must reproduce the above copyright +## * Redistributions in binary form must reproduce the above copyright ## notice, this list of conditions and the following disclaimer in ## the documentation and/or other materials provided with the ## distribution. -## # Neither the name of The Qt Company Ltd nor the names of its +## * Neither the name of The Qt Company Ltd nor the names of its ## contributors may be used to endorse or promote products derived ## from this software without specific prior written permission. ## diff --git a/sources/pyside2/doc/codesnippets/doc/src/snippets/sqldatabase/sqldatabase.cpp b/sources/pyside2/doc/codesnippets/doc/src/snippets/sqldatabase/sqldatabase.cpp index aa026d755..d92a03335 100644 --- a/sources/pyside2/doc/codesnippets/doc/src/snippets/sqldatabase/sqldatabase.cpp +++ b/sources/pyside2/doc/codesnippets/doc/src/snippets/sqldatabase/sqldatabase.cpp @@ -21,13 +21,13 @@ ## "Redistribution and use in source and binary forms, with or without ## modification, are permitted provided that the following conditions are ## met: -## # Redistributions of source code must retain the above copyright +## * Redistributions of source code must retain the above copyright ## notice, this list of conditions and the following disclaimer. -## # Redistributions in binary form must reproduce the above copyright +## * Redistributions in binary form must reproduce the above copyright ## notice, this list of conditions and the following disclaimer in ## the documentation and/or other materials provided with the ## distribution. -## # Neither the name of The Qt Company Ltd nor the names of its +## * Neither the name of The Qt Company Ltd nor the names of its ## contributors may be used to endorse or promote products derived ## from this software without specific prior written permission. ## diff --git a/sources/pyside2/doc/codesnippets/doc/src/snippets/textdocument-css/main.cpp b/sources/pyside2/doc/codesnippets/doc/src/snippets/textdocument-css/main.cpp index e7d355115..ddac007c6 100644 --- a/sources/pyside2/doc/codesnippets/doc/src/snippets/textdocument-css/main.cpp +++ b/sources/pyside2/doc/codesnippets/doc/src/snippets/textdocument-css/main.cpp @@ -21,13 +21,13 @@ ## "Redistribution and use in source and binary forms, with or without ## modification, are permitted provided that the following conditions are ## met: -## # Redistributions of source code must retain the above copyright +## * Redistributions of source code must retain the above copyright ## notice, this list of conditions and the following disclaimer. -## # Redistributions in binary form must reproduce the above copyright +## * Redistributions in binary form must reproduce the above copyright ## notice, this list of conditions and the following disclaimer in ## the documentation and/or other materials provided with the ## distribution. -## # Neither the name of The Qt Company Ltd nor the names of its +## * Neither the name of The Qt Company Ltd nor the names of its ## contributors may be used to endorse or promote products derived ## from this software without specific prior written permission. ## diff --git a/sources/pyside2/doc/codesnippets/doc/src/snippets/textdocument-tables/mainwindow.cpp b/sources/pyside2/doc/codesnippets/doc/src/snippets/textdocument-tables/mainwindow.cpp index c15d43646..dedc06e86 100644 --- a/sources/pyside2/doc/codesnippets/doc/src/snippets/textdocument-tables/mainwindow.cpp +++ b/sources/pyside2/doc/codesnippets/doc/src/snippets/textdocument-tables/mainwindow.cpp @@ -21,13 +21,13 @@ ## "Redistribution and use in source and binary forms, with or without ## modification, are permitted provided that the following conditions are ## met: -## # Redistributions of source code must retain the above copyright +## * Redistributions of source code must retain the above copyright ## notice, this list of conditions and the following disclaimer. -## # Redistributions in binary form must reproduce the above copyright +## * Redistributions in binary form must reproduce the above copyright ## notice, this list of conditions and the following disclaimer in ## the documentation and/or other materials provided with the ## distribution. -## # Neither the name of The Qt Company Ltd nor the names of its +## * Neither the name of The Qt Company Ltd nor the names of its ## contributors may be used to endorse or promote products derived ## from this software without specific prior written permission. ## diff --git a/sources/pyside2/doc/codesnippets/doc/src/snippets/textdocument-texttable/main.cpp b/sources/pyside2/doc/codesnippets/doc/src/snippets/textdocument-texttable/main.cpp index 7874764db..640575050 100644 --- a/sources/pyside2/doc/codesnippets/doc/src/snippets/textdocument-texttable/main.cpp +++ b/sources/pyside2/doc/codesnippets/doc/src/snippets/textdocument-texttable/main.cpp @@ -21,13 +21,13 @@ ## "Redistribution and use in source and binary forms, with or without ## modification, are permitted provided that the following conditions are ## met: -## # Redistributions of source code must retain the above copyright +## * Redistributions of source code must retain the above copyright ## notice, this list of conditions and the following disclaimer. -## # Redistributions in binary form must reproduce the above copyright +## * Redistributions in binary form must reproduce the above copyright ## notice, this list of conditions and the following disclaimer in ## the documentation and/or other materials provided with the ## distribution. -## # Neither the name of The Qt Company Ltd nor the names of its +## * Neither the name of The Qt Company Ltd nor the names of its ## contributors may be used to endorse or promote products derived ## from this software without specific prior written permission. ## diff --git a/sources/pyside2/doc/codesnippets/doc/src/snippets/transform/main.cpp b/sources/pyside2/doc/codesnippets/doc/src/snippets/transform/main.cpp index 6d84261e9..784f4df1a 100644 --- a/sources/pyside2/doc/codesnippets/doc/src/snippets/transform/main.cpp +++ b/sources/pyside2/doc/codesnippets/doc/src/snippets/transform/main.cpp @@ -21,13 +21,13 @@ ## "Redistribution and use in source and binary forms, with or without ## modification, are permitted provided that the following conditions are ## met: -## # Redistributions of source code must retain the above copyright +## * Redistributions of source code must retain the above copyright ## notice, this list of conditions and the following disclaimer. -## # Redistributions in binary form must reproduce the above copyright +## * Redistributions in binary form must reproduce the above copyright ## notice, this list of conditions and the following disclaimer in ## the documentation and/or other materials provided with the ## distribution. -## # Neither the name of The Qt Company Ltd nor the names of its +## * Neither the name of The Qt Company Ltd nor the names of its ## contributors may be used to endorse or promote products derived ## from this software without specific prior written permission. ## diff --git a/sources/pyside2/doc/codesnippets/doc/src/snippets/whatsthis/whatsthis.cpp b/sources/pyside2/doc/codesnippets/doc/src/snippets/whatsthis/whatsthis.cpp index d25ce3637..be575f53f 100644 --- a/sources/pyside2/doc/codesnippets/doc/src/snippets/whatsthis/whatsthis.cpp +++ b/sources/pyside2/doc/codesnippets/doc/src/snippets/whatsthis/whatsthis.cpp @@ -21,13 +21,13 @@ ## "Redistribution and use in source and binary forms, with or without ## modification, are permitted provided that the following conditions are ## met: -## # Redistributions of source code must retain the above copyright +## * Redistributions of source code must retain the above copyright ## notice, this list of conditions and the following disclaimer. -## # Redistributions in binary form must reproduce the above copyright +## * Redistributions in binary form must reproduce the above copyright ## notice, this list of conditions and the following disclaimer in ## the documentation and/or other materials provided with the ## distribution. -## # Neither the name of The Qt Company Ltd nor the names of its +## * Neither the name of The Qt Company Ltd nor the names of its ## contributors may be used to endorse or promote products derived ## from this software without specific prior written permission. ## diff --git a/sources/pyside2/doc/codesnippets/examples/dialogs/extension/finddialog.cpp b/sources/pyside2/doc/codesnippets/examples/dialogs/extension/finddialog.cpp index de99bb3ec..18612e4ba 100644 --- a/sources/pyside2/doc/codesnippets/examples/dialogs/extension/finddialog.cpp +++ b/sources/pyside2/doc/codesnippets/examples/dialogs/extension/finddialog.cpp @@ -21,13 +21,13 @@ ## "Redistribution and use in source and binary forms, with or without ## modification, are permitted provided that the following conditions are ## met: -## # Redistributions of source code must retain the above copyright +## * Redistributions of source code must retain the above copyright ## notice, this list of conditions and the following disclaimer. -## # Redistributions in binary form must reproduce the above copyright +## * Redistributions in binary form must reproduce the above copyright ## notice, this list of conditions and the following disclaimer in ## the documentation and/or other materials provided with the ## distribution. -## # Neither the name of The Qt Company Ltd nor the names of its +## * Neither the name of The Qt Company Ltd nor the names of its ## contributors may be used to endorse or promote products derived ## from this software without specific prior written permission. ## diff --git a/sources/pyside2/doc/codesnippets/examples/declarative/cppextensions/imageprovider/imageprovider-example.qml b/sources/pyside2/doc/codesnippets/examples/imageprovider/imageprovider-example.qml index ad51f2e7a..fc6063e40 100644 --- a/sources/pyside2/doc/codesnippets/examples/declarative/cppextensions/imageprovider/imageprovider-example.qml +++ b/sources/pyside2/doc/codesnippets/examples/imageprovider/imageprovider-example.qml @@ -48,7 +48,7 @@ ** ****************************************************************************/ -import QtQuick 1.0 +import QtQuick 2.0 import "ImageProviderCore" // import the plugin that registers the color image provider //![0] diff --git a/sources/pyside2/doc/codesnippets/examples/declarative/cppextensions/imageprovider/imageprovider.cpp b/sources/pyside2/doc/codesnippets/examples/imageprovider/imageprovider.cpp index ffbe8f564..4d1aeb74f 100644 --- a/sources/pyside2/doc/codesnippets/examples/declarative/cppextensions/imageprovider/imageprovider.cpp +++ b/sources/pyside2/doc/codesnippets/examples/imageprovider/imageprovider.cpp @@ -49,9 +49,9 @@ ****************************************************************************/ //![0] -class ColorImageProvider (QDeclarativeImageProvider): +class ColorImageProvider (QQuickImageProvider): def __init__(self): - QDeclarativeImageProvider.__init__(self, QDeclarativeImageProvider.Pixmap) + QQuickImageProvider.__init__(self, QDeclarativeImageProvider.Pixmap) def requestPixmap(id, size, requestedSize): width = 100 diff --git a/sources/pyside2/doc/codesnippets/examples/itemviews/customsortfiltermodel/mysortfilterproxymodel.cpp b/sources/pyside2/doc/codesnippets/examples/itemviews/customsortfiltermodel/mysortfilterproxymodel.cpp index 0ec3b071f..4732b7773 100644 --- a/sources/pyside2/doc/codesnippets/examples/itemviews/customsortfiltermodel/mysortfilterproxymodel.cpp +++ b/sources/pyside2/doc/codesnippets/examples/itemviews/customsortfiltermodel/mysortfilterproxymodel.cpp @@ -21,13 +21,13 @@ ## "Redistribution and use in source and binary forms, with or without ## modification, are permitted provided that the following conditions are ## met: -## # Redistributions of source code must retain the above copyright +## * Redistributions of source code must retain the above copyright ## notice, this list of conditions and the following disclaimer. -## # Redistributions in binary form must reproduce the above copyright +## * Redistributions in binary form must reproduce the above copyright ## notice, this list of conditions and the following disclaimer in ## the documentation and/or other materials provided with the ## distribution. -## # Neither the name of The Qt Company Ltd nor the names of its +## * Neither the name of The Qt Company Ltd nor the names of its ## contributors may be used to endorse or promote products derived ## from this software without specific prior written permission. ## diff --git a/sources/pyside2/doc/codesnippets/examples/mainwindows/application/mainwindow.cpp b/sources/pyside2/doc/codesnippets/examples/mainwindows/application/mainwindow.cpp index 82c5f891b..d22a39151 100644 --- a/sources/pyside2/doc/codesnippets/examples/mainwindows/application/mainwindow.cpp +++ b/sources/pyside2/doc/codesnippets/examples/mainwindows/application/mainwindow.cpp @@ -21,13 +21,13 @@ ## "Redistribution and use in source and binary forms, with or without ## modification, are permitted provided that the following conditions are ## met: -## # Redistributions of source code must retain the above copyright +## * Redistributions of source code must retain the above copyright ## notice, this list of conditions and the following disclaimer. -## # Redistributions in binary form must reproduce the above copyright +## * Redistributions in binary form must reproduce the above copyright ## notice, this list of conditions and the following disclaimer in ## the documentation and/or other materials provided with the ## distribution. -## # Neither the name of The Qt Company Ltd nor the names of its +## * Neither the name of The Qt Company Ltd nor the names of its ## contributors may be used to endorse or promote products derived ## from this software without specific prior written permission. ## diff --git a/sources/pyside2/doc/codesnippets/examples/mainwindows/dockwidgets/mainwindow.cpp b/sources/pyside2/doc/codesnippets/examples/mainwindows/dockwidgets/mainwindow.cpp index fa125e01f..c6fd2894b 100644 --- a/sources/pyside2/doc/codesnippets/examples/mainwindows/dockwidgets/mainwindow.cpp +++ b/sources/pyside2/doc/codesnippets/examples/mainwindows/dockwidgets/mainwindow.cpp @@ -21,13 +21,13 @@ ## "Redistribution and use in source and binary forms, with or without ## modification, are permitted provided that the following conditions are ## met: -## # Redistributions of source code must retain the above copyright +## * Redistributions of source code must retain the above copyright ## notice, this list of conditions and the following disclaimer. -## # Redistributions in binary form must reproduce the above copyright +## * Redistributions in binary form must reproduce the above copyright ## notice, this list of conditions and the following disclaimer in ## the documentation and/or other materials provided with the ## distribution. -## # Neither the name of The Qt Company Ltd nor the names of its +## * Neither the name of The Qt Company Ltd nor the names of its ## contributors may be used to endorse or promote products derived ## from this software without specific prior written permission. ## diff --git a/sources/pyside2/doc/codesnippets/examples/mainwindows/mainwindow.cpp b/sources/pyside2/doc/codesnippets/examples/mainwindows/mainwindow.cpp index 8dc283ebf..33cb540b4 100644 --- a/sources/pyside2/doc/codesnippets/examples/mainwindows/mainwindow.cpp +++ b/sources/pyside2/doc/codesnippets/examples/mainwindows/mainwindow.cpp @@ -21,13 +21,13 @@ ## "Redistribution and use in source and binary forms, with or without ## modification, are permitted provided that the following conditions are ## met: -## # Redistributions of source code must retain the above copyright +## * Redistributions of source code must retain the above copyright ## notice, this list of conditions and the following disclaimer. -## # Redistributions in binary form must reproduce the above copyright +## * Redistributions in binary form must reproduce the above copyright ## notice, this list of conditions and the following disclaimer in ## the documentation and/or other materials provided with the ## distribution. -## # Neither the name of The Qt Company Ltd nor the names of its +## * Neither the name of The Qt Company Ltd nor the names of its ## contributors may be used to endorse or promote products derived ## from this software without specific prior written permission. ## diff --git a/sources/pyside2/doc/codesnippets/examples/mainwindows/mdi/mainwindow.cpp b/sources/pyside2/doc/codesnippets/examples/mainwindows/mdi/mainwindow.cpp index 7032ba7da..ed23e83eb 100644 --- a/sources/pyside2/doc/codesnippets/examples/mainwindows/mdi/mainwindow.cpp +++ b/sources/pyside2/doc/codesnippets/examples/mainwindows/mdi/mainwindow.cpp @@ -21,13 +21,13 @@ ## "Redistribution and use in source and binary forms, with or without ## modification, are permitted provided that the following conditions are ## met: -## # Redistributions of source code must retain the above copyright +## * Redistributions of source code must retain the above copyright ## notice, this list of conditions and the following disclaimer. -## # Redistributions in binary form must reproduce the above copyright +## * Redistributions in binary form must reproduce the above copyright ## notice, this list of conditions and the following disclaimer in ## the documentation and/or other materials provided with the ## distribution. -## # Neither the name of The Qt Company Ltd nor the names of its +## * Neither the name of The Qt Company Ltd nor the names of its ## contributors may be used to endorse or promote products derived ## from this software without specific prior written permission. ## diff --git a/sources/pyside2/doc/codesnippets/examples/mainwindows/menus/mainwindow.cpp b/sources/pyside2/doc/codesnippets/examples/mainwindows/menus/mainwindow.cpp index 8dc283ebf..33cb540b4 100644 --- a/sources/pyside2/doc/codesnippets/examples/mainwindows/menus/mainwindow.cpp +++ b/sources/pyside2/doc/codesnippets/examples/mainwindows/menus/mainwindow.cpp @@ -21,13 +21,13 @@ ## "Redistribution and use in source and binary forms, with or without ## modification, are permitted provided that the following conditions are ## met: -## # Redistributions of source code must retain the above copyright +## * Redistributions of source code must retain the above copyright ## notice, this list of conditions and the following disclaimer. -## # Redistributions in binary form must reproduce the above copyright +## * Redistributions in binary form must reproduce the above copyright ## notice, this list of conditions and the following disclaimer in ## the documentation and/or other materials provided with the ## distribution. -## # Neither the name of The Qt Company Ltd nor the names of its +## * Neither the name of The Qt Company Ltd nor the names of its ## contributors may be used to endorse or promote products derived ## from this software without specific prior written permission. ## diff --git a/sources/pyside2/doc/codesnippets/doc/src/snippets/code/src_svg_qgraphicssvgitem.cpp b/sources/pyside2/doc/codesnippets/examples/quick/plugins/plugins.qml index df2dcbd94..df2dcbd94 100644 --- a/sources/pyside2/doc/codesnippets/doc/src/snippets/code/src_svg_qgraphicssvgitem.cpp +++ b/sources/pyside2/doc/codesnippets/examples/quick/plugins/plugins.qml diff --git a/sources/pyside2/doc/codesnippets/examples/sql/relationaltablemodel/relationaltablemodel.cpp b/sources/pyside2/doc/codesnippets/examples/relationaltablemodel/relationaltablemodel.cpp index b34c652d0..8df1d73b2 100644 --- a/sources/pyside2/doc/codesnippets/examples/sql/relationaltablemodel/relationaltablemodel.cpp +++ b/sources/pyside2/doc/codesnippets/examples/relationaltablemodel/relationaltablemodel.cpp @@ -21,13 +21,13 @@ ## "Redistribution and use in source and binary forms, with or without ## modification, are permitted provided that the following conditions are ## met: -## # Redistributions of source code must retain the above copyright +## * Redistributions of source code must retain the above copyright ## notice, this list of conditions and the following disclaimer. -## # Redistributions in binary form must reproduce the above copyright +## * Redistributions in binary form must reproduce the above copyright ## notice, this list of conditions and the following disclaimer in ## the documentation and/or other materials provided with the ## distribution. -## # Neither the name of The Qt Company Ltd nor the names of its +## * Neither the name of The Qt Company Ltd nor the names of its ## contributors may be used to endorse or promote products derived ## from this software without specific prior written permission. ## diff --git a/sources/pyside2/doc/codesnippets/examples/painting/svggenerator/window.cpp b/sources/pyside2/doc/codesnippets/examples/svggenerator/window.cpp index 60c415949..60c415949 100644 --- a/sources/pyside2/doc/codesnippets/examples/painting/svggenerator/window.cpp +++ b/sources/pyside2/doc/codesnippets/examples/svggenerator/window.cpp diff --git a/sources/pyside2/doc/codesnippets/examples/widgets/icons/iconsizespinbox.cpp b/sources/pyside2/doc/codesnippets/examples/widgets/icons/iconsizespinbox.cpp index 22e5fbc37..f0d1f2ac6 100644 --- a/sources/pyside2/doc/codesnippets/examples/widgets/icons/iconsizespinbox.cpp +++ b/sources/pyside2/doc/codesnippets/examples/widgets/icons/iconsizespinbox.cpp @@ -21,13 +21,13 @@ ## "Redistribution and use in source and binary forms, with or without ## modification, are permitted provided that the following conditions are ## met: -## # Redistributions of source code must retain the above copyright +## * Redistributions of source code must retain the above copyright ## notice, this list of conditions and the following disclaimer. -## # Redistributions in binary form must reproduce the above copyright +## * Redistributions in binary form must reproduce the above copyright ## notice, this list of conditions and the following disclaimer in ## the documentation and/or other materials provided with the ## distribution. -## # Neither the name of The Qt Company Ltd nor the names of its +## * Neither the name of The Qt Company Ltd nor the names of its ## contributors may be used to endorse or promote products derived ## from this software without specific prior written permission. ## diff --git a/sources/pyside2/doc/codesnippets/examples/widgets/spinboxes/window.cpp b/sources/pyside2/doc/codesnippets/examples/widgets/spinboxes/window.cpp index 54a9523ee..bf07fb73c 100644 --- a/sources/pyside2/doc/codesnippets/examples/widgets/spinboxes/window.cpp +++ b/sources/pyside2/doc/codesnippets/examples/widgets/spinboxes/window.cpp @@ -21,13 +21,13 @@ ## "Redistribution and use in source and binary forms, with or without ## modification, are permitted provided that the following conditions are ## met: -## # Redistributions of source code must retain the above copyright +## * Redistributions of source code must retain the above copyright ## notice, this list of conditions and the following disclaimer. -## # Redistributions in binary form must reproduce the above copyright +## * Redistributions in binary form must reproduce the above copyright ## notice, this list of conditions and the following disclaimer in ## the documentation and/or other materials provided with the ## distribution. -## # Neither the name of The Qt Company Ltd nor the names of its +## * Neither the name of The Qt Company Ltd nor the names of its ## contributors may be used to endorse or promote products derived ## from this software without specific prior written permission. ## diff --git a/sources/pyside2/doc/codesnippets/webkitsnippets/simple/main.cpp b/sources/pyside2/doc/codesnippets/webkitsnippets/simple/main.cpp index 231636773..ee6b2c213 100644 --- a/sources/pyside2/doc/codesnippets/webkitsnippets/simple/main.cpp +++ b/sources/pyside2/doc/codesnippets/webkitsnippets/simple/main.cpp @@ -57,7 +57,7 @@ app = QApplication(sys.argv) parent = None //! [Using QWebView] view = QWebView(parent) -view.load(QUrl("http://qt.nokia.com/")) +view.load(QUrl("http://qt-project.org/")) view.show() //! [Using QWebView] sys.exit(app.exec_()) diff --git a/sources/pyside2/doc/codesnippets/webkitsnippets/webpage/main.cpp b/sources/pyside2/doc/codesnippets/webkitsnippets/webpage/main.cpp index 8166a8a49..92df5730b 100644 --- a/sources/pyside2/doc/codesnippets/webkitsnippets/webpage/main.cpp +++ b/sources/pyside2/doc/codesnippets/webkitsnippets/webpage/main.cpp @@ -78,6 +78,6 @@ class Thumbnailer (QObject): app = QApplication(sys.argv) -thumbnail = Thumbnailer(QUrl("http://qt.nokia.com")) +thumbnail = Thumbnailer(QUrl("http://qt-project.org")) thumbnail.finished.connect(app.quit) sys.exit(app.exec_()) diff --git a/sources/pyside2/doc/conf.py.in b/sources/pyside2/doc/conf.py.in index 3fd1781b5..c0ae45fd3 100644 --- a/sources/pyside2/doc/conf.py.in +++ b/sources/pyside2/doc/conf.py.in @@ -132,10 +132,6 @@ html_theme_path = ['@CMAKE_CURRENT_SOURCE_DIR@/_themes'] # using the given strftime format. #html_last_updated_fmt = '%b %d, %Y' -# If true, SmartyPants will be used to convert quotes and dashes to -# typographically correct entities. -html_use_smartypants = True - # Custom sidebar templates, maps document names to template names. #html_sidebars = { '' : ''} @@ -155,8 +151,6 @@ html_split_index = False # If true, links to the reST sources are added to the pages. html_show_sourcelink = False -html_add_permalinks = True - # If true, an OpenSearch description file will be output, and all pages will # contain a <link> tag referring to it. The value of this option must be the # base URL from which the finished HTML is served. diff --git a/sources/pyside2/doc/inheritance_diagram.py b/sources/pyside2/doc/inheritance_diagram.py index a7f376ccd..038c22f29 100644 --- a/sources/pyside2/doc/inheritance_diagram.py +++ b/sources/pyside2/doc/inheritance_diagram.py @@ -52,15 +52,38 @@ from docutils.parsers.rst import directives from sphinx.ext.graphviz import render_dot_html, render_dot_latex from sphinx.util.compat import Directive - -class_sig_re = re.compile(r'''^([\w.]*\.)? # module names - (\w+) \s* $ # class/final module name - ''', re.VERBOSE) - - class InheritanceException(Exception): pass +# When passed something like: +# PySide2.QtCore.QStateMachine.SignalEvent +# try to import the underlying module and return a +# handle to the object. In a loop, import +# PySide2.QtCore.QStateMachine.SignalEvent +# PySide2.QtCore.QStateMachine +# PySide2.QtCore +# until the import succeeds and walk up the attributes +# to obtain the object + +def importClassOrModule(name): + components = name.split('.') + for i in range(len(components), 0, -1): + importPath = '.'.join(components[: i]) + try: + __import__(importPath) + except ImportError: + continue + if i == len(components): + return sys.modules[importPath] + remaining = components[i :] + cls = sys.modules[importPath] + for component in remaining: + try: + cls = getattr(cls, component) + except Exception: # No such attribute + return None + return cls + return None class InheritanceGraph(object): """ @@ -86,38 +109,13 @@ class InheritanceGraph(object): """ Import a class using its fully-qualified *name*. """ - try: - path, base = class_sig_re.match(name).groups() - except (AttributeError, ValueError): - raise InheritanceException('Invalid class or module %r specified ' - 'for inheritance diagram' % name) - - fullname = (path or '') + base - path = (path and path.rstrip('.') or '') - - # two possibilities: either it is a module, then import it - try: - __import__(fullname) - todoc = sys.modules[fullname] - except ImportError: - # else it is a class, then import the module - if not path: - if currmodule: - # try the current module - path = currmodule - else: - raise InheritanceException( - 'Could not import class %r specified for ' - 'inheritance diagram' % base) - try: - __import__(path) - todoc = getattr(sys.modules[path], base) - except (ImportError, AttributeError): - raise InheritanceException( - 'Could not import class or module %r specified for ' - 'inheritance diagram' % (path + '.' + base)) - - # If a class, just return it + todoc = importClassOrModule(name) + if not todoc and currmodule is not None: + todoc = importClassOrModule(currmodule + '.' + name) + if not todoc: + moduleStr = '(module {})'.format(currmodule) if currmodule else '' + raise InheritanceException('Could not import class {} specified for ' + 'inheritance diagram {}.'.format(name, moduleStr)) if inspect.isclass(todoc): return [todoc] elif inspect.ismodule(todoc): @@ -167,7 +165,7 @@ class InheritanceGraph(object): for cls in classes: recurse(cls) - return all_classes.values() + return list(all_classes.values()) def class_name(self, cls, parts=0): """Given a class object, return a fully-qualified name. @@ -200,8 +198,8 @@ class InheritanceGraph(object): 'shape': 'box', 'fontsize': 10, 'height': 0.25, - 'fontname': 'Vera Sans, DejaVu Sans, Liberation Sans, ' - 'Arial, Helvetica, sans', + 'fontname': '"Vera Sans, DejaVu Sans, Liberation Sans, ' + 'Arial, Helvetica, sans"', 'style': '"setlinewidth(0.5)"', } default_edge_attrs = { @@ -314,7 +312,8 @@ class InheritanceDiagram(Directive): def get_graph_hash(node): - return md5(node['content'] + str(node['parts'])).hexdigest()[-10:] + hashString = node['content'] + str(node['parts']) + return md5(hashString.encode('utf-8')).hexdigest()[-10:] def html_visit_inheritance_diagram(self, node): @@ -336,7 +335,7 @@ def html_visit_inheritance_diagram(self, node): urls[child['reftitle']] = '#' + child.get('refid') dotcode = graph.generate_dot(name, urls, env=self.builder.env) - render_dot_html(self, node, dotcode, [], 'inheritance', 'inheritance', + render_dot_html(self, node, dotcode, {}, 'inheritance', 'inheritance', alt='Inheritance diagram of ' + node['content']) raise nodes.SkipNode @@ -352,7 +351,7 @@ def latex_visit_inheritance_diagram(self, node): dotcode = graph.generate_dot(name, env=self.builder.env, graph_attrs={'size': '"6.0,6.0"'}) - render_dot_latex(self, node, dotcode, [], 'inheritance') + render_dot_latex(self, node, dotcode, {}, 'inheritance') raise nodes.SkipNode diff --git a/sources/pyside2/doc/modules.rst b/sources/pyside2/doc/modules.rst index 0faa629ad..3bf0f2abb 100644 --- a/sources/pyside2/doc/modules.rst +++ b/sources/pyside2/doc/modules.rst @@ -6,16 +6,16 @@ Qt is splitted in several modules. .. toctree:: :maxdepth: 1 - PySide/QtCore/index.rst - PySide/QtGui/index.rst - PySide/QtHelp/index.rst - PySide/QtMultimedia/index.rst - PySide/QtNetwork/index.rst - PySide/QtOpenGL/index.rst - PySide/QtScript/index.rst - PySide/QtScriptTools/index.rst - PySide/QtSql/index.rst - PySide/QtSvg/index.rst - PySide/QtUiTools/index.rst - PySide/QtXml/index.rst - PySide/QtWebKit/index.rst + PySide2/QtCore/index.rst + PySide2/QtGui/index.rst + PySide2/QtHelp/index.rst + PySide2/QtMultimedia/index.rst + PySide2/QtNetwork/index.rst + PySide2/QtOpenGL/index.rst + PySide2/QtScript/index.rst + PySide2/QtScriptTools/index.rst + PySide2/QtSql/index.rst + PySide2/QtSvg/index.rst + PySide2/QtUiTools/index.rst + PySide2/QtXml/index.rst + PySide2/QtWebKit/index.rst diff --git a/sources/pyside2/doc/pyside-config.qdocconf.in b/sources/pyside2/doc/pyside-config.qdocconf.in new file mode 100644 index 000000000..4a9af5994 --- /dev/null +++ b/sources/pyside2/doc/pyside-config.qdocconf.in @@ -0,0 +1,10 @@ +buildversion = @PYSIDE_QT_VERSION@ +navigation.homepage = PySide + +outputdir = @DOC_DATA_DIR@ +outputformats = WebXML +WebXML.quotinginformation = true +WebXML.nosubdirs = true +WebXML.outputsubdir = webxml + +spurious += "Hostile character .*" diff --git a/sources/pyside2/doc/pyside.qdocconf.in b/sources/pyside2/doc/pyside.qdocconf.in deleted file mode 100644 index 9672d6103..000000000 --- a/sources/pyside2/doc/pyside.qdocconf.in +++ /dev/null @@ -1,269 +0,0 @@ -######################## compat.qdocconf -alias.i = e -alias.include = input - -macro.0 = "\\\\0" -macro.b = "\\\\b" -macro.n = "\\\\n" -macro.r = "\\\\r" -macro.i = "\\o" -macro.i11 = "\\o{1,1}" -macro.i12 = "\\o{1,2}" -macro.i13 = "\\o{1,3}" -macro.i14 = "\\o{1,4}" -macro.i15 = "\\o{1,5}" -macro.i16 = "\\o{1,6}" -macro.i17 = "\\o{1,7}" -macro.i18 = "\\o{1,8}" -macro.i19 = "\\o{1,9}" -macro.i21 = "\\o{2,1}" -macro.i31 = "\\o{3,1}" -macro.i41 = "\\o{4,1}" -macro.i51 = "\\o{5,1}" -macro.i61 = "\\o{6,1}" -macro.i71 = "\\o{7,1}" -macro.i81 = "\\o{8,1}" -macro.i91 = "\\o{9,1}" -macro.img = "\\image" -macro.endquote = "\\endquotation" -macro.relatesto = "\\relates" - -spurious = "Missing comma in .*" \ - "Missing pattern .*" - -######################## macros.qdocconf -macro.aacute.HTML = "á" -macro.Aring.HTML = "Å" -macro.aring.HTML = "å" -macro.Auml.HTML = "Ä" -macro.author = "\\bold{Author:}" -macro.br.HTML = "<br />" -macro.BR.HTML = "<br />" -macro.copyright.HTML = "©" -macro.eacute.HTML = "é" -macro.gui = "\\bold" -macro.hr.HTML = "<hr />" -macro.iacute.HTML = "í" -macro.key = "\\bold" -macro.menu = "\\bold" -macro.note = "\\bold{Note:}" -macro.oslash.HTML = "ø" -macro.ouml.HTML = "ö" -macro.QA = "\\e{Qt Assistant}" -macro.QD = "\\e{Qt Designer}" -macro.QL = "\\e{Qt Linguist}" -macro.QQV = "\\e{Qt QML Viewer}" -macro.qmlbasictype = "\\e" -macro.param = "\\e" -macro.raisedaster.HTML = "<sup>*</sup>" -macro.rarrow.HTML = "→" -macro.reg.HTML = "<sup>®</sup>" -macro.return = "Returns" -macro.starslash = "\\c{*/}" -macro.begincomment = "\\c{/*}" -macro.endcomment = "\\c{*/}" -macro.uuml.HTML = "ü" -macro.mdash.HTML = "—" - -macro.beginfloatleft.HTML = "<div style=\"float: left; margin-right: 2em\">" -macro.beginfloatright.HTML = "<div style=\"float: right; margin-left: 2em\">" -macro.endfloat.HTML = "</div>" -macro.clearfloat.HTML = "<br style=\"clear: both\" />" - -######################## qt-cpp-ignore.qdocconf -Cpp.ignoretokens = QAXFACTORY_EXPORT \ - QDESIGNER_COMPONENTS_LIBRARY \ - QDESIGNER_EXTENSION_LIBRARY \ - QDESIGNER_SDK_LIBRARY \ - QDESIGNER_SHARED_LIBRARY \ - QDESIGNER_UILIB_LIBRARY \ - QM_EXPORT_CANVAS \ - QM_EXPORT_DNS \ - QM_EXPORT_DOM \ - QM_EXPORT_FTP \ - QM_EXPORT_HTTP \ - QM_EXPORT_ICONVIEW \ - QM_EXPORT_NETWORK \ - QM_EXPORT_OPENGL \ - QM_EXPORT_OPENVG \ - QM_EXPORT_SQL \ - QM_EXPORT_TABLE \ - QM_EXPORT_WORKSPACE \ - QM_EXPORT_XML \ - QT_ASCII_CAST_WARN \ - QT_ASCII_CAST_WARN_CONSTRUCTOR \ - QT_BEGIN_HEADER \ - QT_DESIGNER_STATIC \ - QT_END_HEADER \ - QT_FASTCALL \ - QT_WIDGET_PLUGIN_EXPORT \ - Q_COMPAT_EXPORT \ - Q_CORE_EXPORT \ - Q_CORE_EXPORT_INLINE \ - Q_EXPLICIT \ - Q_EXPORT \ - Q_EXPORT_CODECS_CN \ - Q_EXPORT_CODECS_JP \ - Q_EXPORT_CODECS_KR \ - Q_EXPORT_PLUGIN \ - Q_GFX_INLINE \ - Q_AUTOTEST_EXPORT \ - Q_GUI_EXPORT \ - Q_GUI_EXPORT_INLINE \ - Q_GUI_EXPORT_STYLE_CDE \ - Q_GUI_EXPORT_STYLE_COMPACT \ - Q_GUI_EXPORT_STYLE_MAC \ - Q_GUI_EXPORT_STYLE_MOTIF \ - Q_GUI_EXPORT_STYLE_MOTIFPLUS \ - Q_GUI_EXPORT_STYLE_PLATINUM \ - Q_GUI_EXPORT_STYLE_POCKETPC \ - Q_GUI_EXPORT_STYLE_SGI \ - Q_GUI_EXPORT_STYLE_WINDOWS \ - Q_GUI_EXPORT_STYLE_WINDOWSXP \ - QHELP_EXPORT \ - Q_INLINE_TEMPLATE \ - Q_INTERNAL_WIN_NO_THROW \ - Q_NETWORK_EXPORT \ - Q_OPENGL_EXPORT \ - Q_OPENVG_EXPORT \ - Q_OUTOFLINE_TEMPLATE \ - Q_SQL_EXPORT \ - Q_SVG_EXPORT \ - Q_SCRIPT_EXPORT \ - Q_SCRIPTTOOLS_EXPORT \ - Q_TESTLIB_EXPORT \ - Q_TYPENAME \ - Q_XML_EXPORT \ - Q_XMLSTREAM_EXPORT \ - Q_XMLPATTERNS_EXPORT \ - QDBUS_EXPORT \ - QT_BEGIN_NAMESPACE \ - QT_BEGIN_INCLUDE_NAMESPACE \ - QT_END_NAMESPACE \ - QT_END_INCLUDE_NAMESPACE \ - Q_DECLARATIVE_EXPORT \ - Q_GADGET \ - QWEBKIT_EXPORT -Cpp.ignoredirectives = Q_DECLARE_HANDLE \ - Q_DECLARE_INTERFACE \ - Q_DECLARE_METATYPE \ - Q_DECLARE_OPERATORS_FOR_FLAGS \ - Q_DECLARE_PRIVATE \ - Q_DECLARE_PUBLIC \ - Q_DECLARE_SHARED \ - Q_DECLARE_TR_FUNCTIONS \ - Q_DECLARE_TYPEINFO \ - Q_DISABLE_COPY \ - QT_FORWARD_DECLARE_CLASS \ - Q_DUMMY_COMPARISON_OPERATOR \ - Q_ENUMS \ - Q_FLAGS \ - Q_INTERFACES \ - __attribute__ \ - K_DECLARE_PRIVATE \ - Q_PRIVATE_PROPERTY \ - Q_DECLARE_PRIVATE_D \ - Q_CLASSINFO - -######################## qt-defines.qdocconf -defines = Q_QDOC \ - QT_.*_SUPPORT \ - QT_.*_LIB \ - QT_COMPAT \ - QT_KEYPAD_NAVIGATION \ - QT3_SUPPORT \ - Q_WS_.* \ - Q_OS_.* \ - Q_BYTE_ORDER \ - QT_DEPRECATED \ - Q_NO_USING_KEYWORD \ - __cplusplus - -versionsym = QT_VERSION_STR - -codeindent = 1 - -######################## qt.qdocconf - -project = Qt -versionsym = -version = @PYSIDE_QT_VERSION@ -description = Qt Reference Documentation -url = http://www.pyside.org/docs/pyside-@PYSIDE_QT_VERSION@ - -language = Cpp - -headerdirs = @QT_SRC_DIR@/src \ - @QT_SRC_DIR@/extensions/activeqt \ - @QT_SRC_DIR@/tools/assistant/lib \ - @QT_SRC_DIR@/tools/assistant/compat/lib \ - @QT_SRC_DIR@/tools/designer/src/uitools \ - @QT_SRC_DIR@/tools/designer/src/lib/extension \ - @QT_SRC_DIR@/tools/designer/src/lib/sdk \ - @QT_SRC_DIR@/tools/designer/src/lib/uilib \ - @QT_SRC_DIR@/tools/qtestlib/src \ - @QT_SRC_DIR@/tools/qdbus/src \ - @pyside_SOURCE_DIR@ -sourcedirs = @QT_SRC_DIR@/src \ - @QT_SRC_DIR@/doc/src \ - @QT_SRC_DIR@/extensions/activeqt \ - @QT_SRC_DIR@/tools/assistant/lib \ - @QT_SRC_DIR@/tools/assistant/compat/lib \ - @QT_SRC_DIR@/tools/designer/src/uitools \ - @QT_SRC_DIR@/tools/designer/src/lib/extension \ - @QT_SRC_DIR@/tools/designer/src/lib/sdk \ - @QT_SRC_DIR@/tools/designer/src/lib/uilib \ - @QT_SRC_DIR@/tools/qtestlib/src \ - @QT_SRC_DIR@/tools/qdbus \ - @pyside_SOURCE_DIR@ - -excludedirs = @QT_SRC_DIR@/src/3rdparty/clucene \ - @QT_SRC_DIR@/src/3rdparty/des \ - @QT_SRC_DIR@/src/3rdparty/freetype \ - @QT_SRC_DIR@/src/3rdparty/harfbuzz \ - @QT_SRC_DIR@/src/3rdparty/kdebase \ - @QT_SRC_DIR@/src/3rdparty/libjpeg \ - @QT_SRC_DIR@/src/3rdparty/libmng \ - @QT_SRC_DIR@/src/3rdparty/libpng \ - @QT_SRC_DIR@/src/3rdparty/libtiff \ - @QT_SRC_DIR@/src/3rdparty/md4 \ - @QT_SRC_DIR@/src/3rdparty/md5 \ - @QT_SRC_DIR@/src/3rdparty/patches \ - @QT_SRC_DIR@/src/3rdparty/sha1 \ - @QT_SRC_DIR@/src/3rdparty/sqlite \ - @QT_SRC_DIR@/src/3rdparty/webkit/JavaScriptCore \ - @QT_SRC_DIR@/src/3rdparty/webkit/WebCore \ - @QT_SRC_DIR@/src/3rdparty/wintab \ - @QT_SRC_DIR@/src/3rdparty/zlib \ - @QT_SRC_DIR@/doc/src/snippets \ - @QT_SRC_DIR@/doc/src/ja_JP \ - @QT_SRC_DIR@/doc/src/zh_CN - -sources.fileextensions = "*.cpp *.qdoc *.mm" -examples.fileextensions = "*.cpp *.h *.js *.xq *.svg *.xml *.ui *.qhp *.qhcp" -examples.imageextensions = "*.png" - -tagfile = @QT_SRC_DIR@/doc/html/qt.tags -base = file:@QT_SRC_DIR@/doc/html - -HTML.generatemacrefs = "true" - -######################## pyside.qdocconf -quotinginformation = true -exampledirs = @QT_SRC_DIR@/doc/src \ - @QT_SRC_DIR@/examples \ - @QT_SRC_DIR@/examples/tutorials \ - @QT_SRC_DIR@ \ - @QT_SRC_DIR@/qmake/examples \ - @QT_SRC_DIR@/src/3rdparty/webkit/WebKit/qt/docs - -imagedirs = @QT_SRC_DIR@/doc/src/images \ - @QT_SRC_DIR@/examples \ - @QT_SRC_DIR@/doc/src/declarative/pics \ - @QT_SRC_DIR@/doc/src/template/image - -outputdir = @DOC_DATA_DIR@ -outputformats = WebXML - -generateindex = false -url = . diff --git a/sources/pyside2/doc/pysideinclude.py b/sources/pyside2/doc/pysideinclude.py index 89024f0c0..91fffe115 100644 --- a/sources/pyside2/doc/pysideinclude.py +++ b/sources/pyside2/doc/pysideinclude.py @@ -67,7 +67,7 @@ class PySideInclude(Directive): encoding = self.options.get('encoding', env.config.source_encoding) codec_info = codecs.lookup(encoding) try: - f = codecs.StreamReaderWriter(open(fn, 'U'), + f = codecs.StreamReaderWriter(open(fn, 'Ub'), codec_info[2], codec_info[3], 'strict') lines = f.readlines() f.close() @@ -97,7 +97,7 @@ class PySideInclude(Directive): if linespec is not None: try: linelist = parselinenos(linespec, len(lines)) - except ValueError, err: + except ValueError as err: return [document.reporter.warning(str(err), line=self.lineno)] lines = [lines[i] for i in linelist] diff --git a/sources/pyside2/doc/pysideversion.rst b/sources/pyside2/doc/pysideversion.rst index 3bcebe0da..5ad308c1e 100644 --- a/sources/pyside2/doc/pysideversion.rst +++ b/sources/pyside2/doc/pysideversion.rst @@ -1,31 +1,31 @@ Getting PySide and Qt version ***************************** -PySide exports their version numbers among the version of Qt used to compile PySide in a pythonnic way, you can check it using the variables: +PySide exports their version numbers among the version of Qt used to compile PySide in a pythonic way, you can check it using the variables: :: - import PySide + import PySide2.QtCore # Prints PySide version # e.g. 1.0.2 - print PySide.__version__ + print(PySide2.__version__) # Gets a tuple with each version component # e.g. (1, 0, 2, 'final', 1) - print PySide.__version_info__ + print(PySide2.__version_info__) # Prints the Qt version used to compile PySide - # e.g. "4.7.2" - print PySide2.QtCore.__version__ + # e.g. "5.11.0" + print(PySide2.QtCore.__version__) # Gets a tuple with each version components of Qt used to compile PySide - # e.g. (4, 7, 2) - print PySide2.QtCore.__version_info__ + # e.g. (5, 11, 0) + print(PySide2.QtCore.__version_info__) Note that the Qt version used to compile PySide may differ from the version used to run PySide, to get the current running Qt version you can do: :: - print PySide2.QtCore.qVersion() + print(PySide2.QtCore.qVersion()) diff --git a/sources/pyside2/doc/qtmodules/pyside-qt3dextras.qdocconf.in b/sources/pyside2/doc/qtmodules/pyside-qt3dextras.qdocconf.in new file mode 100644 index 000000000..5bc4e8c9c --- /dev/null +++ b/sources/pyside2/doc/qtmodules/pyside-qt3dextras.qdocconf.in @@ -0,0 +1,2 @@ +include(@QT_SRC_DIR@/../qt3d/src/doc/qt3d.qdocconf) +include(../pyside-config.qdocconf) diff --git a/sources/pyside2/doc/qtmodules/pyside-qtcharts.qdocconf.in b/sources/pyside2/doc/qtmodules/pyside-qtcharts.qdocconf.in new file mode 100644 index 000000000..1a58c2dc4 --- /dev/null +++ b/sources/pyside2/doc/qtmodules/pyside-qtcharts.qdocconf.in @@ -0,0 +1,2 @@ +include(@QT_SRC_DIR@/../qtcharts/src/charts/doc/qtcharts.qdocconf) +include(../pyside-config.qdocconf) diff --git a/sources/pyside2/doc/qtmodules/pyside-qtconcurrent.qdocconf.in b/sources/pyside2/doc/qtmodules/pyside-qtconcurrent.qdocconf.in new file mode 100644 index 000000000..a6976c24b --- /dev/null +++ b/sources/pyside2/doc/qtmodules/pyside-qtconcurrent.qdocconf.in @@ -0,0 +1,2 @@ +include(@QT_SRC_DIR@/src/concurrent/doc/qtconcurrent.qdocconf) +include(../pyside-config.qdocconf) diff --git a/sources/pyside2/doc/qtmodules/pyside-qtcore.qdocconf.in b/sources/pyside2/doc/qtmodules/pyside-qtcore.qdocconf.in new file mode 100644 index 000000000..5fb7248c9 --- /dev/null +++ b/sources/pyside2/doc/qtmodules/pyside-qtcore.qdocconf.in @@ -0,0 +1,2 @@ +include(@QT_SRC_DIR@/src/corelib/doc/qtcore.qdocconf) +include(../pyside-config.qdocconf) diff --git a/sources/pyside2/doc/qtmodules/pyside-qtdatavisualization.qdocconf.in b/sources/pyside2/doc/qtmodules/pyside-qtdatavisualization.qdocconf.in new file mode 100644 index 000000000..c9fcb317c --- /dev/null +++ b/sources/pyside2/doc/qtmodules/pyside-qtdatavisualization.qdocconf.in @@ -0,0 +1,2 @@ +include(@QT_SRC_DIR@/../qtdatavis3d/src/datavisualization/doc/qtdatavis3d.qdocconf) +include(../pyside-config.qdocconf) diff --git a/sources/pyside2/doc/qtmodules/pyside-qtgui.qdocconf.in b/sources/pyside2/doc/qtmodules/pyside-qtgui.qdocconf.in new file mode 100644 index 000000000..77e7e6e18 --- /dev/null +++ b/sources/pyside2/doc/qtmodules/pyside-qtgui.qdocconf.in @@ -0,0 +1,2 @@ +include(@QT_SRC_DIR@/src/gui/doc/qtgui.qdocconf) +include(../pyside-config.qdocconf) diff --git a/sources/pyside2/doc/qtmodules/pyside-qthelp.qdocconf.in b/sources/pyside2/doc/qtmodules/pyside-qthelp.qdocconf.in new file mode 100644 index 000000000..9336909c1 --- /dev/null +++ b/sources/pyside2/doc/qtmodules/pyside-qthelp.qdocconf.in @@ -0,0 +1,2 @@ +include(@QT_SRC_DIR@/../qttools/src/assistant/help/doc/qthelp.qdocconf) +include(../pyside-config.qdocconf) diff --git a/sources/pyside2/doc/qtmodules/pyside-qtmacextras.qdocconf.in b/sources/pyside2/doc/qtmodules/pyside-qtmacextras.qdocconf.in new file mode 100644 index 000000000..3e0e40019 --- /dev/null +++ b/sources/pyside2/doc/qtmodules/pyside-qtmacextras.qdocconf.in @@ -0,0 +1,2 @@ +include(@QT_SRC_DIR@/../qtmacextras/src/macextras/doc/qtmacextras.qdocconf) +include(../pyside-config.qdocconf) diff --git a/sources/pyside2/doc/qtmodules/pyside-qtmultimedia.qdocconf.in b/sources/pyside2/doc/qtmodules/pyside-qtmultimedia.qdocconf.in new file mode 100644 index 000000000..35bf1bc6a --- /dev/null +++ b/sources/pyside2/doc/qtmodules/pyside-qtmultimedia.qdocconf.in @@ -0,0 +1,2 @@ +include(@QT_SRC_DIR@/../qtmultimedia/src/multimedia/doc/qtmultimedia.qdocconf) +include(../pyside-config.qdocconf) diff --git a/sources/pyside2/doc/qtmodules/pyside-qtnetwork.qdocconf.in b/sources/pyside2/doc/qtmodules/pyside-qtnetwork.qdocconf.in new file mode 100644 index 000000000..addec9aee --- /dev/null +++ b/sources/pyside2/doc/qtmodules/pyside-qtnetwork.qdocconf.in @@ -0,0 +1,2 @@ +include(@QT_SRC_DIR@/src/network/doc/qtnetwork.qdocconf) +include(../pyside-config.qdocconf) diff --git a/sources/pyside2/doc/qtmodules/pyside-qtopengl.qdocconf.in b/sources/pyside2/doc/qtmodules/pyside-qtopengl.qdocconf.in new file mode 100644 index 000000000..34895f0c6 --- /dev/null +++ b/sources/pyside2/doc/qtmodules/pyside-qtopengl.qdocconf.in @@ -0,0 +1,2 @@ +include(@QT_SRC_DIR@/src/opengl/doc/qtopengl.qdocconf) +include(../pyside-config.qdocconf) diff --git a/sources/pyside2/doc/qtmodules/pyside-qtprintsupport.qdocconf.in b/sources/pyside2/doc/qtmodules/pyside-qtprintsupport.qdocconf.in new file mode 100644 index 000000000..04c554434 --- /dev/null +++ b/sources/pyside2/doc/qtmodules/pyside-qtprintsupport.qdocconf.in @@ -0,0 +1,2 @@ +include(@QT_SRC_DIR@/src/printsupport/doc/qtprintsupport.qdocconf) +include(../pyside-config.qdocconf) diff --git a/sources/pyside2/doc/qtmodules/pyside-qtquickwidgets.qdocconf.in b/sources/pyside2/doc/qtmodules/pyside-qtquickwidgets.qdocconf.in new file mode 100644 index 000000000..242dc3c02 --- /dev/null +++ b/sources/pyside2/doc/qtmodules/pyside-qtquickwidgets.qdocconf.in @@ -0,0 +1,2 @@ +include(@QT_SRC_DIR@/../qtdeclarative/src/quick/doc/qtquick.qdocconf) +include(../pyside-config.qdocconf) diff --git a/sources/pyside2/doc/qtmodules/pyside-qtsql.qdocconf.in b/sources/pyside2/doc/qtmodules/pyside-qtsql.qdocconf.in new file mode 100644 index 000000000..8f41c552c --- /dev/null +++ b/sources/pyside2/doc/qtmodules/pyside-qtsql.qdocconf.in @@ -0,0 +1,2 @@ +include(@QT_SRC_DIR@/src/sql/doc/qtsql.qdocconf) +include(../pyside-config.qdocconf) diff --git a/sources/pyside2/doc/qtmodules/pyside-qtsvg.qdocconf.in b/sources/pyside2/doc/qtmodules/pyside-qtsvg.qdocconf.in new file mode 100644 index 000000000..e3c39a645 --- /dev/null +++ b/sources/pyside2/doc/qtmodules/pyside-qtsvg.qdocconf.in @@ -0,0 +1,2 @@ +include(@QT_SRC_DIR@/../qtsvg/src/svg/doc/qtsvg.qdocconf) +include(../pyside-config.qdocconf) diff --git a/sources/pyside2/doc/qtmodules/pyside-qttest.qdocconf.in b/sources/pyside2/doc/qtmodules/pyside-qttest.qdocconf.in new file mode 100644 index 000000000..b092d9294 --- /dev/null +++ b/sources/pyside2/doc/qtmodules/pyside-qttest.qdocconf.in @@ -0,0 +1,2 @@ +include(@QT_SRC_DIR@/src/testlib/doc/qttestlib.qdocconf) +include(../pyside-config.qdocconf) diff --git a/sources/pyside2/doc/qtmodules/pyside-qttexttospeech.qdocconf.in b/sources/pyside2/doc/qtmodules/pyside-qttexttospeech.qdocconf.in new file mode 100644 index 000000000..2bf722f23 --- /dev/null +++ b/sources/pyside2/doc/qtmodules/pyside-qttexttospeech.qdocconf.in @@ -0,0 +1,2 @@ +include(@QT_SRC_DIR@/../qtspeech/src/doc/qtspeech.qdocconf) +include(../pyside-config.qdocconf) diff --git a/sources/pyside2/doc/qtmodules/pyside-qtuitools.qdocconf.in b/sources/pyside2/doc/qtmodules/pyside-qtuitools.qdocconf.in new file mode 100644 index 000000000..7bd3941f7 --- /dev/null +++ b/sources/pyside2/doc/qtmodules/pyside-qtuitools.qdocconf.in @@ -0,0 +1,2 @@ +include(@QT_SRC_DIR@/../qttools/src/designer/src/uitools/doc/qtuitools.qdocconf) +include(../pyside-config.qdocconf) diff --git a/sources/pyside2/doc/qtmodules/pyside-qtwebchannel.qdocconf.in b/sources/pyside2/doc/qtmodules/pyside-qtwebchannel.qdocconf.in new file mode 100644 index 000000000..f3f2f5cf4 --- /dev/null +++ b/sources/pyside2/doc/qtmodules/pyside-qtwebchannel.qdocconf.in @@ -0,0 +1,2 @@ +include(@QT_SRC_DIR@/../qtwebchannel/src/webchannel/doc/qtwebchannel.qdocconf) +include(../pyside-config.qdocconf) diff --git a/sources/pyside2/doc/qtmodules/pyside-qtwebsockets.qdocconf.in b/sources/pyside2/doc/qtmodules/pyside-qtwebsockets.qdocconf.in new file mode 100644 index 000000000..082b94883 --- /dev/null +++ b/sources/pyside2/doc/qtmodules/pyside-qtwebsockets.qdocconf.in @@ -0,0 +1,2 @@ +include(@QT_SRC_DIR@/../qtwebsockets/src/websockets/doc/qtwebsockets.qdocconf) +include(../pyside-config.qdocconf) diff --git a/sources/pyside2/doc/qtmodules/pyside-qtwidgets.qdocconf.in b/sources/pyside2/doc/qtmodules/pyside-qtwidgets.qdocconf.in new file mode 100644 index 000000000..90e887f38 --- /dev/null +++ b/sources/pyside2/doc/qtmodules/pyside-qtwidgets.qdocconf.in @@ -0,0 +1,2 @@ +include(@QT_SRC_DIR@/src/widgets/doc/qtwidgets.qdocconf) +include(../pyside-config.qdocconf) diff --git a/sources/pyside2/doc/qtmodules/pyside-qtwinextras.qdocconf.in b/sources/pyside2/doc/qtmodules/pyside-qtwinextras.qdocconf.in new file mode 100644 index 000000000..d2c1d5be7 --- /dev/null +++ b/sources/pyside2/doc/qtmodules/pyside-qtwinextras.qdocconf.in @@ -0,0 +1,2 @@ +include(@QT_SRC_DIR@/../qtwinextras/src/winextras/doc/qtwinextras.qdocconf) +include(../pyside-config.qdocconf) diff --git a/sources/pyside2/doc/qtmodules/pyside-qtx11extras.qdocconf.in b/sources/pyside2/doc/qtmodules/pyside-qtx11extras.qdocconf.in new file mode 100644 index 000000000..9315fa58c --- /dev/null +++ b/sources/pyside2/doc/qtmodules/pyside-qtx11extras.qdocconf.in @@ -0,0 +1,2 @@ +include(@QT_SRC_DIR@/../qtx11extras/src/x11extras/doc/qtx11extras.qdocconf) +include(../pyside-config.qdocconf) diff --git a/sources/pyside2/doc/qtmodules/pyside-qtxml.qdocconf.in b/sources/pyside2/doc/qtmodules/pyside-qtxml.qdocconf.in new file mode 100644 index 000000000..f9ccce7d7 --- /dev/null +++ b/sources/pyside2/doc/qtmodules/pyside-qtxml.qdocconf.in @@ -0,0 +1,2 @@ +include(@QT_SRC_DIR@/src/xml/doc/qtxml.qdocconf) +include(../pyside-config.qdocconf) diff --git a/sources/pyside2/doc/qtmodules/pyside-qtxmlpatterns.qdocconf.in b/sources/pyside2/doc/qtmodules/pyside-qtxmlpatterns.qdocconf.in new file mode 100644 index 000000000..9e132ff24 --- /dev/null +++ b/sources/pyside2/doc/qtmodules/pyside-qtxmlpatterns.qdocconf.in @@ -0,0 +1,2 @@ +include(@QT_SRC_DIR@/../qtxmlpatterns/src/xmlpatterns/doc/qtxmlpatterns.qdocconf) +include(../pyside-config.qdocconf) diff --git a/sources/pyside2/doc/src/README.md b/sources/pyside2/doc/src/README.md new file mode 100644 index 000000000..df37cf691 --- /dev/null +++ b/sources/pyside2/doc/src/README.md @@ -0,0 +1 @@ +Any qdoc source files in this directory will be parsed when generating docs. diff --git a/sources/pyside2/doc/tutorials/qmltutorial/helloworld/Cell.qml b/sources/pyside2/doc/tutorials/qmltutorial/helloworld/Cell.qml index a561e34db..a2b346724 100644 --- a/sources/pyside2/doc/tutorials/qmltutorial/helloworld/Cell.qml +++ b/sources/pyside2/doc/tutorials/qmltutorial/helloworld/Cell.qml @@ -49,7 +49,7 @@ ****************************************************************************/ //![0] -import QtQuick 1.0 +import QtQuick 2.0 //![1] Item { diff --git a/sources/pyside2/doc/tutorials/qmltutorial/helloworld/tutorial1.qml b/sources/pyside2/doc/tutorials/qmltutorial/helloworld/tutorial1.qml index ef26bb1aa..2cef1500f 100644 --- a/sources/pyside2/doc/tutorials/qmltutorial/helloworld/tutorial1.qml +++ b/sources/pyside2/doc/tutorials/qmltutorial/helloworld/tutorial1.qml @@ -50,7 +50,7 @@ //![0] //![3] -import QtQuick 1.0 +import QtQuick 2.0 //![3] //![1] diff --git a/sources/pyside2/doc/tutorials/qmltutorial/helloworld/tutorial2.qml b/sources/pyside2/doc/tutorials/qmltutorial/helloworld/tutorial2.qml index f86da25b7..2d2000bc6 100644 --- a/sources/pyside2/doc/tutorials/qmltutorial/helloworld/tutorial2.qml +++ b/sources/pyside2/doc/tutorials/qmltutorial/helloworld/tutorial2.qml @@ -49,7 +49,7 @@ ****************************************************************************/ //![0] -import QtQuick 1.0 +import QtQuick 2.0 Rectangle { id: page diff --git a/sources/pyside2/doc/tutorials/qmltutorial/helloworld/tutorial3.qml b/sources/pyside2/doc/tutorials/qmltutorial/helloworld/tutorial3.qml index 7324c4df9..f1b972cc4 100644 --- a/sources/pyside2/doc/tutorials/qmltutorial/helloworld/tutorial3.qml +++ b/sources/pyside2/doc/tutorials/qmltutorial/helloworld/tutorial3.qml @@ -49,7 +49,7 @@ ****************************************************************************/ //![0] -import QtQuick 1.0 +import QtQuick 2.0 Rectangle { id: page diff --git a/sources/pyside2/doc/tutorials/qmltutorial/index.rst b/sources/pyside2/doc/tutorials/qmltutorial/index.rst index 35cda3170..45a6842bc 100644 --- a/sources/pyside2/doc/tutorials/qmltutorial/index.rst +++ b/sources/pyside2/doc/tutorials/qmltutorial/index.rst @@ -7,8 +7,8 @@ QML Tutorial This tutorial gives an introduction to QML, the mark up language for Qt Quick. It doesn't cover everything; the emphasis is on teaching the key principles, and features are introduced as needed. -Through the different steps of this tutorial we will learn about QML basic types, we will create our own QML component -with properties and signals, and we will create a simple animation with the help of states and transitions. +Through the different steps of this tutorial you will learn about QML basic types, create our own QML component +with properties and signals, and create a simple animation with the help of states and transitions. Chapter one starts with a minimal "Hello world" program and the following chapters introduce new concepts. diff --git a/sources/pyside2/doc/tutorials/qmltutorial/step1.rst b/sources/pyside2/doc/tutorials/qmltutorial/step1.rst index 02a1095bc..bca69d9f4 100644 --- a/sources/pyside2/doc/tutorials/qmltutorial/step1.rst +++ b/sources/pyside2/doc/tutorials/qmltutorial/step1.rst @@ -4,7 +4,7 @@ QML Tutorial 1 - Basic Types **************************** This first program is a very simple "Hello world" example that introduces some basic QML concepts. -The picture below is a screenshot of this program. +The following image is a screenshot of this program. .. figure:: declarative-tutorial1.png :align: center @@ -20,8 +20,8 @@ Walkthrough Import ------ -First, we need to import the types that we need for this example. Most QML files will import the built-in QML -types (like Rectangle, Image, ...) that come with Qt, using: +First, you need to import the types that are required for this example. Most QML files import the built-in QML +types (like Rectangle, Image, ...) that come with Qt, using the following statement: .. pysideinclude:: helloworld/tutorial1.qml :snippet: 3 @@ -32,10 +32,9 @@ Rectangle element .. pysideinclude:: helloworld/tutorial1.qml :snippet: 1 -We declare a root element of type Rectangle. It is one of the basic building blocks you can use to create an application in QML. -We give it an ``id`` to be able to refer to it later. In this case, we call it "page". -We also set the ``width``, ``height`` and ``color`` properties. -The Rectangle element contains many other properties (such as ``x`` and ``y``), but these are left at their default values. +Declare a root element using the Rectangle type, which is one of the basic building blocks to create an application in QML. +Give it an ``id`` so that you can refer to it later. For example, call it "page", and also set its ``width``, +``height``, and ``color`` properties. Text element ------------ @@ -43,12 +42,12 @@ Text element .. pysideinclude code/tutorial1.qml :snippet: 2 -We add a Text element as a child of the root Rectangle element that displays the text 'Hello world!'. +Add a Text element as the child of the Rectangle element to display the text, 'Hello world!'. -The ``y`` property is used to position the text vertically at 30 pixels from the top of its parent. +Use its ``y`` property to position it at 30 pixels from the top of its parent. The ``anchors.horizontalCenter`` property refers to the horizontal center of an element. -In this case, we specify that our text element should be horizontally centered in the *page* element. +In this case, specify that the text element must be horizontally centered in the *page* element. The ``font.pointSize`` and ``font.bold properties`` are related to fonts and use the dot notation. @@ -56,11 +55,12 @@ The ``font.pointSize`` and ``font.bold properties`` are related to fonts and use Viewing the example ------------------- -To view what you have created, run the QML Viewer tool (located in the ``bin directory`` of your Qt installation) with your filename as the first argument. -For example, to run the provided completed Tutorial 1 example from the install location, you would type: +To view what you have created, run the ``qmlscene`` tool (located in the ``bin directory`` of your Qt installation) with your +QML filename as the first argument. For example, to run the Tutorial 1 example from the install +location, you would type: :: - bin/qmlviewer tutorial1.qml + > [QT_INSTALL_DIR]\bin\qmlscene tutorial1.qml [Previous :ref:`qmltutorial`][Next :ref:`qmlcomponents`] diff --git a/sources/pyside2/doc/tutorials/qmltutorial/step2.rst b/sources/pyside2/doc/tutorials/qmltutorial/step2.rst index 4dacd00a9..5b48ca63f 100644 --- a/sources/pyside2/doc/tutorials/qmltutorial/step2.rst +++ b/sources/pyside2/doc/tutorials/qmltutorial/step2.rst @@ -3,19 +3,19 @@ QML Tutorial 2 - QML Components ******************************* -This chapter adds a color picker to change the color of the text. +In this chapter, you are going to add a color picker to change the color of the text. .. figure:: declarative-tutorial2.png :align: center -Our color picker is made of six cells with different colors. -To avoid writing the same code multiple times for each cell, we create a new ``Cell`` component. -A component provides a way of defining a new type that we can re-use in other QML files. -A QML component is like a black-box and interacts with the outside world through properties, signals and functions and is generally -defined in its own QML file. +The color picker is made of six cells with different colors. +To avoid writing the same code multiple times for each cell, create a new ``Cell`` component. +A component provides a way of defining a new type that you can re-use in other QML files. +A QML component is like a black-box that interacts with the outside world through its properties, signals, +and functions, and is generally defined in its own QML file. The component's filename must always start with a capital letter. -Here is the QML code for ``Cell.qml``: +Here is the QML code for ``Cell``: .. pysideinclude:: helloworld/Cell.qml :snippet: 0 @@ -29,53 +29,53 @@ The Cell Component .. pysideinclude:: helloworld/Cell.qml :snippet: 1 -The root element of our component is an Item with the ``id`` *container*. +The root element of the component is an Item with the ``id``, *container*. An Item is the most basic visual element in QML and is often used as a container for other elements. .. pysideinclude:: helloworld/Cell.qml :snippet: 4 -We declare a ``cellColor`` property. This property is accessible from *outside* our component, this allows us -to instantiate the cells with different colors. -This property is just an alias to an existing property - the color of the rectangle that compose the cell. +Its ``cellColor`` property is accessible from *outside* the component, allowing you +to instantiate cells with different colors. It is an alias to the existing color property of the rectangle +that composes the cell. .. pysideinclude:: helloworld/Cell.qml :snippet: 5 -We want our component to also have a signal that we call *clicked* with a *cellColor* parameter of type *color*. -We will use this signal to change the color of the text in the main QML file later. +The Cell has a signal called *clicked* with the *cellColor* parameter of type *color*. +You need this signal to change the color of the text in the main QML file later. .. pysideinclude:: helloworld/Cell.qml :snippet: 2 -Our cell component is basically a colored rectangle with the ``id`` *rectangle*. +The cell component is basically a colored rectangle with the ``id``, *rectangle*. -The ``anchors.fill`` property is a convenient way to set the size of an element. +Its ``anchors.fill`` property is a convenient way to set the size of an element. In this case the rectangle will have the same size as its parent. .. pysideinclude:: helloworld/Cell.qml :snippet: 3 -In order to change the color of the text when clicking on a cell, we create a MouseArea element with -the same size as its parent. +In order to change the color of the text when the cell is clicked, a MouseArea element with +the same size as its parent is used. -A MouseArea defines a signal called *clicked*. -When this signal is triggered we want to emit our own *clicked* signal with the color as parameter. +A MouseArea enables you to react to mouse events such as clicked, hover, and so on. In this case, when the MouseArea *clicked* +signal is reported, the Cell's *clicked* signal is emitted. The main QML file ----------------- -In our main QML file, we use our ``Cell`` component to create the color picker: +In the main QML file, use the ``Cell`` component to create the color picker: .. pysideinclude:: helloworld/tutorial2.qml :snippet: 0 -We create the color picker by putting 6 cells with different colors in a grid. +Create the color picker by putting 6 cells with different colors in a grid. .. pysideinclude:: helloworld/tutorial2.qml :snippet: 1 -When the *clicked* signal of our cell is triggered, we want to set the color of the text to the *cellColor* passed as a parameter. -We can react to any signal of our component through a property of the name *'onSignalName'*. +When the *clicked* signal of a cell is triggered, set the color of the text to the *cellColor* passed as a parameter. +You can react to a signal of a component through a handler of the name, *'onSignalName'*. [Previous :ref:`qmlbasictypes`][Next :ref:`qmlstatesandtransitions`] diff --git a/sources/pyside2/doc/tutorials/qmltutorial/step3.rst b/sources/pyside2/doc/tutorials/qmltutorial/step3.rst index a72d1eac0..6d5a72f13 100644 --- a/sources/pyside2/doc/tutorials/qmltutorial/step3.rst +++ b/sources/pyside2/doc/tutorials/qmltutorial/step3.rst @@ -3,14 +3,14 @@ QML Tutorial 3 - States and Transitions *************************************** -In this chapter, we make this example a little bit more dynamic by introducing states and transitions. - -We want our text to move to the bottom of the screen, rotate and become red when clicked. +In this chapter, you are guided through the steps to make the example a little more dynamic by +introducing states and transitions. For example, moving the text to the bottom of the screen, +rotate, and change its color when clicked. .. figure:: declarative-tutorial3_animation.gif :align: center -Here is the QML code: +Here is the QML code for such a behavior: .. pysideinclude:: helloworld/tutorial3.qml :snippet: 0 @@ -21,27 +21,26 @@ Walkthrough .. pysideinclude:: helloworld/tutorial3.qml :snippet: 2 -First, we create a new *down* state for our text element. -This state will be activated when the MouseArea is pressed, and deactivated when it is released. +First, create a new *down* state for the text element. +Pressing the MouseArea activates this new state and releasing it deactivates the state. -The *down* state includes a set of property changes from our implicit *default state* +The *down* state includes a set of property changes from the implicit *default state* (the items as they were initially defined in the QML). -Specifically, we set the ``y`` property of the text to ``160``, the rotation to ``180`` and the ``color`` to red. +Specifically, set the ``y`` property of the text to ``160``, rotation to ``180``, and ``color`` to red. .. pysideinclude:: helloworld/tutorial3.qml :snippet: 3 -Because we don't want the text to appear at the bottom instantly but rather move smoothly, -we add a transition between our two states. +To make the application even better, add a transiton between the two states so that switching between these +two states look smooth and nice. -``from`` and ``to`` define the states between which the transition will run. -In this case, we want a transition from the default state to our *down* state. +The ``from`` and ``to`` properties of the Transition element define the states between which the transition will run. +In this case, you want a transition from the default state to the *down* state. -Because we want the same transition to be run in reverse when changing back from the *down* state to the default state, -we set ``reversible`` to ``true``. -This is equivalent to writing the two transitions separately. +To have a similar transition effect when changing back from the *down* state to the default state, +set the ``reversible`` property to ``true``. This is equivalent to writing two transitions. The ParallelAnimation element makes sure that the two types of animations (number and color) start at the same time. -We could also run them one after the other by using SequentialAnimation instead. +You could also run them one after the other by using SequentialAnimation instead. [Previous :ref:`qmlcomponents`] diff --git a/sources/pyside2/doc/typesystem_doc.xml.in b/sources/pyside2/doc/typesystem_doc.xml.in index 50cb2a710..78ccb5bc9 100644 --- a/sources/pyside2/doc/typesystem_doc.xml.in +++ b/sources/pyside2/doc/typesystem_doc.xml.in @@ -52,67 +52,6 @@ <typesystem package="PySide"> <suppress-warning text="File containing conversion code for *" /> <suppress-warning text="File for inject code not exist: *" /> - - <load-typesystem name="typesystem_core.xml" generate="yes"/> - - @if_QtNetwork@ - <load-typesystem name="typesystem_network.xml" generate="yes" /> - @end_QtNetwork@ - - @if_QtXml@ - <load-typesystem name="typesystem_xml.xml" generate="yes" /> - @end_QtXml@ - - @if_QtScript@ - <load-typesystem name="typesystem_script.xml" generate="yes" /> - @end_QtScript@ - - @if_QtGui@ - <load-typesystem name="typesystem_gui.xml" generate="yes"/> - @end_QtGui@ - - @if_QtHelp@ - <load-typesystem name="typesystem_help.xml" generate="yes" /> - @end_QtHelp@ - - @if_QtMultimedia@ - <load-typesystem name="typesystem_multimedia.xml" generate="yes" /> - @end_QtMultimedia@ - - @if_QtOpenGL@ - <load-typesystem name="typesystem_opengl.xml" generate="yes" /> - @end_QtOpenGL@ - - @if_QtScriptTools@ - <load-typesystem name="typesystem_scripttools.xml" generate="yes" /> - @end_QtScriptTools@ - - @if_QtSql@ - <load-typesystem name="typesystem_sql.xml" generate="yes" /> - @end_QtSql@ - - @if_QtSvg@ - <load-typesystem name="typesystem_svg.xml" generate="yes" /> - @end_QtSvg@ - - @if_QtTest@ - <load-typesystem name="typesystem_test.xml" generate="yes" /> - @end_QtTest@ - - @if_QtUiTools@ - <load-typesystem name="typesystem_uitools.xml" generate="yes" /> - @end_QtUiTools@ - - @if_QtWebKit@ - <load-typesystem name="typesystem_webkit.xml" generate="yes" /> - @end_QtWebKit@ - - - @if_QtXmlPatterns@ - <load-typesystem name="typesystem_xmlpatterns.xml" generate="yes" /> - @end_QtXmlPatterns@ - - <suppress-warning text="Can't find qdoc3 file for class QMatrix4x3, tried: /home/hugo/src/pyside/build/doc/qdoc3-output/qmatrix4x3.xml" /> <suppress-warning text="Can't find qdoc3 file for class QMatrix3x4, tried: /home/hugo/src/pyside/build/doc/qdoc3-output/qmatrix3x4.xml" /> <suppress-warning text="Can't find qdoc3 file for class QMatrix2x3, tried: /home/hugo/src/pyside/build/doc/qdoc3-output/qmatrix2x3.xml" /> @@ -121,5 +60,4 @@ <suppress-warning text="Can't find qdoc3 file for class QMatrix2x2, tried: /home/hugo/src/pyside/build/doc/qdoc3-output/qmatrix2x2.xml" /> <suppress-warning text="Can't find qdoc3 file for class QMatrix3x2, tried: /home/hugo/src/pyside/build/doc/qdoc3-output/qmatrix3x2.xml" /> <suppress-warning text="Can't find qdoc3 file for class QMatrix2x4, tried: /home/hugo/src/pyside/build/doc/qdoc3-output/qmatrix2x4.xml" /> - - </typesystem> +<!-- Modules to be appended --> diff --git a/sources/pyside2/header.BSD b/sources/pyside2/header.BSD deleted file mode 100644 index aa400a469..000000000 --- a/sources/pyside2/header.BSD +++ /dev/null @@ -1,50 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2016 The Qt Company Ltd. -** Contact: https://www.qt.io/licensing/ -** -** This file is part of the FOO module of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:BSD$ -** 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. -** -** BSD License Usage -** Alternatively, you may use this file under the terms of the BSD license -** as follows: -** -** "Redistribution and use in source and binary forms, with or without -** modification, are permitted provided that the following conditions are -** met: -** * Redistributions of source code must retain the above copyright -** notice, this list of conditions and the following disclaimer. -** * Redistributions in binary form must reproduce the above copyright -** notice, this list of conditions and the following disclaimer in -** the documentation and/or other materials provided with the -** distribution. -** * Neither the name of The Qt Company Ltd nor the names of its -** contributors may be used to endorse or promote products derived -** from this software without specific prior written permission. -** -** -** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS -** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT -** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR -** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT -** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT -** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, -** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY -** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT -** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE -** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE." -** -** $QT_END_LICENSE$ -** -****************************************************************************/ - diff --git a/sources/pyside2/header.BSD-OLD b/sources/pyside2/header.BSD-OLD deleted file mode 100644 index 5d73a99e9..000000000 --- a/sources/pyside2/header.BSD-OLD +++ /dev/null @@ -1,40 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2015 The Qt Company Ltd. -** Contact: http://www.qt.io/licensing/ -** -** This file is part of the FOO module of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:BSD-OLD$ -** You may use this file under the terms of the BSD license as follows: -** -** "Redistribution and use in source and binary forms, with or without -** modification, are permitted provided that the following conditions are -** met: -** * Redistributions of source code must retain the above copyright -** notice, this list of conditions and the following disclaimer. -** * Redistributions in binary form must reproduce the above copyright -** notice, this list of conditions and the following disclaimer in -** the documentation and/or other materials provided with the -** distribution. -** * Neither the name of The Qt Company Ltd nor the names of its -** contributors may be used to endorse or promote products derived -** from this software without specific prior written permission. -** -** -** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS -** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT -** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR -** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT -** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT -** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, -** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY -** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT -** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE -** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE." -** -** $QT_END_LICENSE$ -** -****************************************************************************/ - diff --git a/sources/pyside2/header.COMM b/sources/pyside2/header.COMM deleted file mode 100644 index 1c8cb00e7..000000000 --- a/sources/pyside2/header.COMM +++ /dev/null @@ -1,20 +0,0 @@ -/****************************************************************************** -** -** Copyright (C) 2015 The Qt Company Ltd. -** Contact: http://www.qt.io/licensing/ -** -** This file is part of the <Fill> module. -** -** $QT_BEGIN_LICENSE:COMM$ -** -** 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 http://www.qt.io/terms-conditions. For further -** information use the contact form at http://www.qt.io/contact-us. -** -** $QT_END_LICENSE$ -** -******************************************************************************/ diff --git a/sources/pyside2/header.FDL b/sources/pyside2/header.FDL deleted file mode 100644 index 90195db13..000000000 --- a/sources/pyside2/header.FDL +++ /dev/null @@ -1,27 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2016 The Qt Company Ltd. -** Contact: https://www.qt.io/licensing/ -** -** This file is part of the documentation of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:FDL$ -** 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 Free Documentation License Usage -** Alternatively, this file may be used under the terms of the GNU Free -** Documentation License version 1.3 as published by the Free Software -** Foundation and appearing in the file included in the packaging of -** this file. Please review the following information to ensure -** the GNU Free Documentation License version 1.3 requirements -** will be met: https://www.gnu.org/licenses/fdl-1.3.html. -** $QT_END_LICENSE$ -** -****************************************************************************/ - diff --git a/sources/pyside2/header.FDL-OLD b/sources/pyside2/header.FDL-OLD deleted file mode 100644 index 58436c482..000000000 --- a/sources/pyside2/header.FDL-OLD +++ /dev/null @@ -1,27 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2015 The Qt Company Ltd. -** Contact: http://www.qt.io/licensing/ -** -** This file is part of the documentation of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:FDL-OLD$ -** 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 http://www.qt.io/terms-conditions. For further -** information use the contact form at http://www.qt.io/contact-us. -** -** GNU Free Documentation License Usage -** Alternatively, this file may be used under the terms of the GNU Free -** Documentation License version 1.3 as published by the Free Software -** Foundation and appearing in the file included in the packaging of -** this file. Please review the following information to ensure -** the GNU Free Documentation License version 1.3 requirements -** will be met: http://www.gnu.org/copyleft/fdl.html. -** $QT_END_LICENSE$ -** -****************************************************************************/ - diff --git a/sources/pyside2/header.GPL b/sources/pyside2/header.GPL deleted file mode 100644 index af4a1636b..000000000 --- a/sources/pyside2/header.GPL +++ /dev/null @@ -1,29 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2016 The Qt Company Ltd. -** Contact: https://www.qt.io/licensing/ -** -** This file is part of the FOO module of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:GPL$ -** 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 General Public License Usage -** Alternatively, this file may be used under the terms of the GNU -** General Public License version 3 or (at your option) 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.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-3.0.html. -** -** $QT_END_LICENSE$ -** -****************************************************************************/ - diff --git a/sources/pyside2/header.GPL-EXCEPT b/sources/pyside2/header.GPL-EXCEPT deleted file mode 100644 index 26ed5a245..000000000 --- a/sources/pyside2/header.GPL-EXCEPT +++ /dev/null @@ -1,28 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2016 The Qt Company Ltd. -** Contact: https://www.qt.io/licensing/ -** -** This file is part of the FOO module of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:GPL-EXCEPT$ -** 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 General Public License Usage -** Alternatively, this file may be used under the terms of the GNU -** General Public License version 3 as published by the Free Software -** Foundation with exceptions as appearing in the file LICENSE.GPL3-EXCEPT -** 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-3.0.html. -** -** $QT_END_LICENSE$ -** -****************************************************************************/ - diff --git a/sources/pyside2/header.LGPL-ONLY b/sources/pyside2/header.LGPL-ONLY deleted file mode 100644 index 9a676032e..000000000 --- a/sources/pyside2/header.LGPL-ONLY +++ /dev/null @@ -1,22 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2015 The Qt Company Ltd. -** Contact: http://www.qt.io/licensing/ -** -** This file is part of the FOO module of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:LGPL-ONLY$ -** GNU Lesser General Public License Usage -** This file may be used under the terms of the GNU Lesser -** General Public License version 2.1 as published by the Free Software -** Foundation and appearing in the file LICENSE.LGPL included in the -** packaging of this file. Please review the following information to -** ensure the GNU Lesser General Public License version 2.1 requirements -** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. -** -** If you have questions regarding the use of this file, please contact -** us via http://www.qt.io/contact-us/. -** -** $QT_END_LICENSE$ -** -****************************************************************************/ diff --git a/sources/pyside2/header.LGPL21 b/sources/pyside2/header.LGPL21 deleted file mode 100644 index 533390b07..000000000 --- a/sources/pyside2/header.LGPL21 +++ /dev/null @@ -1,33 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2015 The Qt Company Ltd. -** Contact: http://www.qt.io/licensing/ -** -** This file is part of the FOO module of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:LGPL21$ -** 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 http://www.qt.io/terms-conditions. For further -** information use the contact form at http://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 2.1 or version 3 as published by the Free -** Software Foundation and appearing in the file LICENSE.LGPLv21 and -** LICENSE.LGPLv3 included in the packaging of this file. Please review the -** following information to ensure the GNU Lesser General Public License -** requirements will be met: https://www.gnu.org/licenses/lgpl.html and -** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. -** -** As a special exception, The Qt Company gives you certain additional -** rights. These rights are described in The Qt Company LGPL Exception -** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. -** -** $QT_END_LICENSE$ -** -****************************************************************************/ - diff --git a/sources/pyside2/header.LGPL3 b/sources/pyside2/header.LGPL3 deleted file mode 100644 index d9a65c2e4..000000000 --- a/sources/pyside2/header.LGPL3 +++ /dev/null @@ -1,36 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2015 The Qt Company Ltd. -** Contact: http://www.qt.io/licensing/ -** -** This file is part of the FOO module of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:LGPL3$ -** 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 http://www.qt.io/terms-conditions. For further -** information use the contact form at http://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.LGPLv3 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.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 later as published by the Free -** Software Foundation and appearing in the file LICENSE.GPL included in -** the packaging of this file. Please review the following information to -** ensure the GNU General Public License version 2.0 requirements will be -** met: http://www.gnu.org/licenses/gpl-2.0.html. -** -** $QT_END_LICENSE$ -** -****************************************************************************/ - diff --git a/sources/pyside2/header.LGPL3-COMM b/sources/pyside2/header.LGPL3-COMM deleted file mode 100644 index b5dc15d38..000000000 --- a/sources/pyside2/header.LGPL3-COMM +++ /dev/null @@ -1,28 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2015 The Qt Company Ltd. -** Contact: http://www.qt.io/licensing/ -** -** This file is part of the FOO module of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:LGPL3-COMM$ -** 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 http://www.qt.io/terms-conditions. For further -** information use the contact form at http://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.LGPLv3 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.html. -** -** $QT_END_LICENSE$ -** -****************************************************************************/ - diff --git a/sources/pyside2/libpyside/CMakeLists.txt b/sources/pyside2/libpyside/CMakeLists.txt index 15879a201..3069b1ca2 100644 --- a/sources/pyside2/libpyside/CMakeLists.txt +++ b/sources/pyside2/libpyside/CMakeLists.txt @@ -76,13 +76,10 @@ endmacro() # Test files. file(GLOB_RECURSE pyside_folder_py_files "../*.py") -# Example files. -file(GLOB_RECURSE example_folder_py_files "../../pyside2-examples/*.py") - # Mostly for setup.py. file(GLOB setup_folder_py_files "../../../*.py") -set(other_files ${pyside_folder_py_files} ${example_folder_py_files} ${setup_folder_py_files}) +set(other_files ${pyside_folder_py_files} ${setup_folder_py_files}) add_other_files(${other_files}) include_directories(${CMAKE_CURRENT_SOURCE_DIR} diff --git a/sources/pyside2/libpyside/pysidesignal.cpp b/sources/pyside2/libpyside/pysidesignal.cpp index e213ff069..a901d10af 100644 --- a/sources/pyside2/libpyside/pysidesignal.cpp +++ b/sources/pyside2/libpyside/pysidesignal.cpp @@ -413,11 +413,64 @@ PyObject* signalInstanceConnect(PyObject* self, PyObject* args, PyObject* kwds) sourceWalk = reinterpret_cast<PySideSignalInstance*>(sourceWalk->d->next); } } else { - //try the first signature + // Check signature of the slot (method or function) to match signal + int slotArgs = -1; + bool useSelf = false; + bool isMethod = PyMethod_Check(slot); + bool isFunction = PyFunction_Check(slot); + bool matchedSlot = false; + + QByteArray functionName; + PySideSignalInstance *it = source; + + if (isMethod || isFunction) { + PyObject *function = isMethod ? PyMethod_GET_FUNCTION(slot) : slot; + PyCodeObject *objCode = reinterpret_cast<PyCodeObject *>(PyFunction_GET_CODE(function)); + PyFunctionObject *function_obj = reinterpret_cast<PyFunctionObject *>(function); + functionName = Shiboken::String::toCString(function_obj->func_name); + useSelf = isMethod; + slotArgs = objCode->co_flags & CO_VARARGS ? -1 : objCode->co_argcount; + if (useSelf) + slotArgs -= 1; + + // Get signature args + bool isShortCircuit = false; + int signatureArgs = 0; + QStringList argsSignature; + + argsSignature = PySide::Signal::getArgsFromSignature(it->d->signature, + &isShortCircuit); + signatureArgs = argsSignature.length(); + + // Iterate the possible types of connection for this signal and compare + // it with slot arguments + if (signatureArgs != slotArgs) { + while (it->d->next != nullptr) { + it = it->d->next; + argsSignature = PySide::Signal::getArgsFromSignature(it->d->signature, + &isShortCircuit); + signatureArgs = argsSignature.length(); + if (signatureArgs == slotArgs) { + matchedSlot = true; + break; + } + } + } + } + + // Adding references to pyArgs PyList_Append(pyArgs, source->d->source); - Shiboken::AutoDecRef signature(PySide::Signal::buildQtCompatible(source->d->signature)); - PyList_Append(pyArgs, signature); + if (matchedSlot) { + // If a slot matching the same number of arguments was found, + // include signature to the pyArgs + Shiboken::AutoDecRef signature(PySide::Signal::buildQtCompatible(it->d->signature)); + PyList_Append(pyArgs, signature); + } else { + // Try the first by default if the slot was not found + Shiboken::AutoDecRef signature(PySide::Signal::buildQtCompatible(source->d->signature)); + PyList_Append(pyArgs, signature); + } PyList_Append(pyArgs, slot); match = true; } @@ -433,7 +486,7 @@ PyObject* signalInstanceConnect(PyObject* self, PyObject* args, PyObject* kwds) return 0; } PyObject* result = PyObject_CallObject(pyMethod, tupleArgs); - if (result == Py_True) + if (result == Py_True || result == Py_False) return result; else Py_XDECREF(result); @@ -564,17 +617,26 @@ PyObject* signalCall(PyObject* self, PyObject* args, PyObject* kw) { PySideSignal* signal = reinterpret_cast<PySideSignal*>(self); + // Native C++ signals can't be called like functions, thus we throw an exception. + // The only way calling a signal can succeed (the Python equivalent of C++'s operator() ) + // is when a method with the same name as the signal is attached to an object. + // An example is QProcess::error() (don't check the docs, but the source code of qprocess.h). if (!signal->homonymousMethod) { PyErr_SetString(PyExc_TypeError, "native Qt signal is not callable"); return 0; } descrgetfunc getDescriptor = signal->homonymousMethod->ob_type->tp_descr_get; - Shiboken::AutoDecRef homonymousMethod(getDescriptor(signal->homonymousMethod, 0, 0)); - if (PyCFunction_GET_FLAGS(homonymousMethod.object()) & METH_STATIC) + // Check if there exists a method with the same name as the signal, which is also a static + // method in C++ land. + Shiboken::AutoDecRef homonymousMethod(getDescriptor(signal->homonymousMethod, 0, 0)); + if (PyCFunction_Check(homonymousMethod) + && (PyCFunction_GET_FLAGS(homonymousMethod.object()) & METH_STATIC)) { return PyCFunction_Call(homonymousMethod, args, kw); + } + // Assumes homonymousMethod is not a static method. ternaryfunc callFunc = signal->homonymousMethod->ob_type->tp_call; return callFunc(homonymousMethod, args, kw); } diff --git a/sources/pyside2/pyside_version.py b/sources/pyside2/pyside_version.py index b207d6b9c..aacb7e0d9 100644 --- a/sources/pyside2/pyside_version.py +++ b/sources/pyside2/pyside_version.py @@ -1,5 +1,44 @@ +############################################################################# +## +## Copyright (C) 2018 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$ +## +############################################################################# + major_version = "5" -minor_version = "6" +minor_version = "9" patch_version = "0" pre_release_version_type = "a" # e.g. "a", "b", "rc". pre_release_version = "1" # e.g "1", "2", (which means "beta1", "beta2", if type is "b") diff --git a/sources/pyside2/tests/Qt3DAnimation/CMakeLists.txt b/sources/pyside2/tests/Qt3DAnimation/CMakeLists.txt new file mode 100644 index 000000000..2f7cb08b9 --- /dev/null +++ b/sources/pyside2/tests/Qt3DAnimation/CMakeLists.txt @@ -0,0 +1 @@ +# Please add some tests, here diff --git a/sources/pyside2/tests/Qt3DCore/CMakeLists.txt b/sources/pyside2/tests/Qt3DCore/CMakeLists.txt new file mode 100644 index 000000000..2f7cb08b9 --- /dev/null +++ b/sources/pyside2/tests/Qt3DCore/CMakeLists.txt @@ -0,0 +1 @@ +# Please add some tests, here diff --git a/sources/pyside2/tests/Qt3DExtras/CMakeLists.txt b/sources/pyside2/tests/Qt3DExtras/CMakeLists.txt new file mode 100644 index 000000000..5f8d2e77b --- /dev/null +++ b/sources/pyside2/tests/Qt3DExtras/CMakeLists.txt @@ -0,0 +1 @@ +PYSIDE_TEST(qt3dextras_test.py) diff --git a/sources/pyside2/tests/Qt3DExtras/qt3dextras_test.py b/sources/pyside2/tests/Qt3DExtras/qt3dextras_test.py new file mode 100644 index 000000000..967886a14 --- /dev/null +++ b/sources/pyside2/tests/Qt3DExtras/qt3dextras_test.py @@ -0,0 +1,154 @@ +#!/usr/bin/python + +############################################################################# +## +## Copyright (C) 2017 The Qt Company Ltd. +## Contact: https://www.qt.io/licensing/ +## +## This file is part of the test suite of PySide2. +## +## $QT_BEGIN_LICENSE:GPL-EXCEPT$ +## 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 General Public License Usage +## Alternatively, this file may be used under the terms of the GNU +## General Public License version 3 as published by the Free Software +## Foundation with exceptions as appearing in the file LICENSE.GPL3-EXCEPT +## 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-3.0.html. +## +## $QT_END_LICENSE$ +## +############################################################################# + +'''Test cases for Q3DExtras''' + +from helper import UsesQGuiApplication +import unittest + +from PySide2.QtCore import(Property, QObject, QPropertyAnimation, QTimer, Signal, Slot) +from PySide2.QtGui import (QGuiApplication, QMatrix4x4, QQuaternion, QVector3D, QWindow) +from PySide2.Qt3DCore import (Qt3DCore) +from PySide2.Qt3DRender import (Qt3DRender) +from PySide2.Qt3DExtras import (Qt3DExtras) + +class OrbitTransformController(QObject): + def __init__(self, parent): + super(OrbitTransformController, self).__init__(parent) + self._target = None + self._matrix = QMatrix4x4() + self._radius = 1 + self._angle = 0 + + def setTarget(self, t): + self._target = t + + def getTarget(self): + return self._target + + def setRadius(self, radius): + if self._radius != radius: + self._radius = radius + self.updateMatrix() + self.radiusChanged.emit() + + def getRadius(self): + return self._radius + + def setAngle(self, angle): + if self._angle != angle: + self._angle = angle + self.updateMatrix() + self.angleChanged.emit() + + def getAngle(self): + return self._angle + + def updateMatrix(self): + self._matrix.setToIdentity(); + self._matrix.rotate(self._angle, QVector3D(0, 1, 0)) + self._matrix.translate(self._radius, 0, 0) + if self._target is not None: + self._target.setMatrix(self._matrix) + + angleChanged = Signal() + radiusChanged = Signal() + angle = Property(float, getAngle, setAngle, notify=angleChanged) + radius = Property(float, getRadius, setRadius, notify=radiusChanged) + +class Window(Qt3DExtras.Qt3DWindow): + def __init__(self): + super(Window, self).__init__() + + # Camera + self.camera().lens().setPerspectiveProjection(45, 16 / 9, 0.1, 1000) + self.camera().setPosition(QVector3D(0, 0, 40)) + self.camera().setViewCenter(QVector3D(0, 0, 0)) + + # For camera controls + self.createScene() + self.camController = Qt3DExtras.QOrbitCameraController(self.rootEntity) + self.camController.setLinearSpeed(50) + self.camController.setLookSpeed(180) + self.camController.setCamera(self.camera()) + + self.setRootEntity(self.rootEntity) + + def createScene(self): + # Root entity + self.rootEntity = Qt3DCore.QEntity() + + # Material + self.material = Qt3DExtras.QPhongMaterial(self.rootEntity) + + # Torus + self.torusEntity = Qt3DCore.QEntity(self.rootEntity) + self.torusMesh = Qt3DExtras.QTorusMesh() + self.torusMesh.setRadius(5) + self.torusMesh.setMinorRadius(1) + self.torusMesh.setRings(100) + self.torusMesh.setSlices(20) + + self.torusTransform = Qt3DCore.QTransform() + self.torusTransform.setScale3D(QVector3D(1.5, 1, 0.5)) + self.torusTransform.setRotation(QQuaternion.fromAxisAndAngle(QVector3D(1, 0, 0), 45)) + + self.torusEntity.addComponent(self.torusMesh) + self.torusEntity.addComponent(self.torusTransform) + self.torusEntity.addComponent(self.material) + + # Sphere + self.sphereEntity = Qt3DCore.QEntity(self.rootEntity) + self.sphereMesh = Qt3DExtras.QSphereMesh() + self.sphereMesh.setRadius(3) + + self.sphereTransform = Qt3DCore.QTransform() + self.controller = OrbitTransformController(self.sphereTransform) + self.controller.setTarget(self.sphereTransform) + self.controller.setRadius(20) + + self.sphereEntity.addComponent(self.sphereMesh) + self.sphereEntity.addComponent(self.sphereTransform) + self.sphereEntity.addComponent(self.material) + +class Qt3DExtrasTestCase(UsesQGuiApplication): + '''Tests related to Q3DExtras''' + + def test3DExtras(self): + + window = Window() + window.show() + while not window.isExposed(): + self.app.processEvents() + QTimer.singleShot(2000, self.app.quit) + self.app.exec_() + +if __name__ == '__main__': + unittest.main() diff --git a/sources/pyside2/tests/Qt3DInput/CMakeLists.txt b/sources/pyside2/tests/Qt3DInput/CMakeLists.txt new file mode 100644 index 000000000..2f7cb08b9 --- /dev/null +++ b/sources/pyside2/tests/Qt3DInput/CMakeLists.txt @@ -0,0 +1 @@ +# Please add some tests, here diff --git a/sources/pyside2/tests/Qt3DLogic/CMakeLists.txt b/sources/pyside2/tests/Qt3DLogic/CMakeLists.txt new file mode 100644 index 000000000..2f7cb08b9 --- /dev/null +++ b/sources/pyside2/tests/Qt3DLogic/CMakeLists.txt @@ -0,0 +1 @@ +# Please add some tests, here diff --git a/sources/pyside2/tests/Qt3DQuick/CMakeLists.txt b/sources/pyside2/tests/Qt3DQuick/CMakeLists.txt new file mode 100644 index 000000000..2f7cb08b9 --- /dev/null +++ b/sources/pyside2/tests/Qt3DQuick/CMakeLists.txt @@ -0,0 +1 @@ +# Please add some tests, here diff --git a/sources/pyside2/tests/Qt3DRender/CMakeLists.txt b/sources/pyside2/tests/Qt3DRender/CMakeLists.txt new file mode 100644 index 000000000..2f7cb08b9 --- /dev/null +++ b/sources/pyside2/tests/Qt3DRender/CMakeLists.txt @@ -0,0 +1 @@ +# Please add some tests, here diff --git a/sources/pyside2/tests/QtAxContainer/CMakeLists.txt b/sources/pyside2/tests/QtAxContainer/CMakeLists.txt new file mode 100644 index 000000000..2f7cb08b9 --- /dev/null +++ b/sources/pyside2/tests/QtAxContainer/CMakeLists.txt @@ -0,0 +1 @@ +# Please add some tests, here diff --git a/sources/pyside2/tests/QtCharts/CMakeLists.txt b/sources/pyside2/tests/QtCharts/CMakeLists.txt new file mode 100644 index 000000000..16e8b4bc9 --- /dev/null +++ b/sources/pyside2/tests/QtCharts/CMakeLists.txt @@ -0,0 +1 @@ +PYSIDE_TEST(qcharts_test.py) diff --git a/sources/pyside2/tests/QtCharts/qcharts_test.py b/sources/pyside2/tests/QtCharts/qcharts_test.py new file mode 100644 index 000000000..1503b2e54 --- /dev/null +++ b/sources/pyside2/tests/QtCharts/qcharts_test.py @@ -0,0 +1,63 @@ +#!/usr/bin/python + +############################################################################# +## +## Copyright (C) 2017 The Qt Company Ltd. +## Contact: https://www.qt.io/licensing/ +## +## This file is part of the test suite of PySide2. +## +## $QT_BEGIN_LICENSE:GPL-EXCEPT$ +## 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 General Public License Usage +## Alternatively, this file may be used under the terms of the GNU +## General Public License version 3 as published by the Free Software +## Foundation with exceptions as appearing in the file LICENSE.GPL3-EXCEPT +## 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-3.0.html. +## +## $QT_END_LICENSE$ +## +############################################################################# + +'''Test cases for QCharts''' + +from helper import UsesQApplication +import unittest + +from PySide2.QtCore import QRect, QSize, QTimer +from PySide2.QtGui import QGuiApplication, QScreen +from PySide2.QtCharts import QtCharts + +class QChartsTestCase(UsesQApplication): + '''Tests related to QCharts''' + + def testCharts(self): + self.series = QtCharts.QPieSeries() + self.series.append("Jane", 1); + self.series.append("Joe", 2); + self.series.append("Andy", 3); + self.series.append("Barbara", 4); + self.series.append("Axel", 5); + slice = self.series.slices()[1] + slice.setExploded(); + slice.setLabelVisible(); + self.chart = QtCharts.QChart() + self.chart.addSeries(self.series); + chartView = QtCharts.QChartView(self.chart) + screenSize = QGuiApplication.primaryScreen().geometry().size() + chartView.resize(screenSize / 2) + chartView.show() + QTimer.singleShot(500, self.app.quit) + self.app.exec_() + +if __name__ == '__main__': + unittest.main() diff --git a/sources/pyside2/tests/QtCore/CMakeLists.txt b/sources/pyside2/tests/QtCore/CMakeLists.txt index 9e66ebc0a..3a08cb45b 100644 --- a/sources/pyside2/tests/QtCore/CMakeLists.txt +++ b/sources/pyside2/tests/QtCore/CMakeLists.txt @@ -61,6 +61,7 @@ PYSIDE_TEST(qenum_test.py) PYSIDE_TEST(qevent_test.py) PYSIDE_TEST(qfileinfo_test.py) PYSIDE_TEST(qfile_test.py) +PYSIDE_TEST(qfileread_test.py) PYSIDE_TEST(qflags_test.py) PYSIDE_TEST(qinstallmsghandler_test.py) PYSIDE_TEST(qlinef_test.py) @@ -85,6 +86,7 @@ PYSIDE_TEST(qprocess_test.py) PYSIDE_TEST(qproperty_decorator.py) PYSIDE_TEST(qrect_test.py) PYSIDE_TEST(qregexp_test.py) +PYSIDE_TEST(qregularexpression_test.py) PYSIDE_TEST(qresource_test.py) PYSIDE_TEST(qsize_test.py) PYSIDE_TEST(qslot_object_test.py) @@ -105,6 +107,9 @@ PYSIDE_TEST(qtimer_timeout_test.py) PYSIDE_TEST(qtimezone_test.py) PYSIDE_TEST(qtnamespace_test.py) PYSIDE_TEST(qurl_test.py) +PYSIDE_TEST(qurlquery_test.py) +PYSIDE_TEST(quuid_test.py) +PYSIDE_TEST(qversionnumber_test.py) PYSIDE_TEST(repr_test.py) PYSIDE_TEST(setprop_on_ctor_test.py) PYSIDE_TEST(staticMetaObject_test.py) diff --git a/sources/pyside2/tests/QtCore/qfileread_test.py b/sources/pyside2/tests/QtCore/qfileread_test.py new file mode 100644 index 000000000..3912fe7e6 --- /dev/null +++ b/sources/pyside2/tests/QtCore/qfileread_test.py @@ -0,0 +1,82 @@ +############################################################################# +## +## Copyright (C) 2018 The Qt Company Ltd. +## Contact: https://www.qt.io/licensing/ +## +## This file is part of the test suite of PySide2. +## +## $QT_BEGIN_LICENSE:GPL-EXCEPT$ +## 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 General Public License Usage +## Alternatively, this file may be used under the terms of the GNU +## General Public License version 3 as published by the Free Software +## Foundation with exceptions as appearing in the file LICENSE.GPL3-EXCEPT +## 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-3.0.html. +## +## $QT_END_LICENSE$ +## +############################################################################# + +import unittest + +import os + +from PySide2.QtCore import QIODevice, QTemporaryFile + +class FileChild1(QTemporaryFile): + pass + +class FileChild2(QTemporaryFile): + def readData(self, maxlen): + return super(FileChild2, self).readData(maxlen) + def readLineData(self, maxlen): + return super(FileChild2, self).readLineData(maxlen) + +class readDataTest(unittest.TestCase): + '''Test case for readData and readLineData''' + + def setUp(self): + '''Acquire resources''' + self.filename1 = FileChild1() + self.assertTrue(self.filename1.open()) + self.filename1.write('Test text for testing') + + self.filename2 = FileChild2() + self.assertTrue(self.filename2.open()) + self.filename2.write('Test text for testing') + + def tearDown(self): + '''release resources''' + pass + + def testBasic(self): + '''QTemporaryFile.read''' + self.filename1.seek(0) + s1 = self.filename1.read(50) + self.assertEqual(s1, 'Test text for testing') + + + def testBug40(self): + self.filename2.seek(0) + s2 = self.filename2.read(50) + self.assertEqual(s2, 'Test text for testing') + + self.filename2.seek(0) + s2 = self.filename2.readLine(22) + self.assertEqual(s2, 'Test text for testing') + + self.filename1.seek(0) + s1 = self.filename1.read(50) + self.assertEqual(s1, s2) + +if __name__ == '__main__': + unittest.main() diff --git a/sources/pyside2/tests/QtCore/qmimedatabase_test.py b/sources/pyside2/tests/QtCore/qmimedatabase_test.py index 7bd9a4586..4c3ae220d 100644 --- a/sources/pyside2/tests/QtCore/qmimedatabase_test.py +++ b/sources/pyside2/tests/QtCore/qmimedatabase_test.py @@ -34,7 +34,7 @@ import unittest import ctypes import sys -from PySide2.QtCore import QMimeDatabase +from PySide2.QtCore import QMimeDatabase, QLocale class QMimeDatabaseTest(unittest.TestCase): def testMimeTypeForName(self): @@ -43,7 +43,8 @@ class QMimeDatabaseTest(unittest.TestCase): s0 = db.mimeTypeForName("application/x-zerosize") self.assertTrue(s0.isValid()) self.assertEqual(s0.name(), "application/x-zerosize") - self.assertEqual(s0.comment(), "empty document") + if "en" in QLocale().name(): + self.assertEqual(s0.comment(), "empty document") s0Again = db.mimeTypeForName("application/x-zerosize") self.assertEqual(s0Again.name(), s0.name()) diff --git a/sources/pyside2/tests/QtCore/qobject_test.py b/sources/pyside2/tests/QtCore/qobject_test.py index 482ae78be..bafa8a643 100644 --- a/sources/pyside2/tests/QtCore/qobject_test.py +++ b/sources/pyside2/tests/QtCore/qobject_test.py @@ -34,7 +34,12 @@ import unittest import py3kcompat as py3k -from PySide2.QtCore import QObject +from PySide2.QtCore import QObject, Signal, Qt + +class Obj(QObject): + signal = Signal() + def empty(self): + pass class ObjectNameCase(unittest.TestCase): '''Tests related to QObject object name''' @@ -67,6 +72,12 @@ class ObjectNameCase(unittest.TestCase): obj.setObjectName(name) self.assertEqual(obj.objectName(), name) + def testUniqueConnection(self): + obj = Obj() + # On first connect, UniqueConnection returns True, and on the second + # it must return False, and not a RuntimeError (PYSIDE-34) + self.assertTrue(obj.signal.connect(obj.empty, Qt.UniqueConnection)) + self.assertFalse(obj.signal.connect(obj.empty, Qt.UniqueConnection)) if __name__ == '__main__': unittest.main() diff --git a/sources/pyside2/tests/QtCore/qregularexpression_test.py b/sources/pyside2/tests/QtCore/qregularexpression_test.py new file mode 100644 index 000000000..e11b9b61c --- /dev/null +++ b/sources/pyside2/tests/QtCore/qregularexpression_test.py @@ -0,0 +1,56 @@ +#!/usr/bin/python + +############################################################################# +## +## Copyright (C) 2017 The Qt Company Ltd. +## Contact: https://www.qt.io/licensing/ +## +## This file is part of the test suite of PySide2. +## +## $QT_BEGIN_LICENSE:GPL-EXCEPT$ +## 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 General Public License Usage +## Alternatively, this file may be used under the terms of the GNU +## General Public License version 3 as published by the Free Software +## Foundation with exceptions as appearing in the file LICENSE.GPL3-EXCEPT +## 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-3.0.html. +## +## $QT_END_LICENSE$ +## +############################################################################# + +'''Unit tests for QRegularExpression''' + +import unittest +from PySide2.QtCore import QRegularExpression, QRegularExpressionMatch, QRegularExpressionMatchIterator + +class QRegularExpressionTest(unittest.TestCase): + + def testMatch(self): + re = QRegularExpression('^.*(word2).*$') + self.assertTrue(re.isValid()) + match = re.match('word1 word2 word3') + self.assertTrue(match.isValid()) + self.assertEqual(match.captured(1), 'word2') + + def testMatchIterator(self): + re = QRegularExpression('(\w+)') + self.assertTrue(re.isValid()) + count = 0 + it = re.globalMatch('word1 word2 word3'); + while it.hasNext(): + it.next() + count = count + 1 + self.assertEqual(count, 3) + +if __name__ == '__main__': + unittest.main() diff --git a/sources/pyside2/tests/QtCore/qurl_test.py b/sources/pyside2/tests/QtCore/qurl_test.py index 595e5931f..d5eb37d6e 100644 --- a/sources/pyside2/tests/QtCore/qurl_test.py +++ b/sources/pyside2/tests/QtCore/qurl_test.py @@ -33,6 +33,7 @@ import unittest from PySide2.QtCore import QUrl +from PySide2.QtCore import QUrlQuery class QUrlBasicConstructor(unittest.TestCase): '''Tests the basic constructors''' @@ -67,59 +68,96 @@ class QUrlBasicConstructor(unittest.TestCase): self.assertEqual(url.toString(), 'ftp://john:abc123@www.google.com:8080/mail/view') +class QueryItemsTest(unittest.TestCase): + '''Test query item management''' + + def testQueryItems(self): + url = QUrl('http://www.google.com/search?q=python&hl=en') + valid_data = [(('q'), ('python')), (('hl'), ('en'))] + + self.assertEqual(sorted(QUrlQuery(url.query()).queryItems()), sorted(valid_data)) + + def testEncodedQueryItems(self): + url = QUrl('http://www.google.com/search?q=python&hl=en') + valid_data = [(('q'), ('python')), (('hl'), ('en'))] + + self.assertEqual(sorted(QUrlQuery(url.query()).queryItems()), sorted(valid_data)) + + def testSetQueryItems(self): + urla = QUrl('http://www.google.com/search?q=python&hl=en') + urlb = QUrl('http://www.google.com/search') + + urlb.setQuery(urla.query()) + + self.assertEqual(urla, urlb) + + def testAddQueryItem(self): + url = QUrlQuery() + valid_data = [('hl', 'en'), ('user', 'konqui')] + + url.addQueryItem(*valid_data[0]) + self.assertEqual(url.queryItems()[0], valid_data[0]) + + url.addQueryItem(*valid_data[1]) + self.assertEqual(sorted(url.queryItems()), sorted(valid_data)) + + def testAllQueryItemsValues(self): + url = QUrlQuery() + key = 'key' + valid_data = ['data', 'valid', 'test'] + + for i, data in enumerate(valid_data): + url.addQueryItem(key, data) + self.assertEqual(url.allQueryItemValues(key), + list(valid_data[:i+1])) + def testPath(self): url = QUrl("http://qt-project.org/images/ban/pgs_front.jpg") self.assertEqual(url.path(), "/images/ban/pgs_front.jpg") # PYSIDE-345: No bindings for QUrlQuery -# class QueryItemsTest(unittest.TestCase): -# '''Test query item management''' -# -# def testQueryItems(self): -# #QUrl.queryItems -# url = QUrl('http://www.google.com/search?q=python&hl=en') -# valid_data = [(('q'), ('python')), (('hl'), ('en'))] -# -# self.assertEqual(sorted(url.queryItems()), sorted(valid_data)) -# -# def testEncodedQueryItems(self): -# #QUrl.encodedQueryItems -# url = QUrl('http://www.google.com/search?q=python&hl=en') -# valid_data = [(('q'), ('python')), (('hl'), ('en'))] -# -# self.assertEqual(sorted(url.encodedQueryItems()), sorted(valid_data)) -# -# def testSetQueryItems(self): -# #QUrl.setQueryItems -# urla = QUrl('http://www.google.com/search?q=python&hl=en') -# urlb = QUrl('http://www.google.com/search') -# -# urlb.setQueryItems(urla.queryItems()) -# -# self.assertEqual(urla, urlb) -# -# def testAddQueryItem(self): -# #QUrl.addQueryItem -# url = QUrl() -# valid_data = [('hl', 'en'), ('user', 'konqui')] -# -# url.addQueryItem(*valid_data[0]) -# self.assertEqual(url.queryItems()[0], valid_data[0]) -# -# url.addQueryItem(*valid_data[1]) -# self.assertEqual(sorted(url.queryItems()), sorted(valid_data)) -# -# def testAllEncodedQueryItemsValues(self): -# #QUrl.allEncodedQueryItemValues -# url = QUrl() -# key = 'key' -# valid_data = ['data', 'valid', 'test'] -# -# for i, data in enumerate(valid_data): -# url.addQueryItem(key, data) -# self.assertEqual(url.allEncodedQueryItemValues(key), -# list(valid_data[:i+1])) +class QueryItemsTest(unittest.TestCase): + '''Test query item management''' + + def testQueryItems(self): + url = QUrl('http://www.google.com/search?q=python&hl=en') + valid_data = [(('q'), ('python')), (('hl'), ('en'))] + + self.assertEqual(sorted(QUrlQuery(url.query()).queryItems()), sorted(valid_data)) + + def testEncodedQueryItems(self): + url = QUrl('http://www.google.com/search?q=python&hl=en') + valid_data = [(('q'), ('python')), (('hl'), ('en'))] + + self.assertEqual(sorted(QUrlQuery(url.query()).queryItems()), sorted(valid_data)) + + def testSetQueryItems(self): + urla = QUrl('http://www.google.com/search?q=python&hl=en') + urlb = QUrl('http://www.google.com/search') + + urlb.setQuery(urla.query()) + + self.assertEqual(urla, urlb) + + def testAddQueryItem(self): + url = QUrlQuery() + valid_data = [('hl', 'en'), ('user', 'konqui')] + + url.addQueryItem(*valid_data[0]) + self.assertEqual(url.queryItems()[0], valid_data[0]) + + url.addQueryItem(*valid_data[1]) + self.assertEqual(sorted(url.queryItems()), sorted(valid_data)) + + def testAllQueryItemsValues(self): + url = QUrlQuery() + key = 'key' + valid_data = ['data', 'valid', 'test'] + for i, data in enumerate(valid_data): + url.addQueryItem(key, data) + self.assertEqual(url.allQueryItemValues(key), + list(valid_data[:i+1])) if __name__ == '__main__': unittest.main() diff --git a/sources/pyside2/tests/QtCore/qurlquery_test.py b/sources/pyside2/tests/QtCore/qurlquery_test.py new file mode 100644 index 000000000..e42856e6d --- /dev/null +++ b/sources/pyside2/tests/QtCore/qurlquery_test.py @@ -0,0 +1,59 @@ +#!/usr/bin/python + +############################################################################# +## +## Copyright (C) 2017 The Qt Company Ltd. +## Contact: https://www.qt.io/licensing/ +## +## This file is part of the test suite of PySide2. +## +## $QT_BEGIN_LICENSE:GPL-EXCEPT$ +## 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 General Public License Usage +## Alternatively, this file may be used under the terms of the GNU +## General Public License version 3 as published by the Free Software +## Foundation with exceptions as appearing in the file LICENSE.GPL3-EXCEPT +## 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-3.0.html. +## +## $QT_END_LICENSE$ +## +############################################################################# + +'''Unit tests for QUrlQuery''' + +import unittest +import ctypes +import sys + +from PySide2.QtCore import QUrlQuery + +class QUrlQueryTest(unittest.TestCase): + def testConstructing(self): + empty = QUrlQuery() + self.assertTrue(empty.isEmpty()) + self.assertEqual(empty.queryPairDelimiter(), QUrlQuery.defaultQueryPairDelimiter()) + self.assertEqual(empty.queryValueDelimiter(), QUrlQuery.defaultQueryValueDelimiter()) + + empty.clear(); + self.assertTrue(empty.isEmpty()) + + def testAddRemove(self): + query = QUrlQuery() + + query.addQueryItem("a", "b"); + self.assertTrue(not query.isEmpty()) + self.assertTrue(query.hasQueryItem("a")) + self.assertEqual(query.queryItemValue("a"), "b") + self.assertEqual(query.allQueryItemValues("a"), ["b"]) + +if __name__ == '__main__': + unittest.main() diff --git a/sources/pyside2/tests/QtCore/quuid_test.py b/sources/pyside2/tests/QtCore/quuid_test.py new file mode 100644 index 000000000..64183884a --- /dev/null +++ b/sources/pyside2/tests/QtCore/quuid_test.py @@ -0,0 +1,45 @@ +#!/usr/bin/python + +############################################################################# +## +## Copyright (C) 2017 The Qt Company Ltd. +## Contact: https://www.qt.io/licensing/ +## +## This file is part of the test suite of PySide2. +## +## $QT_BEGIN_LICENSE:GPL-EXCEPT$ +## 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 General Public License Usage +## Alternatively, this file may be used under the terms of the GNU +## General Public License version 3 as published by the Free Software +## Foundation with exceptions as appearing in the file LICENSE.GPL3-EXCEPT +## 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-3.0.html. +## +## $QT_END_LICENSE$ +## +############################################################################# + +'''Unit tests for QUuid''' + +import unittest + +from PySide2.QtCore import QUuid + +class QUuidTest(unittest.TestCase): + def testFromString(self): + uuidString = '{fc69b59e-cc34-4436-a43c-ee95d128b8c5}' + uuid = QUuid(uuidString) + self.assertTrue(not uuid.isNull()) + self.assertEqual(uuid.toString(), uuidString) + +if __name__ == '__main__': + unittest.main() diff --git a/sources/pyside2/tests/QtCore/qversionnumber_test.py b/sources/pyside2/tests/QtCore/qversionnumber_test.py new file mode 100644 index 000000000..929772fa6 --- /dev/null +++ b/sources/pyside2/tests/QtCore/qversionnumber_test.py @@ -0,0 +1,48 @@ +#!/usr/bin/python + +############################################################################# +## +## Copyright (C) 2017 The Qt Company Ltd. +## Contact: https://www.qt.io/licensing/ +## +## This file is part of the test suite of PySide2. +## +## $QT_BEGIN_LICENSE:GPL-EXCEPT$ +## 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 General Public License Usage +## Alternatively, this file may be used under the terms of the GNU +## General Public License version 3 as published by the Free Software +## Foundation with exceptions as appearing in the file LICENSE.GPL3-EXCEPT +## 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-3.0.html. +## +## $QT_END_LICENSE$ +## +############################################################################# + +'''Unit tests for QVersionNumber''' + +import unittest + +from PySide2.QtCore import QVersionNumber + +class QVersionNumberTest(unittest.TestCase): + def testFromString(self): + versionString = '5.9.2' + version = QVersionNumber.fromString(versionString) + self.assertTrue(not version.isNull()) + self.assertEqual(version.majorVersion(), 5) + self.assertEqual(version.minorVersion(), 9) + self.assertEqual(version.microVersion(), 2) + self.assertEqual(version.toString(), versionString) + +if __name__ == '__main__': + unittest.main() diff --git a/sources/pyside2/tests/QtDataVisualization/CMakeLists.txt b/sources/pyside2/tests/QtDataVisualization/CMakeLists.txt new file mode 100644 index 000000000..61b347263 --- /dev/null +++ b/sources/pyside2/tests/QtDataVisualization/CMakeLists.txt @@ -0,0 +1 @@ +PYSIDE_TEST(datavisualization_test.py) diff --git a/sources/pyside2/tests/QtDataVisualization/datavisualization_test.py b/sources/pyside2/tests/QtDataVisualization/datavisualization_test.py new file mode 100644 index 000000000..7efd6122d --- /dev/null +++ b/sources/pyside2/tests/QtDataVisualization/datavisualization_test.py @@ -0,0 +1,85 @@ +#!/usr/bin/python + +############################################################################# +## +## Copyright (C) 2017 The Qt Company Ltd. +## Contact: https://www.qt.io/licensing/ +## +## This file is part of the test suite of PySide2. +## +## $QT_BEGIN_LICENSE:GPL-EXCEPT$ +## 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 General Public License Usage +## Alternatively, this file may be used under the terms of the GNU +## General Public License version 3 as published by the Free Software +## Foundation with exceptions as appearing in the file LICENSE.GPL3-EXCEPT +## 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-3.0.html. +## +## $QT_END_LICENSE$ +## +############################################################################# + +'''Test cases for QtDataVisualization''' + +from helper import UsesQGuiApplication +from PySide2.QtCore import QTimer +from PySide2.QtDataVisualization import QtDataVisualization +import unittest + +def dataToBarDataRow(data): + result = [] + for d in data: + result.append(QtDataVisualization.QBarDataItem(d)) + return result + +def dataToBarDataArray(data): + result = [] + for row in data: + result.append(dataToBarDataRow(row)) + return result + +class QtDataVisualizationTestCase(UsesQGuiApplication): + '''Tests related to QtDataVisualization''' + + def testBars(self): + self.bars = QtDataVisualization.Q3DBars() + self.columnAxis = QtDataVisualization.QCategory3DAxis() + self.columnAxis.setTitle('Columns') + self.columnAxis.setTitleVisible(True) + self.columnAxis.setLabels(['Column1', 'Column2']) + + self.rowAxis = QtDataVisualization.QCategory3DAxis() + self.rowAxis.setTitle('Rows') + self.rowAxis.setTitleVisible(True) + self.rowAxis.setLabels(['Row1', 'Row2']) + + self.valueAxis = QtDataVisualization.QValue3DAxis() + self.valueAxis.setTitle('Values') + self.valueAxis.setTitleVisible(True) + self.valueAxis.setRange(0, 5); + + self.bars.setRowAxis(self.rowAxis) + self.bars.setColumnAxis(self.columnAxis) + self.bars.setValueAxis(self.valueAxis) + + self.series = QtDataVisualization.QBar3DSeries() + self.arrayData = [[1, 2], [3, 4]] + self.series.dataProxy().addRows(dataToBarDataArray(self.arrayData)) + + self.bars.setPrimarySeries(self.series) + + self.bars.show() + QTimer.singleShot(500, self.app.quit) + self.app.exec_() + +if __name__ == '__main__': + unittest.main() diff --git a/sources/pyside2/tests/QtGui/CMakeLists.txt b/sources/pyside2/tests/QtGui/CMakeLists.txt index 63cf3c35f..eeb7c7e36 100644 --- a/sources/pyside2/tests/QtGui/CMakeLists.txt +++ b/sources/pyside2/tests/QtGui/CMakeLists.txt @@ -37,6 +37,7 @@ PYSIDE_TEST(qpolygonf_test.py) PYSIDE_TEST(qkeysequence_test.py) PYSIDE_TEST(qradialgradient_test.py) PYSIDE_TEST(qrasterwindow_test.py) +PYSIDE_TEST(qopenglwindow_test.py) PYSIDE_TEST(qregion_test.py) PYSIDE_TEST(qstylehints_test.py) PYSIDE_TEST(qtextdocument_undoredo_test.py) diff --git a/sources/pyside2/tests/QtGui/qopenglwindow_test.py b/sources/pyside2/tests/QtGui/qopenglwindow_test.py new file mode 100644 index 000000000..2d11a0238 --- /dev/null +++ b/sources/pyside2/tests/QtGui/qopenglwindow_test.py @@ -0,0 +1,104 @@ +############################################################################# +## +## Copyright (C) 2017 The Qt Company Ltd. +## Contact: https://www.qt.io/licensing/ +## +## This file is part of the test suite of PySide2. +## +## $QT_BEGIN_LICENSE:GPL-EXCEPT$ +## 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 General Public License Usage +## Alternatively, this file may be used under the terms of the GNU +## General Public License version 3 as published by the Free Software +## Foundation with exceptions as appearing in the file LICENSE.GPL3-EXCEPT +## 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-3.0.html. +## +## $QT_END_LICENSE$ +## +############################################################################# + +'''Unit test for QOpenGLContext, QOpenGLTexture, QOpenGLWindow and related classes''' + +import sys +import unittest + +from helper import UsesQApplication + +from PySide2.QtCore import QSize, QTimer, Qt +from PySide2.QtGui import (QColor, QGuiApplication, QImage, QOpenGLContext, + QOpenGLTexture, QSurfaceFormat, QOpenGLWindow) + +try: + from OpenGL import GL +except ImportError: + print("Skipping test due to missing OpenGL module") + sys.exit(0) + +class OpenGLWindow(QOpenGLWindow): + def __init__(self): + super(OpenGLWindow, self).__init__() + + self.m_functions = None + self.m_texture = None + self.visibleChanged.connect(self.slotVisibleChanged) + + def slotVisibleChanged(self, visible): + if not visible and self.m_texture is not None and self.context().makeCurrent(self): + self.m_texture = None + self.context().doneCurrent() + + def initializeGL(self): + self.m_functions = self.context().functions() + self.m_functions.initializeOpenGLFunctions() + image = QImage(QSize(200, 200), QImage.Format_RGBA8888) + image.fill(QColor(Qt.red)) + self.m_texture = QOpenGLTexture(image) + + def paintGL(self): + GL.glMatrixMode(GL.GL_MODELVIEW); + GL.glLoadIdentity(); + + GL.glMatrixMode(GL.GL_PROJECTION); + GL.glLoadIdentity(); + GL.glOrtho(0, 1, 1, 0, -1, 1); + + self.m_functions.glClear(GL.GL_COLOR_BUFFER_BIT) + self.m_functions.glEnable(GL.GL_TEXTURE_2D); + self.m_texture.bind() + + d = 0.5 + GL.glBegin(GL.GL_QUADS) + GL.glTexCoord2f(0, 0) + GL.glVertex2f(0, 0) + GL.glTexCoord2f(d, 0) + GL.glVertex2f(d, 0) + GL.glTexCoord2f(d, d) + GL.glVertex2f(d, d) + GL.glTexCoord2f(0, d) + GL.glVertex2f(0, d) + GL.glEnd() + self.m_texture.release() + + def resizeGL(self, w, h): + self.m_functions.glViewport(0, 0, self.width(), self.height()) + +class QOpenGLWindowTest(UsesQApplication): + # On macOS, glClear(), glViewport() are rejected due to GLbitfield/GLint not being resolved properly + def test(self): + openGlWindow = OpenGLWindow() + openGlWindow.resize(640, 480) + openGlWindow.show() + QTimer.singleShot(100, openGlWindow.close) + self.app.exec_() + +if __name__ == '__main__': + unittest.main() diff --git a/sources/pyside2/tests/QtHelp/CMakeLists.txt b/sources/pyside2/tests/QtHelp/CMakeLists.txt index d0ba2d80c..422dc51c7 100644 --- a/sources/pyside2/tests/QtHelp/CMakeLists.txt +++ b/sources/pyside2/tests/QtHelp/CMakeLists.txt @@ -1 +1,2 @@ PYSIDE_TEST(help_test.py) +PYSIDE_TEST(helpsearchengine_test.py) diff --git a/sources/pyside2/tests/QtHelp/helpsearchengine_test.py b/sources/pyside2/tests/QtHelp/helpsearchengine_test.py new file mode 100644 index 000000000..6bc4b684a --- /dev/null +++ b/sources/pyside2/tests/QtHelp/helpsearchengine_test.py @@ -0,0 +1,44 @@ +############################################################################# +## +## Copyright (C) 2018 The Qt Company Ltd. +## Contact: https://www.qt.io/licensing/ +## +## This file is part of the test suite of PySide2. +## +## $QT_BEGIN_LICENSE:GPL-EXCEPT$ +## 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 General Public License Usage +## Alternatively, this file may be used under the terms of the GNU +## General Public License version 3 as published by the Free Software +## Foundation with exceptions as appearing in the file LICENSE.GPL3-EXCEPT +## 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-3.0.html. +## +## $QT_END_LICENSE$ +## +############################################################################# + +import unittest + +from PySide2.QtHelp import QHelpEngineCore, QHelpSearchEngine, QHelpSearchResult + +from helper import UsesQApplication + +class QHelpSearchEngineTest(UsesQApplication): + + def testQHelpSearchEngine(self): + helpEngineCore = QHelpEngineCore('') + helpSearchEngine = QHelpSearchEngine(helpEngineCore) + helpSearchResult = helpSearchEngine.searchResults(0, 0) + self.assertEqual(len(helpSearchResult), 0) + +if __name__ == '__main__': + unittest.main() diff --git a/sources/pyside2/tests/QtTextToSpeech/CMakeLists.txt b/sources/pyside2/tests/QtTextToSpeech/CMakeLists.txt new file mode 100644 index 000000000..6f5851587 --- /dev/null +++ b/sources/pyside2/tests/QtTextToSpeech/CMakeLists.txt @@ -0,0 +1 @@ +PYSIDE_TEST(qtexttospeech_test.py) diff --git a/sources/pyside2/tests/QtTextToSpeech/qtexttospeech_test.py b/sources/pyside2/tests/QtTextToSpeech/qtexttospeech_test.py new file mode 100644 index 000000000..6f26f3691 --- /dev/null +++ b/sources/pyside2/tests/QtTextToSpeech/qtexttospeech_test.py @@ -0,0 +1,63 @@ +#!/usr/bin/python + +############################################################################# +## +## Copyright (C) 2017 The Qt Company Ltd. +## Contact: https://www.qt.io/licensing/ +## +## This file is part of the test suite of PySide2. +## +## $QT_BEGIN_LICENSE:GPL-EXCEPT$ +## 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 General Public License Usage +## Alternatively, this file may be used under the terms of the GNU +## General Public License version 3 as published by the Free Software +## Foundation with exceptions as appearing in the file LICENSE.GPL3-EXCEPT +## 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-3.0.html. +## +## $QT_END_LICENSE$ +## +############################################################################# + +'''Test cases for QTextToSpeech methods''' + +from helper import UsesQApplication +import sys +import unittest + +from PySide2.QtCore import QTimer + +try: + from PySide2.QtTextToSpeech import QTextToSpeech, QVoice +except ImportError: + print("Skipping test due to missing QtTextToSpeech module") + sys.exit(0) + +class QTextToSpeechTestCase(UsesQApplication): + '''Tests related to QTextToSpeech''' + def testSay(self): + engines = QTextToSpeech.availableEngines() + if not engines: + print('No QTextToSpeech engines available') + else: + speech = QTextToSpeech(engines[0]) + speech.stateChanged.connect(self._slotStateChanged) + speech.say("Hello, PySide2") + QTimer.singleShot(5000, self.app.quit) + self.app.exec_() + + def _slotStateChanged(self, state): + if (state == QTextToSpeech.State.Ready): + self.app.quit() + +if __name__ == '__main__': + unittest.main() diff --git a/sources/pyside2/tests/QtWidgets/CMakeLists.txt b/sources/pyside2/tests/QtWidgets/CMakeLists.txt index 46a07c9a3..4efd9d803 100644 --- a/sources/pyside2/tests/QtWidgets/CMakeLists.txt +++ b/sources/pyside2/tests/QtWidgets/CMakeLists.txt @@ -120,12 +120,14 @@ PYSIDE_TEST(qtabwidget_test.py) PYSIDE_TEST(qtabwidgetclear_test.py) PYSIDE_TEST(qtextedit_test.py) PYSIDE_TEST(qtextedit_signal_test.py) +PYSIDE_TEST(qtreeview_test.py) PYSIDE_TEST(qtoolbar_test.py) PYSIDE_TEST(qtoolbox_test.py) PYSIDE_TEST(qvalidator_test.py) PYSIDE_TEST(qvariant_test.py) PYSIDE_TEST(qwidget_setlayout_test.py) PYSIDE_TEST(qwidget_test.py) +PYSIDE_TEST(qcolormap_test.py) PYSIDE_TEST(reference_count_test.py) PYSIDE_TEST(returnquadruplesofnumbers_test.py) PYSIDE_TEST(standardpixmap_test.py) diff --git a/sources/pyside2/tests/QtWidgets/qcolormap_test.py b/sources/pyside2/tests/QtWidgets/qcolormap_test.py new file mode 100644 index 000000000..c71216592 --- /dev/null +++ b/sources/pyside2/tests/QtWidgets/qcolormap_test.py @@ -0,0 +1,43 @@ +############################################################################# +## +## Copyright (C) 2018 The Qt Company Ltd. +## Contact: https://www.qt.io/licensing/ +## +## This file is part of the test suite of PySide2. +## +## $QT_BEGIN_LICENSE:GPL-EXCEPT$ +## 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 General Public License Usage +## Alternatively, this file may be used under the terms of the GNU +## General Public License version 3 as published by the Free Software +## Foundation with exceptions as appearing in the file LICENSE.GPL3-EXCEPT +## 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-3.0.html. +## +## $QT_END_LICENSE$ +## +############################################################################# + +import unittest + +from PySide2.QtWidgets import QColormap +from helper import UsesQApplication + + +class QColormapTest(UsesQApplication): + + def testQColormap(self): + qc = QColormap.instance() + self.assertEqual(qc.size(), -1) + + +if __name__ == '__main__': + unittest.main() diff --git a/sources/pyside2/tests/QtWidgets/qlistwidget_test.py b/sources/pyside2/tests/QtWidgets/qlistwidget_test.py index b89d2f77c..063623b61 100644 --- a/sources/pyside2/tests/QtWidgets/qlistwidget_test.py +++ b/sources/pyside2/tests/QtWidgets/qlistwidget_test.py @@ -78,5 +78,12 @@ class QListWidgetTest(UsesQApplication): self.app.exec_() self.assertEqual(lst.count(), 1) + def testClear(self): + lst = QtWidgets.QListWidget() + lst.addItem("foo") + item = lst.item(0) + self.assertIsNone(lst.clear()) + self.assertRaises(RuntimeError, lambda: item.text()) + if __name__ == '__main__': unittest.main() diff --git a/sources/pyside2/tests/QtWidgets/qtreeview_test.py b/sources/pyside2/tests/QtWidgets/qtreeview_test.py new file mode 100644 index 000000000..a731ddafa --- /dev/null +++ b/sources/pyside2/tests/QtWidgets/qtreeview_test.py @@ -0,0 +1,89 @@ +############################################################################# +## +## Copyright (C) 2018 The Qt Company Ltd. +## Contact: https://www.qt.io/licensing/ +## +## This file is part of the test suite of PySide2. +## +## $QT_BEGIN_LICENSE:GPL-EXCEPT$ +## 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 General Public License Usage +## Alternatively, this file may be used under the terms of the GNU +## General Public License version 3 as published by the Free Software +## Foundation with exceptions as appearing in the file LICENSE.GPL3-EXCEPT +## 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-3.0.html. +## +## $QT_END_LICENSE$ +## +############################################################################# + +import unittest + +from PySide2.QtGui import QStandardItemModel +from PySide2.QtWidgets import QWidget, QTreeView, QVBoxLayout, QStyledItemDelegate +from helper import UsesQApplication + +class Widget(QWidget): + def __init__(self, parent=None): + QWidget.__init__(self, parent) + self.treeView = QTreeView(self) + layout = QVBoxLayout() + layout.addWidget(self.treeView) + self.setLayout(layout) + self.treeView.setModel(QStandardItemModel()) + + self.treeView.model().setHorizontalHeaderLabels(('3', '1', '5')) + +class QWidgetTest(UsesQApplication): + + def testDelegates(self): + widget = Widget() + t = widget.treeView + + # When calling setItemDelegateForColumn using a separate variable + # for the second argument (QAbstractItemDelegate), there was no problem + # on keeping the reference to this object, since the variable was kept + # alive (case A) + # Contrary, when instantiating this argument on the function call + # Using QStyledItemDelegate inside the call the reference of the + # object was lost, causing a segfault. (case B) + + # Case A + d = QStyledItemDelegate() + # Using QStyledItemDelegate from a variable so we keep the reference alive + # and we encounter no segfault. + t.setItemDelegateForColumn(0, d) + # This raised the Segmentation Fault too, because manually destroying + # the object caused a missing refrence. + del d + + # Getting the delegates + a = t.itemDelegateForColumn(0) + self.assertIsInstance(a, QStyledItemDelegate) + + # Case B + t.setItemDelegateForColumn(1, QStyledItemDelegate()) + + # Getting the delegates + b = t.itemDelegateForColumn(1) + self.assertIsInstance(b, QStyledItemDelegate) + + # Test for Rows + t.setItemDelegateForRow(0, QStyledItemDelegate()) + self.assertIsInstance(t.itemDelegateForRow(0), QStyledItemDelegate) + + # Test for general delegate + t.setItemDelegate(QStyledItemDelegate()) + self.assertIsInstance(t.itemDelegate(), QStyledItemDelegate) + +if __name__ == '__main__': + unittest.main() diff --git a/sources/pyside2/tests/pysidetest/CMakeLists.txt b/sources/pyside2/tests/pysidetest/CMakeLists.txt index 8c86a0ab4..c6d3bb13b 100644 --- a/sources/pyside2/tests/pysidetest/CMakeLists.txt +++ b/sources/pyside2/tests/pysidetest/CMakeLists.txt @@ -1,7 +1,7 @@ project(pysidetest) project(testbinding) -cmake_minimum_required(VERSION 2.6) +cmake_minimum_required(VERSION 3.1) # On Windows, don't link to qtmain.lib for executables automatically. cmake_policy(SET CMP0020 OLD) @@ -38,26 +38,42 @@ ${CMAKE_CURRENT_BINARY_DIR}/testbinding/testview_wrapper.cpp ${CMAKE_CURRENT_BINARY_DIR}/testbinding/testbinding_module_wrapper.cpp ) +# Get per module include dirs. +# There are usually 3 paths there: +# ./qt/include/; ./qt/include/QtCore ; ./qt/mkspecs/linux-g++ +# on framework build they are: +# ./qt/lib/QtCore.framework; ./qt/lib/QtCore.framework/Headers ; ./qt/mkspecs/macx-clang +# Thus we use the second direct path, which contains the actual header files. + +list(GET Qt5Core_INCLUDE_DIRS 1 Qt5Core_DIRECT_INCLUDE_DIR) +list(GET Qt5Gui_INCLUDE_DIRS 1 Qt5Gui_DIRECT_INCLUDE_DIR) +list(GET Qt5Widgets_INCLUDE_DIRS 1 Qt5Widgets_DIRECT_INCLUDE_DIR) + +# Adjust include headers paths for frameworks. +set(shiboken_framework_include_dirs_option "") +if(CMAKE_HOST_APPLE AND QtCore_is_framework) + set(shiboken_framework_include_dirs "${QT_FRAMEWORK_INCLUDE_DIR}") + set(shiboken_framework_include_dirs_option "--framework-include-paths=${shiboken_framework_include_dirs}") +endif() + make_path(testbinding_include_dirs ${pyside2_BINARY_DIR} ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/../../PySide2 ${CMAKE_CURRENT_SOURCE_DIR}/../../libpyside ${QT_INCLUDE_DIR} - ${QT_INCLUDE_DIR}/QtCore - ${QT_INCLUDE_DIR}/QtGui - ${QT_INCLUDE_DIR}/QtWidgets + ${Qt5Core_DIRECT_INCLUDE_DIR} + ${Qt5Gui_DIRECT_INCLUDE_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} ${CMAKE_CURRENT_SOURCE_DIR}/pysidetest_global.h --include-paths=${testbinding_include_dirs} + ${shiboken_framework_include_dirs_option} --typesystem-paths=${testbinding_typesystem_path} --output-directory=${CMAKE_CURRENT_BINARY_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/typesystem_pysidetest.xml 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"> <!-- diff --git a/sources/pyside2/tests/registry/exists_darwin_5_9_3_ci.py b/sources/pyside2/tests/registry/exists_darwin_5_9_4_ci.py index 8f07c2746..bad44da92 100644 --- a/sources/pyside2/tests/registry/exists_darwin_5_9_3_ci.py +++ b/sources/pyside2/tests/registry/exists_darwin_5_9_4_ci.py @@ -1,6 +1,6 @@ ############################################################################# ## -## Copyright (C) 2017 The Qt Company Ltd. +## Copyright (C) 2018 The Qt Company Ltd. ## Contact: https://www.qt.io/licensing/ ## ## This file is part of PySide2. @@ -37,6 +37,14 @@ ## ############################################################################# +""" +This file contains the simplified signatures for all functions in PySide +for module 'exists_darwin_5_9_4_ci'. There are no default values, no variable +names and no self parameter. Only types are present after simplification. +The functions 'next' resp. '__next__' are removed +to make the output identical for Python 2 and 3. +""" + import sys dict = {} @@ -106,13 +114,13 @@ if "PySide2.QtCore" in sys.modules: "QAbstractItemModel.canDropMimeData": ('PySide2.QtCore.QMimeData', 'PySide2.QtCore.Qt.DropAction', 'int', 'int', 'PySide2.QtCore.QModelIndex'), "QAbstractItemModel.canFetchMore": ('PySide2.QtCore.QModelIndex',), "QAbstractItemModel.changePersistentIndex": ('PySide2.QtCore.QModelIndex', 'PySide2.QtCore.QModelIndex'), - "QAbstractItemModel.changePersistentIndexList": ('PySide2.support.signature.typing.List', 'PySide2.support.signature.typing.List'), + "QAbstractItemModel.changePersistentIndexList": ('List[int]', 'List[int]'), "QAbstractItemModel.columnCount": ('PySide2.QtCore.QModelIndex',), "QAbstractItemModel.createIndex": [('int', 'int', 'int'), ('int', 'int', 'object')], "QAbstractItemModel.data": ('PySide2.QtCore.QModelIndex', 'int'), "QAbstractItemModel.decodeData": ('int', 'int', 'PySide2.QtCore.QModelIndex', 'PySide2.QtCore.QDataStream'), "QAbstractItemModel.dropMimeData": ('PySide2.QtCore.QMimeData', 'PySide2.QtCore.Qt.DropAction', 'int', 'int', 'PySide2.QtCore.QModelIndex'), - "QAbstractItemModel.encodeData": ('PySide2.support.signature.typing.List', 'PySide2.QtCore.QDataStream'), + "QAbstractItemModel.encodeData": ('List[int]', 'PySide2.QtCore.QDataStream'), "QAbstractItemModel.endInsertColumns": (), "QAbstractItemModel.endInsertRows": (), "QAbstractItemModel.endMoveColumns": (), @@ -131,8 +139,8 @@ if "PySide2.QtCore" in sys.modules: "QAbstractItemModel.insertRow": ('int', 'PySide2.QtCore.QModelIndex'), "QAbstractItemModel.insertRows": ('int', 'int', 'PySide2.QtCore.QModelIndex'), "QAbstractItemModel.itemData": ('PySide2.QtCore.QModelIndex',), - "QAbstractItemModel.match": ('PySide2.QtCore.QModelIndex', 'int', 'PySide2.support.signature.typing.Any', 'int', 'MatchFlags'), - "QAbstractItemModel.mimeData": ('PySide2.support.signature.typing.List',), + "QAbstractItemModel.match": ('PySide2.QtCore.QModelIndex', 'int', 'Any', 'int', 'MatchFlags'), + "QAbstractItemModel.mimeData": ('List[int]',), "QAbstractItemModel.mimeTypes": (), "QAbstractItemModel.moveColumn": ('PySide2.QtCore.QModelIndex', 'int', 'PySide2.QtCore.QModelIndex', 'int'), "QAbstractItemModel.moveColumns": ('PySide2.QtCore.QModelIndex', 'int', 'int', 'PySide2.QtCore.QModelIndex', 'int'), @@ -148,8 +156,8 @@ if "PySide2.QtCore" in sys.modules: "QAbstractItemModel.revert": (), "QAbstractItemModel.roleNames": (), "QAbstractItemModel.rowCount": ('PySide2.QtCore.QModelIndex',), - "QAbstractItemModel.setData": ('PySide2.QtCore.QModelIndex', 'PySide2.support.signature.typing.Any', 'int'), - "QAbstractItemModel.setHeaderData": ('int', 'PySide2.QtCore.Qt.Orientation', 'PySide2.support.signature.typing.Any', 'int'), + "QAbstractItemModel.setData": ('PySide2.QtCore.QModelIndex', 'Any', 'int'), + "QAbstractItemModel.setHeaderData": ('int', 'PySide2.QtCore.Qt.Orientation', 'Any', 'int'), "QAbstractItemModel.setItemData": ('PySide2.QtCore.QModelIndex', 'dict'), "QAbstractItemModel.sibling": ('int', 'int', 'PySide2.QtCore.QModelIndex'), "QAbstractItemModel.sort": ('int', 'PySide2.QtCore.Qt.SortOrder'), @@ -184,12 +192,12 @@ if "PySide2.QtCore" in sys.modules: "QAbstractProxyModel.mapSelectionFromSource": ('PySide2.QtCore.QItemSelection',), "QAbstractProxyModel.mapSelectionToSource": ('PySide2.QtCore.QItemSelection',), "QAbstractProxyModel.mapToSource": ('PySide2.QtCore.QModelIndex',), - "QAbstractProxyModel.mimeData": ('PySide2.support.signature.typing.List',), + "QAbstractProxyModel.mimeData": ('List[int]',), "QAbstractProxyModel.mimeTypes": (), "QAbstractProxyModel.resetInternalData": (), "QAbstractProxyModel.revert": (), - "QAbstractProxyModel.setData": ('PySide2.QtCore.QModelIndex', 'PySide2.support.signature.typing.Any', 'int'), - "QAbstractProxyModel.setHeaderData": ('int', 'PySide2.QtCore.Qt.Orientation', 'PySide2.support.signature.typing.Any', 'int'), + "QAbstractProxyModel.setData": ('PySide2.QtCore.QModelIndex', 'Any', 'int'), + "QAbstractProxyModel.setHeaderData": ('int', 'PySide2.QtCore.Qt.Orientation', 'Any', 'int'), "QAbstractProxyModel.setItemData": ('PySide2.QtCore.QModelIndex', 'dict'), "QAbstractProxyModel.setSourceModel": ('PySide2.QtCore.QAbstractItemModel',), "QAbstractProxyModel.sibling": ('int', 'int', 'PySide2.QtCore.QModelIndex'), @@ -249,7 +257,7 @@ if "PySide2.QtCore" in sys.modules: # class PySide2.QtCore.QBasicMutex: "QBasicMutex.__init__": (), - "QBasicMutex.isRecursive": [], + "QBasicMutex.isRecursive": (), "QBasicMutex.lock": (), "QBasicMutex.tryLock": (), "QBasicMutex.try_lock": (), @@ -284,7 +292,7 @@ if "PySide2.QtCore" in sys.modules: # class PySide2.QtCore.QBuffer: "QBuffer.__init__": [('PySide2.QtCore.QByteArray', 'PySide2.QtCore.QObject'), ('PySide2.QtCore.QObject',)], "QBuffer.atEnd": (), - "QBuffer.buffer": [], + "QBuffer.buffer": (), "QBuffer.canReadLine": (), "QBuffer.close": (), "QBuffer.connectNotify": ('PySide2.QtCore.QMetaMethod',), @@ -300,68 +308,68 @@ if "PySide2.QtCore" in sys.modules: "QBuffer.writeData": ('str', 'int'), # class PySide2.QtCore.QByteArray: - "QByteArray.__init__": [(), ('PySide2.QtCore.QByteArray',), ('int', 'PySide2.support.signature.typing.Union[str, int]')], + "QByteArray.__init__": [(), ('PySide2.QtCore.QByteArray',), ('int', 'Union[str, int]')], "QByteArray.__copy__": (), "QByteArray.__reduce__": (), - "QByteArray.append": [('PySide2.QtCore.QByteArray',), ('PySide2.support.signature.typing.Union[str, int]',), ('int', 'PySide2.support.signature.typing.Union[str, int]')], + "QByteArray.append": [('PySide2.QtCore.QByteArray',), ('Union[str, int]',), ('int', 'Union[str, int]')], "QByteArray.at": ('int',), "QByteArray.capacity": (), "QByteArray.cbegin": (), "QByteArray.cend": (), "QByteArray.chop": ('int',), "QByteArray.clear": (), - "QByteArray.contains": [('PySide2.QtCore.QByteArray',), ('PySide2.support.signature.typing.Union[str, int]',)], - "QByteArray.count": [(), ('PySide2.QtCore.QByteArray',), ('PySide2.support.signature.typing.Union[str, int]',)], - "QByteArray.data": [], - "QByteArray.endsWith": [('PySide2.QtCore.QByteArray',), ('PySide2.support.signature.typing.Union[str, int]',)], - "QByteArray.fill": ('PySide2.support.signature.typing.Union[str, int]', 'int'), + "QByteArray.contains": [('PySide2.QtCore.QByteArray',), ('Union[str, int]',)], + "QByteArray.count": [(), ('PySide2.QtCore.QByteArray',), ('Union[str, int]',)], + "QByteArray.data": (), + "QByteArray.endsWith": [('PySide2.QtCore.QByteArray',), ('Union[str, int]',)], + "QByteArray.fill": ('Union[str, int]', 'int'), "QByteArray.fromBase64": [('PySide2.QtCore.QByteArray',), ('PySide2.QtCore.QByteArray', 'Base64Options')], "QByteArray.fromHex": ('PySide2.QtCore.QByteArray',), - "QByteArray.fromPercentEncoding": ('PySide2.QtCore.QByteArray', 'PySide2.support.signature.typing.Union[str, int]'), + "QByteArray.fromPercentEncoding": ('PySide2.QtCore.QByteArray', 'Union[str, int]'), "QByteArray.fromRawData": ('str', 'int'), "QByteArray.indexOf": ('PySide2.QtCore.QByteArray', 'int'), - "QByteArray.insert": [('int', 'PySide2.QtCore.QByteArray'), ('int', 'int', 'PySide2.support.signature.typing.Union[str, int]')], + "QByteArray.insert": [('int', 'PySide2.QtCore.QByteArray'), ('int', 'int', 'Union[str, int]')], "QByteArray.isEmpty": (), "QByteArray.isNull": (), "QByteArray.isSharedWith": ('PySide2.QtCore.QByteArray',), "QByteArray.lastIndexOf": ('PySide2.QtCore.QByteArray', 'int'), "QByteArray.left": ('int',), - "QByteArray.leftJustified": ('int', 'PySide2.support.signature.typing.Union[str, int]', 'bool'), + "QByteArray.leftJustified": ('int', 'Union[str, int]', 'bool'), "QByteArray.length": (), "QByteArray.mid": ('int', 'int'), - "QByteArray.number": [('float', 'PySide2.support.signature.typing.Union[str, int]', 'int'), ('int', 'int')], - "QByteArray.prepend": [('PySide2.QtCore.QByteArray',), ('PySide2.support.signature.typing.Union[str, int]',), ('int', 'PySide2.support.signature.typing.Union[str, int]')], + "QByteArray.number": [('float', 'Union[str, int]', 'int'), ('int', 'int')], + "QByteArray.prepend": [('PySide2.QtCore.QByteArray',), ('Union[str, int]',), ('int', 'Union[str, int]')], "QByteArray.remove": ('int', 'int'), "QByteArray.repeated": ('int',), - "QByteArray.replace": [('PySide2.QtCore.QByteArray', 'PySide2.QtCore.QByteArray'), ('PySide2.support.signature.typing.Union[str, int]', 'PySide2.QtCore.QByteArray'), ('PySide2.support.signature.typing.Union[str, int]', 'PySide2.support.signature.typing.Union[str, int]'), ('int', 'int', 'PySide2.QtCore.QByteArray'), ('str', 'PySide2.QtCore.QByteArray')], + "QByteArray.replace": [('PySide2.QtCore.QByteArray', 'PySide2.QtCore.QByteArray'), ('Union[str, int]', 'PySide2.QtCore.QByteArray'), ('Union[str, int]', 'Union[str, int]'), ('int', 'int', 'PySide2.QtCore.QByteArray'), ('str', 'PySide2.QtCore.QByteArray')], "QByteArray.reserve": ('int',), "QByteArray.resize": ('int',), "QByteArray.right": ('int',), - "QByteArray.rightJustified": ('int', 'PySide2.support.signature.typing.Union[str, int]', 'bool'), - "QByteArray.setNum": [('float', 'PySide2.support.signature.typing.Union[str, int]', 'int'), ('int', 'int')], + "QByteArray.rightJustified": ('int', 'Union[str, int]', 'bool'), + "QByteArray.setNum": [('float', 'Union[str, int]', 'int'), ('int', 'int')], "QByteArray.setRawData": ('str', 'int'), - "QByteArray.simplified": [], + "QByteArray.simplified": (), "QByteArray.size": (), - "QByteArray.split": ('PySide2.support.signature.typing.Union[str, int]',), + "QByteArray.split": ('Union[str, int]',), "QByteArray.squeeze": (), - "QByteArray.startsWith": [('PySide2.QtCore.QByteArray',), ('PySide2.support.signature.typing.Union[str, int]',)], + "QByteArray.startsWith": [('PySide2.QtCore.QByteArray',), ('Union[str, int]',)], "QByteArray.swap": ('PySide2.QtCore.QByteArray',), "QByteArray.toBase64": [(), ('Base64Options',)], "QByteArray.toDouble": ('bool',), "QByteArray.toFloat": ('bool',), - "QByteArray.toHex": [(), ('PySide2.support.signature.typing.Union[str, int]',)], + "QByteArray.toHex": [(), ('Union[str, int]',)], "QByteArray.toInt": ('bool', 'int'), "QByteArray.toLong": ('bool', 'int'), "QByteArray.toLongLong": ('bool', 'int'), - "QByteArray.toLower": [], - "QByteArray.toPercentEncoding": ('PySide2.QtCore.QByteArray', 'PySide2.QtCore.QByteArray', 'PySide2.support.signature.typing.Union[str, int]'), + "QByteArray.toLower": (), + "QByteArray.toPercentEncoding": ('PySide2.QtCore.QByteArray', 'PySide2.QtCore.QByteArray', 'Union[str, int]'), "QByteArray.toShort": ('bool', 'int'), "QByteArray.toUInt": ('bool', 'int'), "QByteArray.toULong": ('bool', 'int'), "QByteArray.toULongLong": ('bool', 'int'), "QByteArray.toUShort": ('bool', 'int'), - "QByteArray.toUpper": [], - "QByteArray.trimmed": [], + "QByteArray.toUpper": (), + "QByteArray.trimmed": (), "QByteArray.truncate": ('int',), # class PySide2.QtCore.QByteArrayMatcher: @@ -381,7 +389,7 @@ if "PySide2.QtCore" in sys.modules: # class PySide2.QtCore.QCollator: "QCollator.__init__": [('PySide2.QtCore.QCollator',), ('PySide2.QtCore.QLocale',)], "QCollator.caseSensitivity": (), - "QCollator.compare": [('PySide2.support.signature.typing.Union[str, int]', 'int', 'PySide2.support.signature.typing.Union[str, int]', 'int'), ('str', 'str')], + "QCollator.compare": [('Union[str, int]', 'int', 'Union[str, int]', 'int'), ('str', 'str')], "QCollator.ignorePunctuation": (), "QCollator.locale": (), "QCollator.numericMode": (), @@ -398,14 +406,14 @@ if "PySide2.QtCore" in sys.modules: "QCollatorSortKey.swap": ('PySide2.QtCore.QCollatorSortKey',), # class PySide2.QtCore.QCommandLineOption: - "QCommandLineOption.__init__": [('PySide2.QtCore.QCommandLineOption',), ('PySide2.support.signature.typing.List',), ('PySide2.support.signature.typing.List', 'str', 'str', 'str'), ('str',), ('str', 'str', 'str', 'str')], + "QCommandLineOption.__init__": [('List[str]',), ('List[str]', 'str', 'str', 'str'), ('PySide2.QtCore.QCommandLineOption',), ('str',), ('str', 'str', 'str', 'str')], "QCommandLineOption.defaultValues": (), "QCommandLineOption.description": (), "QCommandLineOption.flags": (), "QCommandLineOption.isHidden": (), "QCommandLineOption.names": (), "QCommandLineOption.setDefaultValue": ('str',), - "QCommandLineOption.setDefaultValues": ('PySide2.support.signature.typing.List',), + "QCommandLineOption.setDefaultValues": ('List[str]',), "QCommandLineOption.setDescription": ('str',), "QCommandLineOption.setFlags": ('Flags',), "QCommandLineOption.setHidden": ('bool',), @@ -426,9 +434,9 @@ if "PySide2.QtCore" in sys.modules: "QCommandLineParser.helpText": (), "QCommandLineParser.isSet": [('PySide2.QtCore.QCommandLineOption',), ('str',)], "QCommandLineParser.optionNames": (), - "QCommandLineParser.parse": ('PySide2.support.signature.typing.List',), + "QCommandLineParser.parse": ('List[str]',), "QCommandLineParser.positionalArguments": (), - "QCommandLineParser.process": [('PySide2.QtCore.QCoreApplication',), ('PySide2.support.signature.typing.List',)], + "QCommandLineParser.process": [('List[str]',), ('PySide2.QtCore.QCoreApplication',)], "QCommandLineParser.setApplicationDescription": ('str',), "QCommandLineParser.setOptionsAfterPositionalArgumentsMode": ('PySide2.QtCore.QCommandLineParser.OptionsAfterPositionalArgumentsMode',), "QCommandLineParser.setSingleDashWordOptionMode": ('PySide2.QtCore.QCommandLineParser.SingleDashWordOptionMode',), @@ -439,7 +447,7 @@ if "PySide2.QtCore" in sys.modules: "QCommandLineParser.values": [('PySide2.QtCore.QCommandLineOption',), ('str',)], # class PySide2.QtCore.QCoreApplication: - "QCoreApplication.__init__": ('PySide2.support.signature.typing.List',), + "QCoreApplication.__init__": ('List[str]',), "QCoreApplication.addLibraryPath": ('str',), "QCoreApplication.applicationDirPath": (), "QCoreApplication.applicationFilePath": (), @@ -474,7 +482,7 @@ if "PySide2.QtCore" in sys.modules: "QCoreApplication.setApplicationVersion": ('str',), "QCoreApplication.setAttribute": ('PySide2.QtCore.Qt.ApplicationAttribute', 'bool'), "QCoreApplication.setEventDispatcher": ('PySide2.QtCore.QAbstractEventDispatcher',), - "QCoreApplication.setLibraryPaths": ('PySide2.support.signature.typing.List',), + "QCoreApplication.setLibraryPaths": ('List[str]',), "QCoreApplication.setOrganizationDomain": ('str',), "QCoreApplication.setOrganizationName": ('str',), "QCoreApplication.setQuitLockEnabled": ('bool',), @@ -533,17 +541,17 @@ if "PySide2.QtCore" in sys.modules: "QDataStream.writeInt16": ('int',), "QDataStream.writeInt32": ('int',), "QDataStream.writeInt64": ('int',), - "QDataStream.writeInt8": ('PySide2.support.signature.typing.Union[str, int]',), - "QDataStream.writeQChar": ('PySide2.support.signature.typing.Union[str, int]',), + "QDataStream.writeInt8": ('Union[str, int]',), + "QDataStream.writeQChar": ('Union[str, int]',), "QDataStream.writeQString": ('str',), - "QDataStream.writeQStringList": ('PySide2.support.signature.typing.List',), - "QDataStream.writeQVariant": ('PySide2.support.signature.typing.Any',), + "QDataStream.writeQStringList": ('List[str]',), + "QDataStream.writeQVariant": ('Any',), "QDataStream.writeRawData": ('str', 'int'), "QDataStream.writeString": ('str',), "QDataStream.writeUInt16": ('int',), "QDataStream.writeUInt32": ('int',), "QDataStream.writeUInt64": ('int',), - "QDataStream.writeUInt8": ('PySide2.support.signature.typing.Union[str, int]',), + "QDataStream.writeUInt8": ('Union[str, int]',), # class PySide2.QtCore.QDate: "QDate.__init__": [(), ('PySide2.QtCore.QDate',), ('int', 'int', 'int')], @@ -561,7 +569,7 @@ if "PySide2.QtCore" in sys.modules: "QDate.daysTo": ('PySide2.QtCore.QDate',), "QDate.fromJulianDay": ('int',), "QDate.fromString": [('str', 'PySide2.QtCore.Qt.DateFormat'), ('str', 'str')], - "QDate.getDate": ['int', 'int', 'int'], + "QDate.getDate": ('int', 'int', 'int'), "QDate.isLeapYear": ('int',), "QDate.isNull": (), "QDate.isValid": [(), ('int', 'int', 'int')], @@ -645,8 +653,8 @@ if "PySide2.QtCore" in sys.modules: "QDir.currentPath": (), "QDir.dirName": (), "QDir.drives": (), - "QDir.entryInfoList": [('Filters', 'SortFlags'), ('PySide2.support.signature.typing.List', 'Filters', 'SortFlags')], - "QDir.entryList": [('Filters', 'SortFlags'), ('PySide2.support.signature.typing.List', 'Filters', 'SortFlags')], + "QDir.entryInfoList": [('Filters', 'SortFlags'), ('List[str]', 'Filters', 'SortFlags')], + "QDir.entryList": [('Filters', 'SortFlags'), ('List[str]', 'Filters', 'SortFlags')], "QDir.exists": [(), ('str',)], "QDir.filePath": ('str',), "QDir.filter": (), @@ -662,7 +670,7 @@ if "PySide2.QtCore" in sys.modules: "QDir.isRoot": (), "QDir.listSeparator": (), "QDir.makeAbsolute": (), - "QDir.match": [('PySide2.support.signature.typing.List', 'str'), ('str', 'str')], + "QDir.match": [('List[str]', 'str'), ('str', 'str')], "QDir.mkdir": ('str',), "QDir.mkpath": ('str',), "QDir.nameFilters": (), @@ -681,9 +689,9 @@ if "PySide2.QtCore" in sys.modules: "QDir.separator": (), "QDir.setCurrent": ('str',), "QDir.setFilter": ('Filters',), - "QDir.setNameFilters": ('PySide2.support.signature.typing.List',), + "QDir.setNameFilters": ('List[str]',), "QDir.setPath": ('str',), - "QDir.setSearchPaths": ('str', 'PySide2.support.signature.typing.List'), + "QDir.setSearchPaths": ('str', 'List[str]'), "QDir.setSorting": ('SortFlags',), "QDir.sorting": (), "QDir.swap": ('PySide2.QtCore.QDir',), @@ -692,12 +700,11 @@ if "PySide2.QtCore" in sys.modules: "QDir.toNativeSeparators": ('str',), # class PySide2.QtCore.QDirIterator: - "QDirIterator.__init__": [('PySide2.QtCore.QDir', 'IteratorFlags'), ('str', 'Filters', 'IteratorFlags'), ('str', 'IteratorFlags'), ('str', 'PySide2.support.signature.typing.List', 'Filters', 'IteratorFlags')], + "QDirIterator.__init__": [('PySide2.QtCore.QDir', 'IteratorFlags'), ('str', 'Filters', 'IteratorFlags'), ('str', 'IteratorFlags'), ('str', 'List[str]', 'Filters', 'IteratorFlags')], "QDirIterator.fileInfo": (), "QDirIterator.fileName": (), "QDirIterator.filePath": (), "QDirIterator.hasNext": (), - "QDirIterator.next": (), "QDirIterator.path": (), # class PySide2.QtCore.QDynamicPropertyChangeEvent: @@ -810,7 +817,7 @@ if "PySide2.QtCore" in sys.modules: "QFileDevice.seek": ('int',), "QFileDevice.setPermissions": ('Permissions',), "QFileDevice.size": (), - "QFileDevice.unmap": ('PySide2.support.signature.typing.Union[str, int]',), + "QFileDevice.unmap": ('Union[str, int]',), "QFileDevice.unsetError": (), "QFileDevice.writeData": ('str', 'int'), @@ -867,16 +874,16 @@ if "PySide2.QtCore" in sys.modules: "QFileSelector.allSelectors": (), "QFileSelector.extraSelectors": (), "QFileSelector.select": [('PySide2.QtCore.QUrl',), ('str',)], - "QFileSelector.setExtraSelectors": ('PySide2.support.signature.typing.List',), + "QFileSelector.setExtraSelectors": ('List[str]',), # class PySide2.QtCore.QFileSystemWatcher: - "QFileSystemWatcher.__init__": [('PySide2.QtCore.QObject',), ('PySide2.support.signature.typing.List', 'PySide2.QtCore.QObject')], + "QFileSystemWatcher.__init__": [('List[str]', 'PySide2.QtCore.QObject'), ('PySide2.QtCore.QObject',)], "QFileSystemWatcher.addPath": ('str',), - "QFileSystemWatcher.addPaths": ('PySide2.support.signature.typing.List',), + "QFileSystemWatcher.addPaths": ('List[str]',), "QFileSystemWatcher.directories": (), "QFileSystemWatcher.files": (), "QFileSystemWatcher.removePath": ('str',), - "QFileSystemWatcher.removePaths": ('PySide2.support.signature.typing.List',), + "QFileSystemWatcher.removePaths": ('List[str]',), # class PySide2.QtCore.QFinalState: "QFinalState.__init__": ('PySide2.QtCore.QState',), @@ -928,7 +935,7 @@ if "PySide2.QtCore" in sys.modules: "QIODevice.openMode": (), "QIODevice.peek": ('int',), "QIODevice.pos": (), - "QIODevice.putChar": ('PySide2.support.signature.typing.Union[str, int]',), + "QIODevice.putChar": ('Union[str, int]',), "QIODevice.read": ('int',), "QIODevice.readAll": (), "QIODevice.readChannelCount": (), @@ -945,7 +952,7 @@ if "PySide2.QtCore" in sys.modules: "QIODevice.setTextModeEnabled": ('bool',), "QIODevice.size": (), "QIODevice.startTransaction": (), - "QIODevice.ungetChar": ('PySide2.support.signature.typing.Union[str, int]',), + "QIODevice.ungetChar": ('Union[str, int]',), "QIODevice.waitForBytesWritten": ('int',), "QIODevice.waitForReadyRead": ('int',), "QIODevice.write": ('PySide2.QtCore.QByteArray',), @@ -957,7 +964,7 @@ if "PySide2.QtCore" in sys.modules: "QItemSelection.__copy__": (), "QItemSelection.append": [('PySide2.QtCore.QItemSelectionRange',), ('list',)], "QItemSelection.at": ('int',), - "QItemSelection.back": [], + "QItemSelection.back": (), "QItemSelection.clear": (), "QItemSelection.constFirst": (), "QItemSelection.constLast": (), @@ -966,16 +973,16 @@ if "PySide2.QtCore" in sys.modules: "QItemSelection.detachShared": (), "QItemSelection.empty": (), "QItemSelection.endsWith": ('PySide2.QtCore.QItemSelectionRange',), - "QItemSelection.first": [], + "QItemSelection.first": (), "QItemSelection.fromSet": ('set',), "QItemSelection.fromVector": ('list',), - "QItemSelection.front": [], + "QItemSelection.front": (), "QItemSelection.indexOf": ('PySide2.QtCore.QItemSelectionRange', 'int'), "QItemSelection.indexes": (), "QItemSelection.insert": ('int', 'PySide2.QtCore.QItemSelectionRange'), "QItemSelection.isEmpty": (), "QItemSelection.isSharedWith": ('list',), - "QItemSelection.last": [], + "QItemSelection.last": (), "QItemSelection.lastIndexOf": ('PySide2.QtCore.QItemSelectionRange', 'int'), "QItemSelection.length": (), "QItemSelection.merge": ('PySide2.QtCore.QItemSelection', 'SelectionFlags'), @@ -1018,7 +1025,7 @@ if "PySide2.QtCore" in sys.modules: "QItemSelectionModel.isColumnSelected": ('int', 'PySide2.QtCore.QModelIndex'), "QItemSelectionModel.isRowSelected": ('int', 'PySide2.QtCore.QModelIndex'), "QItemSelectionModel.isSelected": ('PySide2.QtCore.QModelIndex',), - "QItemSelectionModel.model": [], + "QItemSelectionModel.model": (), "QItemSelectionModel.reset": (), "QItemSelectionModel.rowIntersectsSelection": ('int', 'PySide2.QtCore.QModelIndex'), "QItemSelectionModel.select": [('PySide2.QtCore.QItemSelection', 'SelectionFlags'), ('PySide2.QtCore.QModelIndex', 'SelectionFlags')], @@ -1059,7 +1066,7 @@ if "PySide2.QtCore" in sys.modules: "QJsonArray.count": (), "QJsonArray.empty": (), "QJsonArray.first": (), - "QJsonArray.fromStringList": ('PySide2.support.signature.typing.List',), + "QJsonArray.fromStringList": ('List[str]',), "QJsonArray.fromVariantList": ('list',), "QJsonArray.insert": ('int', 'PySide2.QtCore.QJsonValue'), "QJsonArray.isEmpty": (), @@ -1084,7 +1091,7 @@ if "PySide2.QtCore" in sys.modules: "QJsonDocument.fromBinaryData": ('PySide2.QtCore.QByteArray', 'PySide2.QtCore.QJsonDocument.DataValidation'), "QJsonDocument.fromJson": ('PySide2.QtCore.QByteArray', 'PySide2.QtCore.QJsonParseError'), "QJsonDocument.fromRawData": ('str', 'int', 'PySide2.QtCore.QJsonDocument.DataValidation'), - "QJsonDocument.fromVariant": ('PySide2.support.signature.typing.Any',), + "QJsonDocument.fromVariant": ('Any',), "QJsonDocument.isArray": (), "QJsonDocument.isEmpty": (), "QJsonDocument.isNull": (), @@ -1105,7 +1112,7 @@ if "PySide2.QtCore" in sys.modules: # class PySide2.QtCore.QJsonValue: "QJsonValue.__init__": [('PySide2.QtCore.QJsonArray',), ('PySide2.QtCore.QJsonValue',), ('PySide2.QtCore.QJsonValue.Type',), ('bool',), ('dict',), ('float',), ('int',), ('str',)], "QJsonValue.__copy__": (), - "QJsonValue.fromVariant": ('PySide2.support.signature.typing.Any',), + "QJsonValue.fromVariant": ('Any',), "QJsonValue.isArray": (), "QJsonValue.isBool": (), "QJsonValue.isDouble": (), @@ -1123,8 +1130,8 @@ if "PySide2.QtCore" in sys.modules: "QJsonValue.type": (), # class PySide2.QtCore.QLibraryInfo: - "QLibraryInfo.buildDate": (), "QLibraryInfo.build": (), + "QLibraryInfo.buildDate": (), "QLibraryInfo.isDebugBuild": (), "QLibraryInfo.licensedProducts": (), "QLibraryInfo.licensee": (), @@ -1196,7 +1203,7 @@ if "PySide2.QtCore" in sys.modules: "QLocale.countriesForLanguage": ('PySide2.QtCore.QLocale.Language',), "QLocale.country": (), "QLocale.countryToString": ('PySide2.QtCore.QLocale.Country',), - "QLocale.createSeparatedList": ('PySide2.support.signature.typing.List',), + "QLocale.createSeparatedList": ('List[str]',), "QLocale.currencySymbol": ('PySide2.QtCore.QLocale.CurrencySymbolFormat',), "QLocale.dateFormat": ('PySide2.QtCore.QLocale.FormatType',), "QLocale.dateTimeFormat": ('PySide2.QtCore.QLocale.FormatType',), @@ -1218,7 +1225,7 @@ if "PySide2.QtCore" in sys.modules: "QLocale.percent": (), "QLocale.pmText": (), "QLocale.positiveSign": (), - "QLocale.quoteString": ['PySide2.QtCore.QLocale.QuotationStyle', 'str'], + "QLocale.quoteString": ('str', 'PySide2.QtCore.QLocale.QuotationStyle'), "QLocale.script": (), "QLocale.scriptToString": ('PySide2.QtCore.QLocale.Script',), "QLocale.setDefault": ('PySide2.QtCore.QLocale',), @@ -1238,7 +1245,7 @@ if "PySide2.QtCore" in sys.modules: "QLocale.toLongLong": ('str', 'bool'), "QLocale.toLower": ('str',), "QLocale.toShort": ('str', 'bool'), - "QLocale.toString": [('PySide2.QtCore.QDate', 'PySide2.QtCore.QLocale.FormatType'), ('PySide2.QtCore.QDate', 'str'), ('PySide2.QtCore.QDateTime', 'PySide2.QtCore.QLocale.FormatType'), ('PySide2.QtCore.QDateTime', 'str'), ('PySide2.QtCore.QTime', 'PySide2.QtCore.QLocale.FormatType'), ('PySide2.QtCore.QTime', 'str'), ('float', 'PySide2.support.signature.typing.Union[str, int]', 'int'), ('int',)], + "QLocale.toString": [('PySide2.QtCore.QDate', 'PySide2.QtCore.QLocale.FormatType'), ('PySide2.QtCore.QDate', 'str'), ('PySide2.QtCore.QDateTime', 'PySide2.QtCore.QLocale.FormatType'), ('PySide2.QtCore.QDateTime', 'str'), ('PySide2.QtCore.QTime', 'PySide2.QtCore.QLocale.FormatType'), ('PySide2.QtCore.QTime', 'str'), ('float', 'Union[str, int]', 'int'), ('int',)], "QLocale.toTime": [('str', 'PySide2.QtCore.QLocale.FormatType'), ('str', 'str')], "QLocale.toUInt": ('str', 'bool'), "QLocale.toULongLong": ('str', 'bool'), @@ -1323,7 +1330,7 @@ if "PySide2.QtCore" in sys.modules: # class PySide2.QtCore.QMetaObject: "QMetaObject.__init__": (), - "QMetaObject.cast": ['PySide2.QtCore.QObject'], + "QMetaObject.cast": ('PySide2.QtCore.QObject',), "QMetaObject.checkConnectArgs": [('PySide2.QtCore.QMetaMethod', 'PySide2.QtCore.QMetaMethod'), ('str', 'str')], "QMetaObject.classInfo": ('int',), "QMetaObject.classInfoCount": (), @@ -1389,8 +1396,8 @@ if "PySide2.QtCore" in sys.modules: "QMetaProperty.type": (), "QMetaProperty.typeName": (), "QMetaProperty.userType": (), - "QMetaProperty.write": ('PySide2.QtCore.QObject', 'PySide2.support.signature.typing.Any'), - "QMetaProperty.writeOnGadget": ('int', 'PySide2.support.signature.typing.Any'), + "QMetaProperty.write": ('PySide2.QtCore.QObject', 'Any'), + "QMetaProperty.writeOnGadget": ('int', 'Any'), # class PySide2.QtCore.QMimeData: "QMimeData.__init__": (), @@ -1408,10 +1415,10 @@ if "PySide2.QtCore" in sys.modules: "QMimeData.imageData": (), "QMimeData.removeFormat": ('str',), "QMimeData.retrieveData": ('str', 'type'), - "QMimeData.setColorData": ('PySide2.support.signature.typing.Any',), + "QMimeData.setColorData": ('Any',), "QMimeData.setData": ('str', 'PySide2.QtCore.QByteArray'), "QMimeData.setHtml": ('str',), - "QMimeData.setImageData": ('PySide2.support.signature.typing.Any',), + "QMimeData.setImageData": ('Any',), "QMimeData.setText": ('str',), "QMimeData.setUrls": ('list',), "QMimeData.text": (), @@ -1464,7 +1471,7 @@ if "PySide2.QtCore" in sys.modules: # class PySide2.QtCore.QMutex: "QMutex.__init__": ('PySide2.QtCore.QMutex.RecursionMode',), - "QMutex.isRecursive": [], + "QMutex.isRecursive": (), "QMutex.lock": (), "QMutex.tryLock": [(), ('int',)], "QMutex.try_lock": (), @@ -1483,14 +1490,14 @@ if "PySide2.QtCore" in sys.modules: "QObject.blockSignals": ('bool',), "QObject.childEvent": ('PySide2.QtCore.QChildEvent',), "QObject.children": (), - "QObject.connect": [('PySide2.QtCore.QObject', 'PySide2.QtCore.QMetaMethod', 'PySide2.QtCore.QObject', 'PySide2.QtCore.QMetaMethod', 'PySide2.QtCore.Qt.ConnectionType'), ('PySide2.QtCore.QObject', 'str', 'PySide2.QtCore.QObject', 'str', 'PySide2.QtCore.Qt.ConnectionType'), ('PySide2.QtCore.QObject', 'str', 'PySide2.support.signature.typing.Callable', 'PySide2.QtCore.Qt.ConnectionType'), ('PySide2.QtCore.QObject', 'str', 'str', 'PySide2.QtCore.Qt.ConnectionType'), ('str', 'PySide2.QtCore.QObject', 'str', 'PySide2.QtCore.Qt.ConnectionType'), ('str', 'PySide2.support.signature.typing.Callable', 'PySide2.QtCore.Qt.ConnectionType')], + "QObject.connect": [('PySide2.QtCore.QObject', 'PySide2.QtCore.QMetaMethod', 'PySide2.QtCore.QObject', 'PySide2.QtCore.QMetaMethod', 'PySide2.QtCore.Qt.ConnectionType'), ('PySide2.QtCore.QObject', 'str', 'Callable', 'PySide2.QtCore.Qt.ConnectionType'), ('PySide2.QtCore.QObject', 'str', 'PySide2.QtCore.QObject', 'str', 'PySide2.QtCore.Qt.ConnectionType'), ('PySide2.QtCore.QObject', 'str', 'str', 'PySide2.QtCore.Qt.ConnectionType'), ('str', 'Callable', 'PySide2.QtCore.Qt.ConnectionType'), ('str', 'PySide2.QtCore.QObject', 'str', 'PySide2.QtCore.Qt.ConnectionType')], "QObject.connectNotify": ('PySide2.QtCore.QMetaMethod',), "QObject.customEvent": ('PySide2.QtCore.QEvent',), "QObject.deleteLater": (), - "QObject.disconnect": [('PySide2.QtCore.QMetaObject.Connection',), ('PySide2.QtCore.QObject', 'PySide2.QtCore.QMetaMethod', 'PySide2.QtCore.QObject', 'PySide2.QtCore.QMetaMethod'), ('PySide2.QtCore.QObject', 'str'), ('PySide2.QtCore.QObject', 'str', 'PySide2.QtCore.QObject', 'str'), ('PySide2.QtCore.QObject', 'str', 'PySide2.support.signature.typing.Callable'), ('str', 'PySide2.QtCore.QObject', 'str'), ('str', 'PySide2.support.signature.typing.Callable')], + "QObject.disconnect": [('PySide2.QtCore.QMetaObject.Connection',), ('PySide2.QtCore.QObject', 'PySide2.QtCore.QMetaMethod', 'PySide2.QtCore.QObject', 'PySide2.QtCore.QMetaMethod'), ('PySide2.QtCore.QObject', 'str'), ('PySide2.QtCore.QObject', 'str', 'Callable'), ('PySide2.QtCore.QObject', 'str', 'PySide2.QtCore.QObject', 'str'), ('str', 'Callable'), ('str', 'PySide2.QtCore.QObject', 'str')], "QObject.disconnectNotify": ('PySide2.QtCore.QMetaMethod',), - "QObject.dumpObjectInfo": [], - "QObject.dumpObjectTree": [], + "QObject.dumpObjectInfo": (), + "QObject.dumpObjectTree": (), "QObject.dynamicPropertyNames": (), "QObject.emit": ('str', '...'), "QObject.event": ('PySide2.QtCore.QEvent',), @@ -1515,7 +1522,7 @@ if "PySide2.QtCore" in sys.modules: "QObject.senderSignalIndex": (), "QObject.setObjectName": ('str',), "QObject.setParent": ('PySide2.QtCore.QObject',), - "QObject.setProperty": ('str', 'PySide2.support.signature.typing.Any'), + "QObject.setProperty": ('str', 'Any'), "QObject.signalsBlocked": (), "QObject.startTimer": ('int', 'PySide2.QtCore.Qt.TimerType'), "QObject.thread": (), @@ -1603,7 +1610,7 @@ if "PySide2.QtCore" in sys.modules: "QProcess.closeReadChannel": ('PySide2.QtCore.QProcess.ProcessChannel',), "QProcess.closeWriteChannel": (), "QProcess.environment": (), - "QProcess.execute": [('str',), ('str', 'PySide2.support.signature.typing.List')], + "QProcess.execute": [('str',), ('str', 'List[str]')], "QProcess.exitCode": (), "QProcess.exitStatus": (), "QProcess.inputChannelMode": (), @@ -1620,8 +1627,8 @@ if "PySide2.QtCore" in sys.modules: "QProcess.readAllStandardOutput": (), "QProcess.readChannel": (), "QProcess.readData": ('str', 'int'), - "QProcess.setArguments": ('PySide2.support.signature.typing.List',), - "QProcess.setEnvironment": ('PySide2.support.signature.typing.List',), + "QProcess.setArguments": ('List[str]',), + "QProcess.setEnvironment": ('List[str]',), "QProcess.setInputChannelMode": ('PySide2.QtCore.QProcess.InputChannelMode',), "QProcess.setProcessChannelMode": ('PySide2.QtCore.QProcess.ProcessChannelMode',), "QProcess.setProcessEnvironment": ('PySide2.QtCore.QProcessEnvironment',), @@ -1634,8 +1641,8 @@ if "PySide2.QtCore" in sys.modules: "QProcess.setStandardOutputProcess": ('PySide2.QtCore.QProcess',), "QProcess.setWorkingDirectory": ('str',), "QProcess.setupChildProcess": (), - "QProcess.start": [('OpenMode',), ('str', 'OpenMode'), ('str', 'PySide2.support.signature.typing.List', 'OpenMode')], - "QProcess.startDetached": [('str',), ('str', 'PySide2.support.signature.typing.List'), ('str', 'PySide2.support.signature.typing.List', 'str', 'int')], + "QProcess.start": [('OpenMode',), ('str', 'List[str]', 'OpenMode'), ('str', 'OpenMode')], + "QProcess.startDetached": [('str',), ('str', 'List[str]'), ('str', 'List[str]', 'str', 'int')], "QProcess.state": (), "QProcess.systemEnvironment": (), "QProcess.terminate": (), @@ -1667,7 +1674,7 @@ if "PySide2.QtCore" in sys.modules: "QPropertyAnimation.setPropertyName": ('PySide2.QtCore.QByteArray',), "QPropertyAnimation.setTargetObject": ('PySide2.QtCore.QObject',), "QPropertyAnimation.targetObject": (), - "QPropertyAnimation.updateCurrentValue": ('PySide2.support.signature.typing.Any',), + "QPropertyAnimation.updateCurrentValue": ('Any',), "QPropertyAnimation.updateState": ('PySide2.QtCore.QAbstractAnimation.State', 'PySide2.QtCore.QAbstractAnimation.State'), # class PySide2.QtCore.QReadLocker: @@ -1814,11 +1821,11 @@ if "PySide2.QtCore" in sys.modules: "QRegExp.__init__": [(), ('PySide2.QtCore.QRegExp',), ('str', 'PySide2.QtCore.Qt.CaseSensitivity', 'PySide2.QtCore.QRegExp.PatternSyntax')], "QRegExp.__copy__": (), "QRegExp.__reduce__": (), - "QRegExp.cap": ['int'], + "QRegExp.cap": ('int',), "QRegExp.captureCount": (), - "QRegExp.capturedTexts": [], + "QRegExp.capturedTexts": (), "QRegExp.caseSensitivity": (), - "QRegExp.errorString": [], + "QRegExp.errorString": (), "QRegExp.escape": ('str',), "QRegExp.exactMatch": ('str',), "QRegExp.indexIn": ('str', 'int', 'PySide2.QtCore.QRegExp.CaretMode'), @@ -1829,7 +1836,7 @@ if "PySide2.QtCore" in sys.modules: "QRegExp.matchedLength": (), "QRegExp.pattern": (), "QRegExp.patternSyntax": (), - "QRegExp.pos": ['int'], + "QRegExp.pos": ('int',), "QRegExp.replace": ('str', 'str'), "QRegExp.setCaseSensitivity": ('PySide2.QtCore.Qt.CaseSensitivity',), "QRegExp.setMinimal": ('bool',), @@ -1843,9 +1850,9 @@ if "PySide2.QtCore" in sys.modules: "QRegularExpression.captureCount": (), "QRegularExpression.errorString": (), "QRegularExpression.escape": ('str',), - "QRegularExpression.globalMatch": ['MatchOptions', 'PySide2.QtCore.QRegularExpression.MatchType', 'int', 'str'], + "QRegularExpression.globalMatch": ('str', 'int', 'PySide2.QtCore.QRegularExpression.MatchType', 'MatchOptions'), "QRegularExpression.isValid": (), - "QRegularExpression.match": ['MatchOptions', 'PySide2.QtCore.QRegularExpression.MatchType', 'int', 'str'], + "QRegularExpression.match": ('str', 'int', 'PySide2.QtCore.QRegularExpression.MatchType', 'MatchOptions'), "QRegularExpression.namedCaptureGroups": (), "QRegularExpression.optimize": (), "QRegularExpression.pattern": (), @@ -1880,7 +1887,6 @@ if "PySide2.QtCore" in sys.modules: "QRegularExpressionMatchIterator.isValid": (), "QRegularExpressionMatchIterator.matchOptions": (), "QRegularExpressionMatchIterator.matchType": (), - "QRegularExpressionMatchIterator.next": (), "QRegularExpressionMatchIterator.peekNext": (), "QRegularExpressionMatchIterator.regularExpression": (), "QRegularExpressionMatchIterator.swap": ('PySide2.QtCore.QRegularExpressionMatchIterator',), @@ -1899,13 +1905,13 @@ if "PySide2.QtCore" in sys.modules: "QResource.lastModified": (), "QResource.locale": (), "QResource.registerResource": ('str', 'str'), - "QResource.registerResourceData": ('PySide2.support.signature.typing.Union[str, int]', 'str'), + "QResource.registerResourceData": ('Union[str, int]', 'str'), "QResource.searchPaths": (), "QResource.setFileName": ('str',), "QResource.setLocale": ('PySide2.QtCore.QLocale',), "QResource.size": (), "QResource.unregisterResource": ('str', 'str'), - "QResource.unregisterResourceData": ('PySide2.support.signature.typing.Union[str, int]', 'str'), + "QResource.unregisterResourceData": ('Union[str, int]', 'str'), # class PySide2.QtCore.QRunnable: "QRunnable.__init__": (), @@ -1972,10 +1978,10 @@ if "PySide2.QtCore" in sys.modules: "QSettings.setFallbacksEnabled": ('bool',), "QSettings.setIniCodec": [('PySide2.QtCore.QTextCodec',), ('str',)], "QSettings.setPath": ('PySide2.QtCore.QSettings.Format', 'PySide2.QtCore.QSettings.Scope', 'str'), - "QSettings.setValue": ('str', 'PySide2.support.signature.typing.Any'), + "QSettings.setValue": ('str', 'Any'), "QSettings.status": (), "QSettings.sync": (), - "QSettings.value": ('str', 'PySide2.support.signature.typing.Any'), + "QSettings.value": ('str', 'Any'), # class PySide2.QtCore.QSignalMapper: "QSignalMapper.__init__": ('PySide2.QtCore.QObject',), @@ -2070,14 +2076,14 @@ if "PySide2.QtCore" in sys.modules: "QSortFilterProxyModel.mapSelectionFromSource": ('PySide2.QtCore.QItemSelection',), "QSortFilterProxyModel.mapSelectionToSource": ('PySide2.QtCore.QItemSelection',), "QSortFilterProxyModel.mapToSource": ('PySide2.QtCore.QModelIndex',), - "QSortFilterProxyModel.match": ('PySide2.QtCore.QModelIndex', 'int', 'PySide2.support.signature.typing.Any', 'int', 'MatchFlags'), - "QSortFilterProxyModel.mimeData": ('PySide2.support.signature.typing.List',), + "QSortFilterProxyModel.match": ('PySide2.QtCore.QModelIndex', 'int', 'Any', 'int', 'MatchFlags'), + "QSortFilterProxyModel.mimeData": ('List[int]',), "QSortFilterProxyModel.mimeTypes": (), "QSortFilterProxyModel.parent": [(), ('PySide2.QtCore.QModelIndex',)], "QSortFilterProxyModel.removeColumns": ('int', 'int', 'PySide2.QtCore.QModelIndex'), "QSortFilterProxyModel.removeRows": ('int', 'int', 'PySide2.QtCore.QModelIndex'), "QSortFilterProxyModel.rowCount": ('PySide2.QtCore.QModelIndex',), - "QSortFilterProxyModel.setData": ('PySide2.QtCore.QModelIndex', 'PySide2.support.signature.typing.Any', 'int'), + "QSortFilterProxyModel.setData": ('PySide2.QtCore.QModelIndex', 'Any', 'int'), "QSortFilterProxyModel.setDynamicSortFilter": ('bool',), "QSortFilterProxyModel.setFilterCaseSensitivity": ('PySide2.QtCore.Qt.CaseSensitivity',), "QSortFilterProxyModel.setFilterFixedString": ('str',), @@ -2085,7 +2091,7 @@ if "PySide2.QtCore" in sys.modules: "QSortFilterProxyModel.setFilterRegExp": [('PySide2.QtCore.QRegExp',), ('str',)], "QSortFilterProxyModel.setFilterRole": ('int',), "QSortFilterProxyModel.setFilterWildcard": ('str',), - "QSortFilterProxyModel.setHeaderData": ('int', 'PySide2.QtCore.Qt.Orientation', 'PySide2.support.signature.typing.Any', 'int'), + "QSortFilterProxyModel.setHeaderData": ('int', 'PySide2.QtCore.Qt.Orientation', 'Any', 'int'), "QSortFilterProxyModel.setSortCaseSensitivity": ('PySide2.QtCore.Qt.CaseSensitivity',), "QSortFilterProxyModel.setSortLocaleAware": ('bool',), "QSortFilterProxyModel.setSortRole": ('int',), @@ -2100,20 +2106,20 @@ if "PySide2.QtCore" in sys.modules: "QSortFilterProxyModel.supportedDropActions": (), # class PySide2.QtCore.QStandardPaths: - "QStandardPaths.writableLocation": ('PySide2.QtCore.QStandardPaths.StandardLocation',), "QStandardPaths.displayName": ('PySide2.QtCore.QStandardPaths.StandardLocation',), "QStandardPaths.enableTestMode": ('bool',), - "QStandardPaths.findExecutable": ('str', 'PySide2.support.signature.typing.List'), + "QStandardPaths.findExecutable": ('str', 'List[str]'), "QStandardPaths.isTestModeEnabled": (), "QStandardPaths.locate": ('PySide2.QtCore.QStandardPaths.StandardLocation', 'str', 'LocateOptions'), "QStandardPaths.locateAll": ('PySide2.QtCore.QStandardPaths.StandardLocation', 'str', 'LocateOptions'), "QStandardPaths.setTestModeEnabled": ('bool',), "QStandardPaths.standardLocations": ('PySide2.QtCore.QStandardPaths.StandardLocation',), + "QStandardPaths.writableLocation": ('PySide2.QtCore.QStandardPaths.StandardLocation',), # class PySide2.QtCore.QState: "QState.__init__": [('PySide2.QtCore.QState',), ('PySide2.QtCore.QState.ChildMode', 'PySide2.QtCore.QState')], "QState.addTransition": [('PySide2.QtCore.QAbstractState',), ('PySide2.QtCore.QAbstractTransition',), ('PySide2.QtCore.QObject', 'str', 'PySide2.QtCore.QAbstractState'), ('object', 'PySide2.QtCore.QAbstractState')], - "QState.assignProperty": ('PySide2.QtCore.QObject', 'str', 'PySide2.support.signature.typing.Any'), + "QState.assignProperty": ('PySide2.QtCore.QObject', 'str', 'Any'), "QState.childMode": (), "QState.errorState": (), "QState.event": ('PySide2.QtCore.QEvent',), @@ -2134,7 +2140,7 @@ if "PySide2.QtCore" in sys.modules: "QStateMachine.beginSelectTransitions": ('PySide2.QtCore.QEvent',), "QStateMachine.cancelDelayedEvent": ('int',), "QStateMachine.clearError": (), - "QStateMachine.configuration": [], + "QStateMachine.configuration": (), "QStateMachine.defaultAnimations": (), "QStateMachine.endMicrostep": ('PySide2.QtCore.QEvent',), "QStateMachine.endSelectTransitions": ('PySide2.QtCore.QEvent',), @@ -2243,7 +2249,7 @@ if "PySide2.QtCore" in sys.modules: "QTextCodec.aliases": (), "QTextCodec.availableCodecs": (), "QTextCodec.availableMibs": (), - "QTextCodec.canEncode": [('PySide2.support.signature.typing.Union[str, int]',), ('str',)], + "QTextCodec.canEncode": [('Union[str, int]',), ('str',)], "QTextCodec.codecForHtml": [('PySide2.QtCore.QByteArray',), ('PySide2.QtCore.QByteArray', 'PySide2.QtCore.QTextCodec')], "QTextCodec.codecForLocale": (), "QTextCodec.codecForMib": ('int',), @@ -2300,7 +2306,7 @@ if "PySide2.QtCore" in sys.modules: "QTextStream.setIntegerBase": ('int',), "QTextStream.setLocale": ('PySide2.QtCore.QLocale',), "QTextStream.setNumberFlags": ('NumberFlags',), - "QTextStream.setPadChar": ('PySide2.support.signature.typing.Union[str, int]',), + "QTextStream.setPadChar": ('Union[str, int]',), "QTextStream.setRealNumberNotation": ('PySide2.QtCore.QTextStream.RealNumberNotation',), "QTextStream.setRealNumberPrecision": ('int',), "QTextStream.setStatus": ('PySide2.QtCore.QTextStream.Status',), @@ -2309,8 +2315,8 @@ if "PySide2.QtCore" in sys.modules: "QTextStream.string": (), # class PySide2.QtCore.QTextStreamManipulator: - "QTextStreamManipulator.exec_": ('PySide2.QtCore.QTextStream',), "QTextStreamManipulator.__copy__": (), + "QTextStreamManipulator.exec_": ('PySide2.QtCore.QTextStream',), # class PySide2.QtCore.QThread: "QThread.__init__": ('PySide2.QtCore.QObject',), @@ -2456,7 +2462,7 @@ if "PySide2.QtCore" in sys.modules: "QTimer.setInterval": ('int',), "QTimer.setSingleShot": ('bool',), "QTimer.setTimerType": ('PySide2.QtCore.Qt.TimerType',), - "QTimer.singleShot": [('int', 'PySide2.QtCore.QObject', 'str'), ('int', 'PySide2.QtCore.Qt.TimerType', 'PySide2.QtCore.QObject', 'str'), ('int', 'PySide2.support.signature.typing.Callable')], + "QTimer.singleShot": [('int', 'Callable'), ('int', 'PySide2.QtCore.QObject', 'str'), ('int', 'PySide2.QtCore.Qt.TimerType', 'PySide2.QtCore.QObject', 'str')], "QTimer.start": [(), ('int',)], "QTimer.stop": (), "QTimer.timerEvent": ('PySide2.QtCore.QTimerEvent',), @@ -2470,7 +2476,7 @@ if "PySide2.QtCore" in sys.modules: # class PySide2.QtCore.QTranslator: "QTranslator.__init__": ('PySide2.QtCore.QObject',), "QTranslator.isEmpty": (), - "QTranslator.load": [('PySide2.QtCore.QLocale', 'str', 'str', 'str', 'str'), ('PySide2.support.signature.typing.Union[str, int]', 'int', 'str'), ('str', 'str', 'str', 'str')], + "QTranslator.load": [('PySide2.QtCore.QLocale', 'str', 'str', 'str', 'str'), ('Union[str, int]', 'int', 'str'), ('str', 'str', 'str', 'str')], "QTranslator.translate": ('str', 'str', 'str', 'int'), # class PySide2.QtCore.QUrl: @@ -2487,7 +2493,7 @@ if "PySide2.QtCore" in sys.modules: "QUrl.fromEncoded": ('PySide2.QtCore.QByteArray', 'PySide2.QtCore.QUrl.ParsingMode'), "QUrl.fromLocalFile": ('str',), "QUrl.fromPercentEncoding": ('PySide2.QtCore.QByteArray',), - "QUrl.fromStringList": ('PySide2.support.signature.typing.List', 'PySide2.QtCore.QUrl.ParsingMode'), + "QUrl.fromStringList": ('List[str]', 'PySide2.QtCore.QUrl.ParsingMode'), "QUrl.fromUserInput": [('str',), ('str', 'str', 'UserInputResolutionOptions')], "QUrl.hasFragment": (), "QUrl.hasQuery": (), @@ -2508,7 +2514,7 @@ if "PySide2.QtCore" in sys.modules: "QUrl.setAuthority": ('str', 'PySide2.QtCore.QUrl.ParsingMode'), "QUrl.setFragment": ('str', 'PySide2.QtCore.QUrl.ParsingMode'), "QUrl.setHost": ('str', 'PySide2.QtCore.QUrl.ParsingMode'), - "QUrl.setIdnWhitelist": ('PySide2.support.signature.typing.List',), + "QUrl.setIdnWhitelist": ('List[str]',), "QUrl.setPassword": ('str', 'PySide2.QtCore.QUrl.ParsingMode'), "QUrl.setPath": ('str', 'PySide2.QtCore.QUrl.ParsingMode'), "QUrl.setPort": ('int',), @@ -2548,13 +2554,13 @@ if "PySide2.QtCore" in sys.modules: "QUrlQuery.removeAllQueryItems": ('str',), "QUrlQuery.removeQueryItem": ('str',), "QUrlQuery.setQuery": ('str',), - "QUrlQuery.setQueryDelimiters": ('PySide2.support.signature.typing.Union[str, int]', 'PySide2.support.signature.typing.Union[str, int]'), + "QUrlQuery.setQueryDelimiters": ('Union[str, int]', 'Union[str, int]'), "QUrlQuery.setQueryItems": ('list',), "QUrlQuery.swap": ('PySide2.QtCore.QUrlQuery',), "QUrlQuery.toString": ('PySide2.QtCore.QUrl.ComponentFormattingOption',), # class PySide2.QtCore.QUuid: - "QUuid.__init__": [(), ('PySide2.QtCore.QByteArray',), ('PySide2.QtCore.QUuid',), ('int', 'int', 'int', 'PySide2.support.signature.typing.Union[str, int]', 'PySide2.support.signature.typing.Union[str, int]', 'PySide2.support.signature.typing.Union[str, int]', 'PySide2.support.signature.typing.Union[str, int]', 'PySide2.support.signature.typing.Union[str, int]', 'PySide2.support.signature.typing.Union[str, int]', 'PySide2.support.signature.typing.Union[str, int]', 'PySide2.support.signature.typing.Union[str, int]'), ('str',)], + "QUuid.__init__": [(), ('PySide2.QtCore.QByteArray',), ('PySide2.QtCore.QUuid',), ('int', 'int', 'int', 'Union[str, int]', 'Union[str, int]', 'Union[str, int]', 'Union[str, int]', 'Union[str, int]', 'Union[str, int]', 'Union[str, int]', 'Union[str, int]'), ('str',)], "QUuid.__copy__": (), "QUuid.__reduce__": (), "QUuid.createUuid": (), @@ -2575,16 +2581,16 @@ if "PySide2.QtCore" in sys.modules: "QVariantAnimation.easingCurve": (), "QVariantAnimation.endValue": (), "QVariantAnimation.event": ('PySide2.QtCore.QEvent',), - "QVariantAnimation.interpolated": ('PySide2.support.signature.typing.Any', 'PySide2.support.signature.typing.Any', 'float'), + "QVariantAnimation.interpolated": ('Any', 'Any', 'float'), "QVariantAnimation.keyValueAt": ('float',), "QVariantAnimation.setDuration": ('int',), "QVariantAnimation.setEasingCurve": ('PySide2.QtCore.QEasingCurve',), - "QVariantAnimation.setEndValue": ('PySide2.support.signature.typing.Any',), - "QVariantAnimation.setKeyValueAt": ('float', 'PySide2.support.signature.typing.Any'), - "QVariantAnimation.setStartValue": ('PySide2.support.signature.typing.Any',), + "QVariantAnimation.setEndValue": ('Any',), + "QVariantAnimation.setKeyValueAt": ('float', 'Any'), + "QVariantAnimation.setStartValue": ('Any',), "QVariantAnimation.startValue": (), "QVariantAnimation.updateCurrentTime": ('int',), - "QVariantAnimation.updateCurrentValue": ('PySide2.support.signature.typing.Any',), + "QVariantAnimation.updateCurrentValue": ('Any',), "QVariantAnimation.updateState": ('PySide2.QtCore.QAbstractAnimation.State', 'PySide2.QtCore.QAbstractAnimation.State'), # class PySide2.QtCore.QVersionNumber: @@ -2643,18 +2649,18 @@ if "PySide2.QtCore" in sys.modules: "QXmlStreamAttributes.constLast": (), "QXmlStreamAttributes.contains": ('PySide2.QtCore.QXmlStreamAttribute',), "QXmlStreamAttributes.count": [(), ('PySide2.QtCore.QXmlStreamAttribute',)], - "QXmlStreamAttributes.data": [], + "QXmlStreamAttributes.data": (), "QXmlStreamAttributes.empty": (), "QXmlStreamAttributes.endsWith": ('PySide2.QtCore.QXmlStreamAttribute',), "QXmlStreamAttributes.fill": ('PySide2.QtCore.QXmlStreamAttribute', 'int'), - "QXmlStreamAttributes.first": [], + "QXmlStreamAttributes.first": (), "QXmlStreamAttributes.front": (), "QXmlStreamAttributes.hasAttribute": [('str',), ('str', 'str')], "QXmlStreamAttributes.indexOf": ('PySide2.QtCore.QXmlStreamAttribute', 'int'), "QXmlStreamAttributes.insert": [('int', 'PySide2.QtCore.QXmlStreamAttribute'), ('int', 'int', 'PySide2.QtCore.QXmlStreamAttribute')], "QXmlStreamAttributes.isEmpty": (), "QXmlStreamAttributes.isSharedWith": ('list',), - "QXmlStreamAttributes.last": [], + "QXmlStreamAttributes.last": (), "QXmlStreamAttributes.lastIndexOf": ('PySide2.QtCore.QXmlStreamAttribute', 'int'), "QXmlStreamAttributes.length": (), "QXmlStreamAttributes.mid": ('int', 'int'), @@ -2790,10 +2796,6 @@ if "PySide2.QtCore" in sys.modules: "QXmlStreamWriter.writeStartElement": [('str',), ('str', 'str')], "QXmlStreamWriter.writeTextElement": [('str', 'str'), ('str', 'str', 'str')], - # class PySide2.QtCore.Qt: - "Qt.qt_getEnumName": [('Alignment',), ('DockWidgetAreas',), ('DropActions',), ('Edges',), ('ImageConversionFlags',), ('InputMethodHints',), ('InputMethodQueries',), ('ItemFlags',), ('KeyboardModifiers',), ('MatchFlags',), ('MouseButtons',), ('Orientations',), ('PySide2.QtCore.Qt.ApplicationAttribute',), ('PySide2.QtCore.Qt.ApplicationState',), ('PySide2.QtCore.Qt.ArrowType',), ('PySide2.QtCore.Qt.AspectRatioMode',), ('PySide2.QtCore.Qt.Axis',), ('PySide2.QtCore.Qt.BGMode',), ('PySide2.QtCore.Qt.BrushStyle',), ('PySide2.QtCore.Qt.CaseSensitivity',), ('PySide2.QtCore.Qt.CheckState',), ('PySide2.QtCore.Qt.ChecksumType',), ('PySide2.QtCore.Qt.ClipOperation',), ('PySide2.QtCore.Qt.ConnectionType',), ('PySide2.QtCore.Qt.ContextMenuPolicy',), ('PySide2.QtCore.Qt.Corner',), ('PySide2.QtCore.Qt.CursorMoveStyle',), ('PySide2.QtCore.Qt.CursorShape',), ('PySide2.QtCore.Qt.DateFormat',), ('PySide2.QtCore.Qt.DayOfWeek',), ('PySide2.QtCore.Qt.DockWidgetArea',), ('PySide2.QtCore.Qt.DropAction',), ('PySide2.QtCore.Qt.Edge',), ('PySide2.QtCore.Qt.EnterKeyType',), ('PySide2.QtCore.Qt.FillRule',), ('PySide2.QtCore.Qt.FocusPolicy',), ('PySide2.QtCore.Qt.FocusReason',), ('PySide2.QtCore.Qt.GestureState',), ('PySide2.QtCore.Qt.GestureType',), ('PySide2.QtCore.Qt.GlobalColor',), ('PySide2.QtCore.Qt.InputMethodHint',), ('PySide2.QtCore.Qt.InputMethodQuery',), ('PySide2.QtCore.Qt.ItemDataRole',), ('PySide2.QtCore.Qt.ItemSelectionMode',), ('PySide2.QtCore.Qt.ItemSelectionOperation',), ('PySide2.QtCore.Qt.Key',), ('PySide2.QtCore.Qt.LayoutDirection',), ('PySide2.QtCore.Qt.MaskMode',), ('PySide2.QtCore.Qt.MouseEventFlag',), ('PySide2.QtCore.Qt.MouseEventSource',), ('PySide2.QtCore.Qt.NativeGestureType',), ('PySide2.QtCore.Qt.Orientation',), ('PySide2.QtCore.Qt.PenCapStyle',), ('PySide2.QtCore.Qt.PenJoinStyle',), ('PySide2.QtCore.Qt.PenStyle',), ('PySide2.QtCore.Qt.ScreenOrientation',), ('PySide2.QtCore.Qt.ScrollBarPolicy',), ('PySide2.QtCore.Qt.ScrollPhase',), ('PySide2.QtCore.Qt.ShortcutContext',), ('PySide2.QtCore.Qt.SizeHint',), ('PySide2.QtCore.Qt.SizeMode',), ('PySide2.QtCore.Qt.SortOrder',), ('PySide2.QtCore.Qt.TabFocusBehavior',), ('PySide2.QtCore.Qt.TextElideMode',), ('PySide2.QtCore.Qt.TextFlag',), ('PySide2.QtCore.Qt.TextFormat',), ('PySide2.QtCore.Qt.TextInteractionFlag',), ('PySide2.QtCore.Qt.TimeSpec',), ('PySide2.QtCore.Qt.TimerType',), ('PySide2.QtCore.Qt.ToolBarArea',), ('PySide2.QtCore.Qt.ToolButtonStyle',), ('PySide2.QtCore.Qt.TransformationMode',), ('PySide2.QtCore.Qt.WidgetAttribute',), ('PySide2.QtCore.Qt.WindowModality',), ('PySide2.QtCore.Qt.WindowState',), ('PySide2.QtCore.Qt.WindowType',), ('ScreenOrientations',), ('TextInteractionFlags',), ('ToolBarAreas',), ('TouchPointStates',), ('WindowFlags',), ('WindowStates',)], - "Qt.qt_getEnumMetaObject": [('Alignment',), ('DockWidgetAreas',), ('DropActions',), ('Edges',), ('ImageConversionFlags',), ('InputMethodHints',), ('InputMethodQueries',), ('ItemFlags',), ('KeyboardModifiers',), ('MatchFlags',), ('MouseButtons',), ('Orientations',), ('PySide2.QtCore.Qt.ApplicationAttribute',), ('PySide2.QtCore.Qt.ApplicationState',), ('PySide2.QtCore.Qt.ArrowType',), ('PySide2.QtCore.Qt.AspectRatioMode',), ('PySide2.QtCore.Qt.Axis',), ('PySide2.QtCore.Qt.BGMode',), ('PySide2.QtCore.Qt.BrushStyle',), ('PySide2.QtCore.Qt.CaseSensitivity',), ('PySide2.QtCore.Qt.CheckState',), ('PySide2.QtCore.Qt.ChecksumType',), ('PySide2.QtCore.Qt.ClipOperation',), ('PySide2.QtCore.Qt.ConnectionType',), ('PySide2.QtCore.Qt.ContextMenuPolicy',), ('PySide2.QtCore.Qt.Corner',), ('PySide2.QtCore.Qt.CursorMoveStyle',), ('PySide2.QtCore.Qt.CursorShape',), ('PySide2.QtCore.Qt.DateFormat',), ('PySide2.QtCore.Qt.DayOfWeek',), ('PySide2.QtCore.Qt.DockWidgetArea',), ('PySide2.QtCore.Qt.DropAction',), ('PySide2.QtCore.Qt.Edge',), ('PySide2.QtCore.Qt.EnterKeyType',), ('PySide2.QtCore.Qt.FillRule',), ('PySide2.QtCore.Qt.FocusPolicy',), ('PySide2.QtCore.Qt.FocusReason',), ('PySide2.QtCore.Qt.GestureState',), ('PySide2.QtCore.Qt.GestureType',), ('PySide2.QtCore.Qt.GlobalColor',), ('PySide2.QtCore.Qt.InputMethodHint',), ('PySide2.QtCore.Qt.InputMethodQuery',), ('PySide2.QtCore.Qt.ItemDataRole',), ('PySide2.QtCore.Qt.ItemSelectionMode',), ('PySide2.QtCore.Qt.ItemSelectionOperation',), ('PySide2.QtCore.Qt.Key',), ('PySide2.QtCore.Qt.LayoutDirection',), ('PySide2.QtCore.Qt.MaskMode',), ('PySide2.QtCore.Qt.MouseEventFlag',), ('PySide2.QtCore.Qt.MouseEventSource',), ('PySide2.QtCore.Qt.NativeGestureType',), ('PySide2.QtCore.Qt.Orientation',), ('PySide2.QtCore.Qt.PenCapStyle',), ('PySide2.QtCore.Qt.PenJoinStyle',), ('PySide2.QtCore.Qt.PenStyle',), ('PySide2.QtCore.Qt.ScreenOrientation',), ('PySide2.QtCore.Qt.ScrollBarPolicy',), ('PySide2.QtCore.Qt.ScrollPhase',), ('PySide2.QtCore.Qt.ShortcutContext',), ('PySide2.QtCore.Qt.SizeHint',), ('PySide2.QtCore.Qt.SizeMode',), ('PySide2.QtCore.Qt.SortOrder',), ('PySide2.QtCore.Qt.TabFocusBehavior',), ('PySide2.QtCore.Qt.TextElideMode',), ('PySide2.QtCore.Qt.TextFlag',), ('PySide2.QtCore.Qt.TextFormat',), ('PySide2.QtCore.Qt.TextInteractionFlag',), ('PySide2.QtCore.Qt.TimeSpec',), ('PySide2.QtCore.Qt.TimerType',), ('PySide2.QtCore.Qt.ToolBarArea',), ('PySide2.QtCore.Qt.ToolButtonStyle',), ('PySide2.QtCore.Qt.TransformationMode',), ('PySide2.QtCore.Qt.WidgetAttribute',), ('PySide2.QtCore.Qt.WindowModality',), ('PySide2.QtCore.Qt.WindowState',), ('PySide2.QtCore.Qt.WindowType',), ('ScreenOrientations',), ('TextInteractionFlags',), ('ToolBarAreas',), ('TouchPointStates',), ('WindowFlags',), ('WindowStates',)], - # class PySide2.QtCore.QtMsgType: # class PySide2.QtCore.Signal: @@ -2837,13 +2839,13 @@ if "PySide2.QtGui" in sys.modules: "QAbstractTextDocumentLayout.unregisterHandler": ('int', 'PySide2.QtCore.QObject'), # class PySide2.QtGui.QAccessible: - "QAccessible.queryAccessibleInterface": ('PySide2.QtCore.QObject',), "QAccessible.__copy__": (), "QAccessible.accessibleInterface": ('int',), "QAccessible.cleanup": (), "QAccessible.deleteAccessibleInterface": ('int',), "QAccessible.isActive": (), "QAccessible.qAccessibleTextBoundaryHelper": ('PySide2.QtGui.QTextCursor', 'PySide2.QtGui.QAccessible.TextBoundaryType'), + "QAccessible.queryAccessibleInterface": ('PySide2.QtCore.QObject',), "QAccessible.registerAccessibleInterface": ('PySide2.QtGui.QAccessibleInterface',), "QAccessible.setActive": ('bool',), "QAccessible.setRootObject": ('PySide2.QtCore.QObject',), @@ -2900,8 +2902,8 @@ if "PySide2.QtGui" in sys.modules: "QBitmap.__init__": [(), ('PySide2.QtCore.QSize',), ('PySide2.QtGui.QBitmap',), ('PySide2.QtGui.QPixmap',), ('int', 'int'), ('str', 'str')], "QBitmap.__copy__": (), "QBitmap.clear": (), - "QBitmap.fromData": ('PySide2.QtCore.QSize', 'PySide2.support.signature.typing.Union[str, int]', 'PySide2.QtGui.QImage.Format'), - "QBitmap.fromImage": ['ImageConversionFlags', 'PySide2.QtGui.QImage'], + "QBitmap.fromData": ('PySide2.QtCore.QSize', 'Union[str, int]', 'PySide2.QtGui.QImage.Format'), + "QBitmap.fromImage": ('PySide2.QtGui.QImage', 'ImageConversionFlags'), "QBitmap.swap": [('PySide2.QtGui.QBitmap',), ('PySide2.QtGui.QPixmap',)], "QBitmap.transformed": [('PySide2.QtGui.QMatrix',), ('PySide2.QtGui.QMatrix', 'PySide2.QtCore.Qt.TransformationMode'), ('PySide2.QtGui.QTransform',)], @@ -2925,7 +2927,6 @@ if "PySide2.QtGui" in sys.modules: "QBrush.transform": (), # class PySide2.QtGui.QClipboard: - "QClipboard.setMimeData": ('PySide2.QtCore.QMimeData', 'PySide2.QtGui.QClipboard.Mode'), "QClipboard.clear": ('PySide2.QtGui.QClipboard.Mode',), "QClipboard.image": ('PySide2.QtGui.QClipboard.Mode',), "QClipboard.mimeData": ('PySide2.QtGui.QClipboard.Mode',), @@ -2934,6 +2935,7 @@ if "PySide2.QtGui" in sys.modules: "QClipboard.ownsSelection": (), "QClipboard.pixmap": ('PySide2.QtGui.QClipboard.Mode',), "QClipboard.setImage": ('PySide2.QtGui.QImage', 'PySide2.QtGui.QClipboard.Mode'), + "QClipboard.setMimeData": ('PySide2.QtCore.QMimeData', 'PySide2.QtGui.QClipboard.Mode'), "QClipboard.setPixmap": ('PySide2.QtGui.QPixmap', 'PySide2.QtGui.QClipboard.Mode'), "QClipboard.setText": ('str', 'PySide2.QtGui.QClipboard.Mode'), "QClipboard.supportsFindBuffer": (), @@ -2944,7 +2946,7 @@ if "PySide2.QtGui" in sys.modules: "QCloseEvent.__init__": (), # class PySide2.QtGui.QColor: - "QColor.__init__": [(), ('PySide2.QtCore.Qt.GlobalColor',), ('PySide2.QtGui.QColor',), ('PySide2.support.signature.typing.Any',), ('int',), ('int', 'int', 'int', 'int'), ('str',)], + "QColor.__init__": [(), ('Any',), ('PySide2.QtCore.Qt.GlobalColor',), ('PySide2.QtGui.QColor',), ('int',), ('int', 'int', 'int', 'int'), ('str',)], "QColor.__copy__": (), "QColor.__reduce__": (), "QColor.__setstate__": ('object',), @@ -3044,9 +3046,9 @@ if "PySide2.QtGui" in sys.modules: # class PySide2.QtGui.QContextMenuEvent: "QContextMenuEvent.__init__": [('PySide2.QtGui.QContextMenuEvent.Reason', 'PySide2.QtCore.QPoint'), ('PySide2.QtGui.QContextMenuEvent.Reason', 'PySide2.QtCore.QPoint', 'PySide2.QtCore.QPoint'), ('PySide2.QtGui.QContextMenuEvent.Reason', 'PySide2.QtCore.QPoint', 'PySide2.QtCore.QPoint', 'KeyboardModifiers')], - "QContextMenuEvent.global"+"Y": (), "QContextMenuEvent.globalPos": (), "QContextMenuEvent.globalX": (), + "QContextMenuEvent.global""Y": (), "QContextMenuEvent.pos": (), "QContextMenuEvent.reason": (), "QContextMenuEvent.x": (), @@ -3130,9 +3132,9 @@ if "PySide2.QtGui" in sys.modules: # class PySide2.QtGui.QEnterEvent: "QEnterEvent.__init__": ('PySide2.QtCore.QPointF', 'PySide2.QtCore.QPointF', 'PySide2.QtCore.QPointF'), - "QEnterEvent.global"+"Y": (), "QEnterEvent.globalPos": (), "QEnterEvent.globalX": (), + "QEnterEvent.global""Y": (), "QEnterEvent.localPos": (), "QEnterEvent.pos": (), "QEnterEvent.screenPos": (), @@ -3171,7 +3173,7 @@ if "PySide2.QtGui" in sys.modules: "QFont.hintingPreference": (), "QFont.initialize": (), "QFont.insertSubstitution": ('str', 'str'), - "QFont.insertSubstitutions": ('str', 'PySide2.support.signature.typing.List'), + "QFont.insertSubstitutions": ('str', 'List[str]'), "QFont.isCopyOf": ('PySide2.QtGui.QFont',), "QFont.italic": (), "QFont.kerning": (), @@ -3283,30 +3285,30 @@ if "PySide2.QtGui" in sys.modules: "QFontMetrics.ascent": (), "QFontMetrics.averageCharWidth": (), "QFontMetrics.boundingRect": [('PySide2.QtCore.QRect', 'int', 'str', 'int', 'int'), ('int', 'int', 'int', 'int', 'int', 'str', 'int', 'int'), ('str',)], - "QFontMetrics.boundingRectChar": ('PySide2.support.signature.typing.Union[str, int]',), + "QFontMetrics.boundingRectChar": ('Union[str, int]',), "QFontMetrics.capHeight": (), "QFontMetrics.charWidth": ('str', 'int'), "QFontMetrics.descent": (), "QFontMetrics.elidedText": ('str', 'PySide2.QtCore.Qt.TextElideMode', 'int', 'int'), "QFontMetrics.height": (), - "QFontMetrics.inFont": ('PySide2.support.signature.typing.Union[str, int]',), + "QFontMetrics.inFont": ('Union[str, int]',), "QFontMetrics.inFontUcs4": ('int',), "QFontMetrics.leading": (), - "QFontMetrics.leftBearing": ('PySide2.support.signature.typing.Union[str, int]',), + "QFontMetrics.leftBearing": ('Union[str, int]',), "QFontMetrics.lineSpacing": (), "QFontMetrics.lineWidth": (), "QFontMetrics.maxWidth": (), "QFontMetrics.minLeftBearing": (), "QFontMetrics.minRightBearing": (), "QFontMetrics.overlinePos": (), - "QFontMetrics.rightBearing": ('PySide2.support.signature.typing.Union[str, int]',), + "QFontMetrics.rightBearing": ('Union[str, int]',), "QFontMetrics.size": ('int', 'str', 'int', 'int'), "QFontMetrics.strikeOutPos": (), "QFontMetrics.swap": ('PySide2.QtGui.QFontMetrics',), "QFontMetrics.tightBoundingRect": ('str',), "QFontMetrics.underlinePos": (), "QFontMetrics.width": [('str', 'int'), ('str', 'int', 'int')], - "QFontMetrics.widthChar": ('PySide2.support.signature.typing.Union[str, int]',), + "QFontMetrics.widthChar": ('Union[str, int]',), "QFontMetrics.xHeight": (), # class PySide2.QtGui.QFontMetricsF: @@ -3315,29 +3317,29 @@ if "PySide2.QtGui" in sys.modules: "QFontMetricsF.ascent": (), "QFontMetricsF.averageCharWidth": (), "QFontMetricsF.boundingRect": [('PySide2.QtCore.QRectF', 'int', 'str', 'int', 'int'), ('str',)], - "QFontMetricsF.boundingRectChar": ('PySide2.support.signature.typing.Union[str, int]',), + "QFontMetricsF.boundingRectChar": ('Union[str, int]',), "QFontMetricsF.capHeight": (), "QFontMetricsF.descent": (), "QFontMetricsF.elidedText": ('str', 'PySide2.QtCore.Qt.TextElideMode', 'float', 'int'), "QFontMetricsF.height": (), - "QFontMetricsF.inFont": ('PySide2.support.signature.typing.Union[str, int]',), + "QFontMetricsF.inFont": ('Union[str, int]',), "QFontMetricsF.inFontUcs4": ('int',), "QFontMetricsF.leading": (), - "QFontMetricsF.leftBearing": ('PySide2.support.signature.typing.Union[str, int]',), + "QFontMetricsF.leftBearing": ('Union[str, int]',), "QFontMetricsF.lineSpacing": (), "QFontMetricsF.lineWidth": (), "QFontMetricsF.maxWidth": (), "QFontMetricsF.minLeftBearing": (), "QFontMetricsF.minRightBearing": (), "QFontMetricsF.overlinePos": (), - "QFontMetricsF.rightBearing": ('PySide2.support.signature.typing.Union[str, int]',), + "QFontMetricsF.rightBearing": ('Union[str, int]',), "QFontMetricsF.size": ('int', 'str', 'int', 'int'), "QFontMetricsF.strikeOutPos": (), "QFontMetricsF.swap": ('PySide2.QtGui.QFontMetricsF',), "QFontMetricsF.tightBoundingRect": ('str',), "QFontMetricsF.underlinePos": (), "QFontMetricsF.width": ('str',), - "QFontMetricsF.widthChar": ('PySide2.support.signature.typing.Union[str, int]',), + "QFontMetricsF.widthChar": ('Union[str, int]',), "QFontMetricsF.xHeight": (), # class PySide2.QtGui.QGradient: @@ -3355,7 +3357,7 @@ if "PySide2.QtGui" in sys.modules: "QGradient.type": (), # class PySide2.QtGui.QGuiApplication: - "QGuiApplication.__init__": ('PySide2.support.signature.typing.List',), + "QGuiApplication.__init__": ('List[str]',), "QGuiApplication.allWindows": (), "QGuiApplication.applicationDisplayName": (), "QGuiApplication.applicationState": (), @@ -3407,9 +3409,9 @@ if "PySide2.QtGui" in sys.modules: # class PySide2.QtGui.QHelpEvent: "QHelpEvent.__init__": ('PySide2.QtCore.QEvent.Type', 'PySide2.QtCore.QPoint', 'PySide2.QtCore.QPoint'), - "QHelpEvent.global"+"Y": (), "QHelpEvent.globalPos": (), "QHelpEvent.globalX": (), + "QHelpEvent.global""Y": (), "QHelpEvent.pos": (), "QHelpEvent.x": (), "QHelpEvent.y": (), @@ -3441,7 +3443,7 @@ if "PySide2.QtGui" in sys.modules: "QIcon.pixmap": [('PySide2.QtCore.QSize', 'PySide2.QtGui.QIcon.Mode', 'PySide2.QtGui.QIcon.State'), ('PySide2.QtGui.QWindow', 'PySide2.QtCore.QSize', 'PySide2.QtGui.QIcon.Mode', 'PySide2.QtGui.QIcon.State'), ('int', 'PySide2.QtGui.QIcon.Mode', 'PySide2.QtGui.QIcon.State'), ('int', 'int', 'PySide2.QtGui.QIcon.Mode', 'PySide2.QtGui.QIcon.State')], "QIcon.setIsMask": ('bool',), "QIcon.setThemeName": ('str',), - "QIcon.setThemeSearchPaths": ('PySide2.support.signature.typing.List',), + "QIcon.setThemeSearchPaths": ('List[str]',), "QIcon.swap": ('PySide2.QtGui.QIcon',), "QIcon.themeName": (), "QIcon.themeSearchPaths": (), @@ -3466,7 +3468,7 @@ if "PySide2.QtGui" in sys.modules: "QIconEngine.write": ('PySide2.QtCore.QDataStream',), # class PySide2.QtGui.QImage: - "QImage.__init__": [(), ('PySide2.QtCore.QSize', 'PySide2.QtGui.QImage.Format'), ('PySide2.QtGui.QImage',), ('PySide2.support.signature.typing.List',), ('PySide2.support.signature.typing.Union[str, int]', 'int', 'int', 'PySide2.QtGui.QImage.Format', 'PySide2.support.signature.typing.Callable', 'int'), ('PySide2.support.signature.typing.Union[str, int]', 'int', 'int', 'int', 'PySide2.QtGui.QImage.Format', 'PySide2.support.signature.typing.Callable', 'int'), ('int', 'int', 'PySide2.QtGui.QImage.Format'), ('str', 'int', 'int', 'PySide2.QtGui.QImage.Format'), ('str', 'int', 'int', 'int', 'PySide2.QtGui.QImage.Format'), ('str', 'str')], + "QImage.__init__": [(), ('List[str]',), ('PySide2.QtCore.QSize', 'PySide2.QtGui.QImage.Format'), ('PySide2.QtGui.QImage',), ('Union[str, int]', 'int', 'int', 'PySide2.QtGui.QImage.Format', 'Callable', 'int'), ('Union[str, int]', 'int', 'int', 'int', 'PySide2.QtGui.QImage.Format', 'Callable', 'int'), ('int', 'int', 'PySide2.QtGui.QImage.Format'), ('str', 'int', 'int', 'PySide2.QtGui.QImage.Format'), ('str', 'int', 'int', 'int', 'PySide2.QtGui.QImage.Format'), ('str', 'str')], "QImage.__copy__": (), "QImage.allGray": (), "QImage.alphaChannel": (), @@ -3561,8 +3563,8 @@ if "PySide2.QtGui" in sys.modules: "QImageIOHandler.option": ('PySide2.QtGui.QImageIOHandler.ImageOption',), "QImageIOHandler.read": ('PySide2.QtGui.QImage',), "QImageIOHandler.setDevice": ('PySide2.QtCore.QIODevice',), - "QImageIOHandler.setFormat": ['PySide2.QtCore.QByteArray'], - "QImageIOHandler.setOption": ('PySide2.QtGui.QImageIOHandler.ImageOption', 'PySide2.support.signature.typing.Any'), + "QImageIOHandler.setFormat": ('PySide2.QtCore.QByteArray',), + "QImageIOHandler.setOption": ('PySide2.QtGui.QImageIOHandler.ImageOption', 'Any'), "QImageIOHandler.supportsOption": ('PySide2.QtGui.QImageIOHandler.ImageOption',), "QImageIOHandler.write": ('PySide2.QtGui.QImage',), @@ -3735,7 +3737,7 @@ if "PySide2.QtGui" in sys.modules: "QMatrix.translate": ('float', 'float'), # class PySide2.QtGui.QMatrix2x2: - "QMatrix2x2.__init__": [('PySide2.QtGui.QMatrix2x2',), ('PySide2.support.signature.typing.Sequence',)], + "QMatrix2x2.__init__": [('PySide2.QtGui.QMatrix2x2',), ('Sequence',)], "QMatrix2x2.__copy__": (), "QMatrix2x2.__reduce__": (), "QMatrix2x2.data": (), @@ -3743,7 +3745,7 @@ if "PySide2.QtGui" in sys.modules: "QMatrix2x2.transposed": (), # class PySide2.QtGui.QMatrix2x3: - "QMatrix2x3.__init__": [('PySide2.QtGui.QMatrix2x3',), ('PySide2.support.signature.typing.Sequence',)], + "QMatrix2x3.__init__": [('PySide2.QtGui.QMatrix2x3',), ('Sequence',)], "QMatrix2x3.__copy__": (), "QMatrix2x3.__reduce__": (), "QMatrix2x3.data": (), @@ -3751,7 +3753,7 @@ if "PySide2.QtGui" in sys.modules: "QMatrix2x3.transposed": (), # class PySide2.QtGui.QMatrix2x4: - "QMatrix2x4.__init__": [('PySide2.QtGui.QMatrix2x4',), ('PySide2.support.signature.typing.Sequence',)], + "QMatrix2x4.__init__": [('PySide2.QtGui.QMatrix2x4',), ('Sequence',)], "QMatrix2x4.__copy__": (), "QMatrix2x4.__reduce__": (), "QMatrix2x4.data": (), @@ -3759,7 +3761,7 @@ if "PySide2.QtGui" in sys.modules: "QMatrix2x4.transposed": (), # class PySide2.QtGui.QMatrix3x2: - "QMatrix3x2.__init__": [('PySide2.QtGui.QMatrix3x2',), ('PySide2.support.signature.typing.Sequence',)], + "QMatrix3x2.__init__": [('PySide2.QtGui.QMatrix3x2',), ('Sequence',)], "QMatrix3x2.__copy__": (), "QMatrix3x2.__reduce__": (), "QMatrix3x2.data": (), @@ -3767,7 +3769,7 @@ if "PySide2.QtGui" in sys.modules: "QMatrix3x2.transposed": (), # class PySide2.QtGui.QMatrix3x3: - "QMatrix3x3.__init__": [('PySide2.QtGui.QMatrix3x3',), ('PySide2.support.signature.typing.Sequence',)], + "QMatrix3x3.__init__": [('PySide2.QtGui.QMatrix3x3',), ('Sequence',)], "QMatrix3x3.__copy__": (), "QMatrix3x3.__reduce__": (), "QMatrix3x3.data": (), @@ -3775,7 +3777,7 @@ if "PySide2.QtGui" in sys.modules: "QMatrix3x3.transposed": (), # class PySide2.QtGui.QMatrix3x4: - "QMatrix3x4.__init__": [('PySide2.QtGui.QMatrix3x4',), ('PySide2.support.signature.typing.Sequence',)], + "QMatrix3x4.__init__": [('PySide2.QtGui.QMatrix3x4',), ('Sequence',)], "QMatrix3x4.__copy__": (), "QMatrix3x4.__reduce__": (), "QMatrix3x4.data": (), @@ -3783,7 +3785,7 @@ if "PySide2.QtGui" in sys.modules: "QMatrix3x4.transposed": (), # class PySide2.QtGui.QMatrix4x2: - "QMatrix4x2.__init__": [('PySide2.QtGui.QMatrix4x2',), ('PySide2.support.signature.typing.Sequence',)], + "QMatrix4x2.__init__": [('PySide2.QtGui.QMatrix4x2',), ('Sequence',)], "QMatrix4x2.__copy__": (), "QMatrix4x2.__reduce__": (), "QMatrix4x2.data": (), @@ -3791,7 +3793,7 @@ if "PySide2.QtGui" in sys.modules: "QMatrix4x2.transposed": (), # class PySide2.QtGui.QMatrix4x3: - "QMatrix4x3.__init__": [('PySide2.QtGui.QMatrix4x3',), ('PySide2.support.signature.typing.Sequence',)], + "QMatrix4x3.__init__": [('PySide2.QtGui.QMatrix4x3',), ('Sequence',)], "QMatrix4x3.__copy__": (), "QMatrix4x3.__reduce__": (), "QMatrix4x3.data": (), @@ -3837,9 +3839,9 @@ if "PySide2.QtGui" in sys.modules: "QMouseEvent.button": (), "QMouseEvent.buttons": (), "QMouseEvent.flags": (), - "QMouseEvent.global"+"Y": (), "QMouseEvent.globalPos": (), "QMouseEvent.globalX": (), + "QMouseEvent.global""Y": (), "QMouseEvent.localPos": (), "QMouseEvent.pos": (), "QMouseEvent.screenPos": (), @@ -3942,7 +3944,7 @@ if "PySide2.QtGui" in sys.modules: "QOpenGLContext.openGLModuleType": (), "QOpenGLContext.screen": (), "QOpenGLContext.setFormat": ('PySide2.QtGui.QSurfaceFormat',), - "QOpenGLContext.setNativeHandle": ('PySide2.support.signature.typing.Any',), + "QOpenGLContext.setNativeHandle": ('Any',), "QOpenGLContext.setScreen": ('PySide2.QtGui.QScreen',), "QOpenGLContext.setShareContext": ('PySide2.QtGui.QOpenGLContext',), "QOpenGLContext.shareContext": (), @@ -3953,8 +3955,8 @@ if "PySide2.QtGui" in sys.modules: "QOpenGLContext.versionFunctions": ('PySide2.QtGui.QOpenGLVersionProfile',), # class PySide2.QtGui.QOpenGLContextGroup: - "QOpenGLContextGroup.shares": (), "QOpenGLContextGroup.currentContextGroup": (), + "QOpenGLContextGroup.shares": (), # class PySide2.QtGui.QOpenGLDebugLogger: "QOpenGLDebugLogger.__init__": ('PySide2.QtCore.QObject',), @@ -3989,7 +3991,7 @@ if "PySide2.QtGui" in sys.modules: "QOpenGLExtraFunctions.glBeginQuery": ('int', 'int'), "QOpenGLExtraFunctions.glBeginTransformFeedback": ('int',), "QOpenGLExtraFunctions.glBindBufferBase": ('int', 'int', 'int'), - "QOpenGLExtraFunctions.glBindImageTexture": ('int', 'int', 'int', 'int', 'int', 'int', 'int'), + "QOpenGLExtraFunctions.glBindImageTexture": ('int', 'int', 'int', 'Union[str, int]', 'int', 'int', 'int'), "QOpenGLExtraFunctions.glBindProgramPipeline": ('int',), "QOpenGLExtraFunctions.glBindSampler": ('int', 'int'), "QOpenGLExtraFunctions.glBindTransformFeedback": ('int', 'int'), @@ -4042,6 +4044,7 @@ if "PySide2.QtGui" in sys.modules: "QOpenGLExtraFunctions.glGetQueryiv": ('int', 'int', 'int'), "QOpenGLExtraFunctions.glGetSamplerParameterfv": ('int', 'int', 'float'), "QOpenGLExtraFunctions.glGetSamplerParameteriv": ('int', 'int', 'int'), + "QOpenGLExtraFunctions.glGetStringi": ('int', 'int'), "QOpenGLExtraFunctions.glGetTexLevelParameterfv": ('int', 'int', 'int', 'float'), "QOpenGLExtraFunctions.glGetTexLevelParameteriv": ('int', 'int', 'int', 'int'), "QOpenGLExtraFunctions.glGetUniformBlockIndex": ('int', 'str'), @@ -4083,15 +4086,15 @@ if "PySide2.QtGui" in sys.modules: "QOpenGLExtraFunctions.glProgramUniform4iv": ('int', 'int', 'int', 'int'), "QOpenGLExtraFunctions.glProgramUniform4ui": ('int', 'int', 'int', 'int', 'int', 'int'), "QOpenGLExtraFunctions.glProgramUniform4uiv": ('int', 'int', 'int', 'int'), - "QOpenGLExtraFunctions.glProgramUniformMatrix2fv": ('int', 'int', 'int', 'int', 'float'), - "QOpenGLExtraFunctions.glProgramUniformMatrix2x3fv": ('int', 'int', 'int', 'int', 'float'), - "QOpenGLExtraFunctions.glProgramUniformMatrix2x4fv": ('int', 'int', 'int', 'int', 'float'), - "QOpenGLExtraFunctions.glProgramUniformMatrix3fv": ('int', 'int', 'int', 'int', 'float'), - "QOpenGLExtraFunctions.glProgramUniformMatrix3x2fv": ('int', 'int', 'int', 'int', 'float'), - "QOpenGLExtraFunctions.glProgramUniformMatrix3x4fv": ('int', 'int', 'int', 'int', 'float'), - "QOpenGLExtraFunctions.glProgramUniformMatrix4fv": ('int', 'int', 'int', 'int', 'float'), - "QOpenGLExtraFunctions.glProgramUniformMatrix4x2fv": ('int', 'int', 'int', 'int', 'float'), - "QOpenGLExtraFunctions.glProgramUniformMatrix4x3fv": ('int', 'int', 'int', 'int', 'float'), + "QOpenGLExtraFunctions.glProgramUniformMatrix2fv": ('int', 'int', 'int', 'Union[str, int]', 'float'), + "QOpenGLExtraFunctions.glProgramUniformMatrix2x3fv": ('int', 'int', 'int', 'Union[str, int]', 'float'), + "QOpenGLExtraFunctions.glProgramUniformMatrix2x4fv": ('int', 'int', 'int', 'Union[str, int]', 'float'), + "QOpenGLExtraFunctions.glProgramUniformMatrix3fv": ('int', 'int', 'int', 'Union[str, int]', 'float'), + "QOpenGLExtraFunctions.glProgramUniformMatrix3x2fv": ('int', 'int', 'int', 'Union[str, int]', 'float'), + "QOpenGLExtraFunctions.glProgramUniformMatrix3x4fv": ('int', 'int', 'int', 'Union[str, int]', 'float'), + "QOpenGLExtraFunctions.glProgramUniformMatrix4fv": ('int', 'int', 'int', 'Union[str, int]', 'float'), + "QOpenGLExtraFunctions.glProgramUniformMatrix4x2fv": ('int', 'int', 'int', 'Union[str, int]', 'float'), + "QOpenGLExtraFunctions.glProgramUniformMatrix4x3fv": ('int', 'int', 'int', 'Union[str, int]', 'float'), "QOpenGLExtraFunctions.glReadBuffer": ('int',), "QOpenGLExtraFunctions.glRenderbufferStorageMultisample": ('int', 'int', 'int', 'int', 'int'), "QOpenGLExtraFunctions.glSampleMaski": ('int', 'int'), @@ -4101,7 +4104,7 @@ if "PySide2.QtGui" in sys.modules: "QOpenGLExtraFunctions.glSamplerParameteriv": ('int', 'int', 'int'), "QOpenGLExtraFunctions.glTexImage3D": ('int', 'int', 'int', 'int', 'int', 'int', 'int', 'int', 'int', 'int'), "QOpenGLExtraFunctions.glTexStorage2D": ('int', 'int', 'int', 'int', 'int'), - "QOpenGLExtraFunctions.glTexStorage2DMultisample": ('int', 'int', 'int', 'int', 'int', 'int'), + "QOpenGLExtraFunctions.glTexStorage2DMultisample": ('int', 'int', 'int', 'int', 'int', 'Union[str, int]'), "QOpenGLExtraFunctions.glTexStorage3D": ('int', 'int', 'int', 'int', 'int', 'int'), "QOpenGLExtraFunctions.glTexSubImage3D": ('int', 'int', 'int', 'int', 'int', 'int', 'int', 'int', 'int', 'int', 'int'), "QOpenGLExtraFunctions.glUniform1ui": ('int', 'int'), @@ -4113,18 +4116,18 @@ if "PySide2.QtGui" in sys.modules: "QOpenGLExtraFunctions.glUniform4ui": ('int', 'int', 'int', 'int', 'int'), "QOpenGLExtraFunctions.glUniform4uiv": ('int', 'int', 'int'), "QOpenGLExtraFunctions.glUniformBlockBinding": ('int', 'int', 'int'), - "QOpenGLExtraFunctions.glUniformMatrix2x3fv": ('int', 'int', 'int', 'float'), - "QOpenGLExtraFunctions.glUniformMatrix2x4fv": ('int', 'int', 'int', 'float'), - "QOpenGLExtraFunctions.glUniformMatrix3x2fv": ('int', 'int', 'int', 'float'), - "QOpenGLExtraFunctions.glUniformMatrix3x4fv": ('int', 'int', 'int', 'float'), - "QOpenGLExtraFunctions.glUniformMatrix4x2fv": ('int', 'int', 'int', 'float'), - "QOpenGLExtraFunctions.glUniformMatrix4x3fv": ('int', 'int', 'int', 'float'), + "QOpenGLExtraFunctions.glUniformMatrix2x3fv": ('int', 'int', 'Union[str, int]', 'float'), + "QOpenGLExtraFunctions.glUniformMatrix2x4fv": ('int', 'int', 'Union[str, int]', 'float'), + "QOpenGLExtraFunctions.glUniformMatrix3x2fv": ('int', 'int', 'Union[str, int]', 'float'), + "QOpenGLExtraFunctions.glUniformMatrix3x4fv": ('int', 'int', 'Union[str, int]', 'float'), + "QOpenGLExtraFunctions.glUniformMatrix4x2fv": ('int', 'int', 'Union[str, int]', 'float'), + "QOpenGLExtraFunctions.glUniformMatrix4x3fv": ('int', 'int', 'Union[str, int]', 'float'), "QOpenGLExtraFunctions.glUnmapBuffer": ('int',), "QOpenGLExtraFunctions.glUseProgramStages": ('int', 'int', 'int'), "QOpenGLExtraFunctions.glValidateProgramPipeline": ('int',), "QOpenGLExtraFunctions.glVertexAttribBinding": ('int', 'int'), "QOpenGLExtraFunctions.glVertexAttribDivisor": ('int', 'int'), - "QOpenGLExtraFunctions.glVertexAttribFormat": ('int', 'int', 'int', 'int', 'int'), + "QOpenGLExtraFunctions.glVertexAttribFormat": ('int', 'int', 'int', 'Union[str, int]', 'int'), "QOpenGLExtraFunctions.glVertexAttribI4i": ('int', 'int', 'int', 'int', 'int'), "QOpenGLExtraFunctions.glVertexAttribI4iv": ('int', 'int'), "QOpenGLExtraFunctions.glVertexAttribI4ui": ('int', 'int', 'int', 'int', 'int'), @@ -4190,7 +4193,7 @@ if "PySide2.QtGui" in sys.modules: "QOpenGLFunctions.glClearColor": ('float', 'float', 'float', 'float'), "QOpenGLFunctions.glClearDepthf": ('float',), "QOpenGLFunctions.glClearStencil": ('int',), - "QOpenGLFunctions.glColorMask": ('int', 'int', 'int', 'int'), + "QOpenGLFunctions.glColorMask": ('Union[str, int]', 'Union[str, int]', 'Union[str, int]', 'Union[str, int]'), "QOpenGLFunctions.glCompileShader": ('int',), "QOpenGLFunctions.glCompressedTexImage2D": ('int', 'int', 'int', 'int', 'int', 'int', 'int', 'int'), "QOpenGLFunctions.glCompressedTexSubImage2D": ('int', 'int', 'int', 'int', 'int', 'int', 'int', 'int', 'int'), @@ -4206,7 +4209,7 @@ if "PySide2.QtGui" in sys.modules: "QOpenGLFunctions.glDeleteShader": ('int',), "QOpenGLFunctions.glDeleteTextures": ('int', 'int'), "QOpenGLFunctions.glDepthFunc": ('int',), - "QOpenGLFunctions.glDepthMask": ('int',), + "QOpenGLFunctions.glDepthMask": ('Union[str, int]',), "QOpenGLFunctions.glDepthRangef": ('float', 'float'), "QOpenGLFunctions.glDetachShader": ('int', 'int'), "QOpenGLFunctions.glDisable": ('int',), @@ -4236,6 +4239,7 @@ if "PySide2.QtGui" in sys.modules: "QOpenGLFunctions.glGetRenderbufferParameteriv": ('int', 'int', 'int'), "QOpenGLFunctions.glGetShaderPrecisionFormat": ('int', 'int', 'int', 'int'), "QOpenGLFunctions.glGetShaderiv": ('int', 'int', 'int'), + "QOpenGLFunctions.glGetString": ('int',), "QOpenGLFunctions.glGetTexParameterfv": ('int', 'int', 'float'), "QOpenGLFunctions.glGetTexParameteriv": ('int', 'int', 'int'), "QOpenGLFunctions.glGetUniformLocation": ('int', 'str'), @@ -4258,7 +4262,7 @@ if "PySide2.QtGui" in sys.modules: "QOpenGLFunctions.glReadPixels": ('int', 'int', 'int', 'int', 'int', 'int', 'int'), "QOpenGLFunctions.glReleaseShaderCompiler": (), "QOpenGLFunctions.glRenderbufferStorage": ('int', 'int', 'int', 'int'), - "QOpenGLFunctions.glSampleCoverage": ('float', 'int'), + "QOpenGLFunctions.glSampleCoverage": ('float', 'Union[str, int]'), "QOpenGLFunctions.glScissor": ('int', 'int', 'int', 'int'), "QOpenGLFunctions.glShaderBinary": ('int', 'int', 'int', 'int', 'int'), "QOpenGLFunctions.glStencilFunc": ('int', 'int', 'int'), @@ -4289,9 +4293,9 @@ if "PySide2.QtGui" in sys.modules: "QOpenGLFunctions.glUniform4fv": ('int', 'int', 'float'), "QOpenGLFunctions.glUniform4i": ('int', 'int', 'int', 'int', 'int'), "QOpenGLFunctions.glUniform4iv": ('int', 'int', 'int'), - "QOpenGLFunctions.glUniformMatrix2fv": ('int', 'int', 'int', 'float'), - "QOpenGLFunctions.glUniformMatrix3fv": ('int', 'int', 'int', 'float'), - "QOpenGLFunctions.glUniformMatrix4fv": ('int', 'int', 'int', 'float'), + "QOpenGLFunctions.glUniformMatrix2fv": ('int', 'int', 'Union[str, int]', 'float'), + "QOpenGLFunctions.glUniformMatrix3fv": ('int', 'int', 'Union[str, int]', 'float'), + "QOpenGLFunctions.glUniformMatrix4fv": ('int', 'int', 'Union[str, int]', 'float'), "QOpenGLFunctions.glUseProgram": ('int',), "QOpenGLFunctions.glValidateProgram": ('int',), "QOpenGLFunctions.glVertexAttrib1f": ('int', 'float'), @@ -4302,7 +4306,7 @@ if "PySide2.QtGui" in sys.modules: "QOpenGLFunctions.glVertexAttrib3fv": ('int', 'float'), "QOpenGLFunctions.glVertexAttrib4f": ('int', 'float', 'float', 'float', 'float'), "QOpenGLFunctions.glVertexAttrib4fv": ('int', 'float'), - "QOpenGLFunctions.glVertexAttribPointer": ('int', 'int', 'int', 'int', 'int', 'int'), + "QOpenGLFunctions.glVertexAttribPointer": ('int', 'int', 'int', 'Union[str, int]', 'int', 'int'), "QOpenGLFunctions.glViewport": ('int', 'int', 'int', 'int'), "QOpenGLFunctions.hasOpenGLFeature": ('PySide2.QtGui.QOpenGLFunctions.OpenGLFeature',), "QOpenGLFunctions.initializeOpenGLFunctions": (), @@ -4371,7 +4375,7 @@ if "PySide2.QtGui" in sys.modules: "QOpenGLShaderProgram.setDefaultInnerTessellationLevels": ('list',), "QOpenGLShaderProgram.setDefaultOuterTessellationLevels": ('list',), "QOpenGLShaderProgram.setPatchVertexCount": ('int',), - "QOpenGLShaderProgram.setUniformValue": [('int', 'PySide2.QtCore.QPoint'), ('int', 'PySide2.QtCore.QPointF'), ('int', 'PySide2.QtCore.QSize'), ('int', 'PySide2.QtCore.QSizeF'), ('int', 'PySide2.QtGui.QColor'), ('int', 'PySide2.QtGui.QMatrix2x2'), ('int', 'PySide2.QtGui.QMatrix2x3'), ('int', 'PySide2.QtGui.QMatrix2x4'), ('int', 'PySide2.QtGui.QMatrix3x2'), ('int', 'PySide2.QtGui.QMatrix3x3'), ('int', 'PySide2.QtGui.QMatrix3x4'), ('int', 'PySide2.QtGui.QMatrix4x2'), ('int', 'PySide2.QtGui.QMatrix4x3'), ('int', 'PySide2.QtGui.QMatrix4x4'), ('int', 'PySide2.QtGui.QTransform'), ('int', 'PySide2.QtGui.QVector2D'), ('int', 'PySide2.QtGui.QVector3D'), ('int', 'PySide2.QtGui.QVector4D'), ('int', 'PySide2.support.signature.typing.List'), ('int', 'float'), ('int', 'float', 'float'), ('int', 'float', 'float', 'float'), ('int', 'float', 'float', 'float', 'float'), ('int', 'int'), ('str', 'PySide2.QtCore.QPoint'), ('str', 'PySide2.QtCore.QPointF'), ('str', 'PySide2.QtCore.QSize'), ('str', 'PySide2.QtCore.QSizeF'), ('str', 'PySide2.QtGui.QColor'), ('str', 'PySide2.QtGui.QMatrix2x2'), ('str', 'PySide2.QtGui.QMatrix2x3'), ('str', 'PySide2.QtGui.QMatrix2x4'), ('str', 'PySide2.QtGui.QMatrix3x2'), ('str', 'PySide2.QtGui.QMatrix3x3'), ('str', 'PySide2.QtGui.QMatrix3x4'), ('str', 'PySide2.QtGui.QMatrix4x2'), ('str', 'PySide2.QtGui.QMatrix4x3'), ('str', 'PySide2.QtGui.QMatrix4x4'), ('str', 'PySide2.QtGui.QTransform'), ('str', 'PySide2.QtGui.QVector2D'), ('str', 'PySide2.QtGui.QVector3D'), ('str', 'PySide2.QtGui.QVector4D'), ('str', 'PySide2.support.signature.typing.List'), ('str', 'float'), ('str', 'float', 'float'), ('str', 'float', 'float', 'float'), ('str', 'float', 'float', 'float', 'float'), ('str', 'int')], + "QOpenGLShaderProgram.setUniformValue": [('int', 'List[List[float]]'), ('int', 'PySide2.QtCore.QPoint'), ('int', 'PySide2.QtCore.QPointF'), ('int', 'PySide2.QtCore.QSize'), ('int', 'PySide2.QtCore.QSizeF'), ('int', 'PySide2.QtGui.QColor'), ('int', 'PySide2.QtGui.QMatrix2x2'), ('int', 'PySide2.QtGui.QMatrix2x3'), ('int', 'PySide2.QtGui.QMatrix2x4'), ('int', 'PySide2.QtGui.QMatrix3x2'), ('int', 'PySide2.QtGui.QMatrix3x3'), ('int', 'PySide2.QtGui.QMatrix3x4'), ('int', 'PySide2.QtGui.QMatrix4x2'), ('int', 'PySide2.QtGui.QMatrix4x3'), ('int', 'PySide2.QtGui.QMatrix4x4'), ('int', 'PySide2.QtGui.QTransform'), ('int', 'PySide2.QtGui.QVector2D'), ('int', 'PySide2.QtGui.QVector3D'), ('int', 'PySide2.QtGui.QVector4D'), ('int', 'float'), ('int', 'float', 'float'), ('int', 'float', 'float', 'float'), ('int', 'float', 'float', 'float', 'float'), ('int', 'int'), ('str', 'List[List[float]]'), ('str', 'PySide2.QtCore.QPoint'), ('str', 'PySide2.QtCore.QPointF'), ('str', 'PySide2.QtCore.QSize'), ('str', 'PySide2.QtCore.QSizeF'), ('str', 'PySide2.QtGui.QColor'), ('str', 'PySide2.QtGui.QMatrix2x2'), ('str', 'PySide2.QtGui.QMatrix2x3'), ('str', 'PySide2.QtGui.QMatrix2x4'), ('str', 'PySide2.QtGui.QMatrix3x2'), ('str', 'PySide2.QtGui.QMatrix3x3'), ('str', 'PySide2.QtGui.QMatrix3x4'), ('str', 'PySide2.QtGui.QMatrix4x2'), ('str', 'PySide2.QtGui.QMatrix4x3'), ('str', 'PySide2.QtGui.QMatrix4x4'), ('str', 'PySide2.QtGui.QTransform'), ('str', 'PySide2.QtGui.QVector2D'), ('str', 'PySide2.QtGui.QVector3D'), ('str', 'PySide2.QtGui.QVector4D'), ('str', 'float'), ('str', 'float', 'float'), ('str', 'float', 'float', 'float'), ('str', 'float', 'float', 'float', 'float'), ('str', 'int')], "QOpenGLShaderProgram.setUniformValueArray": [('int', 'float', 'int', 'int'), ('int', 'int', 'int'), ('str', 'float', 'int', 'int'), ('str', 'int', 'int')], "QOpenGLShaderProgram.shaders": (), "QOpenGLShaderProgram.uniformLocation": [('PySide2.QtCore.QByteArray',), ('str',)], @@ -4568,7 +4572,7 @@ if "PySide2.QtGui" in sys.modules: # class PySide2.QtGui.QPagedPaintDevice: "QPagedPaintDevice.__init__": (), - "QPagedPaintDevice.devicePageLayout": [], + "QPagedPaintDevice.devicePageLayout": (), "QPagedPaintDevice.margins": (), "QPagedPaintDevice.newPage": (), "QPagedPaintDevice.pageLayout": (), @@ -4605,9 +4609,9 @@ if "PySide2.QtGui" in sys.modules: "QPaintDevice.widthMM": (), # class PySide2.QtGui.QPaintDeviceWindow: - "QPaintDeviceWindow.metric": ('PySide2.QtGui.QPaintDevice.PaintDeviceMetric',), "QPaintDeviceWindow.event": ('PySide2.QtCore.QEvent',), "QPaintDeviceWindow.exposeEvent": ('PySide2.QtGui.QExposeEvent',), + "QPaintDeviceWindow.metric": ('PySide2.QtGui.QPaintDevice.PaintDeviceMetric',), "QPaintDeviceWindow.paintEngine": (), "QPaintDeviceWindow.paintEvent": ('PySide2.QtGui.QPaintEvent',), "QPaintDeviceWindow.update": [(), ('PySide2.QtCore.QRect',), ('PySide2.QtGui.QRegion',)], @@ -4695,7 +4699,7 @@ if "PySide2.QtGui" in sys.modules: "QPainter.drawEllipse": [('PySide2.QtCore.QPoint', 'int', 'int'), ('PySide2.QtCore.QPointF', 'float', 'float'), ('PySide2.QtCore.QRect',), ('PySide2.QtCore.QRectF',), ('int', 'int', 'int', 'int')], "QPainter.drawImage": [('PySide2.QtCore.QPoint', 'PySide2.QtGui.QImage'), ('PySide2.QtCore.QPoint', 'PySide2.QtGui.QImage', 'PySide2.QtCore.QRect', 'ImageConversionFlags'), ('PySide2.QtCore.QPointF', 'PySide2.QtGui.QImage'), ('PySide2.QtCore.QPointF', 'PySide2.QtGui.QImage', 'PySide2.QtCore.QRectF', 'ImageConversionFlags'), ('PySide2.QtCore.QRect', 'PySide2.QtGui.QImage'), ('PySide2.QtCore.QRect', 'PySide2.QtGui.QImage', 'PySide2.QtCore.QRect', 'ImageConversionFlags'), ('PySide2.QtCore.QRectF', 'PySide2.QtGui.QImage'), ('PySide2.QtCore.QRectF', 'PySide2.QtGui.QImage', 'PySide2.QtCore.QRectF', 'ImageConversionFlags'), ('int', 'int', 'PySide2.QtGui.QImage', 'int', 'int', 'int', 'int', 'ImageConversionFlags')], "QPainter.drawLine": [('PySide2.QtCore.QLine',), ('PySide2.QtCore.QLineF',), ('PySide2.QtCore.QPoint', 'PySide2.QtCore.QPoint'), ('PySide2.QtCore.QPointF', 'PySide2.QtCore.QPointF'), ('int', 'int', 'int', 'int')], - "QPainter.drawLines": ['list'], + "QPainter.drawLines": ('list',), "QPainter.drawPath": ('PySide2.QtGui.QPainterPath',), "QPainter.drawPicture": [('PySide2.QtCore.QPoint', 'PySide2.QtGui.QPicture'), ('PySide2.QtCore.QPointF', 'PySide2.QtGui.QPicture'), ('int', 'int', 'PySide2.QtGui.QPicture')], "QPainter.drawPie": [('PySide2.QtCore.QRect', 'int', 'int'), ('PySide2.QtCore.QRectF', 'int', 'int'), ('int', 'int', 'int', 'int', 'int', 'int')], @@ -4706,7 +4710,7 @@ if "PySide2.QtGui" in sys.modules: "QPainter.drawPolygon": [('PySide2.QtGui.QPolygon', 'PySide2.QtCore.Qt.FillRule'), ('PySide2.QtGui.QPolygonF', 'PySide2.QtCore.Qt.FillRule'), ('list', 'PySide2.QtCore.Qt.FillRule')], "QPainter.drawPolyline": [('PySide2.QtGui.QPolygon',), ('PySide2.QtGui.QPolygonF',), ('list',)], "QPainter.drawRect": [('PySide2.QtCore.QRect',), ('PySide2.QtCore.QRectF',), ('int', 'int', 'int', 'int')], - "QPainter.drawRects": ['list'], + "QPainter.drawRects": ('list',), "QPainter.drawRoundRect": [('PySide2.QtCore.QRect', 'int', 'int'), ('PySide2.QtCore.QRectF', 'int', 'int'), ('int', 'int', 'int', 'int', 'int', 'int')], "QPainter.drawRoundedRect": [('PySide2.QtCore.QRect', 'float', 'float', 'PySide2.QtCore.Qt.SizeMode'), ('PySide2.QtCore.QRectF', 'float', 'float', 'PySide2.QtCore.Qt.SizeMode'), ('int', 'int', 'int', 'int', 'float', 'float', 'PySide2.QtCore.Qt.SizeMode')], "QPainter.drawStaticText": [('PySide2.QtCore.QPoint', 'PySide2.QtGui.QStaticText'), ('PySide2.QtCore.QPointF', 'PySide2.QtGui.QStaticText'), ('int', 'int', 'PySide2.QtGui.QStaticText')], @@ -4972,7 +4976,7 @@ if "PySide2.QtGui" in sys.modules: "QPictureIO.write": (), # class PySide2.QtGui.QPixelFormat: - "QPixelFormat.__init__": [(), ('PySide2.QtGui.QPixelFormat',), ('PySide2.QtGui.QPixelFormat.ColorModel', 'PySide2.support.signature.typing.Union[str, int]', 'PySide2.support.signature.typing.Union[str, int]', 'PySide2.support.signature.typing.Union[str, int]', 'PySide2.support.signature.typing.Union[str, int]', 'PySide2.support.signature.typing.Union[str, int]', 'PySide2.support.signature.typing.Union[str, int]', 'PySide2.QtGui.QPixelFormat.AlphaUsage', 'PySide2.QtGui.QPixelFormat.AlphaPosition', 'PySide2.QtGui.QPixelFormat.AlphaPremultiplied', 'PySide2.QtGui.QPixelFormat.TypeInterpretation', 'PySide2.QtGui.QPixelFormat.ByteOrder', 'PySide2.support.signature.typing.Union[str, int]')], + "QPixelFormat.__init__": [(), ('PySide2.QtGui.QPixelFormat',), ('PySide2.QtGui.QPixelFormat.ColorModel', 'Union[str, int]', 'Union[str, int]', 'Union[str, int]', 'Union[str, int]', 'Union[str, int]', 'Union[str, int]', 'PySide2.QtGui.QPixelFormat.AlphaUsage', 'PySide2.QtGui.QPixelFormat.AlphaPosition', 'PySide2.QtGui.QPixelFormat.AlphaPremultiplied', 'PySide2.QtGui.QPixelFormat.TypeInterpretation', 'PySide2.QtGui.QPixelFormat.ByteOrder', 'Union[str, int]')], "QPixelFormat.__copy__": (), "QPixelFormat.alphaPosition": (), "QPixelFormat.alphaSize": (), @@ -4998,7 +5002,7 @@ if "PySide2.QtGui" in sys.modules: "QPixelFormat.yuvLayout": (), # class PySide2.QtGui.QPixmap: - "QPixmap.__init__": [(), ('PySide2.QtCore.QSize',), ('PySide2.QtGui.QImage',), ('PySide2.QtGui.QPixmap',), ('PySide2.support.signature.typing.List',), ('int', 'int'), ('str', 'str', 'ImageConversionFlags')], + "QPixmap.__init__": [(), ('List[str]',), ('PySide2.QtCore.QSize',), ('PySide2.QtGui.QImage',), ('PySide2.QtGui.QPixmap',), ('int', 'int'), ('str', 'str', 'ImageConversionFlags')], "QPixmap.__copy__": (), "QPixmap.cacheKey": (), "QPixmap.convertFromImage": ('PySide2.QtGui.QImage', 'ImageConversionFlags'), @@ -5021,7 +5025,7 @@ if "PySide2.QtGui" in sys.modules: "QPixmap.isNull": (), "QPixmap.isQBitmap": (), "QPixmap.load": ('str', 'str', 'ImageConversionFlags'), - "QPixmap.loadFromData": [('PySide2.QtCore.QByteArray', 'str', 'ImageConversionFlags'), ('PySide2.support.signature.typing.Union[str, int]', 'int', 'str', 'ImageConversionFlags')], + "QPixmap.loadFromData": [('PySide2.QtCore.QByteArray', 'str', 'ImageConversionFlags'), ('Union[str, int]', 'int', 'str', 'ImageConversionFlags')], "QPixmap.mask": (), "QPixmap.metric": ('PySide2.QtGui.QPaintDevice.PaintDeviceMetric',), "QPixmap.paintEngine": (), @@ -5065,11 +5069,11 @@ if "PySide2.QtGui" in sys.modules: "QPolygon.contains": ('PySide2.QtCore.QPoint',), "QPolygon.containsPoint": ('PySide2.QtCore.QPoint', 'PySide2.QtCore.Qt.FillRule'), "QPolygon.count": [(), ('PySide2.QtCore.QPoint',)], - "QPolygon.data": [], + "QPolygon.data": (), "QPolygon.empty": (), "QPolygon.endsWith": ('PySide2.QtCore.QPoint',), "QPolygon.fill": ('PySide2.QtCore.QPoint', 'int'), - "QPolygon.first": [], + "QPolygon.first": (), "QPolygon.fromList": ('list',), "QPolygon.front": (), "QPolygon.indexOf": ('PySide2.QtCore.QPoint', 'int'), @@ -5077,7 +5081,7 @@ if "PySide2.QtGui" in sys.modules: "QPolygon.intersected": ('PySide2.QtGui.QPolygon',), "QPolygon.isEmpty": (), "QPolygon.isSharedWith": ('list',), - "QPolygon.last": [], + "QPolygon.last": (), "QPolygon.lastIndexOf": ('PySide2.QtCore.QPoint', 'int'), "QPolygon.length": (), "QPolygon.mid": ('int', 'int'), @@ -5125,11 +5129,11 @@ if "PySide2.QtGui" in sys.modules: "QPolygonF.contains": ('PySide2.QtCore.QPointF',), "QPolygonF.containsPoint": ('PySide2.QtCore.QPointF', 'PySide2.QtCore.Qt.FillRule'), "QPolygonF.count": [(), ('PySide2.QtCore.QPointF',)], - "QPolygonF.data": [], + "QPolygonF.data": (), "QPolygonF.empty": (), "QPolygonF.endsWith": ('PySide2.QtCore.QPointF',), "QPolygonF.fill": ('PySide2.QtCore.QPointF', 'int'), - "QPolygonF.first": [], + "QPolygonF.first": (), "QPolygonF.fromList": ('list',), "QPolygonF.front": (), "QPolygonF.indexOf": ('PySide2.QtCore.QPointF', 'int'), @@ -5138,7 +5142,7 @@ if "PySide2.QtGui" in sys.modules: "QPolygonF.isClosed": (), "QPolygonF.isEmpty": (), "QPolygonF.isSharedWith": ('list',), - "QPolygonF.last": [], + "QPolygonF.last": (), "QPolygonF.lastIndexOf": ('PySide2.QtCore.QPointF', 'int'), "QPolygonF.length": (), "QPolygonF.mid": ('int', 'int'), @@ -5262,7 +5266,7 @@ if "PySide2.QtGui" in sys.modules: "QRawFont.style": (), "QRawFont.styleName": (), "QRawFont.supportedWritingSystems": (), - "QRawFont.supportsCharacter": [('PySide2.support.signature.typing.Union[str, int]',), ('int',)], + "QRawFont.supportsCharacter": [('Union[str, int]',), ('int',)], "QRawFont.swap": ('PySide2.QtGui.QRawFont',), "QRawFont.underlinePosition": (), "QRawFont.unitsPerEm": (), @@ -5304,7 +5308,6 @@ if "PySide2.QtGui" in sys.modules: "QResizeEvent.size": (), # class PySide2.QtGui.QScreen: - "QScreen.physicalDotsPerInchX": (), "QScreen.angleBetween": ('PySide2.QtCore.Qt.ScreenOrientation', 'PySide2.QtCore.Qt.ScreenOrientation'), "QScreen.availableGeometry": (), "QScreen.availableSize": (), @@ -5327,6 +5330,7 @@ if "PySide2.QtGui" in sys.modules: "QScreen.orientation": (), "QScreen.orientationUpdateMask": (), "QScreen.physicalDotsPerInch": (), + "QScreen.physicalDotsPerInchX": (), "QScreen.physicalDotsPerInchY": (), "QScreen.physicalSize": (), "QScreen.primaryOrientation": (), @@ -5340,9 +5344,9 @@ if "PySide2.QtGui" in sys.modules: "QScreen.virtualSize": (), # class PySide2.QtGui.QSessionManager: - "QSessionManager.cancel": (), "QSessionManager.allowsErrorInteraction": (), "QSessionManager.allowsInteraction": (), + "QSessionManager.cancel": (), "QSessionManager.discardCommand": (), "QSessionManager.isPhase2": (), "QSessionManager.release": (), @@ -5351,9 +5355,9 @@ if "PySide2.QtGui" in sys.modules: "QSessionManager.restartHint": (), "QSessionManager.sessionId": (), "QSessionManager.sessionKey": (), - "QSessionManager.setDiscardCommand": ('PySide2.support.signature.typing.List',), - "QSessionManager.setManagerProperty": [('str', 'PySide2.support.signature.typing.List'), ('str', 'str')], - "QSessionManager.setRestartCommand": ('PySide2.support.signature.typing.List',), + "QSessionManager.setDiscardCommand": ('List[str]',), + "QSessionManager.setManagerProperty": [('str', 'List[str]'), ('str', 'str')], + "QSessionManager.setRestartCommand": ('List[str]',), "QSessionManager.setRestartHint": ('PySide2.QtGui.QSessionManager.RestartHint',), # class PySide2.QtGui.QShortcutEvent: @@ -5413,7 +5417,7 @@ if "PySide2.QtGui" in sys.modules: "QStandardItem.setCheckable": ('bool',), "QStandardItem.setChild": [('int', 'PySide2.QtGui.QStandardItem'), ('int', 'int', 'PySide2.QtGui.QStandardItem')], "QStandardItem.setColumnCount": ('int',), - "QStandardItem.setData": ('PySide2.support.signature.typing.Any', 'int'), + "QStandardItem.setData": ('Any', 'int'), "QStandardItem.setDragEnabled": ('bool',), "QStandardItem.setDropEnabled": ('bool',), "QStandardItem.setEditable": ('bool',), @@ -5469,17 +5473,17 @@ if "PySide2.QtGui" in sys.modules: "QStandardItemModel.itemData": ('PySide2.QtCore.QModelIndex',), "QStandardItemModel.itemFromIndex": ('PySide2.QtCore.QModelIndex',), "QStandardItemModel.itemPrototype": (), - "QStandardItemModel.mimeData": ('PySide2.support.signature.typing.List',), + "QStandardItemModel.mimeData": ('List[int]',), "QStandardItemModel.mimeTypes": (), "QStandardItemModel.parent": [(), ('PySide2.QtCore.QModelIndex',)], "QStandardItemModel.removeColumns": ('int', 'int', 'PySide2.QtCore.QModelIndex'), "QStandardItemModel.removeRows": ('int', 'int', 'PySide2.QtCore.QModelIndex'), "QStandardItemModel.rowCount": ('PySide2.QtCore.QModelIndex',), "QStandardItemModel.setColumnCount": ('int',), - "QStandardItemModel.setData": ('PySide2.QtCore.QModelIndex', 'PySide2.support.signature.typing.Any', 'int'), - "QStandardItemModel.setHeaderData": ('int', 'PySide2.QtCore.Qt.Orientation', 'PySide2.support.signature.typing.Any', 'int'), + "QStandardItemModel.setData": ('PySide2.QtCore.QModelIndex', 'Any', 'int'), + "QStandardItemModel.setHeaderData": ('int', 'PySide2.QtCore.Qt.Orientation', 'Any', 'int'), "QStandardItemModel.setHorizontalHeaderItem": ('int', 'PySide2.QtGui.QStandardItem'), - "QStandardItemModel.setHorizontalHeaderLabels": ('PySide2.support.signature.typing.List',), + "QStandardItemModel.setHorizontalHeaderLabels": ('List[str]',), "QStandardItemModel.setItem": [('int', 'PySide2.QtGui.QStandardItem'), ('int', 'int', 'PySide2.QtGui.QStandardItem')], "QStandardItemModel.setItemData": ('PySide2.QtCore.QModelIndex', 'dict'), "QStandardItemModel.setItemPrototype": ('PySide2.QtGui.QStandardItem',), @@ -5487,7 +5491,7 @@ if "PySide2.QtGui" in sys.modules: "QStandardItemModel.setRowCount": ('int',), "QStandardItemModel.setSortRole": ('int',), "QStandardItemModel.setVerticalHeaderItem": ('int', 'PySide2.QtGui.QStandardItem'), - "QStandardItemModel.setVerticalHeaderLabels": ('PySide2.support.signature.typing.List',), + "QStandardItemModel.setVerticalHeaderLabels": ('List[str]',), "QStandardItemModel.sibling": ('int', 'int', 'PySide2.QtCore.QModelIndex'), "QStandardItemModel.sort": ('int', 'PySide2.QtCore.Qt.SortOrder'), "QStandardItemModel.sortRole": (), @@ -5521,21 +5525,20 @@ if "PySide2.QtGui" in sys.modules: "QStatusTipEvent.tip": (), # class PySide2.QtGui.QStringListModel: - "QStringListModel.__init__": [('PySide2.QtCore.QObject',), ('PySide2.support.signature.typing.List', 'PySide2.QtCore.QObject')], + "QStringListModel.__init__": [('List[str]', 'PySide2.QtCore.QObject'), ('PySide2.QtCore.QObject',)], "QStringListModel.data": ('PySide2.QtCore.QModelIndex', 'int'), "QStringListModel.flags": ('PySide2.QtCore.QModelIndex',), "QStringListModel.insertRows": ('int', 'int', 'PySide2.QtCore.QModelIndex'), "QStringListModel.removeRows": ('int', 'int', 'PySide2.QtCore.QModelIndex'), "QStringListModel.rowCount": ('PySide2.QtCore.QModelIndex',), - "QStringListModel.setData": ('PySide2.QtCore.QModelIndex', 'PySide2.support.signature.typing.Any', 'int'), - "QStringListModel.setStringList": ('PySide2.support.signature.typing.List',), + "QStringListModel.setData": ('PySide2.QtCore.QModelIndex', 'Any', 'int'), + "QStringListModel.setStringList": ('List[str]',), "QStringListModel.sibling": ('int', 'int', 'PySide2.QtCore.QModelIndex'), "QStringListModel.sort": ('int', 'PySide2.QtCore.Qt.SortOrder'), "QStringListModel.stringList": (), "QStringListModel.supportedDropActions": (), # class PySide2.QtGui.QStyleHints: - "QStyleHints.setFocusOnTouchRelease": (), "QStyleHints.cursorFlashTime": (), "QStyleHints.fontSmoothingGamma": (), "QStyleHints.keyboardAutoRepeatRate": (), @@ -5545,6 +5548,7 @@ if "PySide2.QtGui" in sys.modules: "QStyleHints.passwordMaskCharacter": (), "QStyleHints.passwordMaskDelay": (), "QStyleHints.setCursorFlashTime": ('int',), + "QStyleHints.setFocusOnTouchRelease": (), "QStyleHints.setKeyboardInputInterval": ('int',), "QStyleHints.setMouseDoubleClickInterval": ('int',), "QStyleHints.setMousePressAndHoldInterval": ('int',), @@ -5635,12 +5639,12 @@ if "PySide2.QtGui" in sys.modules: "QTabletEvent.button": (), "QTabletEvent.buttons": (), "QTabletEvent.device": (), - "QTabletEvent.global"+"Y": (), "QTabletEvent.globalPos": (), "QTabletEvent.globalPosF": (), "QTabletEvent.globalX": (), - "QTabletEvent.hiResGlobal"+"Y": (), + "QTabletEvent.global""Y": (), "QTabletEvent.hiResGlobalX": (), + "QTabletEvent.hiResGlobal""Y": (), "QTabletEvent.pointerType": (), "QTabletEvent.pos": (), "QTabletEvent.posF": (), @@ -5674,7 +5678,6 @@ if "PySide2.QtGui" in sys.modules: "QTextBlock.layout": (), "QTextBlock.length": (), "QTextBlock.lineCount": (), - "QTextBlock.next": (), "QTextBlock.position": (), "QTextBlock.previous": (), "QTextBlock.revision": (), @@ -5757,7 +5760,7 @@ if "PySide2.QtGui" in sys.modules: "QTextCharFormat.setAnchor": ('bool',), "QTextCharFormat.setAnchorHref": ('str',), "QTextCharFormat.setAnchorName": ('str',), - "QTextCharFormat.setAnchorNames": ('PySide2.support.signature.typing.List',), + "QTextCharFormat.setAnchorNames": ('List[str]',), "QTextCharFormat.setFont": [('PySide2.QtGui.QFont',), ('PySide2.QtGui.QFont', 'PySide2.QtGui.QTextCharFormat.FontPropertiesInheritanceBehavior')], "QTextCharFormat.setFontCapitalization": ('PySide2.QtGui.QFont.Capitalization',), "QTextCharFormat.setFontFamily": ('str',), @@ -5855,7 +5858,7 @@ if "PySide2.QtGui" in sys.modules: # class PySide2.QtGui.QTextDocument: "QTextDocument.__init__": [('PySide2.QtCore.QObject',), ('str', 'PySide2.QtCore.QObject')], - "QTextDocument.addResource": ('int', 'PySide2.QtCore.QUrl', 'PySide2.support.signature.typing.Any'), + "QTextDocument.addResource": ('int', 'PySide2.QtCore.QUrl', 'Any'), "QTextDocument.adjustSize": (), "QTextDocument.allFormats": (), "QTextDocument.availableRedoSteps": (), @@ -5990,7 +5993,7 @@ if "PySide2.QtGui" in sys.modules: "QTextFormat.setLayoutDirection": ('PySide2.QtCore.Qt.LayoutDirection',), "QTextFormat.setObjectIndex": ('int',), "QTextFormat.setObjectType": ('int',), - "QTextFormat.setProperty": [('int', 'PySide2.support.signature.typing.Any'), ('int', 'list')], + "QTextFormat.setProperty": [('int', 'Any'), ('int', 'list')], "QTextFormat.stringProperty": ('int',), "QTextFormat.swap": ('PySide2.QtGui.QTextFormat',), "QTextFormat.toBlockFormat": (), @@ -6465,10 +6468,10 @@ if "PySide2.QtGui" in sys.modules: "QWheelEvent.angleDelta": (), "QWheelEvent.buttons": (), "QWheelEvent.delta": (), - "QWheelEvent.global"+"Y": (), "QWheelEvent.globalPos": (), "QWheelEvent.globalPosF": (), "QWheelEvent.globalX": (), + "QWheelEvent.global""Y": (), "QWheelEvent.inverted": (), "QWheelEvent.orientation": (), "QWheelEvent.phase": (), @@ -6967,7 +6970,7 @@ if "PySide2.QtWidgets" in sys.modules: "QAction.setAutoRepeat": ('bool',), "QAction.setCheckable": ('bool',), "QAction.setChecked": ('bool',), - "QAction.setData": ('PySide2.support.signature.typing.Any',), + "QAction.setData": ('Any',), "QAction.setDisabled": ('bool',), "QAction.setEnabled": ('bool',), "QAction.setFont": ('PySide2.QtGui.QFont',), @@ -7012,7 +7015,7 @@ if "PySide2.QtWidgets" in sys.modules: "QActionGroup.setVisible": ('bool',), # class PySide2.QtWidgets.QApplication: - "QApplication.__init__": ('PySide2.support.signature.typing.List',), + "QApplication.__init__": ('List[str]',), "QApplication.aboutQt": (), "QApplication.activeModalWidget": (), "QApplication.activePopupWidget": (), @@ -7197,6 +7200,19 @@ if "PySide2.QtWidgets" in sys.modules: "QColorDialog.standardColor": ('int',), "QColorDialog.testOption": ('PySide2.QtWidgets.QColorDialog.ColorDialogOption',), + # class PySide2.QtWidgets.QColormap: + "QColormap.__init__": ('PySide2.QtWidgets.QColormap',), + "QColormap.__copy__": (), + "QColormap.cleanup": (), + "QColormap.colorAt": ('int',), + "QColormap.colormap": (), + "QColormap.depth": (), + "QColormap.initialize": (), + "QColormap.instance": ('int',), + "QColormap.mode": (), + "QColormap.pixel": ('PySide2.QtGui.QColor',), + "QColormap.size": (), + # class PySide2.QtWidgets.QColumnView: "QColumnView.__init__": ('PySide2.QtWidgets.QWidget',), "QColumnView.columnWidths": (), @@ -7228,8 +7244,8 @@ if "PySide2.QtWidgets" in sys.modules: # class PySide2.QtWidgets.QComboBox: "QComboBox.__init__": ('PySide2.QtWidgets.QWidget',), - "QComboBox.addItem": [('PySide2.QtGui.QIcon', 'str', 'PySide2.support.signature.typing.Any'), ('str', 'PySide2.support.signature.typing.Any')], - "QComboBox.addItems": ('PySide2.support.signature.typing.List',), + "QComboBox.addItem": [('PySide2.QtGui.QIcon', 'str', 'Any'), ('str', 'Any')], + "QComboBox.addItems": ('List[str]',), "QComboBox.autoCompletion": (), "QComboBox.autoCompletionCaseSensitivity": (), "QComboBox.changeEvent": ('PySide2.QtCore.QEvent',), @@ -7243,7 +7259,7 @@ if "PySide2.QtWidgets" in sys.modules: "QComboBox.currentText": (), "QComboBox.duplicatesEnabled": (), "QComboBox.event": ('PySide2.QtCore.QEvent',), - "QComboBox.findData": ('PySide2.support.signature.typing.Any', 'int', 'MatchFlags'), + "QComboBox.findData": ('Any', 'int', 'MatchFlags'), "QComboBox.findText": ('str', 'MatchFlags'), "QComboBox.focusInEvent": ('PySide2.QtGui.QFocusEvent',), "QComboBox.focusOutEvent": ('PySide2.QtGui.QFocusEvent',), @@ -7253,9 +7269,9 @@ if "PySide2.QtWidgets" in sys.modules: "QComboBox.iconSize": (), "QComboBox.initStyleOption": ('PySide2.QtWidgets.QStyleOptionComboBox',), "QComboBox.inputMethodEvent": ('PySide2.QtGui.QInputMethodEvent',), - "QComboBox.inputMethodQuery": [('PySide2.QtCore.Qt.InputMethodQuery',), ('PySide2.QtCore.Qt.InputMethodQuery', 'PySide2.support.signature.typing.Any')], - "QComboBox.insertItem": [('int', 'PySide2.QtGui.QIcon', 'str', 'PySide2.support.signature.typing.Any'), ('int', 'str', 'PySide2.support.signature.typing.Any')], - "QComboBox.insertItems": ('int', 'PySide2.support.signature.typing.List'), + "QComboBox.inputMethodQuery": [('PySide2.QtCore.Qt.InputMethodQuery',), ('PySide2.QtCore.Qt.InputMethodQuery', 'Any')], + "QComboBox.insertItem": [('int', 'PySide2.QtGui.QIcon', 'str', 'Any'), ('int', 'str', 'Any')], + "QComboBox.insertItems": ('int', 'List[str]'), "QComboBox.insertPolicy": (), "QComboBox.insertSeparator": ('int',), "QComboBox.isEditable": (), @@ -7289,7 +7305,7 @@ if "PySide2.QtWidgets" in sys.modules: "QComboBox.setFrame": ('bool',), "QComboBox.setIconSize": ('PySide2.QtCore.QSize',), "QComboBox.setInsertPolicy": ('PySide2.QtWidgets.QComboBox.InsertPolicy',), - "QComboBox.setItemData": ('int', 'PySide2.support.signature.typing.Any', 'int'), + "QComboBox.setItemData": ('int', 'Any', 'int'), "QComboBox.setItemDelegate": ('PySide2.QtWidgets.QAbstractItemDelegate',), "QComboBox.setItemIcon": ('int', 'PySide2.QtGui.QIcon'), "QComboBox.setItemText": ('int', 'str'), @@ -7340,7 +7356,7 @@ if "PySide2.QtWidgets" in sys.modules: "QCommonStyle.unpolish": [('PySide2.QtWidgets.QApplication',), ('PySide2.QtWidgets.QWidget',)], # class PySide2.QtWidgets.QCompleter: - "QCompleter.__init__": [('PySide2.QtCore.QAbstractItemModel', 'PySide2.QtCore.QObject'), ('PySide2.QtCore.QObject',), ('PySide2.support.signature.typing.List', 'PySide2.QtCore.QObject')], + "QCompleter.__init__": [('List[str]', 'PySide2.QtCore.QObject'), ('PySide2.QtCore.QAbstractItemModel', 'PySide2.QtCore.QObject'), ('PySide2.QtCore.QObject',)], "QCompleter.caseSensitivity": (), "QCompleter.complete": ('PySide2.QtCore.QRect',), "QCompleter.completionColumn": (), @@ -7409,7 +7425,7 @@ if "PySide2.QtWidgets" in sys.modules: "QDateEdit.__init__": [('PySide2.QtCore.QDate', 'PySide2.QtWidgets.QWidget'), ('PySide2.QtWidgets.QWidget',)], # class PySide2.QtWidgets.QDateTimeEdit: - "QDateTimeEdit.__init__": [('PySide2.QtCore.QDate', 'PySide2.QtWidgets.QWidget'), ('PySide2.QtCore.QDateTime', 'PySide2.QtWidgets.QWidget'), ('PySide2.QtCore.QTime', 'PySide2.QtWidgets.QWidget'), ('PySide2.QtWidgets.QWidget',), ('PySide2.support.signature.typing.Any', 'type', 'PySide2.QtWidgets.QWidget')], + "QDateTimeEdit.__init__": [('Any', 'type', 'PySide2.QtWidgets.QWidget'), ('PySide2.QtCore.QDate', 'PySide2.QtWidgets.QWidget'), ('PySide2.QtCore.QDateTime', 'PySide2.QtWidgets.QWidget'), ('PySide2.QtCore.QTime', 'PySide2.QtWidgets.QWidget'), ('PySide2.QtWidgets.QWidget',)], "QDateTimeEdit.calendarPopup": (), "QDateTimeEdit.calendarWidget": (), "QDateTimeEdit.clear": (), @@ -7550,7 +7566,7 @@ if "PySide2.QtWidgets" in sys.modules: "QDialogButtonBox.standardButtons": (), # class PySide2.QtWidgets.QDirModel: - "QDirModel.__init__": [('PySide2.QtCore.QObject',), ('PySide2.support.signature.typing.List', 'Filters', 'SortFlags', 'PySide2.QtCore.QObject')], + "QDirModel.__init__": [('List[str]', 'Filters', 'SortFlags', 'PySide2.QtCore.QObject'), ('PySide2.QtCore.QObject',)], "QDirModel.columnCount": ('PySide2.QtCore.QModelIndex',), "QDirModel.data": ('PySide2.QtCore.QModelIndex', 'int'), "QDirModel.dropMimeData": ('PySide2.QtCore.QMimeData', 'PySide2.QtCore.Qt.DropAction', 'int', 'int', 'PySide2.QtCore.QModelIndex'), @@ -7567,7 +7583,7 @@ if "PySide2.QtWidgets" in sys.modules: "QDirModel.isDir": ('PySide2.QtCore.QModelIndex',), "QDirModel.isReadOnly": (), "QDirModel.lazyChildCount": (), - "QDirModel.mimeData": ('PySide2.support.signature.typing.List',), + "QDirModel.mimeData": ('List[int]',), "QDirModel.mimeTypes": (), "QDirModel.mkdir": ('PySide2.QtCore.QModelIndex', 'str'), "QDirModel.nameFilters": (), @@ -7577,11 +7593,11 @@ if "PySide2.QtWidgets" in sys.modules: "QDirModel.resolveSymlinks": (), "QDirModel.rmdir": ('PySide2.QtCore.QModelIndex',), "QDirModel.rowCount": ('PySide2.QtCore.QModelIndex',), - "QDirModel.setData": ('PySide2.QtCore.QModelIndex', 'PySide2.support.signature.typing.Any', 'int'), + "QDirModel.setData": ('PySide2.QtCore.QModelIndex', 'Any', 'int'), "QDirModel.setFilter": ('Filters',), "QDirModel.setIconProvider": ('PySide2.QtWidgets.QFileIconProvider',), "QDirModel.setLazyChildCount": ('bool',), - "QDirModel.setNameFilters": ('PySide2.support.signature.typing.List',), + "QDirModel.setNameFilters": ('List[str]',), "QDirModel.setReadOnly": ('bool',), "QDirModel.setResolveSymlinks": ('bool',), "QDirModel.setSorting": ('SortFlags',), @@ -7652,13 +7668,13 @@ if "PySide2.QtWidgets" in sys.modules: "QFileDialog.fileMode": (), "QFileDialog.filter": (), "QFileDialog.getExistingDirectory": ('PySide2.QtWidgets.QWidget', 'str', 'str', 'Options'), - "QFileDialog.getExistingDirectoryUrl": ('PySide2.QtWidgets.QWidget', 'str', 'PySide2.QtCore.QUrl', 'Options', 'PySide2.support.signature.typing.List'), + "QFileDialog.getExistingDirectoryUrl": ('PySide2.QtWidgets.QWidget', 'str', 'PySide2.QtCore.QUrl', 'Options', 'List[str]'), "QFileDialog.getOpenFileName": ('PySide2.QtWidgets.QWidget', 'str', 'str', 'str', 'str', 'Options'), "QFileDialog.getOpenFileNames": ('PySide2.QtWidgets.QWidget', 'str', 'str', 'str', 'str', 'Options'), - "QFileDialog.getOpenFileUrl": ('PySide2.QtWidgets.QWidget', 'str', 'PySide2.QtCore.QUrl', 'str', 'str', 'Options', 'PySide2.support.signature.typing.List'), - "QFileDialog.getOpenFileUrls": ('PySide2.QtWidgets.QWidget', 'str', 'PySide2.QtCore.QUrl', 'str', 'str', 'Options', 'PySide2.support.signature.typing.List'), + "QFileDialog.getOpenFileUrl": ('PySide2.QtWidgets.QWidget', 'str', 'PySide2.QtCore.QUrl', 'str', 'str', 'Options', 'List[str]'), + "QFileDialog.getOpenFileUrls": ('PySide2.QtWidgets.QWidget', 'str', 'PySide2.QtCore.QUrl', 'str', 'str', 'Options', 'List[str]'), "QFileDialog.getSaveFileName": ('PySide2.QtWidgets.QWidget', 'str', 'str', 'str', 'str', 'Options'), - "QFileDialog.getSaveFileUrl": ('PySide2.QtWidgets.QWidget', 'str', 'PySide2.QtCore.QUrl', 'str', 'str', 'Options', 'PySide2.support.signature.typing.List'), + "QFileDialog.getSaveFileUrl": ('PySide2.QtWidgets.QWidget', 'str', 'PySide2.QtCore.QUrl', 'str', 'str', 'Options', 'List[str]'), "QFileDialog.history": (), "QFileDialog.iconProvider": (), "QFileDialog.isNameFilterDetailsVisible": (), @@ -7688,21 +7704,21 @@ if "PySide2.QtWidgets" in sys.modules: "QFileDialog.setDirectoryUrl": ('PySide2.QtCore.QUrl',), "QFileDialog.setFileMode": ('PySide2.QtWidgets.QFileDialog.FileMode',), "QFileDialog.setFilter": ('Filters',), - "QFileDialog.setHistory": ('PySide2.support.signature.typing.List',), + "QFileDialog.setHistory": ('List[str]',), "QFileDialog.setIconProvider": ('PySide2.QtWidgets.QFileIconProvider',), "QFileDialog.setItemDelegate": ('PySide2.QtWidgets.QAbstractItemDelegate',), "QFileDialog.setLabelText": ('PySide2.QtWidgets.QFileDialog.DialogLabel', 'str'), - "QFileDialog.setMimeTypeFilters": ('PySide2.support.signature.typing.List',), + "QFileDialog.setMimeTypeFilters": ('List[str]',), "QFileDialog.setNameFilter": ('str',), "QFileDialog.setNameFilterDetailsVisible": ('bool',), - "QFileDialog.setNameFilters": ('PySide2.support.signature.typing.List',), + "QFileDialog.setNameFilters": ('List[str]',), "QFileDialog.setOption": ('PySide2.QtWidgets.QFileDialog.Option', 'bool'), "QFileDialog.setOptions": ('Options',), "QFileDialog.setProxyModel": ('PySide2.QtCore.QAbstractProxyModel',), "QFileDialog.setReadOnly": ('bool',), "QFileDialog.setResolveSymlinks": ('bool',), "QFileDialog.setSidebarUrls": ('list',), - "QFileDialog.setSupportedSchemes": ('PySide2.support.signature.typing.List',), + "QFileDialog.setSupportedSchemes": ('List[str]',), "QFileDialog.setViewMode": ('PySide2.QtWidgets.QFileDialog.ViewMode',), "QFileDialog.setVisible": ('bool',), "QFileDialog.sidebarUrls": (), @@ -7738,7 +7754,7 @@ if "PySide2.QtWidgets" in sys.modules: "QFileSystemModel.isDir": ('PySide2.QtCore.QModelIndex',), "QFileSystemModel.isReadOnly": (), "QFileSystemModel.lastModified": ('PySide2.QtCore.QModelIndex',), - "QFileSystemModel.mimeData": ('PySide2.support.signature.typing.List',), + "QFileSystemModel.mimeData": ('List[int]',), "QFileSystemModel.mimeTypes": (), "QFileSystemModel.mkdir": ('PySide2.QtCore.QModelIndex', 'str'), "QFileSystemModel.myComputer": ('int',), @@ -7751,11 +7767,11 @@ if "PySide2.QtWidgets" in sys.modules: "QFileSystemModel.rootDirectory": (), "QFileSystemModel.rootPath": (), "QFileSystemModel.rowCount": ('PySide2.QtCore.QModelIndex',), - "QFileSystemModel.setData": ('PySide2.QtCore.QModelIndex', 'PySide2.support.signature.typing.Any', 'int'), + "QFileSystemModel.setData": ('PySide2.QtCore.QModelIndex', 'Any', 'int'), "QFileSystemModel.setFilter": ('Filters',), "QFileSystemModel.setIconProvider": ('PySide2.QtWidgets.QFileIconProvider',), "QFileSystemModel.setNameFilterDisables": ('bool',), - "QFileSystemModel.setNameFilters": ('PySide2.support.signature.typing.List',), + "QFileSystemModel.setNameFilters": ('List[str]',), "QFileSystemModel.setReadOnly": ('bool',), "QFileSystemModel.setResolveSymlinks": ('bool',), "QFileSystemModel.setRootPath": ('str',), @@ -7897,8 +7913,8 @@ if "PySide2.QtWidgets" in sys.modules: "QGestureRecognizer.unregisterRecognizer": ('PySide2.QtCore.Qt.GestureType',), # class PySide2.QtWidgets.QGraphicsAnchor: - "QGraphicsAnchor.setSpacing": ('float',), "QGraphicsAnchor.setSizePolicy": ('PySide2.QtWidgets.QSizePolicy.Policy',), + "QGraphicsAnchor.setSpacing": ('float',), "QGraphicsAnchor.sizePolicy": (), "QGraphicsAnchor.spacing": (), "QGraphicsAnchor.unsetSpacing": (), @@ -7972,7 +7988,7 @@ if "PySide2.QtWidgets" in sys.modules: "QGraphicsEllipseItem.__init__": [('PySide2.QtCore.QRectF', 'PySide2.QtWidgets.QGraphicsItem'), ('PySide2.QtWidgets.QGraphicsItem',), ('float', 'float', 'float', 'float', 'PySide2.QtWidgets.QGraphicsItem')], "QGraphicsEllipseItem.boundingRect": (), "QGraphicsEllipseItem.contains": ('PySide2.QtCore.QPointF',), - "QGraphicsEllipseItem.extension": ('PySide2.support.signature.typing.Any',), + "QGraphicsEllipseItem.extension": ('Any',), "QGraphicsEllipseItem.isObscuredBy": ('PySide2.QtWidgets.QGraphicsItem',), "QGraphicsEllipseItem.opaqueArea": (), "QGraphicsEllipseItem.paint": ('PySide2.QtGui.QPainter', 'PySide2.QtWidgets.QStyleOptionGraphicsItem', 'PySide2.QtWidgets.QWidget'), @@ -8062,7 +8078,7 @@ if "PySide2.QtWidgets" in sys.modules: "QGraphicsItem.dropEvent": ('PySide2.QtWidgets.QGraphicsSceneDragDropEvent',), "QGraphicsItem.effectiveOpacity": (), "QGraphicsItem.ensureVisible": [('PySide2.QtCore.QRectF', 'int', 'int'), ('float', 'float', 'float', 'float', 'int', 'int')], - "QGraphicsItem.extension": ('PySide2.support.signature.typing.Any',), + "QGraphicsItem.extension": ('Any',), "QGraphicsItem.filtersChildEvents": (), "QGraphicsItem.flags": (), "QGraphicsItem.focusInEvent": ('PySide2.QtGui.QFocusEvent',), @@ -8099,7 +8115,7 @@ if "PySide2.QtWidgets" in sys.modules: "QGraphicsItem.isVisibleTo": ('PySide2.QtWidgets.QGraphicsItem',), "QGraphicsItem.isWidget": (), "QGraphicsItem.isWindow": (), - "QGraphicsItem.itemChange": ('PySide2.QtWidgets.QGraphicsItem.GraphicsItemChange', 'PySide2.support.signature.typing.Any'), + "QGraphicsItem.itemChange": ('PySide2.QtWidgets.QGraphicsItem.GraphicsItemChange', 'Any'), "QGraphicsItem.itemTransform": ('PySide2.QtWidgets.QGraphicsItem', 'bool'), "QGraphicsItem.keyPressEvent": ('PySide2.QtGui.QKeyEvent',), "QGraphicsItem.keyReleaseEvent": ('PySide2.QtGui.QKeyEvent',), @@ -8153,7 +8169,7 @@ if "PySide2.QtWidgets" in sys.modules: "QGraphicsItem.setBoundingRegionGranularity": ('float',), "QGraphicsItem.setCacheMode": ('PySide2.QtWidgets.QGraphicsItem.CacheMode', 'PySide2.QtCore.QSize'), "QGraphicsItem.setCursor": ('PySide2.QtGui.QCursor',), - "QGraphicsItem.setData": ('int', 'PySide2.support.signature.typing.Any'), + "QGraphicsItem.setData": ('int', 'Any'), "QGraphicsItem.setEnabled": ('bool',), "QGraphicsItem.setFiltersChildEvents": ('bool',), "QGraphicsItem.setFlag": ('PySide2.QtWidgets.QGraphicsItem.GraphicsItemFlag', 'bool'), @@ -8183,7 +8199,7 @@ if "PySide2.QtWidgets" in sys.modules: "QGraphicsItem.shape": (), "QGraphicsItem.show": (), "QGraphicsItem.stackBefore": ('PySide2.QtWidgets.QGraphicsItem',), - "QGraphicsItem.toGraphicsObject": [], + "QGraphicsItem.toGraphicsObject": (), "QGraphicsItem.toolTip": (), "QGraphicsItem.topLevelItem": (), "QGraphicsItem.topLevelWidget": (), @@ -8300,7 +8316,7 @@ if "PySide2.QtWidgets" in sys.modules: "QGraphicsLineItem.__init__": [('PySide2.QtCore.QLineF', 'PySide2.QtWidgets.QGraphicsItem'), ('PySide2.QtWidgets.QGraphicsItem',), ('float', 'float', 'float', 'float', 'PySide2.QtWidgets.QGraphicsItem')], "QGraphicsLineItem.boundingRect": (), "QGraphicsLineItem.contains": ('PySide2.QtCore.QPointF',), - "QGraphicsLineItem.extension": ('PySide2.support.signature.typing.Any',), + "QGraphicsLineItem.extension": ('Any',), "QGraphicsLineItem.isObscuredBy": ('PySide2.QtWidgets.QGraphicsItem',), "QGraphicsLineItem.line": (), "QGraphicsLineItem.opaqueArea": (), @@ -8355,7 +8371,7 @@ if "PySide2.QtWidgets" in sys.modules: "QGraphicsPathItem.__init__": [('PySide2.QtGui.QPainterPath', 'PySide2.QtWidgets.QGraphicsItem'), ('PySide2.QtWidgets.QGraphicsItem',)], "QGraphicsPathItem.boundingRect": (), "QGraphicsPathItem.contains": ('PySide2.QtCore.QPointF',), - "QGraphicsPathItem.extension": ('PySide2.support.signature.typing.Any',), + "QGraphicsPathItem.extension": ('Any',), "QGraphicsPathItem.isObscuredBy": ('PySide2.QtWidgets.QGraphicsItem',), "QGraphicsPathItem.opaqueArea": (), "QGraphicsPathItem.paint": ('PySide2.QtGui.QPainter', 'PySide2.QtWidgets.QStyleOptionGraphicsItem', 'PySide2.QtWidgets.QWidget'), @@ -8368,7 +8384,7 @@ if "PySide2.QtWidgets" in sys.modules: "QGraphicsPixmapItem.__init__": [('PySide2.QtGui.QPixmap', 'PySide2.QtWidgets.QGraphicsItem'), ('PySide2.QtWidgets.QGraphicsItem',)], "QGraphicsPixmapItem.boundingRect": (), "QGraphicsPixmapItem.contains": ('PySide2.QtCore.QPointF',), - "QGraphicsPixmapItem.extension": ('PySide2.support.signature.typing.Any',), + "QGraphicsPixmapItem.extension": ('Any',), "QGraphicsPixmapItem.isObscuredBy": ('PySide2.QtWidgets.QGraphicsItem',), "QGraphicsPixmapItem.offset": (), "QGraphicsPixmapItem.opaqueArea": (), @@ -8387,7 +8403,7 @@ if "PySide2.QtWidgets" in sys.modules: "QGraphicsPolygonItem.__init__": [('PySide2.QtGui.QPolygonF', 'PySide2.QtWidgets.QGraphicsItem'), ('PySide2.QtWidgets.QGraphicsItem',)], "QGraphicsPolygonItem.boundingRect": (), "QGraphicsPolygonItem.contains": ('PySide2.QtCore.QPointF',), - "QGraphicsPolygonItem.extension": ('PySide2.support.signature.typing.Any',), + "QGraphicsPolygonItem.extension": ('Any',), "QGraphicsPolygonItem.fillRule": (), "QGraphicsPolygonItem.isObscuredBy": ('PySide2.QtWidgets.QGraphicsItem',), "QGraphicsPolygonItem.opaqueArea": (), @@ -8418,7 +8434,7 @@ if "PySide2.QtWidgets" in sys.modules: "QGraphicsProxyWidget.hoverMoveEvent": ('PySide2.QtWidgets.QGraphicsSceneHoverEvent',), "QGraphicsProxyWidget.inputMethodEvent": ('PySide2.QtGui.QInputMethodEvent',), "QGraphicsProxyWidget.inputMethodQuery": ('PySide2.QtCore.Qt.InputMethodQuery',), - "QGraphicsProxyWidget.itemChange": ('PySide2.QtWidgets.QGraphicsItem.GraphicsItemChange', 'PySide2.support.signature.typing.Any'), + "QGraphicsProxyWidget.itemChange": ('PySide2.QtWidgets.QGraphicsItem.GraphicsItemChange', 'Any'), "QGraphicsProxyWidget.keyPressEvent": ('PySide2.QtGui.QKeyEvent',), "QGraphicsProxyWidget.keyReleaseEvent": ('PySide2.QtGui.QKeyEvent',), "QGraphicsProxyWidget.mouseDoubleClickEvent": ('PySide2.QtWidgets.QGraphicsSceneMouseEvent',), @@ -8442,7 +8458,7 @@ if "PySide2.QtWidgets" in sys.modules: "QGraphicsRectItem.__init__": [('PySide2.QtCore.QRectF', 'PySide2.QtWidgets.QGraphicsItem'), ('PySide2.QtWidgets.QGraphicsItem',), ('float', 'float', 'float', 'float', 'PySide2.QtWidgets.QGraphicsItem')], "QGraphicsRectItem.boundingRect": (), "QGraphicsRectItem.contains": ('PySide2.QtCore.QPointF',), - "QGraphicsRectItem.extension": ('PySide2.support.signature.typing.Any',), + "QGraphicsRectItem.extension": ('Any',), "QGraphicsRectItem.isObscuredBy": ('PySide2.QtWidgets.QGraphicsItem',), "QGraphicsRectItem.opaqueArea": (), "QGraphicsRectItem.paint": ('PySide2.QtGui.QPainter', 'PySide2.QtWidgets.QStyleOptionGraphicsItem', 'PySide2.QtWidgets.QWidget'), @@ -8690,7 +8706,7 @@ if "PySide2.QtWidgets" in sys.modules: "QGraphicsSimpleTextItem.__init__": [('PySide2.QtWidgets.QGraphicsItem',), ('str', 'PySide2.QtWidgets.QGraphicsItem')], "QGraphicsSimpleTextItem.boundingRect": (), "QGraphicsSimpleTextItem.contains": ('PySide2.QtCore.QPointF',), - "QGraphicsSimpleTextItem.extension": ('PySide2.support.signature.typing.Any',), + "QGraphicsSimpleTextItem.extension": ('Any',), "QGraphicsSimpleTextItem.font": (), "QGraphicsSimpleTextItem.isObscuredBy": ('PySide2.QtWidgets.QGraphicsItem',), "QGraphicsSimpleTextItem.opaqueArea": (), @@ -8713,7 +8729,7 @@ if "PySide2.QtWidgets" in sys.modules: "QGraphicsTextItem.dragLeaveEvent": ('PySide2.QtWidgets.QGraphicsSceneDragDropEvent',), "QGraphicsTextItem.dragMoveEvent": ('PySide2.QtWidgets.QGraphicsSceneDragDropEvent',), "QGraphicsTextItem.dropEvent": ('PySide2.QtWidgets.QGraphicsSceneDragDropEvent',), - "QGraphicsTextItem.extension": ('PySide2.support.signature.typing.Any',), + "QGraphicsTextItem.extension": ('Any',), "QGraphicsTextItem.focusInEvent": ('PySide2.QtGui.QFocusEvent',), "QGraphicsTextItem.focusOutEvent": ('PySide2.QtGui.QFocusEvent',), "QGraphicsTextItem.font": (), @@ -8770,7 +8786,7 @@ if "PySide2.QtWidgets" in sys.modules: "QGraphicsView.dragMoveEvent": ('PySide2.QtGui.QDragMoveEvent',), "QGraphicsView.drawBackground": ('PySide2.QtGui.QPainter', 'PySide2.QtCore.QRectF'), "QGraphicsView.drawForeground": ('PySide2.QtGui.QPainter', 'PySide2.QtCore.QRectF'), - "QGraphicsView.drawItems": ('PySide2.QtGui.QPainter', 'int', 'PySide2.support.signature.typing.List', 'PySide2.support.signature.typing.List'), + "QGraphicsView.drawItems": ('PySide2.QtGui.QPainter', 'int', 'List[PySide2.QtWidgets.QGraphicsItem]', 'List[PySide2.QtWidgets.QStyleOptionGraphicsItem]'), "QGraphicsView.dropEvent": ('PySide2.QtGui.QDropEvent',), "QGraphicsView.ensureVisible": [('PySide2.QtCore.QRectF', 'int', 'int'), ('PySide2.QtWidgets.QGraphicsItem', 'int', 'int'), ('float', 'float', 'float', 'float', 'int', 'int')], "QGraphicsView.event": ('PySide2.QtCore.QEvent',), @@ -8873,7 +8889,7 @@ if "PySide2.QtWidgets" in sys.modules: "QGraphicsWidget.insertAction": ('PySide2.QtWidgets.QAction', 'PySide2.QtWidgets.QAction'), "QGraphicsWidget.insertActions": ('PySide2.QtWidgets.QAction', 'list'), "QGraphicsWidget.isActiveWindow": (), - "QGraphicsWidget.itemChange": ('PySide2.QtWidgets.QGraphicsItem.GraphicsItemChange', 'PySide2.support.signature.typing.Any'), + "QGraphicsWidget.itemChange": ('PySide2.QtWidgets.QGraphicsItem.GraphicsItemChange', 'Any'), "QGraphicsWidget.layout": (), "QGraphicsWidget.layoutDirection": (), "QGraphicsWidget.moveEvent": ('PySide2.QtWidgets.QGraphicsSceneMoveEvent',), @@ -8881,7 +8897,7 @@ if "PySide2.QtWidgets" in sys.modules: "QGraphicsWidget.paintWindowFrame": ('PySide2.QtGui.QPainter', 'PySide2.QtWidgets.QStyleOptionGraphicsItem', 'PySide2.QtWidgets.QWidget'), "QGraphicsWidget.palette": (), "QGraphicsWidget.polishEvent": (), - "QGraphicsWidget.propertyChange": ('str', 'PySide2.support.signature.typing.Any'), + "QGraphicsWidget.propertyChange": ('str', 'Any'), "QGraphicsWidget.rect": (), "QGraphicsWidget.releaseShortcut": ('int',), "QGraphicsWidget.removeAction": ('PySide2.QtWidgets.QAction',), @@ -9097,7 +9113,7 @@ if "PySide2.QtWidgets" in sys.modules: "QInputDialog.doubleValue": (), "QInputDialog.getDouble": ('PySide2.QtWidgets.QWidget', 'str', 'str', 'float', 'float', 'float', 'int', 'bool', 'WindowFlags'), "QInputDialog.getInt": ('PySide2.QtWidgets.QWidget', 'str', 'str', 'int', 'int', 'int', 'int', 'bool', 'WindowFlags'), - "QInputDialog.getItem": ('PySide2.QtWidgets.QWidget', 'str', 'str', 'PySide2.support.signature.typing.List', 'int', 'bool', 'bool', 'WindowFlags', 'InputMethodHints'), + "QInputDialog.getItem": ('PySide2.QtWidgets.QWidget', 'str', 'str', 'List[str]', 'int', 'bool', 'bool', 'WindowFlags', 'InputMethodHints'), "QInputDialog.getMultiLineText": ('PySide2.QtWidgets.QWidget', 'str', 'str', 'str', 'bool', 'WindowFlags', 'InputMethodHints'), "QInputDialog.getText": ('PySide2.QtWidgets.QWidget', 'str', 'str', 'PySide2.QtWidgets.QLineEdit.EchoMode', 'str', 'bool', 'WindowFlags', 'InputMethodHints'), "QInputDialog.inputMode": (), @@ -9112,7 +9128,7 @@ if "PySide2.QtWidgets" in sys.modules: "QInputDialog.open": [(), ('PySide2.QtCore.QObject', 'str')], "QInputDialog.setCancelButtonText": ('str',), "QInputDialog.setComboBoxEditable": ('bool',), - "QInputDialog.setComboBoxItems": ('PySide2.support.signature.typing.List',), + "QInputDialog.setComboBoxItems": ('List[str]',), "QInputDialog.setDoubleDecimals": ('int',), "QInputDialog.setDoubleMaximum": ('float',), "QInputDialog.setDoubleMinimum": ('float',), @@ -9138,8 +9154,8 @@ if "PySide2.QtWidgets" in sys.modules: # class PySide2.QtWidgets.QItemDelegate: "QItemDelegate.__init__": ('PySide2.QtCore.QObject',), "QItemDelegate.createEditor": ('PySide2.QtWidgets.QWidget', 'PySide2.QtWidgets.QStyleOptionViewItem', 'PySide2.QtCore.QModelIndex'), - "QItemDelegate.decoration": ('PySide2.QtWidgets.QStyleOptionViewItem', 'PySide2.support.signature.typing.Any'), - "QItemDelegate.doCheck": ('PySide2.QtWidgets.QStyleOptionViewItem', 'PySide2.QtCore.QRect', 'PySide2.support.signature.typing.Any'), + "QItemDelegate.decoration": ('PySide2.QtWidgets.QStyleOptionViewItem', 'Any'), + "QItemDelegate.doCheck": ('PySide2.QtWidgets.QStyleOptionViewItem', 'PySide2.QtCore.QRect', 'Any'), "QItemDelegate.drawBackground": ('PySide2.QtGui.QPainter', 'PySide2.QtWidgets.QStyleOptionViewItem', 'PySide2.QtCore.QModelIndex'), "QItemDelegate.drawCheck": ('PySide2.QtGui.QPainter', 'PySide2.QtWidgets.QStyleOptionViewItem', 'PySide2.QtCore.QRect', 'PySide2.QtCore.Qt.CheckState'), "QItemDelegate.drawDecoration": ('PySide2.QtGui.QPainter', 'PySide2.QtWidgets.QStyleOptionViewItem', 'PySide2.QtCore.QRect', 'PySide2.QtGui.QPixmap'), @@ -9374,7 +9390,7 @@ if "PySide2.QtWidgets" in sys.modules: "QLineEdit.initStyleOption": ('PySide2.QtWidgets.QStyleOptionFrame',), "QLineEdit.inputMask": (), "QLineEdit.inputMethodEvent": ('PySide2.QtGui.QInputMethodEvent',), - "QLineEdit.inputMethodQuery": [('PySide2.QtCore.Qt.InputMethodQuery',), ('PySide2.QtCore.Qt.InputMethodQuery', 'PySide2.support.signature.typing.Any')], + "QLineEdit.inputMethodQuery": [('PySide2.QtCore.Qt.InputMethodQuery',), ('PySide2.QtCore.Qt.InputMethodQuery', 'Any')], "QLineEdit.insert": ('str',), "QLineEdit.isClearButtonEnabled": (), "QLineEdit.isModified": (), @@ -9490,7 +9506,7 @@ if "PySide2.QtWidgets" in sys.modules: # class PySide2.QtWidgets.QListWidget: "QListWidget.__init__": ('PySide2.QtWidgets.QWidget',), "QListWidget.addItem": [('PySide2.QtWidgets.QListWidgetItem',), ('str',)], - "QListWidget.addItems": ('PySide2.support.signature.typing.List',), + "QListWidget.addItems": ('List[str]',), "QListWidget.clear": (), "QListWidget.closePersistentEditor": [('PySide2.QtCore.QModelIndex',), ('PySide2.QtWidgets.QListWidgetItem',)], "QListWidget.count": (), @@ -9503,7 +9519,7 @@ if "PySide2.QtWidgets" in sys.modules: "QListWidget.findItems": ('str', 'MatchFlags'), "QListWidget.indexFromItem": ('PySide2.QtWidgets.QListWidgetItem',), "QListWidget.insertItem": [('int', 'PySide2.QtWidgets.QListWidgetItem'), ('int', 'str')], - "QListWidget.insertItems": ('int', 'PySide2.support.signature.typing.List'), + "QListWidget.insertItems": ('int', 'List[str]'), "QListWidget.isItemHidden": ('PySide2.QtWidgets.QListWidgetItem',), "QListWidget.isItemSelected": ('PySide2.QtWidgets.QListWidgetItem',), "QListWidget.isSortingEnabled": (), @@ -9550,7 +9566,7 @@ if "PySide2.QtWidgets" in sys.modules: "QListWidgetItem.setBackground": ('PySide2.QtGui.QBrush',), "QListWidgetItem.setBackgroundColor": ('PySide2.QtGui.QColor',), "QListWidgetItem.setCheckState": ('PySide2.QtCore.Qt.CheckState',), - "QListWidgetItem.setData": ('int', 'PySide2.support.signature.typing.Any'), + "QListWidgetItem.setData": ('int', 'Any'), "QListWidgetItem.setFlags": ('ItemFlags',), "QListWidgetItem.setFont": ('PySide2.QtGui.QFont',), "QListWidgetItem.setForeground": ('PySide2.QtGui.QBrush',), @@ -9978,7 +9994,7 @@ if "PySide2.QtWidgets" in sys.modules: "QPlainTextEdit.focusOutEvent": ('PySide2.QtGui.QFocusEvent',), "QPlainTextEdit.getPaintContext": (), "QPlainTextEdit.inputMethodEvent": ('PySide2.QtGui.QInputMethodEvent',), - "QPlainTextEdit.inputMethodQuery": [('PySide2.QtCore.Qt.InputMethodQuery',), ('PySide2.QtCore.Qt.InputMethodQuery', 'PySide2.support.signature.typing.Any')], + "QPlainTextEdit.inputMethodQuery": [('PySide2.QtCore.Qt.InputMethodQuery',), ('PySide2.QtCore.Qt.InputMethodQuery', 'Any')], "QPlainTextEdit.insertFromMimeData": ('PySide2.QtCore.QMimeData',), "QPlainTextEdit.insertPlainText": ('str',), "QPlainTextEdit.isReadOnly": (), @@ -10176,7 +10192,7 @@ if "PySide2.QtWidgets" in sys.modules: "QScrollBar.wheelEvent": ('PySide2.QtGui.QWheelEvent',), # class PySide2.QtWidgets.QShortcut: - "QShortcut.__init__": [('PySide2.QtGui.QKeySequence', 'PySide2.QtWidgets.QWidget', 'PySide2.support.signature.typing.Callable', 'PySide2.QtCore.Qt.ShortcutContext'), ('PySide2.QtGui.QKeySequence', 'PySide2.QtWidgets.QWidget', 'str', 'str', 'PySide2.QtCore.Qt.ShortcutContext'), ('PySide2.QtWidgets.QWidget',)], + "QShortcut.__init__": [('PySide2.QtGui.QKeySequence', 'PySide2.QtWidgets.QWidget', 'Callable', 'PySide2.QtCore.Qt.ShortcutContext'), ('PySide2.QtGui.QKeySequence', 'PySide2.QtWidgets.QWidget', 'str', 'str', 'PySide2.QtCore.Qt.ShortcutContext'), ('PySide2.QtWidgets.QWidget',)], "QShortcut.autoRepeat": (), "QShortcut.context": (), "QShortcut.event": ('PySide2.QtCore.QEvent',), @@ -10533,7 +10549,7 @@ if "PySide2.QtWidgets" in sys.modules: # class PySide2.QtWidgets.QStyledItemDelegate: "QStyledItemDelegate.__init__": ('PySide2.QtCore.QObject',), "QStyledItemDelegate.createEditor": ('PySide2.QtWidgets.QWidget', 'PySide2.QtWidgets.QStyleOptionViewItem', 'PySide2.QtCore.QModelIndex'), - "QStyledItemDelegate.displayText": ('PySide2.support.signature.typing.Any', 'PySide2.QtCore.QLocale'), + "QStyledItemDelegate.displayText": ('Any', 'PySide2.QtCore.QLocale'), "QStyledItemDelegate.editorEvent": ('PySide2.QtCore.QEvent', 'PySide2.QtCore.QAbstractItemModel', 'PySide2.QtWidgets.QStyleOptionViewItem', 'PySide2.QtCore.QModelIndex'), "QStyledItemDelegate.eventFilter": ('PySide2.QtCore.QObject', 'PySide2.QtCore.QEvent'), "QStyledItemDelegate.initStyleOption": ('PySide2.QtWidgets.QStyleOptionViewItem', 'PySide2.QtCore.QModelIndex'), @@ -10614,7 +10630,7 @@ if "PySide2.QtWidgets" in sys.modules: "QTabBar.setSelectionBehaviorOnRemove": ('PySide2.QtWidgets.QTabBar.SelectionBehavior',), "QTabBar.setShape": ('PySide2.QtWidgets.QTabBar.Shape',), "QTabBar.setTabButton": ('int', 'PySide2.QtWidgets.QTabBar.ButtonPosition', 'PySide2.QtWidgets.QWidget'), - "QTabBar.setTabData": ('int', 'PySide2.support.signature.typing.Any'), + "QTabBar.setTabData": ('int', 'Any'), "QTabBar.setTabEnabled": ('int', 'bool'), "QTabBar.setTabIcon": ('int', 'PySide2.QtGui.QIcon'), "QTabBar.setTabText": ('int', 'str'), @@ -10822,7 +10838,7 @@ if "PySide2.QtWidgets" in sys.modules: "QTableWidget.setCurrentCell": [('int', 'int'), ('int', 'int', 'SelectionFlags')], "QTableWidget.setCurrentItem": [('PySide2.QtWidgets.QTableWidgetItem',), ('PySide2.QtWidgets.QTableWidgetItem', 'SelectionFlags')], "QTableWidget.setHorizontalHeaderItem": ('int', 'PySide2.QtWidgets.QTableWidgetItem'), - "QTableWidget.setHorizontalHeaderLabels": ('PySide2.support.signature.typing.List',), + "QTableWidget.setHorizontalHeaderLabels": ('List[str]',), "QTableWidget.setItem": ('int', 'int', 'PySide2.QtWidgets.QTableWidgetItem'), "QTableWidget.setItemPrototype": ('PySide2.QtWidgets.QTableWidgetItem',), "QTableWidget.setItemSelected": ('PySide2.QtWidgets.QTableWidgetItem', 'bool'), @@ -10831,7 +10847,7 @@ if "PySide2.QtWidgets" in sys.modules: "QTableWidget.setRowCount": ('int',), "QTableWidget.setSortingEnabled": ('bool',), "QTableWidget.setVerticalHeaderItem": ('int', 'PySide2.QtWidgets.QTableWidgetItem'), - "QTableWidget.setVerticalHeaderLabels": ('PySide2.support.signature.typing.List',), + "QTableWidget.setVerticalHeaderLabels": ('List[str]',), "QTableWidget.sortItems": ('int', 'PySide2.QtCore.Qt.SortOrder'), "QTableWidget.supportedDropActions": (), "QTableWidget.takeHorizontalHeaderItem": ('int',), @@ -10860,7 +10876,7 @@ if "PySide2.QtWidgets" in sys.modules: "QTableWidgetItem.setBackground": ('PySide2.QtGui.QBrush',), "QTableWidgetItem.setBackgroundColor": ('PySide2.QtGui.QColor',), "QTableWidgetItem.setCheckState": ('PySide2.QtCore.Qt.CheckState',), - "QTableWidgetItem.setData": ('int', 'PySide2.support.signature.typing.Any'), + "QTableWidgetItem.setData": ('int', 'Any'), "QTableWidgetItem.setFlags": ('ItemFlags',), "QTableWidgetItem.setFont": ('PySide2.QtGui.QFont',), "QTableWidgetItem.setForeground": ('PySide2.QtGui.QBrush',), @@ -10933,7 +10949,7 @@ if "PySide2.QtWidgets" in sys.modules: "QTextBrowser.searchPaths": (), "QTextBrowser.setOpenExternalLinks": ('bool',), "QTextBrowser.setOpenLinks": ('bool',), - "QTextBrowser.setSearchPaths": ('PySide2.support.signature.typing.List',), + "QTextBrowser.setSearchPaths": ('List[str]',), "QTextBrowser.setSource": ('PySide2.QtCore.QUrl',), "QTextBrowser.source": (), @@ -10978,7 +10994,7 @@ if "PySide2.QtWidgets" in sys.modules: "QTextEdit.fontUnderline": (), "QTextEdit.fontWeight": (), "QTextEdit.inputMethodEvent": ('PySide2.QtGui.QInputMethodEvent',), - "QTextEdit.inputMethodQuery": [('PySide2.QtCore.Qt.InputMethodQuery',), ('PySide2.QtCore.Qt.InputMethodQuery', 'PySide2.support.signature.typing.Any')], + "QTextEdit.inputMethodQuery": [('PySide2.QtCore.Qt.InputMethodQuery',), ('PySide2.QtCore.Qt.InputMethodQuery', 'Any')], "QTextEdit.insertFromMimeData": ('PySide2.QtCore.QMimeData',), "QTextEdit.insertHtml": ('str',), "QTextEdit.insertPlainText": ('str',), @@ -11148,10 +11164,10 @@ if "PySide2.QtWidgets" in sys.modules: "QToolButton.toolButtonStyle": (), # class PySide2.QtWidgets.QToolTip: - "QToolTip.palette": (), "QToolTip.font": (), "QToolTip.hideText": (), "QToolTip.isVisible": (), + "QToolTip.palette": (), "QToolTip.setFont": ('PySide2.QtGui.QFont',), "QToolTip.setPalette": ('PySide2.QtGui.QPalette',), "QToolTip.showText": [('PySide2.QtCore.QPoint', 'str', 'PySide2.QtWidgets.QWidget'), ('PySide2.QtCore.QPoint', 'str', 'PySide2.QtWidgets.QWidget', 'PySide2.QtCore.QRect'), ('PySide2.QtCore.QPoint', 'str', 'PySide2.QtWidgets.QWidget', 'PySide2.QtCore.QRect', 'int')], @@ -11273,7 +11289,7 @@ if "PySide2.QtWidgets" in sys.modules: "QTreeWidget.expandItem": ('PySide2.QtWidgets.QTreeWidgetItem',), "QTreeWidget.findItems": ('str', 'MatchFlags', 'int'), "QTreeWidget.headerItem": (), - "QTreeWidget.indexFromItem": ['PySide2.QtWidgets.QTreeWidgetItem', 'int'], + "QTreeWidget.indexFromItem": ('PySide2.QtWidgets.QTreeWidgetItem', 'int'), "QTreeWidget.indexOfTopLevelItem": ('PySide2.QtWidgets.QTreeWidgetItem',), "QTreeWidget.insertTopLevelItem": ('int', 'PySide2.QtWidgets.QTreeWidgetItem'), "QTreeWidget.insertTopLevelItems": ('int', 'list'), @@ -11299,7 +11315,7 @@ if "PySide2.QtWidgets" in sys.modules: "QTreeWidget.setFirstItemColumnSpanned": ('PySide2.QtWidgets.QTreeWidgetItem', 'bool'), "QTreeWidget.setHeaderItem": ('PySide2.QtWidgets.QTreeWidgetItem',), "QTreeWidget.setHeaderLabel": ('str',), - "QTreeWidget.setHeaderLabels": ('PySide2.support.signature.typing.List',), + "QTreeWidget.setHeaderLabels": ('List[str]',), "QTreeWidget.setItemExpanded": ('PySide2.QtWidgets.QTreeWidgetItem', 'bool'), "QTreeWidget.setItemHidden": ('PySide2.QtWidgets.QTreeWidgetItem', 'bool'), "QTreeWidget.setItemSelected": ('PySide2.QtWidgets.QTreeWidgetItem', 'bool'), @@ -11315,7 +11331,7 @@ if "PySide2.QtWidgets" in sys.modules: "QTreeWidget.visualItemRect": ('PySide2.QtWidgets.QTreeWidgetItem',), # class PySide2.QtWidgets.QTreeWidgetItem: - "QTreeWidgetItem.__init__": [('PySide2.QtWidgets.QTreeWidget', 'PySide2.QtWidgets.QTreeWidgetItem', 'int'), ('PySide2.QtWidgets.QTreeWidget', 'PySide2.support.signature.typing.List', 'int'), ('PySide2.QtWidgets.QTreeWidget', 'int'), ('PySide2.QtWidgets.QTreeWidgetItem',), ('PySide2.QtWidgets.QTreeWidgetItem', 'PySide2.QtWidgets.QTreeWidgetItem', 'int'), ('PySide2.QtWidgets.QTreeWidgetItem', 'PySide2.support.signature.typing.List', 'int'), ('PySide2.QtWidgets.QTreeWidgetItem', 'int'), ('PySide2.support.signature.typing.List', 'int'), ('int',)], + "QTreeWidgetItem.__init__": [('List[str]', 'int'), ('PySide2.QtWidgets.QTreeWidget', 'List[str]', 'int'), ('PySide2.QtWidgets.QTreeWidget', 'PySide2.QtWidgets.QTreeWidgetItem', 'int'), ('PySide2.QtWidgets.QTreeWidget', 'int'), ('PySide2.QtWidgets.QTreeWidgetItem',), ('PySide2.QtWidgets.QTreeWidgetItem', 'List[str]', 'int'), ('PySide2.QtWidgets.QTreeWidgetItem', 'PySide2.QtWidgets.QTreeWidgetItem', 'int'), ('PySide2.QtWidgets.QTreeWidgetItem', 'int'), ('int',)], "QTreeWidgetItem.addChild": ('PySide2.QtWidgets.QTreeWidgetItem',), "QTreeWidgetItem.addChildren": ('list',), "QTreeWidgetItem.background": ('int',), @@ -11347,7 +11363,7 @@ if "PySide2.QtWidgets" in sys.modules: "QTreeWidgetItem.setBackgroundColor": ('int', 'PySide2.QtGui.QColor'), "QTreeWidgetItem.setCheckState": ('int', 'PySide2.QtCore.Qt.CheckState'), "QTreeWidgetItem.setChildIndicatorPolicy": ('PySide2.QtWidgets.QTreeWidgetItem.ChildIndicatorPolicy',), - "QTreeWidgetItem.setData": ('int', 'int', 'PySide2.support.signature.typing.Any'), + "QTreeWidgetItem.setData": ('int', 'int', 'Any'), "QTreeWidgetItem.setDisabled": ('bool',), "QTreeWidgetItem.setExpanded": ('bool',), "QTreeWidgetItem.setFirstColumnSpanned": ('bool',), @@ -11457,8 +11473,8 @@ if "PySide2.QtWidgets" in sys.modules: "QVBoxLayout.__init__": [(), ('PySide2.QtWidgets.QWidget',)], # class PySide2.QtWidgets.QWhatsThis: - "QWhatsThis.enterWhatsThisMode": (), "QWhatsThis.createAction": ('PySide2.QtCore.QObject',), + "QWhatsThis.enterWhatsThisMode": (), "QWhatsThis.hideText": (), "QWhatsThis.inWhatsThisMode": (), "QWhatsThis.leaveWhatsThisMode": (), @@ -11767,7 +11783,6 @@ if "PySide2.QtWidgets" in sys.modules: "QWizard.field": ('str',), "QWizard.hasVisitedPage": ('int',), "QWizard.initializePage": ('int',), - "QWizard.next": (), "QWizard.nextId": (), "QWizard.options": (), "QWizard.page": ('int',), @@ -11781,7 +11796,7 @@ if "PySide2.QtWidgets" in sys.modules: "QWizard.setButtonLayout": ('list',), "QWizard.setButtonText": ('PySide2.QtWidgets.QWizard.WizardButton', 'str'), "QWizard.setDefaultProperty": ('str', 'str', 'str'), - "QWizard.setField": ('str', 'PySide2.support.signature.typing.Any'), + "QWizard.setField": ('str', 'Any'), "QWizard.setOption": ('PySide2.QtWidgets.QWizard.WizardOption', 'bool'), "QWizard.setOptions": ('WizardOptions',), "QWizard.setPage": ('int', 'PySide2.QtWidgets.QWizardPage'), @@ -11816,7 +11831,7 @@ if "PySide2.QtWidgets" in sys.modules: "QWizardPage.registerField": ('str', 'PySide2.QtWidgets.QWidget', 'str', 'str'), "QWizardPage.setButtonText": ('PySide2.QtWidgets.QWizard.WizardButton', 'str'), "QWizardPage.setCommitPage": ('bool',), - "QWizardPage.setField": ('str', 'PySide2.support.signature.typing.Any'), + "QWizardPage.setField": ('str', 'Any'), "QWizardPage.setFinalPage": ('bool',), "QWizardPage.setPixmap": ('PySide2.QtWidgets.QWizard.WizardPixmap', 'PySide2.QtGui.QPixmap'), "QWizardPage.setSubTitle": ('str',), @@ -11875,7 +11890,7 @@ if "PySide2.QtPrintSupport" in sys.modules: "QPrintEngine.newPage": (), "QPrintEngine.printerState": (), "QPrintEngine.property": ('PySide2.QtPrintSupport.QPrintEngine.PrintEnginePropertyKey',), - "QPrintEngine.setProperty": ('PySide2.QtPrintSupport.QPrintEngine.PrintEnginePropertyKey', 'PySide2.support.signature.typing.Any'), + "QPrintEngine.setProperty": ('PySide2.QtPrintSupport.QPrintEngine.PrintEnginePropertyKey', 'Any'), # class PySide2.QtPrintSupport.QPrintPreviewDialog: "QPrintPreviewDialog.__init__": [('PySide2.QtPrintSupport.QPrinter', 'PySide2.QtWidgets.QWidget', 'WindowFlags'), ('PySide2.QtWidgets.QWidget', 'WindowFlags')], @@ -12122,7 +12137,7 @@ if "PySide2.QtSql" in sys.modules: "QSqlField.precision": (), "QSqlField.requiredStatus": (), "QSqlField.setAutoValue": ('bool',), - "QSqlField.setDefaultValue": ('PySide2.support.signature.typing.Any',), + "QSqlField.setDefaultValue": ('Any',), "QSqlField.setGenerated": ('bool',), "QSqlField.setLength": ('int',), "QSqlField.setName": ('str',), @@ -12132,7 +12147,7 @@ if "PySide2.QtSql" in sys.modules: "QSqlField.setRequiredStatus": ('PySide2.QtSql.QSqlField.RequiredStatus',), "QSqlField.setSqlType": ('int',), "QSqlField.setType": ('type',), - "QSqlField.setValue": ('PySide2.support.signature.typing.Any',), + "QSqlField.setValue": ('Any',), "QSqlField.type": (), "QSqlField.typeID": (), "QSqlField.value": (), @@ -12151,9 +12166,9 @@ if "PySide2.QtSql" in sys.modules: # class PySide2.QtSql.QSqlQuery: "QSqlQuery.__init__": [('PySide2.QtSql.QSqlDatabase',), ('PySide2.QtSql.QSqlQuery',), ('PySide2.QtSql.QSqlResult',), ('str', 'PySide2.QtSql.QSqlDatabase')], "QSqlQuery.__copy__": (), - "QSqlQuery.addBindValue": ('PySide2.support.signature.typing.Any', 'ParamType'), + "QSqlQuery.addBindValue": ('Any', 'ParamType'), "QSqlQuery.at": (), - "QSqlQuery.bindValue": [('int', 'PySide2.support.signature.typing.Any', 'ParamType'), ('str', 'PySide2.support.signature.typing.Any', 'ParamType')], + "QSqlQuery.bindValue": [('int', 'Any', 'ParamType'), ('str', 'Any', 'ParamType')], "QSqlQuery.boundValue": [('int',), ('str',)], "QSqlQuery.boundValues": (), "QSqlQuery.clear": (), @@ -12172,7 +12187,6 @@ if "PySide2.QtSql" in sys.modules: "QSqlQuery.lastError": (), "QSqlQuery.lastInsertId": (), "QSqlQuery.lastQuery": (), - "QSqlQuery.next": (), "QSqlQuery.nextResult": (), "QSqlQuery.numRowsAffected": (), "QSqlQuery.numericalPrecisionPolicy": (), @@ -12212,7 +12226,7 @@ if "PySide2.QtSql" in sys.modules: "QSqlQueryModel.record": [(), ('int',)], "QSqlQueryModel.removeColumns": ('int', 'int', 'PySide2.QtCore.QModelIndex'), "QSqlQueryModel.rowCount": ('PySide2.QtCore.QModelIndex',), - "QSqlQueryModel.setHeaderData": ('int', 'PySide2.QtCore.Qt.Orientation', 'PySide2.support.signature.typing.Any', 'int'), + "QSqlQueryModel.setHeaderData": ('int', 'PySide2.QtCore.Qt.Orientation', 'Any', 'int'), "QSqlQueryModel.setLastError": ('PySide2.QtSql.QSqlError',), "QSqlQueryModel.setQuery": [('PySide2.QtSql.QSqlQuery',), ('str', 'PySide2.QtSql.QSqlDatabase')], @@ -12236,7 +12250,7 @@ if "PySide2.QtSql" in sys.modules: "QSqlRecord.replace": ('int', 'PySide2.QtSql.QSqlField'), "QSqlRecord.setGenerated": [('int', 'bool'), ('str', 'bool')], "QSqlRecord.setNull": [('int',), ('str',)], - "QSqlRecord.setValue": [('int', 'PySide2.support.signature.typing.Any'), ('str', 'PySide2.support.signature.typing.Any')], + "QSqlRecord.setValue": [('int', 'Any'), ('str', 'Any')], "QSqlRecord.value": [('int',), ('str',)], # class PySide2.QtSql.QSqlRelation: @@ -12265,7 +12279,7 @@ if "PySide2.QtSql" in sys.modules: "QSqlRelationalTableModel.revertRow": ('int',), "QSqlRelationalTableModel.select": (), "QSqlRelationalTableModel.selectStatement": (), - "QSqlRelationalTableModel.setData": ('PySide2.QtCore.QModelIndex', 'PySide2.support.signature.typing.Any', 'int'), + "QSqlRelationalTableModel.setData": ('PySide2.QtCore.QModelIndex', 'Any', 'int'), "QSqlRelationalTableModel.setJoinMode": ('PySide2.QtSql.QSqlRelationalTableModel.JoinMode',), "QSqlRelationalTableModel.setRelation": ('int', 'PySide2.QtSql.QSqlRelation'), "QSqlRelationalTableModel.setTable": ('str',), @@ -12273,9 +12287,9 @@ if "PySide2.QtSql" in sys.modules: # class PySide2.QtSql.QSqlResult: "QSqlResult.__init__": ('PySide2.QtSql.QSqlDriver',), - "QSqlResult.addBindValue": ('PySide2.support.signature.typing.Any', 'ParamType'), + "QSqlResult.addBindValue": ('Any', 'ParamType'), "QSqlResult.at": (), - "QSqlResult.bindValue": [('int', 'PySide2.support.signature.typing.Any', 'ParamType'), ('str', 'PySide2.support.signature.typing.Any', 'ParamType')], + "QSqlResult.bindValue": [('int', 'Any', 'ParamType'), ('str', 'Any', 'ParamType')], "QSqlResult.bindValueType": [('int',), ('str',)], "QSqlResult.bindingSyntax": (), "QSqlResult.boundValue": [('int',), ('str',)], @@ -12350,7 +12364,7 @@ if "PySide2.QtSql" in sys.modules: "QSqlTableModel.select": (), "QSqlTableModel.selectRow": ('int',), "QSqlTableModel.selectStatement": (), - "QSqlTableModel.setData": ('PySide2.QtCore.QModelIndex', 'PySide2.support.signature.typing.Any', 'int'), + "QSqlTableModel.setData": ('PySide2.QtCore.QModelIndex', 'Any', 'int'), "QSqlTableModel.setEditStrategy": ('PySide2.QtSql.QSqlTableModel.EditStrategy',), "QSqlTableModel.setFilter": ('str',), "QSqlTableModel.setPrimaryKey": ('PySide2.QtSql.QSqlIndex',), @@ -12415,7 +12429,7 @@ if "PySide2.QtNetwork" in sys.modules: "QAbstractSocket.setReadBufferSize": ('int',), "QAbstractSocket.setSocketDescriptor": ('int', 'PySide2.QtNetwork.QAbstractSocket.SocketState', 'OpenMode'), "QAbstractSocket.setSocketError": ('PySide2.QtNetwork.QAbstractSocket.SocketError',), - "QAbstractSocket.setSocketOption": ('PySide2.QtNetwork.QAbstractSocket.SocketOption', 'PySide2.support.signature.typing.Any'), + "QAbstractSocket.setSocketOption": ('PySide2.QtNetwork.QAbstractSocket.SocketOption', 'Any'), "QAbstractSocket.setSocketState": ('PySide2.QtNetwork.QAbstractSocket.SocketState',), "QAbstractSocket.socketDescriptor": (), "QAbstractSocket.socketOption": ('PySide2.QtNetwork.QAbstractSocket.SocketOption',), @@ -12435,7 +12449,7 @@ if "PySide2.QtNetwork" in sys.modules: "QAuthenticator.options": (), "QAuthenticator.password": (), "QAuthenticator.realm": (), - "QAuthenticator.setOption": ('str', 'PySide2.support.signature.typing.Any'), + "QAuthenticator.setOption": ('str', 'Any'), "QAuthenticator.setPassword": ('str',), "QAuthenticator.setRealm": ('str',), "QAuthenticator.setUser": ('str',), @@ -12446,7 +12460,7 @@ if "PySide2.QtNetwork" in sys.modules: "QHostAddress.__copy__": (), "QHostAddress.clear": (), "QHostAddress.isEqual": ('PySide2.QtNetwork.QHostAddress', 'ConversionMode'), - "QHostAddress.isInSubnet": [('PySide2.QtNetwork.QHostAddress', 'int'), ('PySide2.support.signature.typing.Tuple',)], + "QHostAddress.isInSubnet": [('PySide2.QtNetwork.QHostAddress', 'int'), ('Tuple[Any, Any]',)], "QHostAddress.isLoopback": (), "QHostAddress.isMulticast": (), "QHostAddress.isNull": (), @@ -12704,7 +12718,7 @@ if "PySide2.QtNetwork" in sys.modules: "QNetworkProxy.rawHeaderList": (), "QNetworkProxy.setApplicationProxy": ('PySide2.QtNetwork.QNetworkProxy',), "QNetworkProxy.setCapabilities": ('Capabilities',), - "QNetworkProxy.setHeader": ('PySide2.QtNetwork.QNetworkRequest.KnownHeaders', 'PySide2.support.signature.typing.Any'), + "QNetworkProxy.setHeader": ('PySide2.QtNetwork.QNetworkRequest.KnownHeaders', 'Any'), "QNetworkProxy.setHostName": ('str',), "QNetworkProxy.setPassword": ('str',), "QNetworkProxy.setPort": ('int',), @@ -12761,10 +12775,10 @@ if "PySide2.QtNetwork" in sys.modules: "QNetworkReply.rawHeaderList": (), "QNetworkReply.readBufferSize": (), "QNetworkReply.request": (), - "QNetworkReply.setAttribute": ('PySide2.QtNetwork.QNetworkRequest.Attribute', 'PySide2.support.signature.typing.Any'), + "QNetworkReply.setAttribute": ('PySide2.QtNetwork.QNetworkRequest.Attribute', 'Any'), "QNetworkReply.setError": ('PySide2.QtNetwork.QNetworkReply.NetworkError', 'str'), "QNetworkReply.setFinished": ('bool',), - "QNetworkReply.setHeader": ('PySide2.QtNetwork.QNetworkRequest.KnownHeaders', 'PySide2.support.signature.typing.Any'), + "QNetworkReply.setHeader": ('PySide2.QtNetwork.QNetworkRequest.KnownHeaders', 'Any'), "QNetworkReply.setOperation": ('PySide2.QtNetwork.QNetworkAccessManager.Operation',), "QNetworkReply.setRawHeader": ('PySide2.QtCore.QByteArray', 'PySide2.QtCore.QByteArray'), "QNetworkReply.setReadBufferSize": ('int',), @@ -12780,7 +12794,7 @@ if "PySide2.QtNetwork" in sys.modules: # class PySide2.QtNetwork.QNetworkRequest: "QNetworkRequest.__init__": [('PySide2.QtCore.QUrl',), ('PySide2.QtNetwork.QNetworkRequest',)], "QNetworkRequest.__copy__": (), - "QNetworkRequest.attribute": ('PySide2.QtNetwork.QNetworkRequest.Attribute', 'PySide2.support.signature.typing.Any'), + "QNetworkRequest.attribute": ('PySide2.QtNetwork.QNetworkRequest.Attribute', 'Any'), "QNetworkRequest.hasRawHeader": ('PySide2.QtCore.QByteArray',), "QNetworkRequest.header": ('PySide2.QtNetwork.QNetworkRequest.KnownHeaders',), "QNetworkRequest.maximumRedirectsAllowed": (), @@ -12788,8 +12802,8 @@ if "PySide2.QtNetwork" in sys.modules: "QNetworkRequest.priority": (), "QNetworkRequest.rawHeader": ('PySide2.QtCore.QByteArray',), "QNetworkRequest.rawHeaderList": (), - "QNetworkRequest.setAttribute": ('PySide2.QtNetwork.QNetworkRequest.Attribute', 'PySide2.support.signature.typing.Any'), - "QNetworkRequest.setHeader": ('PySide2.QtNetwork.QNetworkRequest.KnownHeaders', 'PySide2.support.signature.typing.Any'), + "QNetworkRequest.setAttribute": ('PySide2.QtNetwork.QNetworkRequest.Attribute', 'Any'), + "QNetworkRequest.setHeader": ('PySide2.QtNetwork.QNetworkRequest.KnownHeaders', 'Any'), "QNetworkRequest.setMaximumRedirectsAllowed": ('int',), "QNetworkRequest.setOriginatingObject": ('PySide2.QtCore.QObject',), "QNetworkRequest.setPriority": ('PySide2.QtNetwork.QNetworkRequest.Priority',), @@ -12818,7 +12832,7 @@ if "PySide2.QtNetwork" in sys.modules: "QNetworkSession.open": (), "QNetworkSession.reject": (), "QNetworkSession.sessionProperty": ('str',), - "QNetworkSession.setSessionProperty": ('str', 'PySide2.support.signature.typing.Any'), + "QNetworkSession.setSessionProperty": ('str', 'Any'), "QNetworkSession.state": (), "QNetworkSession.stop": (), "QNetworkSession.usagePolicies": (), @@ -12983,7 +12997,7 @@ if "PySide2.QtNetwork" in sys.modules: "QSslSocket.setProtocol": ('PySide2.QtNetwork.QSsl.SslProtocol',), "QSslSocket.setReadBufferSize": ('int',), "QSslSocket.setSocketDescriptor": ('int', 'PySide2.QtNetwork.QAbstractSocket.SocketState', 'OpenMode'), - "QSslSocket.setSocketOption": ('PySide2.QtNetwork.QAbstractSocket.SocketOption', 'PySide2.support.signature.typing.Any'), + "QSslSocket.setSocketOption": ('PySide2.QtNetwork.QAbstractSocket.SocketOption', 'Any'), "QSslSocket.setSslConfiguration": ('PySide2.QtNetwork.QSslConfiguration',), "QSslSocket.socketOption": ('PySide2.QtNetwork.QAbstractSocket.SocketOption',), "QSslSocket.sslConfiguration": (), @@ -13046,9 +13060,8 @@ if "PySide2.QtTest" in sys.modules: dict.update({ # class PySide2.QtTest.QTest: - "QTest.waitForEvents": (), "QTest.addColumnInternal": ('int', 'str'), - "QTest.asciiToKey": ('PySide2.support.signature.typing.Union[str, int]',), + "QTest.asciiToKey": ('Union[str, int]',), "QTest.compare_string_helper": ('str', 'str', 'str', 'str', 'str', 'int'), "QTest.createTouchDevice": ('PySide2.QtGui.QTouchDevice.DeviceType',), "QTest.currentAppName": (), @@ -13056,11 +13069,11 @@ if "PySide2.QtTest" in sys.modules: "QTest.currentTestFailed": (), "QTest.currentTestFunction": (), "QTest.ignoreMessage": [('PySide2.QtCore.QtMsgType', 'PySide2.QtCore.QRegularExpression'), ('PySide2.QtCore.QtMsgType', 'str')], - "QTest.keyClick": [('PySide2.QtGui.QWindow', 'PySide2.QtCore.Qt.Key', 'KeyboardModifiers', 'int'), ('PySide2.QtGui.QWindow', 'PySide2.support.signature.typing.Union[str, int]', 'KeyboardModifiers', 'int'), ('PySide2.QtWidgets.QWidget', 'PySide2.QtCore.Qt.Key', 'KeyboardModifiers', 'int'), ('PySide2.QtWidgets.QWidget', 'PySide2.support.signature.typing.Union[str, int]', 'KeyboardModifiers', 'int')], + "QTest.keyClick": [('PySide2.QtGui.QWindow', 'PySide2.QtCore.Qt.Key', 'KeyboardModifiers', 'int'), ('PySide2.QtGui.QWindow', 'Union[str, int]', 'KeyboardModifiers', 'int'), ('PySide2.QtWidgets.QWidget', 'PySide2.QtCore.Qt.Key', 'KeyboardModifiers', 'int'), ('PySide2.QtWidgets.QWidget', 'Union[str, int]', 'KeyboardModifiers', 'int')], "QTest.keyClicks": ('PySide2.QtWidgets.QWidget', 'str', 'KeyboardModifiers', 'int'), - "QTest.keyEvent": [('PySide2.QtTest.QTest.KeyAction', 'PySide2.QtGui.QWindow', 'PySide2.QtCore.Qt.Key', 'KeyboardModifiers', 'int'), ('PySide2.QtTest.QTest.KeyAction', 'PySide2.QtGui.QWindow', 'PySide2.support.signature.typing.Union[str, int]', 'KeyboardModifiers', 'int'), ('PySide2.QtTest.QTest.KeyAction', 'PySide2.QtWidgets.QWidget', 'PySide2.QtCore.Qt.Key', 'KeyboardModifiers', 'int'), ('PySide2.QtTest.QTest.KeyAction', 'PySide2.QtWidgets.QWidget', 'PySide2.support.signature.typing.Union[str, int]', 'KeyboardModifiers', 'int')], - "QTest.keyPress": [('PySide2.QtGui.QWindow', 'PySide2.QtCore.Qt.Key', 'KeyboardModifiers', 'int'), ('PySide2.QtGui.QWindow', 'PySide2.support.signature.typing.Union[str, int]', 'KeyboardModifiers', 'int'), ('PySide2.QtWidgets.QWidget', 'PySide2.QtCore.Qt.Key', 'KeyboardModifiers', 'int'), ('PySide2.QtWidgets.QWidget', 'PySide2.support.signature.typing.Union[str, int]', 'KeyboardModifiers', 'int')], - "QTest.keyRelease": [('PySide2.QtGui.QWindow', 'PySide2.QtCore.Qt.Key', 'KeyboardModifiers', 'int'), ('PySide2.QtGui.QWindow', 'PySide2.support.signature.typing.Union[str, int]', 'KeyboardModifiers', 'int'), ('PySide2.QtWidgets.QWidget', 'PySide2.QtCore.Qt.Key', 'KeyboardModifiers', 'int'), ('PySide2.QtWidgets.QWidget', 'PySide2.support.signature.typing.Union[str, int]', 'KeyboardModifiers', 'int')], + "QTest.keyEvent": [('PySide2.QtTest.QTest.KeyAction', 'PySide2.QtGui.QWindow', 'PySide2.QtCore.Qt.Key', 'KeyboardModifiers', 'int'), ('PySide2.QtTest.QTest.KeyAction', 'PySide2.QtGui.QWindow', 'Union[str, int]', 'KeyboardModifiers', 'int'), ('PySide2.QtTest.QTest.KeyAction', 'PySide2.QtWidgets.QWidget', 'PySide2.QtCore.Qt.Key', 'KeyboardModifiers', 'int'), ('PySide2.QtTest.QTest.KeyAction', 'PySide2.QtWidgets.QWidget', 'Union[str, int]', 'KeyboardModifiers', 'int')], + "QTest.keyPress": [('PySide2.QtGui.QWindow', 'PySide2.QtCore.Qt.Key', 'KeyboardModifiers', 'int'), ('PySide2.QtGui.QWindow', 'Union[str, int]', 'KeyboardModifiers', 'int'), ('PySide2.QtWidgets.QWidget', 'PySide2.QtCore.Qt.Key', 'KeyboardModifiers', 'int'), ('PySide2.QtWidgets.QWidget', 'Union[str, int]', 'KeyboardModifiers', 'int')], + "QTest.keyRelease": [('PySide2.QtGui.QWindow', 'PySide2.QtCore.Qt.Key', 'KeyboardModifiers', 'int'), ('PySide2.QtGui.QWindow', 'Union[str, int]', 'KeyboardModifiers', 'int'), ('PySide2.QtWidgets.QWidget', 'PySide2.QtCore.Qt.Key', 'KeyboardModifiers', 'int'), ('PySide2.QtWidgets.QWidget', 'Union[str, int]', 'KeyboardModifiers', 'int')], "QTest.keyToAscii": ('PySide2.QtCore.Qt.Key',), "QTest.mouseClick": [('PySide2.QtGui.QWindow', 'PySide2.QtCore.Qt.MouseButton', 'KeyboardModifiers', 'PySide2.QtCore.QPoint', 'int'), ('PySide2.QtWidgets.QWidget', 'PySide2.QtCore.Qt.MouseButton', 'KeyboardModifiers', 'PySide2.QtCore.QPoint', 'int')], "QTest.mouseDClick": [('PySide2.QtGui.QWindow', 'PySide2.QtCore.Qt.MouseButton', 'KeyboardModifiers', 'PySide2.QtCore.QPoint', 'int'), ('PySide2.QtWidgets.QWidget', 'PySide2.QtCore.Qt.MouseButton', 'KeyboardModifiers', 'PySide2.QtCore.QPoint', 'int')], @@ -13070,18 +13083,19 @@ if "PySide2.QtTest" in sys.modules: "QTest.mouseRelease": [('PySide2.QtGui.QWindow', 'PySide2.QtCore.Qt.MouseButton', 'KeyboardModifiers', 'PySide2.QtCore.QPoint', 'int'), ('PySide2.QtWidgets.QWidget', 'PySide2.QtCore.Qt.MouseButton', 'KeyboardModifiers', 'PySide2.QtCore.QPoint', 'int')], "QTest.qElementData": ('str', 'int'), "QTest.qExpectFail": ('str', 'str', 'PySide2.QtTest.QTest.TestFailMode', 'str', 'int'), - "QTest.qFindTestData": ['int', 'str', 'str', 'str'], + "QTest.qFindTestData": ('str', 'str', 'int', 'str'), "QTest.qGlobalData": ('str', 'int'), "QTest.qSkip": ('str', 'str', 'int'), "QTest.qWaitForWindowActive": ('PySide2.QtWidgets.QWidget', 'int'), "QTest.qWaitForWindowExposed": ('PySide2.QtWidgets.QWidget', 'int'), - "QTest.sendKeyEvent": [('PySide2.QtTest.QTest.KeyAction', 'PySide2.QtGui.QWindow', 'PySide2.QtCore.Qt.Key', 'PySide2.support.signature.typing.Union[str, int]', 'KeyboardModifiers', 'int'), ('PySide2.QtTest.QTest.KeyAction', 'PySide2.QtGui.QWindow', 'PySide2.QtCore.Qt.Key', 'str', 'KeyboardModifiers', 'int'), ('PySide2.QtTest.QTest.KeyAction', 'PySide2.QtWidgets.QWidget', 'PySide2.QtCore.Qt.Key', 'PySide2.support.signature.typing.Union[str, int]', 'KeyboardModifiers', 'int'), ('PySide2.QtTest.QTest.KeyAction', 'PySide2.QtWidgets.QWidget', 'PySide2.QtCore.Qt.Key', 'str', 'KeyboardModifiers', 'int')], + "QTest.sendKeyEvent": [('PySide2.QtTest.QTest.KeyAction', 'PySide2.QtGui.QWindow', 'PySide2.QtCore.Qt.Key', 'Union[str, int]', 'KeyboardModifiers', 'int'), ('PySide2.QtTest.QTest.KeyAction', 'PySide2.QtGui.QWindow', 'PySide2.QtCore.Qt.Key', 'str', 'KeyboardModifiers', 'int'), ('PySide2.QtTest.QTest.KeyAction', 'PySide2.QtWidgets.QWidget', 'PySide2.QtCore.Qt.Key', 'Union[str, int]', 'KeyboardModifiers', 'int'), ('PySide2.QtTest.QTest.KeyAction', 'PySide2.QtWidgets.QWidget', 'PySide2.QtCore.Qt.Key', 'str', 'KeyboardModifiers', 'int')], "QTest.setBenchmarkResult": ('float', 'PySide2.QtTest.QTest.QBenchmarkMetric'), "QTest.setMainSourcePath": ('str', 'str'), "QTest.simulateEvent": [('PySide2.QtGui.QWindow', 'bool', 'int', 'KeyboardModifiers', 'str', 'bool', 'int'), ('PySide2.QtWidgets.QWidget', 'bool', 'int', 'KeyboardModifiers', 'str', 'bool', 'int')], "QTest.testObject": (), "QTest.toPrettyCString": ('str', 'int'), "QTest.touchEvent": [('PySide2.QtGui.QWindow', 'PySide2.QtGui.QTouchDevice', 'bool'), ('PySide2.QtWidgets.QWidget', 'PySide2.QtGui.QTouchDevice', 'bool')], + "QTest.waitForEvents": (), }) # Module PySide2.QtConcurrent @@ -13096,9 +13110,9 @@ if "PySide2.QtMacExtras" in sys.modules: dict.update({ # class PySide2.QtMacExtras.QMacPasteboardMime: - "QMacPasteboardMime.__init__": ('PySide2.support.signature.typing.Union[str, int]',), + "QMacPasteboardMime.__init__": ('Union[str, int]',), "QMacPasteboardMime.canConvert": ('str', 'str'), - "QMacPasteboardMime.convertFromMime": ('str', 'PySide2.support.signature.typing.Any', 'str'), + "QMacPasteboardMime.convertFromMime": ('str', 'Any', 'str'), "QMacPasteboardMime.convertToMime": ('str', 'list', 'str'), "QMacPasteboardMime.convertorName": (), "QMacPasteboardMime.count": ('PySide2.QtCore.QMimeData',), @@ -13460,7 +13474,6 @@ if "PySide2.QtXml" in sys.modules: "QXmlInputSource.data": (), "QXmlInputSource.fetchData": (), "QXmlInputSource.fromRawData": ('PySide2.QtCore.QByteArray', 'bool'), - "QXmlInputSource.next": (), "QXmlInputSource.reset": (), "QXmlInputSource.setData": [('PySide2.QtCore.QByteArray',), ('str',)], @@ -13511,7 +13524,7 @@ if "PySide2.QtXml" in sys.modules: "QXmlReader.hasFeature": ('str',), "QXmlReader.hasProperty": ('str',), "QXmlReader.lexicalHandler": (), - "QXmlReader.parse": ['PySide2.QtXml.QXmlInputSource'], + "QXmlReader.parse": ('PySide2.QtXml.QXmlInputSource',), "QXmlReader.property": ('str', 'bool'), "QXmlReader.setContentHandler": ('PySide2.QtXml.QXmlContentHandler',), "QXmlReader.setDTDHandler": ('PySide2.QtXml.QXmlDTDHandler',), @@ -13582,7 +13595,7 @@ if "PySide2.QtXmlPatterns" in sys.modules: # class PySide2.QtXmlPatterns.QAbstractXmlReceiver: "QAbstractXmlReceiver.__init__": (), - "QAbstractXmlReceiver.atomicValue": ('PySide2.support.signature.typing.Any',), + "QAbstractXmlReceiver.atomicValue": ('Any',), "QAbstractXmlReceiver.attribute": ('PySide2.QtXmlPatterns.QXmlName', 'str'), "QAbstractXmlReceiver.characters": ('str',), "QAbstractXmlReceiver.comment": ('str',), @@ -13609,7 +13622,7 @@ if "PySide2.QtXmlPatterns" in sys.modules: # class PySide2.QtXmlPatterns.QXmlFormatter: "QXmlFormatter.__init__": ('PySide2.QtXmlPatterns.QXmlQuery', 'PySide2.QtCore.QIODevice'), - "QXmlFormatter.atomicValue": ('PySide2.support.signature.typing.Any',), + "QXmlFormatter.atomicValue": ('Any',), "QXmlFormatter.attribute": ('PySide2.QtXmlPatterns.QXmlName', 'str'), "QXmlFormatter.characters": ('str',), "QXmlFormatter.comment": ('str',), @@ -13624,7 +13637,7 @@ if "PySide2.QtXmlPatterns" in sys.modules: "QXmlFormatter.startOfSequence": (), # class PySide2.QtXmlPatterns.QXmlItem: - "QXmlItem.__init__": [(), ('PySide2.QtXmlPatterns.QXmlItem',), ('PySide2.QtXmlPatterns.QXmlNodeModelIndex',), ('PySide2.support.signature.typing.Any',)], + "QXmlItem.__init__": [(), ('Any',), ('PySide2.QtXmlPatterns.QXmlItem',), ('PySide2.QtXmlPatterns.QXmlNodeModelIndex',)], "QXmlItem.__copy__": (), "QXmlItem.isAtomicValue": (), "QXmlItem.isNode": (), @@ -13677,7 +13690,6 @@ if "PySide2.QtXmlPatterns" in sys.modules: "QXmlResultItems.__init__": (), "QXmlResultItems.current": (), "QXmlResultItems.hasError": (), - "QXmlResultItems.next": (), # class PySide2.QtXmlPatterns.QXmlSchema: "QXmlSchema.__init__": [(), ('PySide2.QtXmlPatterns.QXmlSchema',)], @@ -13703,7 +13715,7 @@ if "PySide2.QtXmlPatterns" in sys.modules: # class PySide2.QtXmlPatterns.QXmlSerializer: "QXmlSerializer.__init__": ('PySide2.QtXmlPatterns.QXmlQuery', 'PySide2.QtCore.QIODevice'), - "QXmlSerializer.atomicValue": ('PySide2.support.signature.typing.Any',), + "QXmlSerializer.atomicValue": ('Any',), "QXmlSerializer.attribute": ('PySide2.QtXmlPatterns.QXmlName', 'str'), "QXmlSerializer.characters": ('str',), "QXmlSerializer.codec": (), @@ -13725,11 +13737,11 @@ if "PySide2.QtHelp" in sys.modules: dict.update({ # class PySide2.QtHelp.QHelpContentItem: - "QHelpContentItem.parent": (), "QHelpContentItem.__copy__": (), "QHelpContentItem.child": ('int',), "QHelpContentItem.childCount": (), "QHelpContentItem.childPosition": ('PySide2.QtHelp.QHelpContentItem',), + "QHelpContentItem.parent": (), "QHelpContentItem.row": (), "QHelpContentItem.title": (), "QHelpContentItem.url": (), @@ -13757,17 +13769,17 @@ if "PySide2.QtHelp" in sys.modules: # class PySide2.QtHelp.QHelpEngineCore: "QHelpEngineCore.__init__": ('str', 'PySide2.QtCore.QObject'), - "QHelpEngineCore.addCustomFilter": ('str', 'PySide2.support.signature.typing.List'), + "QHelpEngineCore.addCustomFilter": ('str', 'List[str]'), "QHelpEngineCore.autoSaveFilter": (), "QHelpEngineCore.collectionFile": (), "QHelpEngineCore.copyCollectionFile": ('str',), "QHelpEngineCore.currentFilter": (), "QHelpEngineCore.customFilters": (), - "QHelpEngineCore.customValue": ('str', 'PySide2.support.signature.typing.Any'), + "QHelpEngineCore.customValue": ('str', 'Any'), "QHelpEngineCore.documentationFileName": ('str',), "QHelpEngineCore.error": (), "QHelpEngineCore.fileData": ('PySide2.QtCore.QUrl',), - "QHelpEngineCore.files": ('str', 'PySide2.support.signature.typing.List', 'str'), + "QHelpEngineCore.files": ('str', 'List[str]', 'str'), "QHelpEngineCore.filterAttributeSets": ('str',), "QHelpEngineCore.filterAttributes": [(), ('str',)], "QHelpEngineCore.findFile": ('PySide2.QtCore.QUrl',), @@ -13782,15 +13794,15 @@ if "PySide2.QtHelp" in sys.modules: "QHelpEngineCore.setAutoSaveFilter": ('bool',), "QHelpEngineCore.setCollectionFile": ('str',), "QHelpEngineCore.setCurrentFilter": ('str',), - "QHelpEngineCore.setCustomValue": ('str', 'PySide2.support.signature.typing.Any'), + "QHelpEngineCore.setCustomValue": ('str', 'Any'), "QHelpEngineCore.setupData": (), "QHelpEngineCore.unregisterDocumentation": ('str',), # class PySide2.QtHelp.QHelpIndexModel: - "QHelpIndexModel.linksForKeyword": ('str',), "QHelpIndexModel.createIndex": [('int', 'int', 'int'), ('int', 'int', 'object'), ('str',)], "QHelpIndexModel.filter": ('str', 'str'), "QHelpIndexModel.isCreatingIndex": (), + "QHelpIndexModel.linksForKeyword": ('str',), # class PySide2.QtHelp.QHelpIndexWidget: "QHelpIndexWidget.activateCurrentItem": (), @@ -13810,9 +13822,10 @@ if "PySide2.QtHelp" in sys.modules: "QHelpSearchEngine.search": [('list',), ('str',)], "QHelpSearchEngine.searchInput": (), "QHelpSearchEngine.searchResultCount": (), + "QHelpSearchEngine.searchResults": ('int', 'int'), # class PySide2.QtHelp.QHelpSearchQuery: - "QHelpSearchQuery.__init__": [(), ('PySide2.QtHelp.QHelpSearchQuery',), ('PySide2.QtHelp.QHelpSearchQuery.FieldName', 'PySide2.support.signature.typing.List')], + "QHelpSearchQuery.__init__": [(), ('PySide2.QtHelp.QHelpSearchQuery',), ('PySide2.QtHelp.QHelpSearchQuery.FieldName', 'List[str]')], "QHelpSearchQuery.__copy__": (), # class PySide2.QtHelp.QHelpSearchQueryWidget: @@ -13828,9 +13841,15 @@ if "PySide2.QtHelp" in sys.modules: "QHelpSearchQueryWidget.setQuery": ('list',), "QHelpSearchQueryWidget.setSearchInput": ('str',), + # class PySide2.QtHelp.QHelpSearchResult: + "QHelpSearchResult.__init__": [(), ('PySide2.QtCore.QUrl', 'str', 'str'), ('PySide2.QtHelp.QHelpSearchResult',)], + "QHelpSearchResult.snippet": (), + "QHelpSearchResult.title": (), + "QHelpSearchResult.url": (), + # class PySide2.QtHelp.QHelpSearchResultWidget: - "QHelpSearchResultWidget.linkAt": ('PySide2.QtCore.QPoint',), "QHelpSearchResultWidget.changeEvent": ('PySide2.QtCore.QEvent',), + "QHelpSearchResultWidget.linkAt": ('PySide2.QtCore.QPoint',), }) # Module PySide2.QtMultimedia @@ -13932,7 +13951,7 @@ if "PySide2.QtMultimedia" in sys.modules: "QAudioBuffer.__copy__": (), "QAudioBuffer.byteCount": (), "QAudioBuffer.constData": (), - "QAudioBuffer.data": [], + "QAudioBuffer.data": (), "QAudioBuffer.duration": (), "QAudioBuffer.format": (), "QAudioBuffer.frameCount": (), @@ -13947,7 +13966,7 @@ if "PySide2.QtMultimedia" in sys.modules: "QAudioDecoder.bufferAvailable": (), "QAudioDecoder.duration": (), "QAudioDecoder.errorString": (), - "QAudioDecoder.hasSupport": ('str', 'PySide2.support.signature.typing.List'), + "QAudioDecoder.hasSupport": ('str', 'List[str]'), "QAudioDecoder.position": (), "QAudioDecoder.read": (), "QAudioDecoder.setAudioFormat": ('PySide2.QtMultimedia.QAudioFormat',), @@ -14010,7 +14029,7 @@ if "PySide2.QtMultimedia" in sys.modules: "QAudioEncoderSettings.setChannelCount": ('int',), "QAudioEncoderSettings.setCodec": ('str',), "QAudioEncoderSettings.setEncodingMode": ('PySide2.QtMultimedia.QMultimedia.EncodingMode',), - "QAudioEncoderSettings.setEncodingOption": ('str', 'PySide2.support.signature.typing.Any'), + "QAudioEncoderSettings.setEncodingOption": ('str', 'Any'), "QAudioEncoderSettings.setEncodingOptions": ('dict',), "QAudioEncoderSettings.setQuality": ('PySide2.QtMultimedia.QMultimedia.EncodingQuality',), "QAudioEncoderSettings.setSampleRate": ('int',), @@ -14180,7 +14199,7 @@ if "PySide2.QtMultimedia" in sys.modules: "QCameraExposureControl.actualValue": ('PySide2.QtMultimedia.QCameraExposureControl.ExposureParameter',), "QCameraExposureControl.isParameterSupported": ('PySide2.QtMultimedia.QCameraExposureControl.ExposureParameter',), "QCameraExposureControl.requestedValue": ('PySide2.QtMultimedia.QCameraExposureControl.ExposureParameter',), - "QCameraExposureControl.setValue": ('PySide2.QtMultimedia.QCameraExposureControl.ExposureParameter', 'PySide2.support.signature.typing.Any'), + "QCameraExposureControl.setValue": ('PySide2.QtMultimedia.QCameraExposureControl.ExposureParameter', 'Any'), # class PySide2.QtMultimedia.QCameraFocusZone: "QCameraFocusZone.__init__": [(), ('PySide2.QtCore.QRectF', 'PySide2.QtMultimedia.QCameraFocusZone.FocusZoneStatus'), ('PySide2.QtMultimedia.QCameraFocusZone',)], @@ -14222,9 +14241,9 @@ if "PySide2.QtMultimedia" in sys.modules: # class PySide2.QtMultimedia.QCameraImageProcessingControl: "QCameraImageProcessingControl.__init__": ('PySide2.QtCore.QObject',), "QCameraImageProcessingControl.isParameterSupported": ('PySide2.QtMultimedia.QCameraImageProcessingControl.ProcessingParameter',), - "QCameraImageProcessingControl.isParameterValueSupported": ('PySide2.QtMultimedia.QCameraImageProcessingControl.ProcessingParameter', 'PySide2.support.signature.typing.Any'), + "QCameraImageProcessingControl.isParameterValueSupported": ('PySide2.QtMultimedia.QCameraImageProcessingControl.ProcessingParameter', 'Any'), "QCameraImageProcessingControl.parameter": ('PySide2.QtMultimedia.QCameraImageProcessingControl.ProcessingParameter',), - "QCameraImageProcessingControl.setParameter": ('PySide2.QtMultimedia.QCameraImageProcessingControl.ProcessingParameter', 'PySide2.support.signature.typing.Any'), + "QCameraImageProcessingControl.setParameter": ('PySide2.QtMultimedia.QCameraImageProcessingControl.ProcessingParameter', 'Any'), # class PySide2.QtMultimedia.QCameraInfo: "QCameraInfo.__init__": [('PySide2.QtCore.QByteArray',), ('PySide2.QtMultimedia.QCamera',), ('PySide2.QtMultimedia.QCameraInfo',)], @@ -14268,7 +14287,7 @@ if "PySide2.QtMultimedia" in sys.modules: # class PySide2.QtMultimedia.QCameraViewfinderSettingsControl: "QCameraViewfinderSettingsControl.__init__": ('PySide2.QtCore.QObject',), "QCameraViewfinderSettingsControl.isViewfinderParameterSupported": ('PySide2.QtMultimedia.QCameraViewfinderSettingsControl.ViewfinderParameter',), - "QCameraViewfinderSettingsControl.setViewfinderParameter": ('PySide2.QtMultimedia.QCameraViewfinderSettingsControl.ViewfinderParameter', 'PySide2.support.signature.typing.Any'), + "QCameraViewfinderSettingsControl.setViewfinderParameter": ('PySide2.QtMultimedia.QCameraViewfinderSettingsControl.ViewfinderParameter', 'Any'), "QCameraViewfinderSettingsControl.viewfinderParameter": ('PySide2.QtMultimedia.QCameraViewfinderSettingsControl.ViewfinderParameter',), # class PySide2.QtMultimedia.QCameraViewfinderSettingsControl2: @@ -14304,7 +14323,7 @@ if "PySide2.QtMultimedia" in sys.modules: "QImageEncoderSettings.quality": (), "QImageEncoderSettings.resolution": (), "QImageEncoderSettings.setCodec": ('str',), - "QImageEncoderSettings.setEncodingOption": ('str', 'PySide2.support.signature.typing.Any'), + "QImageEncoderSettings.setEncodingOption": ('str', 'Any'), "QImageEncoderSettings.setEncodingOptions": ('dict',), "QImageEncoderSettings.setQuality": ('PySide2.QtMultimedia.QMultimedia.EncodingQuality',), "QImageEncoderSettings.setResolution": [('PySide2.QtCore.QSize',), ('int', 'int')], @@ -14355,7 +14374,6 @@ if "PySide2.QtMultimedia" in sys.modules: "QMediaNetworkAccessControl.setConfigurations": ('list',), # class PySide2.QtMultimedia.QMediaObject: - "QMediaObject.notifyInterval": (), "QMediaObject.addPropertyWatch": ('PySide2.QtCore.QByteArray',), "QMediaObject.availability": (), "QMediaObject.availableMetaData": (), @@ -14363,6 +14381,7 @@ if "PySide2.QtMultimedia" in sys.modules: "QMediaObject.isAvailable": (), "QMediaObject.isMetaDataAvailable": (), "QMediaObject.metaData": ('str',), + "QMediaObject.notifyInterval": (), "QMediaObject.removePropertyWatch": ('PySide2.QtCore.QByteArray',), "QMediaObject.setNotifyInterval": ('int',), "QMediaObject.unbind": ('PySide2.QtCore.QObject',), @@ -14377,7 +14396,7 @@ if "PySide2.QtMultimedia" in sys.modules: "QMediaPlayer.currentNetworkConfiguration": (), "QMediaPlayer.duration": (), "QMediaPlayer.errorString": (), - "QMediaPlayer.hasSupport": ('str', 'PySide2.support.signature.typing.List', 'Flags'), + "QMediaPlayer.hasSupport": ('str', 'List[str]', 'Flags'), "QMediaPlayer.isAudioAvailable": (), "QMediaPlayer.isMuted": (), "QMediaPlayer.isSeekable": (), @@ -14447,7 +14466,6 @@ if "PySide2.QtMultimedia" in sys.modules: "QMediaPlaylist.mediaCount": (), "QMediaPlaylist.mediaObject": (), "QMediaPlaylist.moveMedia": ('int', 'int'), - "QMediaPlaylist.next": (), "QMediaPlaylist.nextIndex": ('int',), "QMediaPlaylist.playbackMode": (), "QMediaPlaylist.previous": (), @@ -14483,7 +14501,7 @@ if "PySide2.QtMultimedia" in sys.modules: "QMediaRecorder.setContainerFormat": ('str',), "QMediaRecorder.setEncodingSettings": ('PySide2.QtMultimedia.QAudioEncoderSettings', 'PySide2.QtMultimedia.QVideoEncoderSettings', 'str'), "QMediaRecorder.setMediaObject": ('PySide2.QtMultimedia.QMediaObject',), - "QMediaRecorder.setMetaData": ('str', 'PySide2.support.signature.typing.Any'), + "QMediaRecorder.setMetaData": ('str', 'Any'), "QMediaRecorder.setMuted": ('bool',), "QMediaRecorder.setOutputLocation": ('PySide2.QtCore.QUrl',), "QMediaRecorder.setVideoSettings": ('PySide2.QtMultimedia.QVideoEncoderSettings',), @@ -14691,7 +14709,7 @@ if "PySide2.QtMultimedia" in sys.modules: "QVideoEncoderSettings.setBitRate": ('int',), "QVideoEncoderSettings.setCodec": ('str',), "QVideoEncoderSettings.setEncodingMode": ('PySide2.QtMultimedia.QMultimedia.EncodingMode',), - "QVideoEncoderSettings.setEncodingOption": ('str', 'PySide2.support.signature.typing.Any'), + "QVideoEncoderSettings.setEncodingOption": ('str', 'Any'), "QVideoEncoderSettings.setEncodingOptions": ('dict',), "QVideoEncoderSettings.setFrameRate": ('float',), "QVideoEncoderSettings.setQuality": ('PySide2.QtMultimedia.QMultimedia.EncodingQuality',), @@ -14712,7 +14730,7 @@ if "PySide2.QtMultimedia" in sys.modules: "QVideoFrame.__init__": [(), ('PySide2.QtGui.QImage',), ('PySide2.QtMultimedia.QAbstractVideoBuffer', 'PySide2.QtCore.QSize', 'PySide2.QtMultimedia.QVideoFrame.PixelFormat'), ('PySide2.QtMultimedia.QVideoFrame',), ('int', 'PySide2.QtCore.QSize', 'int', 'PySide2.QtMultimedia.QVideoFrame.PixelFormat')], "QVideoFrame.__copy__": (), "QVideoFrame.availableMetaData": (), - "QVideoFrame.bits": [], + "QVideoFrame.bits": (), "QVideoFrame.bytesPerLine": [(), ('int',)], "QVideoFrame.endTime": (), "QVideoFrame.fieldType": (), @@ -14733,7 +14751,7 @@ if "PySide2.QtMultimedia" in sys.modules: "QVideoFrame.planeCount": (), "QVideoFrame.setEndTime": ('int',), "QVideoFrame.setFieldType": ('PySide2.QtMultimedia.QVideoFrame.FieldType',), - "QVideoFrame.setMetaData": ('str', 'PySide2.support.signature.typing.Any'), + "QVideoFrame.setMetaData": ('str', 'Any'), "QVideoFrame.setStartTime": ('int',), "QVideoFrame.size": (), "QVideoFrame.startTime": (), @@ -14767,7 +14785,7 @@ if "PySide2.QtMultimedia" in sys.modules: "QVideoSurfaceFormat.setFrameRate": ('float',), "QVideoSurfaceFormat.setFrameSize": [('PySide2.QtCore.QSize',), ('int', 'int')], "QVideoSurfaceFormat.setPixelAspectRatio": [('PySide2.QtCore.QSize',), ('int', 'int')], - "QVideoSurfaceFormat.setProperty": ('str', 'PySide2.support.signature.typing.Any'), + "QVideoSurfaceFormat.setProperty": ('str', 'Any'), "QVideoSurfaceFormat.setScanLineDirection": ('PySide2.QtMultimedia.QVideoSurfaceFormat.Direction',), "QVideoSurfaceFormat.setViewport": ('PySide2.QtCore.QRect',), "QVideoSurfaceFormat.setYCbCrColorSpace": ('PySide2.QtMultimedia.QVideoSurfaceFormat.YCbCrColorSpace',), @@ -14810,7 +14828,7 @@ if "PySide2.QtMultimediaWidgets" in sys.modules: "QGraphicsVideoItem.__init__": ('PySide2.QtWidgets.QGraphicsItem',), "QGraphicsVideoItem.aspectRatioMode": (), "QGraphicsVideoItem.boundingRect": (), - "QGraphicsVideoItem.itemChange": ('PySide2.QtWidgets.QGraphicsItem.GraphicsItemChange', 'PySide2.support.signature.typing.Any'), + "QGraphicsVideoItem.itemChange": ('PySide2.QtWidgets.QGraphicsItem.GraphicsItemChange', 'Any'), "QGraphicsVideoItem.mediaObject": (), "QGraphicsVideoItem.nativeSize": (), "QGraphicsVideoItem.offset": (), @@ -15167,7 +15185,7 @@ if "PySide2.QtQml" in sys.modules: "QJSEngine.newObject": (), "QJSEngine.newQMetaObject": ('PySide2.QtCore.QMetaObject',), "QJSEngine.newQObject": ('PySide2.QtCore.QObject',), - "QJSEngine.toScriptValue": ('PySide2.support.signature.typing.Any',), + "QJSEngine.toScriptValue": ('Any',), # class PySide2.QtQml.QJSValue: "QJSValue.__init__": [('PySide2.QtQml.QJSValue',), ('PySide2.QtQml.QJSValue.SpecialValue',), ('bool',), ('float',), ('int',), ('str',)], @@ -15213,7 +15231,6 @@ if "PySide2.QtQml" in sys.modules: "QJSValueIterator.__init__": ('PySide2.QtQml.QJSValue',), "QJSValueIterator.hasNext": (), "QJSValueIterator.name": (), - "QJSValueIterator.next": (), "QJSValueIterator.value": (), # class PySide2.QtQml.QQmlAbstractUrlInterceptor: @@ -15224,7 +15241,7 @@ if "PySide2.QtQml" in sys.modules: "QQmlApplicationEngine.__init__": [('PySide2.QtCore.QObject',), ('PySide2.QtCore.QUrl', 'PySide2.QtCore.QObject'), ('str', 'PySide2.QtCore.QObject')], "QQmlApplicationEngine.load": [('PySide2.QtCore.QUrl',), ('str',)], "QQmlApplicationEngine.loadData": ('PySide2.QtCore.QByteArray', 'PySide2.QtCore.QUrl'), - "QQmlApplicationEngine.rootObjects": [], + "QQmlApplicationEngine.rootObjects": (), # class PySide2.QtQml.QQmlComponent: "QQmlComponent.__init__": [('PySide2.QtCore.QObject',), ('PySide2.QtQml.QQmlEngine', 'PySide2.QtCore.QObject'), ('PySide2.QtQml.QQmlEngine', 'PySide2.QtCore.QUrl', 'PySide2.QtCore.QObject'), ('PySide2.QtQml.QQmlEngine', 'PySide2.QtCore.QUrl', 'PySide2.QtQml.QQmlComponent.CompilationMode', 'PySide2.QtCore.QObject'), ('PySide2.QtQml.QQmlEngine', 'str', 'PySide2.QtCore.QObject'), ('PySide2.QtQml.QQmlEngine', 'str', 'PySide2.QtQml.QQmlComponent.CompilationMode', 'PySide2.QtCore.QObject')], @@ -15256,7 +15273,7 @@ if "PySide2.QtQml" in sys.modules: "QQmlContext.resolvedUrl": ('PySide2.QtCore.QUrl',), "QQmlContext.setBaseUrl": ('PySide2.QtCore.QUrl',), "QQmlContext.setContextObject": ('PySide2.QtCore.QObject',), - "QQmlContext.setContextProperty": [('str', 'PySide2.QtCore.QObject'), ('str', 'PySide2.support.signature.typing.Any')], + "QQmlContext.setContextProperty": [('str', 'Any'), ('str', 'PySide2.QtCore.QObject')], # class PySide2.QtQml.QQmlDebuggingEnabler: "QQmlDebuggingEnabler.__init__": ('bool',), @@ -15265,7 +15282,7 @@ if "PySide2.QtQml" in sys.modules: "QQmlDebuggingEnabler.inspectorServices": (), "QQmlDebuggingEnabler.nativeDebuggerServices": (), "QQmlDebuggingEnabler.profilerServices": (), - "QQmlDebuggingEnabler.setServices": ('PySide2.support.signature.typing.List',), + "QQmlDebuggingEnabler.setServices": ('List[str]',), "QQmlDebuggingEnabler.startDebugConnector": ('str', 'dict'), "QQmlDebuggingEnabler.startTcpDebugServer": ('int', 'PySide2.QtQml.QQmlDebuggingEnabler.StartMode', 'str'), @@ -15294,13 +15311,13 @@ if "PySide2.QtQml" in sys.modules: "QQmlEngine.rootContext": (), "QQmlEngine.setBaseUrl": ('PySide2.QtCore.QUrl',), "QQmlEngine.setContextForObject": ('PySide2.QtCore.QObject', 'PySide2.QtQml.QQmlContext'), - "QQmlEngine.setImportPathList": ('PySide2.support.signature.typing.List',), + "QQmlEngine.setImportPathList": ('List[str]',), "QQmlEngine.setIncubationController": ('PySide2.QtQml.QQmlIncubationController',), "QQmlEngine.setNetworkAccessManagerFactory": ('PySide2.QtQml.QQmlNetworkAccessManagerFactory',), "QQmlEngine.setObjectOwnership": ('PySide2.QtCore.QObject', 'PySide2.QtQml.QQmlEngine.ObjectOwnership'), "QQmlEngine.setOfflineStoragePath": ('str',), "QQmlEngine.setOutputWarningsToStandardError": ('bool',), - "QQmlEngine.setPluginPathList": ('PySide2.support.signature.typing.List',), + "QQmlEngine.setPluginPathList": ('List[str]',), "QQmlEngine.setUrlInterceptor": ('PySide2.QtQml.QQmlAbstractUrlInterceptor',), "QQmlEngine.trimComponentCache": (), "QQmlEngine.urlInterceptor": (), @@ -15375,7 +15392,7 @@ if "PySide2.QtQml" in sys.modules: "QQmlFileSelector.__init__": ('PySide2.QtQml.QQmlEngine', 'PySide2.QtCore.QObject'), "QQmlFileSelector.get": ('PySide2.QtQml.QQmlEngine',), "QQmlFileSelector.selector": (), - "QQmlFileSelector.setExtraSelectors": ['PySide2.support.signature.typing.List'], + "QQmlFileSelector.setExtraSelectors": ('List[str]',), "QQmlFileSelector.setSelector": ('PySide2.QtCore.QFileSelector',), # class PySide2.QtQml.QQmlImageProviderBase: @@ -15454,18 +15471,18 @@ if "PySide2.QtQml" in sys.modules: "QQmlProperty.read": [(), ('PySide2.QtCore.QObject', 'str'), ('PySide2.QtCore.QObject', 'str', 'PySide2.QtQml.QQmlContext'), ('PySide2.QtCore.QObject', 'str', 'PySide2.QtQml.QQmlEngine')], "QQmlProperty.reset": (), "QQmlProperty.type": (), - "QQmlProperty.write": [('PySide2.QtCore.QObject', 'str', 'PySide2.support.signature.typing.Any'), ('PySide2.QtCore.QObject', 'str', 'PySide2.support.signature.typing.Any', 'PySide2.QtQml.QQmlContext'), ('PySide2.QtCore.QObject', 'str', 'PySide2.support.signature.typing.Any', 'PySide2.QtQml.QQmlEngine'), ('PySide2.support.signature.typing.Any',)], + "QQmlProperty.write": [('Any',), ('PySide2.QtCore.QObject', 'str', 'Any'), ('PySide2.QtCore.QObject', 'str', 'Any', 'PySide2.QtQml.QQmlContext'), ('PySide2.QtCore.QObject', 'str', 'Any', 'PySide2.QtQml.QQmlEngine')], # class PySide2.QtQml.QQmlPropertyMap: "QQmlPropertyMap.__init__": ('PySide2.QtCore.QObject',), "QQmlPropertyMap.clear": ('str',), "QQmlPropertyMap.contains": ('str',), "QQmlPropertyMap.count": (), - "QQmlPropertyMap.insert": ('str', 'PySide2.support.signature.typing.Any'), + "QQmlPropertyMap.insert": ('str', 'Any'), "QQmlPropertyMap.isEmpty": (), "QQmlPropertyMap.keys": (), "QQmlPropertyMap.size": (), - "QQmlPropertyMap.updateValue": ('str', 'PySide2.support.signature.typing.Any'), + "QQmlPropertyMap.updateValue": ('str', 'Any'), "QQmlPropertyMap.value": ('str',), # class PySide2.QtQml.QQmlPropertyValueSource: @@ -15665,9 +15682,9 @@ if "PySide2.QtQuick" in sys.modules: "QQuickItem.z": (), # class PySide2.QtQuick.QQuickItemGrabResult: - "QQuickItemGrabResult.saveToFile": ['str'], "QQuickItemGrabResult.event": ('PySide2.QtCore.QEvent',), "QQuickItemGrabResult.image": (), + "QQuickItemGrabResult.saveToFile": ('str',), "QQuickItemGrabResult.url": (), # class PySide2.QtQuick.QQuickPaintedItem: @@ -15822,7 +15839,7 @@ if "PySide2.QtQuick" in sys.modules: # class PySide2.QtQuick.QSGBasicGeometryNode: "QSGBasicGeometryNode.__init__": ('PySide2.QtQuick.QSGNode.NodeType',), "QSGBasicGeometryNode.clipList": (), - "QSGBasicGeometryNode.geometry": [], + "QSGBasicGeometryNode.geometry": (), "QSGBasicGeometryNode.matrix": (), "QSGBasicGeometryNode.setGeometry": ('PySide2.QtQuick.QSGGeometry',), "QSGBasicGeometryNode.setRendererClipList": ('PySide2.QtQuick.QSGClipNode',), @@ -15857,9 +15874,9 @@ if "PySide2.QtQuick" in sys.modules: "QSGGeometry.defaultAttributes_TexturedPoint2D": (), "QSGGeometry.drawingMode": (), "QSGGeometry.indexCount": (), - "QSGGeometry.indexData": [], - "QSGGeometry.indexDataAsUInt": [], - "QSGGeometry.indexDataAsUShort": [], + "QSGGeometry.indexData": (), + "QSGGeometry.indexDataAsUInt": (), + "QSGGeometry.indexDataAsUShort": (), "QSGGeometry.indexDataPattern": (), "QSGGeometry.indexType": (), "QSGGeometry.lineWidth": (), @@ -15875,10 +15892,10 @@ if "PySide2.QtQuick" in sys.modules: "QSGGeometry.updateRectGeometry": ('PySide2.QtQuick.QSGGeometry', 'PySide2.QtCore.QRectF'), "QSGGeometry.updateTexturedRectGeometry": ('PySide2.QtQuick.QSGGeometry', 'PySide2.QtCore.QRectF', 'PySide2.QtCore.QRectF'), "QSGGeometry.vertexCount": (), - "QSGGeometry.vertexData": [], - "QSGGeometry.vertexDataAsColoredPoint2D": [], - "QSGGeometry.vertexDataAsPoint2D": [], - "QSGGeometry.vertexDataAsTexturedPoint2D": [], + "QSGGeometry.vertexData": (), + "QSGGeometry.vertexDataAsColoredPoint2D": (), + "QSGGeometry.vertexDataAsPoint2D": (), + "QSGGeometry.vertexDataAsTexturedPoint2D": (), "QSGGeometry.vertexDataPattern": (), # class PySide2.QtQuick.QSGGeometryNode: @@ -16059,7 +16076,7 @@ if "PySide2.QtTextToSpeech" in sys.modules: "QTextToSpeechEngine.__init__": ('PySide2.QtCore.QObject',), "QTextToSpeechEngine.availableLocales": (), "QTextToSpeechEngine.availableVoices": (), - "QTextToSpeechEngine.createVoice": ('str', 'PySide2.QtTextToSpeech.QVoice.Gender', 'PySide2.QtTextToSpeech.QVoice.Age', 'PySide2.support.signature.typing.Any'), + "QTextToSpeechEngine.createVoice": ('str', 'PySide2.QtTextToSpeech.QVoice.Gender', 'PySide2.QtTextToSpeech.QVoice.Age', 'Any'), "QTextToSpeechEngine.locale": (), "QTextToSpeechEngine.pause": (), "QTextToSpeechEngine.pitch": (), @@ -16164,7 +16181,7 @@ if "PySide2.QtDataVisualization" in sys.modules: dict.update({ # class PySide2.QtDataVisualization.QtDataVisualization: - "QtDataVisualization.qDefaultSurfaceFormat": ['bool'], + "QtDataVisualization.qDefaultSurfaceFormat": ('bool',), }) # Module PySide2.QtUiTools @@ -16225,12 +16242,12 @@ if "PySide2.QtWebEngineWidgets" in sys.modules: "QWebEngineCertificateError.url": (), # class PySide2.QtWebEngineWidgets.QWebEngineDownloadItem: - "QWebEngineDownloadItem.mimeType": (), "QWebEngineDownloadItem.accept": (), "QWebEngineDownloadItem.cancel": (), "QWebEngineDownloadItem.id": (), "QWebEngineDownloadItem.interruptReasonString": (), "QWebEngineDownloadItem.isFinished": (), + "QWebEngineDownloadItem.mimeType": (), "QWebEngineDownloadItem.path": (), "QWebEngineDownloadItem.receivedBytes": (), "QWebEngineDownloadItem.setPath": ('str',), @@ -16254,7 +16271,7 @@ if "PySide2.QtWebEngineWidgets" in sys.modules: "QWebEnginePage.action": ('PySide2.QtWebEngineWidgets.QWebEnginePage.WebAction',), "QWebEnginePage.backgroundColor": (), "QWebEnginePage.certificateError": ('PySide2.QtWebEngineWidgets.QWebEngineCertificateError',), - "QWebEnginePage.chooseFiles": ('PySide2.QtWebEngineWidgets.QWebEnginePage.FileSelectionMode', 'PySide2.support.signature.typing.List', 'PySide2.support.signature.typing.List'), + "QWebEnginePage.chooseFiles": ('PySide2.QtWebEngineWidgets.QWebEnginePage.FileSelectionMode', 'List[str]', 'List[str]'), "QWebEnginePage.contentsSize": (), "QWebEnginePage.createStandardContextMenu": (), "QWebEnginePage.createWindow": ('PySide2.QtWebEngineWidgets.QWebEnginePage.WebWindowType',), @@ -16317,7 +16334,7 @@ if "PySide2.QtWebEngineWidgets" in sys.modules: "QWebEngineProfile.setPersistentCookiesPolicy": ('PySide2.QtWebEngineWidgets.QWebEngineProfile.PersistentCookiesPolicy',), "QWebEngineProfile.setPersistentStoragePath": ('str',), "QWebEngineProfile.setSpellCheckEnabled": ('bool',), - "QWebEngineProfile.setSpellCheckLanguages": ('PySide2.support.signature.typing.List',), + "QWebEngineProfile.setSpellCheckLanguages": ('List[str]',), "QWebEngineProfile.spellCheckLanguages": (), "QWebEngineProfile.storageName": (), "QWebEngineProfile.visitedLinksContainsUrl": ('PySide2.QtCore.QUrl',), diff --git a/sources/pyside2/tests/registry/exists_linux_5_9_3_ci.py b/sources/pyside2/tests/registry/exists_linux_5_9_4_ci.py index 9e7503e6c..59d696884 100644 --- a/sources/pyside2/tests/registry/exists_linux_5_9_3_ci.py +++ b/sources/pyside2/tests/registry/exists_linux_5_9_4_ci.py @@ -1,6 +1,6 @@ ############################################################################# ## -## Copyright (C) 2017 The Qt Company Ltd. +## Copyright (C) 2018 The Qt Company Ltd. ## Contact: https://www.qt.io/licensing/ ## ## This file is part of PySide2. @@ -37,6 +37,14 @@ ## ############################################################################# +""" +This file contains the simplified signatures for all functions in PySide +for module 'exists_linux_5_9_4_ci'. There are no default values, no variable +names and no self parameter. Only types are present after simplification. +The functions 'next' resp. '__next__' are removed +to make the output identical for Python 2 and 3. +""" + import sys dict = {} @@ -249,7 +257,7 @@ if "PySide2.QtCore" in sys.modules: # class PySide2.QtCore.QBasicMutex: "QBasicMutex.__init__": (), - "QBasicMutex.isRecursive": [], + "QBasicMutex.isRecursive": (), "QBasicMutex.lock": (), "QBasicMutex.tryLock": (), "QBasicMutex.try_lock": (), @@ -284,7 +292,7 @@ if "PySide2.QtCore" in sys.modules: # class PySide2.QtCore.QBuffer: "QBuffer.__init__": [('PySide2.QtCore.QByteArray', 'PySide2.QtCore.QObject'), ('PySide2.QtCore.QObject',)], "QBuffer.atEnd": (), - "QBuffer.buffer": [], + "QBuffer.buffer": (), "QBuffer.canReadLine": (), "QBuffer.close": (), "QBuffer.connectNotify": ('PySide2.QtCore.QMetaMethod',), @@ -312,7 +320,7 @@ if "PySide2.QtCore" in sys.modules: "QByteArray.clear": (), "QByteArray.contains": [('PySide2.QtCore.QByteArray',), ('Union[str, int]',)], "QByteArray.count": [(), ('PySide2.QtCore.QByteArray',), ('Union[str, int]',)], - "QByteArray.data": [], + "QByteArray.data": (), "QByteArray.endsWith": [('PySide2.QtCore.QByteArray',), ('Union[str, int]',)], "QByteArray.fill": ('Union[str, int]', 'int'), "QByteArray.fromBase64": [('PySide2.QtCore.QByteArray',), ('PySide2.QtCore.QByteArray', 'Base64Options')], @@ -340,7 +348,7 @@ if "PySide2.QtCore" in sys.modules: "QByteArray.rightJustified": ('int', 'Union[str, int]', 'bool'), "QByteArray.setNum": [('float', 'Union[str, int]', 'int'), ('int', 'int')], "QByteArray.setRawData": ('str', 'int'), - "QByteArray.simplified": [], + "QByteArray.simplified": (), "QByteArray.size": (), "QByteArray.split": ('Union[str, int]',), "QByteArray.squeeze": (), @@ -353,15 +361,15 @@ if "PySide2.QtCore" in sys.modules: "QByteArray.toInt": ('bool', 'int'), "QByteArray.toLong": ('bool', 'int'), "QByteArray.toLongLong": ('bool', 'int'), - "QByteArray.toLower": [], + "QByteArray.toLower": (), "QByteArray.toPercentEncoding": ('PySide2.QtCore.QByteArray', 'PySide2.QtCore.QByteArray', 'Union[str, int]'), "QByteArray.toShort": ('bool', 'int'), "QByteArray.toUInt": ('bool', 'int'), "QByteArray.toULong": ('bool', 'int'), "QByteArray.toULongLong": ('bool', 'int'), "QByteArray.toUShort": ('bool', 'int'), - "QByteArray.toUpper": [], - "QByteArray.trimmed": [], + "QByteArray.toUpper": (), + "QByteArray.trimmed": (), "QByteArray.truncate": ('int',), # class PySide2.QtCore.QByteArrayMatcher: @@ -561,7 +569,7 @@ if "PySide2.QtCore" in sys.modules: "QDate.daysTo": ('PySide2.QtCore.QDate',), "QDate.fromJulianDay": ('int',), "QDate.fromString": [('str', 'PySide2.QtCore.Qt.DateFormat'), ('str', 'str')], - "QDate.getDate": ['int', 'int', 'int'], + "QDate.getDate": ('int', 'int', 'int'), "QDate.isLeapYear": ('int',), "QDate.isNull": (), "QDate.isValid": [(), ('int', 'int', 'int')], @@ -697,7 +705,6 @@ if "PySide2.QtCore" in sys.modules: "QDirIterator.fileName": (), "QDirIterator.filePath": (), "QDirIterator.hasNext": (), - "QDirIterator.next": (), "QDirIterator.path": (), # class PySide2.QtCore.QDynamicPropertyChangeEvent: @@ -957,7 +964,7 @@ if "PySide2.QtCore" in sys.modules: "QItemSelection.__copy__": (), "QItemSelection.append": [('PySide2.QtCore.QItemSelectionRange',), ('list',)], "QItemSelection.at": ('int',), - "QItemSelection.back": [], + "QItemSelection.back": (), "QItemSelection.clear": (), "QItemSelection.constFirst": (), "QItemSelection.constLast": (), @@ -966,16 +973,16 @@ if "PySide2.QtCore" in sys.modules: "QItemSelection.detachShared": (), "QItemSelection.empty": (), "QItemSelection.endsWith": ('PySide2.QtCore.QItemSelectionRange',), - "QItemSelection.first": [], + "QItemSelection.first": (), "QItemSelection.fromSet": ('set',), "QItemSelection.fromVector": ('list',), - "QItemSelection.front": [], + "QItemSelection.front": (), "QItemSelection.indexOf": ('PySide2.QtCore.QItemSelectionRange', 'int'), "QItemSelection.indexes": (), "QItemSelection.insert": ('int', 'PySide2.QtCore.QItemSelectionRange'), "QItemSelection.isEmpty": (), "QItemSelection.isSharedWith": ('list',), - "QItemSelection.last": [], + "QItemSelection.last": (), "QItemSelection.lastIndexOf": ('PySide2.QtCore.QItemSelectionRange', 'int'), "QItemSelection.length": (), "QItemSelection.merge": ('PySide2.QtCore.QItemSelection', 'SelectionFlags'), @@ -1018,7 +1025,7 @@ if "PySide2.QtCore" in sys.modules: "QItemSelectionModel.isColumnSelected": ('int', 'PySide2.QtCore.QModelIndex'), "QItemSelectionModel.isRowSelected": ('int', 'PySide2.QtCore.QModelIndex'), "QItemSelectionModel.isSelected": ('PySide2.QtCore.QModelIndex',), - "QItemSelectionModel.model": [], + "QItemSelectionModel.model": (), "QItemSelectionModel.reset": (), "QItemSelectionModel.rowIntersectsSelection": ('int', 'PySide2.QtCore.QModelIndex'), "QItemSelectionModel.select": [('PySide2.QtCore.QItemSelection', 'SelectionFlags'), ('PySide2.QtCore.QModelIndex', 'SelectionFlags')], @@ -1123,13 +1130,13 @@ if "PySide2.QtCore" in sys.modules: "QJsonValue.type": (), # class PySide2.QtCore.QLibraryInfo: - "QLibraryInfo.platformPluginArguments": ('str',), "QLibraryInfo.build": (), "QLibraryInfo.buildDate": (), "QLibraryInfo.isDebugBuild": (), "QLibraryInfo.licensedProducts": (), "QLibraryInfo.licensee": (), "QLibraryInfo.location": ('PySide2.QtCore.QLibraryInfo.LibraryLocation',), + "QLibraryInfo.platformPluginArguments": ('str',), "QLibraryInfo.version": (), # class PySide2.QtCore.QLine: @@ -1218,7 +1225,7 @@ if "PySide2.QtCore" in sys.modules: "QLocale.percent": (), "QLocale.pmText": (), "QLocale.positiveSign": (), - "QLocale.quoteString": ['PySide2.QtCore.QLocale.QuotationStyle', 'str'], + "QLocale.quoteString": ('str', 'PySide2.QtCore.QLocale.QuotationStyle'), "QLocale.script": (), "QLocale.scriptToString": ('PySide2.QtCore.QLocale.Script',), "QLocale.setDefault": ('PySide2.QtCore.QLocale',), @@ -1323,7 +1330,7 @@ if "PySide2.QtCore" in sys.modules: # class PySide2.QtCore.QMetaObject: "QMetaObject.__init__": (), - "QMetaObject.cast": ['PySide2.QtCore.QObject'], + "QMetaObject.cast": ('PySide2.QtCore.QObject',), "QMetaObject.checkConnectArgs": [('PySide2.QtCore.QMetaMethod', 'PySide2.QtCore.QMetaMethod'), ('str', 'str')], "QMetaObject.classInfo": ('int',), "QMetaObject.classInfoCount": (), @@ -1464,7 +1471,7 @@ if "PySide2.QtCore" in sys.modules: # class PySide2.QtCore.QMutex: "QMutex.__init__": ('PySide2.QtCore.QMutex.RecursionMode',), - "QMutex.isRecursive": [], + "QMutex.isRecursive": (), "QMutex.lock": (), "QMutex.tryLock": [(), ('int',)], "QMutex.try_lock": (), @@ -1489,8 +1496,8 @@ if "PySide2.QtCore" in sys.modules: "QObject.deleteLater": (), "QObject.disconnect": [('PySide2.QtCore.QMetaObject.Connection',), ('PySide2.QtCore.QObject', 'PySide2.QtCore.QMetaMethod', 'PySide2.QtCore.QObject', 'PySide2.QtCore.QMetaMethod'), ('PySide2.QtCore.QObject', 'str'), ('PySide2.QtCore.QObject', 'str', 'Callable'), ('PySide2.QtCore.QObject', 'str', 'PySide2.QtCore.QObject', 'str'), ('str', 'Callable'), ('str', 'PySide2.QtCore.QObject', 'str')], "QObject.disconnectNotify": ('PySide2.QtCore.QMetaMethod',), - "QObject.dumpObjectInfo": [], - "QObject.dumpObjectTree": [], + "QObject.dumpObjectInfo": (), + "QObject.dumpObjectTree": (), "QObject.dynamicPropertyNames": (), "QObject.emit": ('str', '...'), "QObject.event": ('PySide2.QtCore.QEvent',), @@ -1814,11 +1821,11 @@ if "PySide2.QtCore" in sys.modules: "QRegExp.__init__": [(), ('PySide2.QtCore.QRegExp',), ('str', 'PySide2.QtCore.Qt.CaseSensitivity', 'PySide2.QtCore.QRegExp.PatternSyntax')], "QRegExp.__copy__": (), "QRegExp.__reduce__": (), - "QRegExp.cap": ['int'], + "QRegExp.cap": ('int',), "QRegExp.captureCount": (), - "QRegExp.capturedTexts": [], + "QRegExp.capturedTexts": (), "QRegExp.caseSensitivity": (), - "QRegExp.errorString": [], + "QRegExp.errorString": (), "QRegExp.escape": ('str',), "QRegExp.exactMatch": ('str',), "QRegExp.indexIn": ('str', 'int', 'PySide2.QtCore.QRegExp.CaretMode'), @@ -1829,7 +1836,7 @@ if "PySide2.QtCore" in sys.modules: "QRegExp.matchedLength": (), "QRegExp.pattern": (), "QRegExp.patternSyntax": (), - "QRegExp.pos": ['int'], + "QRegExp.pos": ('int',), "QRegExp.replace": ('str', 'str'), "QRegExp.setCaseSensitivity": ('PySide2.QtCore.Qt.CaseSensitivity',), "QRegExp.setMinimal": ('bool',), @@ -1843,9 +1850,9 @@ if "PySide2.QtCore" in sys.modules: "QRegularExpression.captureCount": (), "QRegularExpression.errorString": (), "QRegularExpression.escape": ('str',), - "QRegularExpression.globalMatch": ['MatchOptions', 'PySide2.QtCore.QRegularExpression.MatchType', 'int', 'str'], + "QRegularExpression.globalMatch": ('str', 'int', 'PySide2.QtCore.QRegularExpression.MatchType', 'MatchOptions'), "QRegularExpression.isValid": (), - "QRegularExpression.match": ['MatchOptions', 'PySide2.QtCore.QRegularExpression.MatchType', 'int', 'str'], + "QRegularExpression.match": ('str', 'int', 'PySide2.QtCore.QRegularExpression.MatchType', 'MatchOptions'), "QRegularExpression.namedCaptureGroups": (), "QRegularExpression.optimize": (), "QRegularExpression.pattern": (), @@ -1880,7 +1887,6 @@ if "PySide2.QtCore" in sys.modules: "QRegularExpressionMatchIterator.isValid": (), "QRegularExpressionMatchIterator.matchOptions": (), "QRegularExpressionMatchIterator.matchType": (), - "QRegularExpressionMatchIterator.next": (), "QRegularExpressionMatchIterator.peekNext": (), "QRegularExpressionMatchIterator.regularExpression": (), "QRegularExpressionMatchIterator.swap": ('PySide2.QtCore.QRegularExpressionMatchIterator',), @@ -2100,7 +2106,6 @@ if "PySide2.QtCore" in sys.modules: "QSortFilterProxyModel.supportedDropActions": (), # class PySide2.QtCore.QStandardPaths: - "QStandardPaths.writableLocation": ('PySide2.QtCore.QStandardPaths.StandardLocation',), "QStandardPaths.displayName": ('PySide2.QtCore.QStandardPaths.StandardLocation',), "QStandardPaths.enableTestMode": ('bool',), "QStandardPaths.findExecutable": ('str', 'List[str]'), @@ -2109,6 +2114,7 @@ if "PySide2.QtCore" in sys.modules: "QStandardPaths.locateAll": ('PySide2.QtCore.QStandardPaths.StandardLocation', 'str', 'LocateOptions'), "QStandardPaths.setTestModeEnabled": ('bool',), "QStandardPaths.standardLocations": ('PySide2.QtCore.QStandardPaths.StandardLocation',), + "QStandardPaths.writableLocation": ('PySide2.QtCore.QStandardPaths.StandardLocation',), # class PySide2.QtCore.QState: "QState.__init__": [('PySide2.QtCore.QState',), ('PySide2.QtCore.QState.ChildMode', 'PySide2.QtCore.QState')], @@ -2134,7 +2140,7 @@ if "PySide2.QtCore" in sys.modules: "QStateMachine.beginSelectTransitions": ('PySide2.QtCore.QEvent',), "QStateMachine.cancelDelayedEvent": ('int',), "QStateMachine.clearError": (), - "QStateMachine.configuration": [], + "QStateMachine.configuration": (), "QStateMachine.defaultAnimations": (), "QStateMachine.endMicrostep": ('PySide2.QtCore.QEvent',), "QStateMachine.endSelectTransitions": ('PySide2.QtCore.QEvent',), @@ -2642,18 +2648,18 @@ if "PySide2.QtCore" in sys.modules: "QXmlStreamAttributes.constLast": (), "QXmlStreamAttributes.contains": ('PySide2.QtCore.QXmlStreamAttribute',), "QXmlStreamAttributes.count": [(), ('PySide2.QtCore.QXmlStreamAttribute',)], - "QXmlStreamAttributes.data": [], + "QXmlStreamAttributes.data": (), "QXmlStreamAttributes.empty": (), "QXmlStreamAttributes.endsWith": ('PySide2.QtCore.QXmlStreamAttribute',), "QXmlStreamAttributes.fill": ('PySide2.QtCore.QXmlStreamAttribute', 'int'), - "QXmlStreamAttributes.first": [], + "QXmlStreamAttributes.first": (), "QXmlStreamAttributes.front": (), "QXmlStreamAttributes.hasAttribute": [('str',), ('str', 'str')], "QXmlStreamAttributes.indexOf": ('PySide2.QtCore.QXmlStreamAttribute', 'int'), "QXmlStreamAttributes.insert": [('int', 'PySide2.QtCore.QXmlStreamAttribute'), ('int', 'int', 'PySide2.QtCore.QXmlStreamAttribute')], "QXmlStreamAttributes.isEmpty": (), "QXmlStreamAttributes.isSharedWith": ('list',), - "QXmlStreamAttributes.last": [], + "QXmlStreamAttributes.last": (), "QXmlStreamAttributes.lastIndexOf": ('PySide2.QtCore.QXmlStreamAttribute', 'int'), "QXmlStreamAttributes.length": (), "QXmlStreamAttributes.mid": ('int', 'int'), @@ -2789,10 +2795,6 @@ if "PySide2.QtCore" in sys.modules: "QXmlStreamWriter.writeStartElement": [('str',), ('str', 'str')], "QXmlStreamWriter.writeTextElement": [('str', 'str'), ('str', 'str', 'str')], - # class PySide2.QtCore.Qt: - "Qt.qt_getEnumName": [('Alignment',), ('DockWidgetAreas',), ('DropActions',), ('Edges',), ('ImageConversionFlags',), ('InputMethodHints',), ('InputMethodQueries',), ('ItemFlags',), ('KeyboardModifiers',), ('MatchFlags',), ('MouseButtons',), ('Orientations',), ('PySide2.QtCore.Qt.ApplicationAttribute',), ('PySide2.QtCore.Qt.ApplicationState',), ('PySide2.QtCore.Qt.ArrowType',), ('PySide2.QtCore.Qt.AspectRatioMode',), ('PySide2.QtCore.Qt.Axis',), ('PySide2.QtCore.Qt.BGMode',), ('PySide2.QtCore.Qt.BrushStyle',), ('PySide2.QtCore.Qt.CaseSensitivity',), ('PySide2.QtCore.Qt.CheckState',), ('PySide2.QtCore.Qt.ChecksumType',), ('PySide2.QtCore.Qt.ClipOperation',), ('PySide2.QtCore.Qt.ConnectionType',), ('PySide2.QtCore.Qt.ContextMenuPolicy',), ('PySide2.QtCore.Qt.Corner',), ('PySide2.QtCore.Qt.CursorMoveStyle',), ('PySide2.QtCore.Qt.CursorShape',), ('PySide2.QtCore.Qt.DateFormat',), ('PySide2.QtCore.Qt.DayOfWeek',), ('PySide2.QtCore.Qt.DockWidgetArea',), ('PySide2.QtCore.Qt.DropAction',), ('PySide2.QtCore.Qt.Edge',), ('PySide2.QtCore.Qt.EnterKeyType',), ('PySide2.QtCore.Qt.FillRule',), ('PySide2.QtCore.Qt.FocusPolicy',), ('PySide2.QtCore.Qt.FocusReason',), ('PySide2.QtCore.Qt.GestureState',), ('PySide2.QtCore.Qt.GestureType',), ('PySide2.QtCore.Qt.GlobalColor',), ('PySide2.QtCore.Qt.InputMethodHint',), ('PySide2.QtCore.Qt.InputMethodQuery',), ('PySide2.QtCore.Qt.ItemDataRole',), ('PySide2.QtCore.Qt.ItemSelectionMode',), ('PySide2.QtCore.Qt.ItemSelectionOperation',), ('PySide2.QtCore.Qt.Key',), ('PySide2.QtCore.Qt.LayoutDirection',), ('PySide2.QtCore.Qt.MaskMode',), ('PySide2.QtCore.Qt.MouseEventFlag',), ('PySide2.QtCore.Qt.MouseEventSource',), ('PySide2.QtCore.Qt.NativeGestureType',), ('PySide2.QtCore.Qt.Orientation',), ('PySide2.QtCore.Qt.PenCapStyle',), ('PySide2.QtCore.Qt.PenJoinStyle',), ('PySide2.QtCore.Qt.PenStyle',), ('PySide2.QtCore.Qt.ScreenOrientation',), ('PySide2.QtCore.Qt.ScrollBarPolicy',), ('PySide2.QtCore.Qt.ScrollPhase',), ('PySide2.QtCore.Qt.ShortcutContext',), ('PySide2.QtCore.Qt.SizeHint',), ('PySide2.QtCore.Qt.SizeMode',), ('PySide2.QtCore.Qt.SortOrder',), ('PySide2.QtCore.Qt.TabFocusBehavior',), ('PySide2.QtCore.Qt.TextElideMode',), ('PySide2.QtCore.Qt.TextFlag',), ('PySide2.QtCore.Qt.TextFormat',), ('PySide2.QtCore.Qt.TextInteractionFlag',), ('PySide2.QtCore.Qt.TimeSpec',), ('PySide2.QtCore.Qt.TimerType',), ('PySide2.QtCore.Qt.ToolBarArea',), ('PySide2.QtCore.Qt.ToolButtonStyle',), ('PySide2.QtCore.Qt.TransformationMode',), ('PySide2.QtCore.Qt.WidgetAttribute',), ('PySide2.QtCore.Qt.WindowModality',), ('PySide2.QtCore.Qt.WindowState',), ('PySide2.QtCore.Qt.WindowType',), ('ScreenOrientations',), ('TextInteractionFlags',), ('ToolBarAreas',), ('TouchPointStates',), ('WindowFlags',), ('WindowStates',)], - "Qt.qt_getEnumMetaObject": [('Alignment',), ('DockWidgetAreas',), ('DropActions',), ('Edges',), ('ImageConversionFlags',), ('InputMethodHints',), ('InputMethodQueries',), ('ItemFlags',), ('KeyboardModifiers',), ('MatchFlags',), ('MouseButtons',), ('Orientations',), ('PySide2.QtCore.Qt.ApplicationAttribute',), ('PySide2.QtCore.Qt.ApplicationState',), ('PySide2.QtCore.Qt.ArrowType',), ('PySide2.QtCore.Qt.AspectRatioMode',), ('PySide2.QtCore.Qt.Axis',), ('PySide2.QtCore.Qt.BGMode',), ('PySide2.QtCore.Qt.BrushStyle',), ('PySide2.QtCore.Qt.CaseSensitivity',), ('PySide2.QtCore.Qt.CheckState',), ('PySide2.QtCore.Qt.ChecksumType',), ('PySide2.QtCore.Qt.ClipOperation',), ('PySide2.QtCore.Qt.ConnectionType',), ('PySide2.QtCore.Qt.ContextMenuPolicy',), ('PySide2.QtCore.Qt.Corner',), ('PySide2.QtCore.Qt.CursorMoveStyle',), ('PySide2.QtCore.Qt.CursorShape',), ('PySide2.QtCore.Qt.DateFormat',), ('PySide2.QtCore.Qt.DayOfWeek',), ('PySide2.QtCore.Qt.DockWidgetArea',), ('PySide2.QtCore.Qt.DropAction',), ('PySide2.QtCore.Qt.Edge',), ('PySide2.QtCore.Qt.EnterKeyType',), ('PySide2.QtCore.Qt.FillRule',), ('PySide2.QtCore.Qt.FocusPolicy',), ('PySide2.QtCore.Qt.FocusReason',), ('PySide2.QtCore.Qt.GestureState',), ('PySide2.QtCore.Qt.GestureType',), ('PySide2.QtCore.Qt.GlobalColor',), ('PySide2.QtCore.Qt.InputMethodHint',), ('PySide2.QtCore.Qt.InputMethodQuery',), ('PySide2.QtCore.Qt.ItemDataRole',), ('PySide2.QtCore.Qt.ItemSelectionMode',), ('PySide2.QtCore.Qt.ItemSelectionOperation',), ('PySide2.QtCore.Qt.Key',), ('PySide2.QtCore.Qt.LayoutDirection',), ('PySide2.QtCore.Qt.MaskMode',), ('PySide2.QtCore.Qt.MouseEventFlag',), ('PySide2.QtCore.Qt.MouseEventSource',), ('PySide2.QtCore.Qt.NativeGestureType',), ('PySide2.QtCore.Qt.Orientation',), ('PySide2.QtCore.Qt.PenCapStyle',), ('PySide2.QtCore.Qt.PenJoinStyle',), ('PySide2.QtCore.Qt.PenStyle',), ('PySide2.QtCore.Qt.ScreenOrientation',), ('PySide2.QtCore.Qt.ScrollBarPolicy',), ('PySide2.QtCore.Qt.ScrollPhase',), ('PySide2.QtCore.Qt.ShortcutContext',), ('PySide2.QtCore.Qt.SizeHint',), ('PySide2.QtCore.Qt.SizeMode',), ('PySide2.QtCore.Qt.SortOrder',), ('PySide2.QtCore.Qt.TabFocusBehavior',), ('PySide2.QtCore.Qt.TextElideMode',), ('PySide2.QtCore.Qt.TextFlag',), ('PySide2.QtCore.Qt.TextFormat',), ('PySide2.QtCore.Qt.TextInteractionFlag',), ('PySide2.QtCore.Qt.TimeSpec',), ('PySide2.QtCore.Qt.TimerType',), ('PySide2.QtCore.Qt.ToolBarArea',), ('PySide2.QtCore.Qt.ToolButtonStyle',), ('PySide2.QtCore.Qt.TransformationMode',), ('PySide2.QtCore.Qt.WidgetAttribute',), ('PySide2.QtCore.Qt.WindowModality',), ('PySide2.QtCore.Qt.WindowState',), ('PySide2.QtCore.Qt.WindowType',), ('ScreenOrientations',), ('TextInteractionFlags',), ('ToolBarAreas',), ('TouchPointStates',), ('WindowFlags',), ('WindowStates',)], - # class PySide2.QtCore.QtMsgType: # class PySide2.QtCore.Signal: @@ -2836,11 +2838,11 @@ if "PySide2.QtGui" in sys.modules: "QAbstractTextDocumentLayout.unregisterHandler": ('int', 'PySide2.QtCore.QObject'), # class PySide2.QtGui.QAccessible: - "QAccessible.isActive": (), "QAccessible.__copy__": (), "QAccessible.accessibleInterface": ('int',), "QAccessible.cleanup": (), "QAccessible.deleteAccessibleInterface": ('int',), + "QAccessible.isActive": (), "QAccessible.qAccessibleTextBoundaryHelper": ('PySide2.QtGui.QTextCursor', 'PySide2.QtGui.QAccessible.TextBoundaryType'), "QAccessible.queryAccessibleInterface": ('PySide2.QtCore.QObject',), "QAccessible.registerAccessibleInterface": ('PySide2.QtGui.QAccessibleInterface',), @@ -2900,7 +2902,7 @@ if "PySide2.QtGui" in sys.modules: "QBitmap.__copy__": (), "QBitmap.clear": (), "QBitmap.fromData": ('PySide2.QtCore.QSize', 'Union[str, int]', 'PySide2.QtGui.QImage.Format'), - "QBitmap.fromImage": ['ImageConversionFlags', 'PySide2.QtGui.QImage'], + "QBitmap.fromImage": ('PySide2.QtGui.QImage', 'ImageConversionFlags'), "QBitmap.swap": [('PySide2.QtGui.QBitmap',), ('PySide2.QtGui.QPixmap',)], "QBitmap.transformed": [('PySide2.QtGui.QMatrix',), ('PySide2.QtGui.QMatrix', 'PySide2.QtCore.Qt.TransformationMode'), ('PySide2.QtGui.QTransform',)], @@ -2924,7 +2926,6 @@ if "PySide2.QtGui" in sys.modules: "QBrush.transform": (), # class PySide2.QtGui.QClipboard: - "QClipboard.setText": ('str', 'PySide2.QtGui.QClipboard.Mode'), "QClipboard.clear": ('PySide2.QtGui.QClipboard.Mode',), "QClipboard.image": ('PySide2.QtGui.QClipboard.Mode',), "QClipboard.mimeData": ('PySide2.QtGui.QClipboard.Mode',), @@ -2935,6 +2936,7 @@ if "PySide2.QtGui" in sys.modules: "QClipboard.setImage": ('PySide2.QtGui.QImage', 'PySide2.QtGui.QClipboard.Mode'), "QClipboard.setMimeData": ('PySide2.QtCore.QMimeData', 'PySide2.QtGui.QClipboard.Mode'), "QClipboard.setPixmap": ('PySide2.QtGui.QPixmap', 'PySide2.QtGui.QClipboard.Mode'), + "QClipboard.setText": ('str', 'PySide2.QtGui.QClipboard.Mode'), "QClipboard.supportsFindBuffer": (), "QClipboard.supportsSelection": (), "QClipboard.text": [('PySide2.QtGui.QClipboard.Mode',), ('str', 'PySide2.QtGui.QClipboard.Mode')], @@ -3043,9 +3045,9 @@ if "PySide2.QtGui" in sys.modules: # class PySide2.QtGui.QContextMenuEvent: "QContextMenuEvent.__init__": [('PySide2.QtGui.QContextMenuEvent.Reason', 'PySide2.QtCore.QPoint'), ('PySide2.QtGui.QContextMenuEvent.Reason', 'PySide2.QtCore.QPoint', 'PySide2.QtCore.QPoint'), ('PySide2.QtGui.QContextMenuEvent.Reason', 'PySide2.QtCore.QPoint', 'PySide2.QtCore.QPoint', 'KeyboardModifiers')], - "QContextMenuEvent.global"+"Y": (), "QContextMenuEvent.globalPos": (), "QContextMenuEvent.globalX": (), + "QContextMenuEvent.global""Y": (), "QContextMenuEvent.pos": (), "QContextMenuEvent.reason": (), "QContextMenuEvent.x": (), @@ -3129,9 +3131,9 @@ if "PySide2.QtGui" in sys.modules: # class PySide2.QtGui.QEnterEvent: "QEnterEvent.__init__": ('PySide2.QtCore.QPointF', 'PySide2.QtCore.QPointF', 'PySide2.QtCore.QPointF'), - "QEnterEvent.global"+"Y": (), "QEnterEvent.globalPos": (), "QEnterEvent.globalX": (), + "QEnterEvent.global""Y": (), "QEnterEvent.localPos": (), "QEnterEvent.pos": (), "QEnterEvent.screenPos": (), @@ -3406,9 +3408,9 @@ if "PySide2.QtGui" in sys.modules: # class PySide2.QtGui.QHelpEvent: "QHelpEvent.__init__": ('PySide2.QtCore.QEvent.Type', 'PySide2.QtCore.QPoint', 'PySide2.QtCore.QPoint'), - "QHelpEvent.global"+"Y": (), "QHelpEvent.globalPos": (), "QHelpEvent.globalX": (), + "QHelpEvent.global""Y": (), "QHelpEvent.pos": (), "QHelpEvent.x": (), "QHelpEvent.y": (), @@ -3465,7 +3467,7 @@ if "PySide2.QtGui" in sys.modules: "QIconEngine.write": ('PySide2.QtCore.QDataStream',), # class PySide2.QtGui.QImage: - "QImage.__init__": [(), ('List[str]',), ('PySide2.QtCore.QSize', 'PySide2.QtGui.QImage.Format'), ('PySide2.QtGui.QImage',), ('Union[str, int]', 'int', 'int', 'PySide2.QtGui.QImage.Format', 'Callable[[bytes], NoneType]', 'int'), ('Union[str, int]', 'int', 'int', 'int', 'PySide2.QtGui.QImage.Format', 'Callable[[bytes], NoneType]', 'int'), ('int', 'int', 'PySide2.QtGui.QImage.Format'), ('str', 'int', 'int', 'PySide2.QtGui.QImage.Format'), ('str', 'int', 'int', 'int', 'PySide2.QtGui.QImage.Format'), ('str', 'str')], + "QImage.__init__": [(), ('List[str]',), ('PySide2.QtCore.QSize', 'PySide2.QtGui.QImage.Format'), ('PySide2.QtGui.QImage',), ('Union[str, int]', 'int', 'int', 'PySide2.QtGui.QImage.Format', 'Callable', 'int'), ('Union[str, int]', 'int', 'int', 'int', 'PySide2.QtGui.QImage.Format', 'Callable', 'int'), ('int', 'int', 'PySide2.QtGui.QImage.Format'), ('str', 'int', 'int', 'PySide2.QtGui.QImage.Format'), ('str', 'int', 'int', 'int', 'PySide2.QtGui.QImage.Format'), ('str', 'str')], "QImage.__copy__": (), "QImage.allGray": (), "QImage.alphaChannel": (), @@ -3560,7 +3562,7 @@ if "PySide2.QtGui" in sys.modules: "QImageIOHandler.option": ('PySide2.QtGui.QImageIOHandler.ImageOption',), "QImageIOHandler.read": ('PySide2.QtGui.QImage',), "QImageIOHandler.setDevice": ('PySide2.QtCore.QIODevice',), - "QImageIOHandler.setFormat": ['PySide2.QtCore.QByteArray'], + "QImageIOHandler.setFormat": ('PySide2.QtCore.QByteArray',), "QImageIOHandler.setOption": ('PySide2.QtGui.QImageIOHandler.ImageOption', 'Any'), "QImageIOHandler.supportsOption": ('PySide2.QtGui.QImageIOHandler.ImageOption',), "QImageIOHandler.write": ('PySide2.QtGui.QImage',), @@ -3836,9 +3838,9 @@ if "PySide2.QtGui" in sys.modules: "QMouseEvent.button": (), "QMouseEvent.buttons": (), "QMouseEvent.flags": (), - "QMouseEvent.global"+"Y": (), "QMouseEvent.globalPos": (), "QMouseEvent.globalX": (), + "QMouseEvent.global""Y": (), "QMouseEvent.localPos": (), "QMouseEvent.pos": (), "QMouseEvent.screenPos": (), @@ -3952,8 +3954,8 @@ if "PySide2.QtGui" in sys.modules: "QOpenGLContext.versionFunctions": ('PySide2.QtGui.QOpenGLVersionProfile',), # class PySide2.QtGui.QOpenGLContextGroup: - "QOpenGLContextGroup.shares": (), "QOpenGLContextGroup.currentContextGroup": (), + "QOpenGLContextGroup.shares": (), # class PySide2.QtGui.QOpenGLDebugLogger: "QOpenGLDebugLogger.__init__": ('PySide2.QtCore.QObject',), @@ -4041,6 +4043,7 @@ if "PySide2.QtGui" in sys.modules: "QOpenGLExtraFunctions.glGetQueryiv": ('int', 'int', 'int'), "QOpenGLExtraFunctions.glGetSamplerParameterfv": ('int', 'int', 'float'), "QOpenGLExtraFunctions.glGetSamplerParameteriv": ('int', 'int', 'int'), + "QOpenGLExtraFunctions.glGetStringi": ('int', 'int'), "QOpenGLExtraFunctions.glGetTexLevelParameterfv": ('int', 'int', 'int', 'float'), "QOpenGLExtraFunctions.glGetTexLevelParameteriv": ('int', 'int', 'int', 'int'), "QOpenGLExtraFunctions.glGetUniformBlockIndex": ('int', 'str'), @@ -4235,6 +4238,7 @@ if "PySide2.QtGui" in sys.modules: "QOpenGLFunctions.glGetRenderbufferParameteriv": ('int', 'int', 'int'), "QOpenGLFunctions.glGetShaderPrecisionFormat": ('int', 'int', 'int', 'int'), "QOpenGLFunctions.glGetShaderiv": ('int', 'int', 'int'), + "QOpenGLFunctions.glGetString": ('int',), "QOpenGLFunctions.glGetTexParameterfv": ('int', 'int', 'float'), "QOpenGLFunctions.glGetTexParameteriv": ('int', 'int', 'int'), "QOpenGLFunctions.glGetUniformLocation": ('int', 'str'), @@ -4567,7 +4571,7 @@ if "PySide2.QtGui" in sys.modules: # class PySide2.QtGui.QPagedPaintDevice: "QPagedPaintDevice.__init__": (), - "QPagedPaintDevice.devicePageLayout": [], + "QPagedPaintDevice.devicePageLayout": (), "QPagedPaintDevice.margins": (), "QPagedPaintDevice.newPage": (), "QPagedPaintDevice.pageLayout": (), @@ -4604,10 +4608,10 @@ if "PySide2.QtGui" in sys.modules: "QPaintDevice.widthMM": (), # class PySide2.QtGui.QPaintDeviceWindow: - "QPaintDeviceWindow.paintEngine": (), "QPaintDeviceWindow.event": ('PySide2.QtCore.QEvent',), "QPaintDeviceWindow.exposeEvent": ('PySide2.QtGui.QExposeEvent',), "QPaintDeviceWindow.metric": ('PySide2.QtGui.QPaintDevice.PaintDeviceMetric',), + "QPaintDeviceWindow.paintEngine": (), "QPaintDeviceWindow.paintEvent": ('PySide2.QtGui.QPaintEvent',), "QPaintDeviceWindow.update": [(), ('PySide2.QtCore.QRect',), ('PySide2.QtGui.QRegion',)], @@ -4694,7 +4698,7 @@ if "PySide2.QtGui" in sys.modules: "QPainter.drawEllipse": [('PySide2.QtCore.QPoint', 'int', 'int'), ('PySide2.QtCore.QPointF', 'float', 'float'), ('PySide2.QtCore.QRect',), ('PySide2.QtCore.QRectF',), ('int', 'int', 'int', 'int')], "QPainter.drawImage": [('PySide2.QtCore.QPoint', 'PySide2.QtGui.QImage'), ('PySide2.QtCore.QPoint', 'PySide2.QtGui.QImage', 'PySide2.QtCore.QRect', 'ImageConversionFlags'), ('PySide2.QtCore.QPointF', 'PySide2.QtGui.QImage'), ('PySide2.QtCore.QPointF', 'PySide2.QtGui.QImage', 'PySide2.QtCore.QRectF', 'ImageConversionFlags'), ('PySide2.QtCore.QRect', 'PySide2.QtGui.QImage'), ('PySide2.QtCore.QRect', 'PySide2.QtGui.QImage', 'PySide2.QtCore.QRect', 'ImageConversionFlags'), ('PySide2.QtCore.QRectF', 'PySide2.QtGui.QImage'), ('PySide2.QtCore.QRectF', 'PySide2.QtGui.QImage', 'PySide2.QtCore.QRectF', 'ImageConversionFlags'), ('int', 'int', 'PySide2.QtGui.QImage', 'int', 'int', 'int', 'int', 'ImageConversionFlags')], "QPainter.drawLine": [('PySide2.QtCore.QLine',), ('PySide2.QtCore.QLineF',), ('PySide2.QtCore.QPoint', 'PySide2.QtCore.QPoint'), ('PySide2.QtCore.QPointF', 'PySide2.QtCore.QPointF'), ('int', 'int', 'int', 'int')], - "QPainter.drawLines": ['list'], + "QPainter.drawLines": ('list',), "QPainter.drawPath": ('PySide2.QtGui.QPainterPath',), "QPainter.drawPicture": [('PySide2.QtCore.QPoint', 'PySide2.QtGui.QPicture'), ('PySide2.QtCore.QPointF', 'PySide2.QtGui.QPicture'), ('int', 'int', 'PySide2.QtGui.QPicture')], "QPainter.drawPie": [('PySide2.QtCore.QRect', 'int', 'int'), ('PySide2.QtCore.QRectF', 'int', 'int'), ('int', 'int', 'int', 'int', 'int', 'int')], @@ -4705,7 +4709,7 @@ if "PySide2.QtGui" in sys.modules: "QPainter.drawPolygon": [('PySide2.QtGui.QPolygon', 'PySide2.QtCore.Qt.FillRule'), ('PySide2.QtGui.QPolygonF', 'PySide2.QtCore.Qt.FillRule'), ('list', 'PySide2.QtCore.Qt.FillRule')], "QPainter.drawPolyline": [('PySide2.QtGui.QPolygon',), ('PySide2.QtGui.QPolygonF',), ('list',)], "QPainter.drawRect": [('PySide2.QtCore.QRect',), ('PySide2.QtCore.QRectF',), ('int', 'int', 'int', 'int')], - "QPainter.drawRects": ['list'], + "QPainter.drawRects": ('list',), "QPainter.drawRoundRect": [('PySide2.QtCore.QRect', 'int', 'int'), ('PySide2.QtCore.QRectF', 'int', 'int'), ('int', 'int', 'int', 'int', 'int', 'int')], "QPainter.drawRoundedRect": [('PySide2.QtCore.QRect', 'float', 'float', 'PySide2.QtCore.Qt.SizeMode'), ('PySide2.QtCore.QRectF', 'float', 'float', 'PySide2.QtCore.Qt.SizeMode'), ('int', 'int', 'int', 'int', 'float', 'float', 'PySide2.QtCore.Qt.SizeMode')], "QPainter.drawStaticText": [('PySide2.QtCore.QPoint', 'PySide2.QtGui.QStaticText'), ('PySide2.QtCore.QPointF', 'PySide2.QtGui.QStaticText'), ('int', 'int', 'PySide2.QtGui.QStaticText')], @@ -5064,11 +5068,11 @@ if "PySide2.QtGui" in sys.modules: "QPolygon.contains": ('PySide2.QtCore.QPoint',), "QPolygon.containsPoint": ('PySide2.QtCore.QPoint', 'PySide2.QtCore.Qt.FillRule'), "QPolygon.count": [(), ('PySide2.QtCore.QPoint',)], - "QPolygon.data": [], + "QPolygon.data": (), "QPolygon.empty": (), "QPolygon.endsWith": ('PySide2.QtCore.QPoint',), "QPolygon.fill": ('PySide2.QtCore.QPoint', 'int'), - "QPolygon.first": [], + "QPolygon.first": (), "QPolygon.fromList": ('list',), "QPolygon.front": (), "QPolygon.indexOf": ('PySide2.QtCore.QPoint', 'int'), @@ -5076,7 +5080,7 @@ if "PySide2.QtGui" in sys.modules: "QPolygon.intersected": ('PySide2.QtGui.QPolygon',), "QPolygon.isEmpty": (), "QPolygon.isSharedWith": ('list',), - "QPolygon.last": [], + "QPolygon.last": (), "QPolygon.lastIndexOf": ('PySide2.QtCore.QPoint', 'int'), "QPolygon.length": (), "QPolygon.mid": ('int', 'int'), @@ -5124,11 +5128,11 @@ if "PySide2.QtGui" in sys.modules: "QPolygonF.contains": ('PySide2.QtCore.QPointF',), "QPolygonF.containsPoint": ('PySide2.QtCore.QPointF', 'PySide2.QtCore.Qt.FillRule'), "QPolygonF.count": [(), ('PySide2.QtCore.QPointF',)], - "QPolygonF.data": [], + "QPolygonF.data": (), "QPolygonF.empty": (), "QPolygonF.endsWith": ('PySide2.QtCore.QPointF',), "QPolygonF.fill": ('PySide2.QtCore.QPointF', 'int'), - "QPolygonF.first": [], + "QPolygonF.first": (), "QPolygonF.fromList": ('list',), "QPolygonF.front": (), "QPolygonF.indexOf": ('PySide2.QtCore.QPointF', 'int'), @@ -5137,7 +5141,7 @@ if "PySide2.QtGui" in sys.modules: "QPolygonF.isClosed": (), "QPolygonF.isEmpty": (), "QPolygonF.isSharedWith": ('list',), - "QPolygonF.last": [], + "QPolygonF.last": (), "QPolygonF.lastIndexOf": ('PySide2.QtCore.QPointF', 'int'), "QPolygonF.length": (), "QPolygonF.mid": ('int', 'int'), @@ -5303,7 +5307,6 @@ if "PySide2.QtGui" in sys.modules: "QResizeEvent.size": (), # class PySide2.QtGui.QScreen: - "QScreen.virtualGeometry": (), "QScreen.angleBetween": ('PySide2.QtCore.Qt.ScreenOrientation', 'PySide2.QtCore.Qt.ScreenOrientation'), "QScreen.availableGeometry": (), "QScreen.availableSize": (), @@ -5335,11 +5338,11 @@ if "PySide2.QtGui" in sys.modules: "QScreen.setOrientationUpdateMask": ('ScreenOrientations',), "QScreen.size": (), "QScreen.transformBetween": ('PySide2.QtCore.Qt.ScreenOrientation', 'PySide2.QtCore.Qt.ScreenOrientation', 'PySide2.QtCore.QRect'), + "QScreen.virtualGeometry": (), "QScreen.virtualSiblings": (), "QScreen.virtualSize": (), # class PySide2.QtGui.QSessionManager: - "QSessionManager.restartCommand": (), "QSessionManager.allowsErrorInteraction": (), "QSessionManager.allowsInteraction": (), "QSessionManager.cancel": (), @@ -5347,6 +5350,7 @@ if "PySide2.QtGui" in sys.modules: "QSessionManager.isPhase2": (), "QSessionManager.release": (), "QSessionManager.requestPhase2": (), + "QSessionManager.restartCommand": (), "QSessionManager.restartHint": (), "QSessionManager.sessionId": (), "QSessionManager.sessionKey": (), @@ -5534,7 +5538,6 @@ if "PySide2.QtGui" in sys.modules: "QStringListModel.supportedDropActions": (), # class PySide2.QtGui.QStyleHints: - "QStyleHints.useRtlExtensions": (), "QStyleHints.cursorFlashTime": (), "QStyleHints.fontSmoothingGamma": (), "QStyleHints.keyboardAutoRepeatRate": (), @@ -5561,6 +5564,7 @@ if "PySide2.QtGui" in sys.modules: "QStyleHints.startDragVelocity": (), "QStyleHints.tabFocusBehavior": (), "QStyleHints.useHoverEffects": (), + "QStyleHints.useRtlExtensions": (), "QStyleHints.wheelScrollLines": (), # class PySide2.QtGui.QSurface: @@ -5634,12 +5638,12 @@ if "PySide2.QtGui" in sys.modules: "QTabletEvent.button": (), "QTabletEvent.buttons": (), "QTabletEvent.device": (), - "QTabletEvent.global"+"Y": (), "QTabletEvent.globalPos": (), "QTabletEvent.globalPosF": (), "QTabletEvent.globalX": (), - "QTabletEvent.hiResGlobal"+"Y": (), + "QTabletEvent.global""Y": (), "QTabletEvent.hiResGlobalX": (), + "QTabletEvent.hiResGlobal""Y": (), "QTabletEvent.pointerType": (), "QTabletEvent.pos": (), "QTabletEvent.posF": (), @@ -5673,7 +5677,6 @@ if "PySide2.QtGui" in sys.modules: "QTextBlock.layout": (), "QTextBlock.length": (), "QTextBlock.lineCount": (), - "QTextBlock.next": (), "QTextBlock.position": (), "QTextBlock.previous": (), "QTextBlock.revision": (), @@ -6464,10 +6467,10 @@ if "PySide2.QtGui" in sys.modules: "QWheelEvent.angleDelta": (), "QWheelEvent.buttons": (), "QWheelEvent.delta": (), - "QWheelEvent.global"+"Y": (), "QWheelEvent.globalPos": (), "QWheelEvent.globalPosF": (), "QWheelEvent.globalX": (), + "QWheelEvent.global""Y": (), "QWheelEvent.inverted": (), "QWheelEvent.orientation": (), "QWheelEvent.phase": (), @@ -7196,6 +7199,19 @@ if "PySide2.QtWidgets" in sys.modules: "QColorDialog.standardColor": ('int',), "QColorDialog.testOption": ('PySide2.QtWidgets.QColorDialog.ColorDialogOption',), + # class PySide2.QtWidgets.QColormap: + "QColormap.__init__": ('PySide2.QtWidgets.QColormap',), + "QColormap.__copy__": (), + "QColormap.cleanup": (), + "QColormap.colorAt": ('int',), + "QColormap.colormap": (), + "QColormap.depth": (), + "QColormap.initialize": (), + "QColormap.instance": ('int',), + "QColormap.mode": (), + "QColormap.pixel": ('PySide2.QtGui.QColor',), + "QColormap.size": (), + # class PySide2.QtWidgets.QColumnView: "QColumnView.__init__": ('PySide2.QtWidgets.QWidget',), "QColumnView.columnWidths": (), @@ -7896,10 +7912,10 @@ if "PySide2.QtWidgets" in sys.modules: "QGestureRecognizer.unregisterRecognizer": ('PySide2.QtCore.Qt.GestureType',), # class PySide2.QtWidgets.QGraphicsAnchor: - "QGraphicsAnchor.spacing": (), "QGraphicsAnchor.setSizePolicy": ('PySide2.QtWidgets.QSizePolicy.Policy',), "QGraphicsAnchor.setSpacing": ('float',), "QGraphicsAnchor.sizePolicy": (), + "QGraphicsAnchor.spacing": (), "QGraphicsAnchor.unsetSpacing": (), # class PySide2.QtWidgets.QGraphicsAnchorLayout: @@ -8182,7 +8198,7 @@ if "PySide2.QtWidgets" in sys.modules: "QGraphicsItem.shape": (), "QGraphicsItem.show": (), "QGraphicsItem.stackBefore": ('PySide2.QtWidgets.QGraphicsItem',), - "QGraphicsItem.toGraphicsObject": [], + "QGraphicsItem.toGraphicsObject": (), "QGraphicsItem.toolTip": (), "QGraphicsItem.topLevelItem": (), "QGraphicsItem.topLevelWidget": (), @@ -11146,13 +11162,13 @@ if "PySide2.QtWidgets" in sys.modules: "QToolButton.toolButtonStyle": (), # class PySide2.QtWidgets.QToolTip: - "QToolTip.showText": [('PySide2.QtCore.QPoint', 'str', 'PySide2.QtWidgets.QWidget'), ('PySide2.QtCore.QPoint', 'str', 'PySide2.QtWidgets.QWidget', 'PySide2.QtCore.QRect'), ('PySide2.QtCore.QPoint', 'str', 'PySide2.QtWidgets.QWidget', 'PySide2.QtCore.QRect', 'int')], "QToolTip.font": (), "QToolTip.hideText": (), "QToolTip.isVisible": (), "QToolTip.palette": (), "QToolTip.setFont": ('PySide2.QtGui.QFont',), "QToolTip.setPalette": ('PySide2.QtGui.QPalette',), + "QToolTip.showText": [('PySide2.QtCore.QPoint', 'str', 'PySide2.QtWidgets.QWidget'), ('PySide2.QtCore.QPoint', 'str', 'PySide2.QtWidgets.QWidget', 'PySide2.QtCore.QRect'), ('PySide2.QtCore.QPoint', 'str', 'PySide2.QtWidgets.QWidget', 'PySide2.QtCore.QRect', 'int')], "QToolTip.text": (), # class PySide2.QtWidgets.QTreeView: @@ -11271,7 +11287,7 @@ if "PySide2.QtWidgets" in sys.modules: "QTreeWidget.expandItem": ('PySide2.QtWidgets.QTreeWidgetItem',), "QTreeWidget.findItems": ('str', 'MatchFlags', 'int'), "QTreeWidget.headerItem": (), - "QTreeWidget.indexFromItem": ['PySide2.QtWidgets.QTreeWidgetItem', 'int'], + "QTreeWidget.indexFromItem": ('PySide2.QtWidgets.QTreeWidgetItem', 'int'), "QTreeWidget.indexOfTopLevelItem": ('PySide2.QtWidgets.QTreeWidgetItem',), "QTreeWidget.insertTopLevelItem": ('int', 'PySide2.QtWidgets.QTreeWidgetItem'), "QTreeWidget.insertTopLevelItems": ('int', 'list'), @@ -11455,12 +11471,12 @@ if "PySide2.QtWidgets" in sys.modules: "QVBoxLayout.__init__": [(), ('PySide2.QtWidgets.QWidget',)], # class PySide2.QtWidgets.QWhatsThis: - "QWhatsThis.showText": ('PySide2.QtCore.QPoint', 'str', 'PySide2.QtWidgets.QWidget'), "QWhatsThis.createAction": ('PySide2.QtCore.QObject',), "QWhatsThis.enterWhatsThisMode": (), "QWhatsThis.hideText": (), "QWhatsThis.inWhatsThisMode": (), "QWhatsThis.leaveWhatsThisMode": (), + "QWhatsThis.showText": ('PySide2.QtCore.QPoint', 'str', 'PySide2.QtWidgets.QWidget'), # class PySide2.QtWidgets.QWidget: "QWidget.__init__": ('PySide2.QtWidgets.QWidget', 'WindowFlags'), @@ -11765,7 +11781,6 @@ if "PySide2.QtWidgets" in sys.modules: "QWizard.field": ('str',), "QWizard.hasVisitedPage": ('int',), "QWizard.initializePage": ('int',), - "QWizard.next": (), "QWizard.nextId": (), "QWizard.options": (), "QWizard.page": ('int',), @@ -12170,7 +12185,6 @@ if "PySide2.QtSql" in sys.modules: "QSqlQuery.lastError": (), "QSqlQuery.lastInsertId": (), "QSqlQuery.lastQuery": (), - "QSqlQuery.next": (), "QSqlQuery.nextResult": (), "QSqlQuery.numRowsAffected": (), "QSqlQuery.numericalPrecisionPolicy": (), @@ -12859,12 +12873,12 @@ if "PySide2.QtTest" in sys.modules: dict.update({ # class PySide2.QtTest.QTest: - "QTest.currentDataTag": (), "QTest.addColumnInternal": ('int', 'str'), "QTest.asciiToKey": ('Union[str, int]',), "QTest.compare_string_helper": ('str', 'str', 'str', 'str', 'str', 'int'), "QTest.createTouchDevice": ('PySide2.QtGui.QTouchDevice.DeviceType',), "QTest.currentAppName": (), + "QTest.currentDataTag": (), "QTest.currentTestFailed": (), "QTest.currentTestFunction": (), "QTest.ignoreMessage": [('PySide2.QtCore.QtMsgType', 'PySide2.QtCore.QRegularExpression'), ('PySide2.QtCore.QtMsgType', 'str')], @@ -12882,7 +12896,7 @@ if "PySide2.QtTest" in sys.modules: "QTest.mouseRelease": [('PySide2.QtGui.QWindow', 'PySide2.QtCore.Qt.MouseButton', 'KeyboardModifiers', 'PySide2.QtCore.QPoint', 'int'), ('PySide2.QtWidgets.QWidget', 'PySide2.QtCore.Qt.MouseButton', 'KeyboardModifiers', 'PySide2.QtCore.QPoint', 'int')], "QTest.qElementData": ('str', 'int'), "QTest.qExpectFail": ('str', 'str', 'PySide2.QtTest.QTest.TestFailMode', 'str', 'int'), - "QTest.qFindTestData": ['int', 'str', 'str', 'str'], + "QTest.qFindTestData": ('str', 'str', 'int', 'str'), "QTest.qGlobalData": ('str', 'int'), "QTest.qSkip": ('str', 'str', 'int'), "QTest.qWaitForWindowActive": ('PySide2.QtWidgets.QWidget', 'int'), @@ -12909,9 +12923,9 @@ if "PySide2.QtX11Extras" in sys.modules: dict.update({ # class PySide2.QtX11Extras.QX11Info: - "QX11Info.appRootWindow": ('int',), "QX11Info.appDpiX": ('int',), "QX11Info.appDpiY": ('int',), + "QX11Info.appRootWindow": ('int',), "QX11Info.appScreen": (), "QX11Info.appTime": (), "QX11Info.appUserTime": (), @@ -13253,7 +13267,6 @@ if "PySide2.QtXml" in sys.modules: "QXmlInputSource.data": (), "QXmlInputSource.fetchData": (), "QXmlInputSource.fromRawData": ('PySide2.QtCore.QByteArray', 'bool'), - "QXmlInputSource.next": (), "QXmlInputSource.reset": (), "QXmlInputSource.setData": [('PySide2.QtCore.QByteArray',), ('str',)], @@ -13304,7 +13317,7 @@ if "PySide2.QtXml" in sys.modules: "QXmlReader.hasFeature": ('str',), "QXmlReader.hasProperty": ('str',), "QXmlReader.lexicalHandler": (), - "QXmlReader.parse": ['PySide2.QtXml.QXmlInputSource'], + "QXmlReader.parse": ('PySide2.QtXml.QXmlInputSource',), "QXmlReader.property": ('str', 'bool'), "QXmlReader.setContentHandler": ('PySide2.QtXml.QXmlContentHandler',), "QXmlReader.setDTDHandler": ('PySide2.QtXml.QXmlDTDHandler',), @@ -13470,7 +13483,6 @@ if "PySide2.QtXmlPatterns" in sys.modules: "QXmlResultItems.__init__": (), "QXmlResultItems.current": (), "QXmlResultItems.hasError": (), - "QXmlResultItems.next": (), # class PySide2.QtXmlPatterns.QXmlSchema: "QXmlSchema.__init__": [(), ('PySide2.QtXmlPatterns.QXmlSchema',)], @@ -13528,12 +13540,12 @@ if "PySide2.QtHelp" in sys.modules: "QHelpContentItem.url": (), # class PySide2.QtHelp.QHelpContentModel: - "QHelpContentModel.isCreatingContents": (), "QHelpContentModel.columnCount": ('PySide2.QtCore.QModelIndex',), "QHelpContentModel.contentItemAt": ('PySide2.QtCore.QModelIndex',), "QHelpContentModel.createContents": ('str',), "QHelpContentModel.data": ('PySide2.QtCore.QModelIndex', 'int'), "QHelpContentModel.index": ('int', 'int', 'PySide2.QtCore.QModelIndex'), + "QHelpContentModel.isCreatingContents": (), "QHelpContentModel.parent": [(), ('PySide2.QtCore.QModelIndex',)], "QHelpContentModel.rowCount": ('PySide2.QtCore.QModelIndex',), @@ -13580,9 +13592,9 @@ if "PySide2.QtHelp" in sys.modules: "QHelpEngineCore.unregisterDocumentation": ('str',), # class PySide2.QtHelp.QHelpIndexModel: - "QHelpIndexModel.isCreatingIndex": (), "QHelpIndexModel.createIndex": [('int', 'int', 'int'), ('int', 'int', 'object'), ('str',)], "QHelpIndexModel.filter": ('str', 'str'), + "QHelpIndexModel.isCreatingIndex": (), "QHelpIndexModel.linksForKeyword": ('str',), # class PySide2.QtHelp.QHelpIndexWidget: @@ -13603,6 +13615,7 @@ if "PySide2.QtHelp" in sys.modules: "QHelpSearchEngine.search": [('list',), ('str',)], "QHelpSearchEngine.searchInput": (), "QHelpSearchEngine.searchResultCount": (), + "QHelpSearchEngine.searchResults": ('int', 'int'), # class PySide2.QtHelp.QHelpSearchQuery: "QHelpSearchQuery.__init__": [(), ('PySide2.QtHelp.QHelpSearchQuery',), ('PySide2.QtHelp.QHelpSearchQuery.FieldName', 'List[str]')], @@ -13621,6 +13634,12 @@ if "PySide2.QtHelp" in sys.modules: "QHelpSearchQueryWidget.setQuery": ('list',), "QHelpSearchQueryWidget.setSearchInput": ('str',), + # class PySide2.QtHelp.QHelpSearchResult: + "QHelpSearchResult.__init__": [(), ('PySide2.QtCore.QUrl', 'str', 'str'), ('PySide2.QtHelp.QHelpSearchResult',)], + "QHelpSearchResult.snippet": (), + "QHelpSearchResult.title": (), + "QHelpSearchResult.url": (), + # class PySide2.QtHelp.QHelpSearchResultWidget: "QHelpSearchResultWidget.changeEvent": ('PySide2.QtCore.QEvent',), "QHelpSearchResultWidget.linkAt": ('PySide2.QtCore.QPoint',), @@ -13725,7 +13744,7 @@ if "PySide2.QtMultimedia" in sys.modules: "QAudioBuffer.__copy__": (), "QAudioBuffer.byteCount": (), "QAudioBuffer.constData": (), - "QAudioBuffer.data": [], + "QAudioBuffer.data": (), "QAudioBuffer.duration": (), "QAudioBuffer.format": (), "QAudioBuffer.frameCount": (), @@ -14148,9 +14167,9 @@ if "PySide2.QtMultimedia" in sys.modules: "QMediaNetworkAccessControl.setConfigurations": ('list',), # class PySide2.QtMultimedia.QMediaObject: - "QMediaObject.availableMetaData": (), "QMediaObject.addPropertyWatch": ('PySide2.QtCore.QByteArray',), "QMediaObject.availability": (), + "QMediaObject.availableMetaData": (), "QMediaObject.bind": ('PySide2.QtCore.QObject',), "QMediaObject.isAvailable": (), "QMediaObject.isMetaDataAvailable": (), @@ -14240,7 +14259,6 @@ if "PySide2.QtMultimedia" in sys.modules: "QMediaPlaylist.mediaCount": (), "QMediaPlaylist.mediaObject": (), "QMediaPlaylist.moveMedia": ('int', 'int'), - "QMediaPlaylist.next": (), "QMediaPlaylist.nextIndex": ('int',), "QMediaPlaylist.playbackMode": (), "QMediaPlaylist.previous": (), @@ -14505,7 +14523,7 @@ if "PySide2.QtMultimedia" in sys.modules: "QVideoFrame.__init__": [(), ('PySide2.QtGui.QImage',), ('PySide2.QtMultimedia.QAbstractVideoBuffer', 'PySide2.QtCore.QSize', 'PySide2.QtMultimedia.QVideoFrame.PixelFormat'), ('PySide2.QtMultimedia.QVideoFrame',), ('int', 'PySide2.QtCore.QSize', 'int', 'PySide2.QtMultimedia.QVideoFrame.PixelFormat')], "QVideoFrame.__copy__": (), "QVideoFrame.availableMetaData": (), - "QVideoFrame.bits": [], + "QVideoFrame.bits": (), "QVideoFrame.bytesPerLine": [(), ('int',)], "QVideoFrame.endTime": (), "QVideoFrame.fieldType": (), @@ -15006,7 +15024,6 @@ if "PySide2.QtQml" in sys.modules: "QJSValueIterator.__init__": ('PySide2.QtQml.QJSValue',), "QJSValueIterator.hasNext": (), "QJSValueIterator.name": (), - "QJSValueIterator.next": (), "QJSValueIterator.value": (), # class PySide2.QtQml.QQmlAbstractUrlInterceptor: @@ -15017,7 +15034,7 @@ if "PySide2.QtQml" in sys.modules: "QQmlApplicationEngine.__init__": [('PySide2.QtCore.QObject',), ('PySide2.QtCore.QUrl', 'PySide2.QtCore.QObject'), ('str', 'PySide2.QtCore.QObject')], "QQmlApplicationEngine.load": [('PySide2.QtCore.QUrl',), ('str',)], "QQmlApplicationEngine.loadData": ('PySide2.QtCore.QByteArray', 'PySide2.QtCore.QUrl'), - "QQmlApplicationEngine.rootObjects": [], + "QQmlApplicationEngine.rootObjects": (), # class PySide2.QtQml.QQmlComponent: "QQmlComponent.__init__": [('PySide2.QtCore.QObject',), ('PySide2.QtQml.QQmlEngine', 'PySide2.QtCore.QObject'), ('PySide2.QtQml.QQmlEngine', 'PySide2.QtCore.QUrl', 'PySide2.QtCore.QObject'), ('PySide2.QtQml.QQmlEngine', 'PySide2.QtCore.QUrl', 'PySide2.QtQml.QQmlComponent.CompilationMode', 'PySide2.QtCore.QObject'), ('PySide2.QtQml.QQmlEngine', 'str', 'PySide2.QtCore.QObject'), ('PySide2.QtQml.QQmlEngine', 'str', 'PySide2.QtQml.QQmlComponent.CompilationMode', 'PySide2.QtCore.QObject')], @@ -15168,7 +15185,7 @@ if "PySide2.QtQml" in sys.modules: "QQmlFileSelector.__init__": ('PySide2.QtQml.QQmlEngine', 'PySide2.QtCore.QObject'), "QQmlFileSelector.get": ('PySide2.QtQml.QQmlEngine',), "QQmlFileSelector.selector": (), - "QQmlFileSelector.setExtraSelectors": ['List[str]'], + "QQmlFileSelector.setExtraSelectors": ('List[str]',), "QQmlFileSelector.setSelector": ('PySide2.QtCore.QFileSelector',), # class PySide2.QtQml.QQmlImageProviderBase: @@ -15458,9 +15475,9 @@ if "PySide2.QtQuick" in sys.modules: "QQuickItem.z": (), # class PySide2.QtQuick.QQuickItemGrabResult: - "QQuickItemGrabResult.saveToFile": ['str'], "QQuickItemGrabResult.event": ('PySide2.QtCore.QEvent',), "QQuickItemGrabResult.image": (), + "QQuickItemGrabResult.saveToFile": ('str',), "QQuickItemGrabResult.url": (), # class PySide2.QtQuick.QQuickPaintedItem: @@ -15615,7 +15632,7 @@ if "PySide2.QtQuick" in sys.modules: # class PySide2.QtQuick.QSGBasicGeometryNode: "QSGBasicGeometryNode.__init__": ('PySide2.QtQuick.QSGNode.NodeType',), "QSGBasicGeometryNode.clipList": (), - "QSGBasicGeometryNode.geometry": [], + "QSGBasicGeometryNode.geometry": (), "QSGBasicGeometryNode.matrix": (), "QSGBasicGeometryNode.setGeometry": ('PySide2.QtQuick.QSGGeometry',), "QSGBasicGeometryNode.setRendererClipList": ('PySide2.QtQuick.QSGClipNode',), @@ -15650,9 +15667,9 @@ if "PySide2.QtQuick" in sys.modules: "QSGGeometry.defaultAttributes_TexturedPoint2D": (), "QSGGeometry.drawingMode": (), "QSGGeometry.indexCount": (), - "QSGGeometry.indexData": [], - "QSGGeometry.indexDataAsUInt": [], - "QSGGeometry.indexDataAsUShort": [], + "QSGGeometry.indexData": (), + "QSGGeometry.indexDataAsUInt": (), + "QSGGeometry.indexDataAsUShort": (), "QSGGeometry.indexDataPattern": (), "QSGGeometry.indexType": (), "QSGGeometry.lineWidth": (), @@ -15668,10 +15685,10 @@ if "PySide2.QtQuick" in sys.modules: "QSGGeometry.updateRectGeometry": ('PySide2.QtQuick.QSGGeometry', 'PySide2.QtCore.QRectF'), "QSGGeometry.updateTexturedRectGeometry": ('PySide2.QtQuick.QSGGeometry', 'PySide2.QtCore.QRectF', 'PySide2.QtCore.QRectF'), "QSGGeometry.vertexCount": (), - "QSGGeometry.vertexData": [], - "QSGGeometry.vertexDataAsColoredPoint2D": [], - "QSGGeometry.vertexDataAsPoint2D": [], - "QSGGeometry.vertexDataAsTexturedPoint2D": [], + "QSGGeometry.vertexData": (), + "QSGGeometry.vertexDataAsColoredPoint2D": (), + "QSGGeometry.vertexDataAsPoint2D": (), + "QSGGeometry.vertexDataAsTexturedPoint2D": (), "QSGGeometry.vertexDataPattern": (), # class PySide2.QtQuick.QSGGeometryNode: @@ -15957,7 +15974,7 @@ if "PySide2.QtDataVisualization" in sys.modules: dict.update({ # class PySide2.QtDataVisualization.QtDataVisualization: - "QtDataVisualization.qDefaultSurfaceFormat": ['bool'], + "QtDataVisualization.qDefaultSurfaceFormat": ('bool',), }) # Module PySide2.QtUiTools @@ -16018,13 +16035,13 @@ if "PySide2.QtWebEngineWidgets" in sys.modules: "QWebEngineCertificateError.url": (), # class PySide2.QtWebEngineWidgets.QWebEngineDownloadItem: - "QWebEngineDownloadItem.path": (), "QWebEngineDownloadItem.accept": (), "QWebEngineDownloadItem.cancel": (), "QWebEngineDownloadItem.id": (), "QWebEngineDownloadItem.interruptReasonString": (), "QWebEngineDownloadItem.isFinished": (), "QWebEngineDownloadItem.mimeType": (), + "QWebEngineDownloadItem.path": (), "QWebEngineDownloadItem.receivedBytes": (), "QWebEngineDownloadItem.setPath": ('str',), "QWebEngineDownloadItem.state": (), diff --git a/sources/pyside2/tests/registry/exists_win32_5_9_3_ci.py b/sources/pyside2/tests/registry/exists_win32_5_9_4_ci.py index 4a6862a98..8d7c8a7e0 100644 --- a/sources/pyside2/tests/registry/exists_win32_5_9_3_ci.py +++ b/sources/pyside2/tests/registry/exists_win32_5_9_4_ci.py @@ -1,6 +1,6 @@ ############################################################################# ## -## Copyright (C) 2017 The Qt Company Ltd. +## Copyright (C) 2018 The Qt Company Ltd. ## Contact: https://www.qt.io/licensing/ ## ## This file is part of PySide2. @@ -37,6 +37,14 @@ ## ############################################################################# +""" +This file contains the simplified signatures for all functions in PySide +for module 'exists_win32_5_9_4_ci'. There are no default values, no variable +names and no self parameter. Only types are present after simplification. +The functions 'next' resp. '__next__' are removed +to make the output identical for Python 2 and 3. +""" + import sys dict = {} @@ -108,13 +116,13 @@ if "PySide2.QtCore" in sys.modules: "QAbstractItemModel.canDropMimeData": ('PySide2.QtCore.QMimeData', 'PySide2.QtCore.Qt.DropAction', 'int', 'int', 'PySide2.QtCore.QModelIndex'), "QAbstractItemModel.canFetchMore": ('PySide2.QtCore.QModelIndex',), "QAbstractItemModel.changePersistentIndex": ('PySide2.QtCore.QModelIndex', 'PySide2.QtCore.QModelIndex'), - "QAbstractItemModel.changePersistentIndexList": ('PySide2.support.signature.typing.List', 'PySide2.support.signature.typing.List'), + "QAbstractItemModel.changePersistentIndexList": ('List[int]', 'List[int]'), "QAbstractItemModel.columnCount": ('PySide2.QtCore.QModelIndex',), "QAbstractItemModel.createIndex": [('int', 'int', 'int'), ('int', 'int', 'object')], "QAbstractItemModel.data": ('PySide2.QtCore.QModelIndex', 'int'), "QAbstractItemModel.decodeData": ('int', 'int', 'PySide2.QtCore.QModelIndex', 'PySide2.QtCore.QDataStream'), "QAbstractItemModel.dropMimeData": ('PySide2.QtCore.QMimeData', 'PySide2.QtCore.Qt.DropAction', 'int', 'int', 'PySide2.QtCore.QModelIndex'), - "QAbstractItemModel.encodeData": ('PySide2.support.signature.typing.List', 'PySide2.QtCore.QDataStream'), + "QAbstractItemModel.encodeData": ('List[int]', 'PySide2.QtCore.QDataStream'), "QAbstractItemModel.endInsertColumns": (), "QAbstractItemModel.endInsertRows": (), "QAbstractItemModel.endMoveColumns": (), @@ -133,8 +141,8 @@ if "PySide2.QtCore" in sys.modules: "QAbstractItemModel.insertRow": ('int', 'PySide2.QtCore.QModelIndex'), "QAbstractItemModel.insertRows": ('int', 'int', 'PySide2.QtCore.QModelIndex'), "QAbstractItemModel.itemData": ('PySide2.QtCore.QModelIndex',), - "QAbstractItemModel.match": ('PySide2.QtCore.QModelIndex', 'int', 'PySide2.support.signature.typing.Any', 'int', 'MatchFlags'), - "QAbstractItemModel.mimeData": ('PySide2.support.signature.typing.List',), + "QAbstractItemModel.match": ('PySide2.QtCore.QModelIndex', 'int', 'Any', 'int', 'MatchFlags'), + "QAbstractItemModel.mimeData": ('List[int]',), "QAbstractItemModel.mimeTypes": (), "QAbstractItemModel.moveColumn": ('PySide2.QtCore.QModelIndex', 'int', 'PySide2.QtCore.QModelIndex', 'int'), "QAbstractItemModel.moveColumns": ('PySide2.QtCore.QModelIndex', 'int', 'int', 'PySide2.QtCore.QModelIndex', 'int'), @@ -150,8 +158,8 @@ if "PySide2.QtCore" in sys.modules: "QAbstractItemModel.revert": (), "QAbstractItemModel.roleNames": (), "QAbstractItemModel.rowCount": ('PySide2.QtCore.QModelIndex',), - "QAbstractItemModel.setData": ('PySide2.QtCore.QModelIndex', 'PySide2.support.signature.typing.Any', 'int'), - "QAbstractItemModel.setHeaderData": ('int', 'PySide2.QtCore.Qt.Orientation', 'PySide2.support.signature.typing.Any', 'int'), + "QAbstractItemModel.setData": ('PySide2.QtCore.QModelIndex', 'Any', 'int'), + "QAbstractItemModel.setHeaderData": ('int', 'PySide2.QtCore.Qt.Orientation', 'Any', 'int'), "QAbstractItemModel.setItemData": ('PySide2.QtCore.QModelIndex', 'dict'), "QAbstractItemModel.sibling": ('int', 'int', 'PySide2.QtCore.QModelIndex'), "QAbstractItemModel.sort": ('int', 'PySide2.QtCore.Qt.SortOrder'), @@ -186,12 +194,12 @@ if "PySide2.QtCore" in sys.modules: "QAbstractProxyModel.mapSelectionFromSource": ('PySide2.QtCore.QItemSelection',), "QAbstractProxyModel.mapSelectionToSource": ('PySide2.QtCore.QItemSelection',), "QAbstractProxyModel.mapToSource": ('PySide2.QtCore.QModelIndex',), - "QAbstractProxyModel.mimeData": ('PySide2.support.signature.typing.List',), + "QAbstractProxyModel.mimeData": ('List[int]',), "QAbstractProxyModel.mimeTypes": (), "QAbstractProxyModel.resetInternalData": (), "QAbstractProxyModel.revert": (), - "QAbstractProxyModel.setData": ('PySide2.QtCore.QModelIndex', 'PySide2.support.signature.typing.Any', 'int'), - "QAbstractProxyModel.setHeaderData": ('int', 'PySide2.QtCore.Qt.Orientation', 'PySide2.support.signature.typing.Any', 'int'), + "QAbstractProxyModel.setData": ('PySide2.QtCore.QModelIndex', 'Any', 'int'), + "QAbstractProxyModel.setHeaderData": ('int', 'PySide2.QtCore.Qt.Orientation', 'Any', 'int'), "QAbstractProxyModel.setItemData": ('PySide2.QtCore.QModelIndex', 'dict'), "QAbstractProxyModel.setSourceModel": ('PySide2.QtCore.QAbstractItemModel',), "QAbstractProxyModel.sibling": ('int', 'int', 'PySide2.QtCore.QModelIndex'), @@ -251,7 +259,7 @@ if "PySide2.QtCore" in sys.modules: # class PySide2.QtCore.QBasicMutex: "QBasicMutex.__init__": (), - "QBasicMutex.isRecursive": [], + "QBasicMutex.isRecursive": (), "QBasicMutex.lock": (), "QBasicMutex.tryLock": (), "QBasicMutex.try_lock": (), @@ -286,7 +294,7 @@ if "PySide2.QtCore" in sys.modules: # class PySide2.QtCore.QBuffer: "QBuffer.__init__": [('PySide2.QtCore.QByteArray', 'PySide2.QtCore.QObject'), ('PySide2.QtCore.QObject',)], "QBuffer.atEnd": (), - "QBuffer.buffer": [], + "QBuffer.buffer": (), "QBuffer.canReadLine": (), "QBuffer.close": (), "QBuffer.connectNotify": ('PySide2.QtCore.QMetaMethod',), @@ -302,68 +310,68 @@ if "PySide2.QtCore" in sys.modules: "QBuffer.writeData": ('str', 'int'), # class PySide2.QtCore.QByteArray: - "QByteArray.__init__": [(), ('PySide2.QtCore.QByteArray',), ('int', 'PySide2.support.signature.typing.Union[str, int]')], + "QByteArray.__init__": [(), ('PySide2.QtCore.QByteArray',), ('int', 'Union[str, int]')], "QByteArray.__copy__": (), "QByteArray.__reduce__": (), - "QByteArray.append": [('PySide2.QtCore.QByteArray',), ('PySide2.support.signature.typing.Union[str, int]',), ('int', 'PySide2.support.signature.typing.Union[str, int]')], + "QByteArray.append": [('PySide2.QtCore.QByteArray',), ('Union[str, int]',), ('int', 'Union[str, int]')], "QByteArray.at": ('int',), "QByteArray.capacity": (), "QByteArray.cbegin": (), "QByteArray.cend": (), "QByteArray.chop": ('int',), "QByteArray.clear": (), - "QByteArray.contains": [('PySide2.QtCore.QByteArray',), ('PySide2.support.signature.typing.Union[str, int]',)], - "QByteArray.count": [(), ('PySide2.QtCore.QByteArray',), ('PySide2.support.signature.typing.Union[str, int]',)], - "QByteArray.data": [], - "QByteArray.endsWith": [('PySide2.QtCore.QByteArray',), ('PySide2.support.signature.typing.Union[str, int]',)], - "QByteArray.fill": ('PySide2.support.signature.typing.Union[str, int]', 'int'), + "QByteArray.contains": [('PySide2.QtCore.QByteArray',), ('Union[str, int]',)], + "QByteArray.count": [(), ('PySide2.QtCore.QByteArray',), ('Union[str, int]',)], + "QByteArray.data": (), + "QByteArray.endsWith": [('PySide2.QtCore.QByteArray',), ('Union[str, int]',)], + "QByteArray.fill": ('Union[str, int]', 'int'), "QByteArray.fromBase64": [('PySide2.QtCore.QByteArray',), ('PySide2.QtCore.QByteArray', 'Base64Options')], "QByteArray.fromHex": ('PySide2.QtCore.QByteArray',), - "QByteArray.fromPercentEncoding": ('PySide2.QtCore.QByteArray', 'PySide2.support.signature.typing.Union[str, int]'), + "QByteArray.fromPercentEncoding": ('PySide2.QtCore.QByteArray', 'Union[str, int]'), "QByteArray.fromRawData": ('str', 'int'), "QByteArray.indexOf": ('PySide2.QtCore.QByteArray', 'int'), - "QByteArray.insert": [('int', 'PySide2.QtCore.QByteArray'), ('int', 'int', 'PySide2.support.signature.typing.Union[str, int]')], + "QByteArray.insert": [('int', 'PySide2.QtCore.QByteArray'), ('int', 'int', 'Union[str, int]')], "QByteArray.isEmpty": (), "QByteArray.isNull": (), "QByteArray.isSharedWith": ('PySide2.QtCore.QByteArray',), "QByteArray.lastIndexOf": ('PySide2.QtCore.QByteArray', 'int'), "QByteArray.left": ('int',), - "QByteArray.leftJustified": ('int', 'PySide2.support.signature.typing.Union[str, int]', 'bool'), + "QByteArray.leftJustified": ('int', 'Union[str, int]', 'bool'), "QByteArray.length": (), "QByteArray.mid": ('int', 'int'), - "QByteArray.number": [('float', 'PySide2.support.signature.typing.Union[str, int]', 'int'), ('int', 'int')], - "QByteArray.prepend": [('PySide2.QtCore.QByteArray',), ('PySide2.support.signature.typing.Union[str, int]',), ('int', 'PySide2.support.signature.typing.Union[str, int]')], + "QByteArray.number": [('float', 'Union[str, int]', 'int'), ('int', 'int')], + "QByteArray.prepend": [('PySide2.QtCore.QByteArray',), ('Union[str, int]',), ('int', 'Union[str, int]')], "QByteArray.remove": ('int', 'int'), "QByteArray.repeated": ('int',), - "QByteArray.replace": [('PySide2.QtCore.QByteArray', 'PySide2.QtCore.QByteArray'), ('PySide2.support.signature.typing.Union[str, int]', 'PySide2.QtCore.QByteArray'), ('PySide2.support.signature.typing.Union[str, int]', 'PySide2.support.signature.typing.Union[str, int]'), ('int', 'int', 'PySide2.QtCore.QByteArray'), ('str', 'PySide2.QtCore.QByteArray')], + "QByteArray.replace": [('PySide2.QtCore.QByteArray', 'PySide2.QtCore.QByteArray'), ('Union[str, int]', 'PySide2.QtCore.QByteArray'), ('Union[str, int]', 'Union[str, int]'), ('int', 'int', 'PySide2.QtCore.QByteArray'), ('str', 'PySide2.QtCore.QByteArray')], "QByteArray.reserve": ('int',), "QByteArray.resize": ('int',), "QByteArray.right": ('int',), - "QByteArray.rightJustified": ('int', 'PySide2.support.signature.typing.Union[str, int]', 'bool'), - "QByteArray.setNum": [('float', 'PySide2.support.signature.typing.Union[str, int]', 'int'), ('int', 'int')], + "QByteArray.rightJustified": ('int', 'Union[str, int]', 'bool'), + "QByteArray.setNum": [('float', 'Union[str, int]', 'int'), ('int', 'int')], "QByteArray.setRawData": ('str', 'int'), - "QByteArray.simplified": [], + "QByteArray.simplified": (), "QByteArray.size": (), - "QByteArray.split": ('PySide2.support.signature.typing.Union[str, int]',), + "QByteArray.split": ('Union[str, int]',), "QByteArray.squeeze": (), - "QByteArray.startsWith": [('PySide2.QtCore.QByteArray',), ('PySide2.support.signature.typing.Union[str, int]',)], + "QByteArray.startsWith": [('PySide2.QtCore.QByteArray',), ('Union[str, int]',)], "QByteArray.swap": ('PySide2.QtCore.QByteArray',), "QByteArray.toBase64": [(), ('Base64Options',)], "QByteArray.toDouble": ('bool',), "QByteArray.toFloat": ('bool',), - "QByteArray.toHex": [(), ('PySide2.support.signature.typing.Union[str, int]',)], + "QByteArray.toHex": [(), ('Union[str, int]',)], "QByteArray.toInt": ('bool', 'int'), "QByteArray.toLong": ('bool', 'int'), "QByteArray.toLongLong": ('bool', 'int'), - "QByteArray.toLower": [], - "QByteArray.toPercentEncoding": ('PySide2.QtCore.QByteArray', 'PySide2.QtCore.QByteArray', 'PySide2.support.signature.typing.Union[str, int]'), + "QByteArray.toLower": (), + "QByteArray.toPercentEncoding": ('PySide2.QtCore.QByteArray', 'PySide2.QtCore.QByteArray', 'Union[str, int]'), "QByteArray.toShort": ('bool', 'int'), "QByteArray.toUInt": ('bool', 'int'), "QByteArray.toULong": ('bool', 'int'), "QByteArray.toULongLong": ('bool', 'int'), "QByteArray.toUShort": ('bool', 'int'), - "QByteArray.toUpper": [], - "QByteArray.trimmed": [], + "QByteArray.toUpper": (), + "QByteArray.trimmed": (), "QByteArray.truncate": ('int',), # class PySide2.QtCore.QByteArrayMatcher: @@ -383,7 +391,7 @@ if "PySide2.QtCore" in sys.modules: # class PySide2.QtCore.QCollator: "QCollator.__init__": [('PySide2.QtCore.QCollator',), ('PySide2.QtCore.QLocale',)], "QCollator.caseSensitivity": (), - "QCollator.compare": [('PySide2.support.signature.typing.Union[str, int]', 'int', 'PySide2.support.signature.typing.Union[str, int]', 'int'), ('str', 'str')], + "QCollator.compare": [('Union[str, int]', 'int', 'Union[str, int]', 'int'), ('str', 'str')], "QCollator.ignorePunctuation": (), "QCollator.locale": (), "QCollator.numericMode": (), @@ -400,14 +408,14 @@ if "PySide2.QtCore" in sys.modules: "QCollatorSortKey.swap": ('PySide2.QtCore.QCollatorSortKey',), # class PySide2.QtCore.QCommandLineOption: - "QCommandLineOption.__init__": [('PySide2.QtCore.QCommandLineOption',), ('PySide2.support.signature.typing.List',), ('PySide2.support.signature.typing.List', 'str', 'str', 'str'), ('str',), ('str', 'str', 'str', 'str')], + "QCommandLineOption.__init__": [('List[str]',), ('List[str]', 'str', 'str', 'str'), ('PySide2.QtCore.QCommandLineOption',), ('str',), ('str', 'str', 'str', 'str')], "QCommandLineOption.defaultValues": (), "QCommandLineOption.description": (), "QCommandLineOption.flags": (), "QCommandLineOption.isHidden": (), "QCommandLineOption.names": (), "QCommandLineOption.setDefaultValue": ('str',), - "QCommandLineOption.setDefaultValues": ('PySide2.support.signature.typing.List',), + "QCommandLineOption.setDefaultValues": ('List[str]',), "QCommandLineOption.setDescription": ('str',), "QCommandLineOption.setFlags": ('Flags',), "QCommandLineOption.setHidden": ('bool',), @@ -428,9 +436,9 @@ if "PySide2.QtCore" in sys.modules: "QCommandLineParser.helpText": (), "QCommandLineParser.isSet": [('PySide2.QtCore.QCommandLineOption',), ('str',)], "QCommandLineParser.optionNames": (), - "QCommandLineParser.parse": ('PySide2.support.signature.typing.List',), + "QCommandLineParser.parse": ('List[str]',), "QCommandLineParser.positionalArguments": (), - "QCommandLineParser.process": [('PySide2.QtCore.QCoreApplication',), ('PySide2.support.signature.typing.List',)], + "QCommandLineParser.process": [('List[str]',), ('PySide2.QtCore.QCoreApplication',)], "QCommandLineParser.setApplicationDescription": ('str',), "QCommandLineParser.setOptionsAfterPositionalArgumentsMode": ('PySide2.QtCore.QCommandLineParser.OptionsAfterPositionalArgumentsMode',), "QCommandLineParser.setSingleDashWordOptionMode": ('PySide2.QtCore.QCommandLineParser.SingleDashWordOptionMode',), @@ -441,7 +449,7 @@ if "PySide2.QtCore" in sys.modules: "QCommandLineParser.values": [('PySide2.QtCore.QCommandLineOption',), ('str',)], # class PySide2.QtCore.QCoreApplication: - "QCoreApplication.__init__": ('PySide2.support.signature.typing.List',), + "QCoreApplication.__init__": ('List[str]',), "QCoreApplication.addLibraryPath": ('str',), "QCoreApplication.applicationDirPath": (), "QCoreApplication.applicationFilePath": (), @@ -476,7 +484,7 @@ if "PySide2.QtCore" in sys.modules: "QCoreApplication.setApplicationVersion": ('str',), "QCoreApplication.setAttribute": ('PySide2.QtCore.Qt.ApplicationAttribute', 'bool'), "QCoreApplication.setEventDispatcher": ('PySide2.QtCore.QAbstractEventDispatcher',), - "QCoreApplication.setLibraryPaths": ('PySide2.support.signature.typing.List',), + "QCoreApplication.setLibraryPaths": ('List[str]',), "QCoreApplication.setOrganizationDomain": ('str',), "QCoreApplication.setOrganizationName": ('str',), "QCoreApplication.setQuitLockEnabled": ('bool',), @@ -535,17 +543,17 @@ if "PySide2.QtCore" in sys.modules: "QDataStream.writeInt16": ('int',), "QDataStream.writeInt32": ('int',), "QDataStream.writeInt64": ('int',), - "QDataStream.writeInt8": ('PySide2.support.signature.typing.Union[str, int]',), - "QDataStream.writeQChar": ('PySide2.support.signature.typing.Union[str, int]',), + "QDataStream.writeInt8": ('Union[str, int]',), + "QDataStream.writeQChar": ('Union[str, int]',), "QDataStream.writeQString": ('str',), - "QDataStream.writeQStringList": ('PySide2.support.signature.typing.List',), - "QDataStream.writeQVariant": ('PySide2.support.signature.typing.Any',), + "QDataStream.writeQStringList": ('List[str]',), + "QDataStream.writeQVariant": ('Any',), "QDataStream.writeRawData": ('str', 'int'), "QDataStream.writeString": ('str',), "QDataStream.writeUInt16": ('int',), "QDataStream.writeUInt32": ('int',), "QDataStream.writeUInt64": ('int',), - "QDataStream.writeUInt8": ('PySide2.support.signature.typing.Union[str, int]',), + "QDataStream.writeUInt8": ('Union[str, int]',), # class PySide2.QtCore.QDate: "QDate.__init__": [(), ('PySide2.QtCore.QDate',), ('int', 'int', 'int')], @@ -563,7 +571,7 @@ if "PySide2.QtCore" in sys.modules: "QDate.daysTo": ('PySide2.QtCore.QDate',), "QDate.fromJulianDay": ('int',), "QDate.fromString": [('str', 'PySide2.QtCore.Qt.DateFormat'), ('str', 'str')], - "QDate.getDate": ['int', 'int', 'int'], + "QDate.getDate": ('int', 'int', 'int'), "QDate.isLeapYear": ('int',), "QDate.isNull": (), "QDate.isValid": [(), ('int', 'int', 'int')], @@ -647,8 +655,8 @@ if "PySide2.QtCore" in sys.modules: "QDir.currentPath": (), "QDir.dirName": (), "QDir.drives": (), - "QDir.entryInfoList": [('Filters', 'SortFlags'), ('PySide2.support.signature.typing.List', 'Filters', 'SortFlags')], - "QDir.entryList": [('Filters', 'SortFlags'), ('PySide2.support.signature.typing.List', 'Filters', 'SortFlags')], + "QDir.entryInfoList": [('Filters', 'SortFlags'), ('List[str]', 'Filters', 'SortFlags')], + "QDir.entryList": [('Filters', 'SortFlags'), ('List[str]', 'Filters', 'SortFlags')], "QDir.exists": [(), ('str',)], "QDir.filePath": ('str',), "QDir.filter": (), @@ -664,7 +672,7 @@ if "PySide2.QtCore" in sys.modules: "QDir.isRoot": (), "QDir.listSeparator": (), "QDir.makeAbsolute": (), - "QDir.match": [('PySide2.support.signature.typing.List', 'str'), ('str', 'str')], + "QDir.match": [('List[str]', 'str'), ('str', 'str')], "QDir.mkdir": ('str',), "QDir.mkpath": ('str',), "QDir.nameFilters": (), @@ -683,9 +691,9 @@ if "PySide2.QtCore" in sys.modules: "QDir.separator": (), "QDir.setCurrent": ('str',), "QDir.setFilter": ('Filters',), - "QDir.setNameFilters": ('PySide2.support.signature.typing.List',), + "QDir.setNameFilters": ('List[str]',), "QDir.setPath": ('str',), - "QDir.setSearchPaths": ('str', 'PySide2.support.signature.typing.List'), + "QDir.setSearchPaths": ('str', 'List[str]'), "QDir.setSorting": ('SortFlags',), "QDir.sorting": (), "QDir.swap": ('PySide2.QtCore.QDir',), @@ -694,12 +702,11 @@ if "PySide2.QtCore" in sys.modules: "QDir.toNativeSeparators": ('str',), # class PySide2.QtCore.QDirIterator: - "QDirIterator.__init__": [('PySide2.QtCore.QDir', 'IteratorFlags'), ('str', 'Filters', 'IteratorFlags'), ('str', 'IteratorFlags'), ('str', 'PySide2.support.signature.typing.List', 'Filters', 'IteratorFlags')], + "QDirIterator.__init__": [('PySide2.QtCore.QDir', 'IteratorFlags'), ('str', 'Filters', 'IteratorFlags'), ('str', 'IteratorFlags'), ('str', 'List[str]', 'Filters', 'IteratorFlags')], "QDirIterator.fileInfo": (), "QDirIterator.fileName": (), "QDirIterator.filePath": (), "QDirIterator.hasNext": (), - "QDirIterator.next": (), "QDirIterator.path": (), # class PySide2.QtCore.QDynamicPropertyChangeEvent: @@ -812,7 +819,7 @@ if "PySide2.QtCore" in sys.modules: "QFileDevice.seek": ('int',), "QFileDevice.setPermissions": ('Permissions',), "QFileDevice.size": (), - "QFileDevice.unmap": ('PySide2.support.signature.typing.Union[str, int]',), + "QFileDevice.unmap": ('Union[str, int]',), "QFileDevice.unsetError": (), "QFileDevice.writeData": ('str', 'int'), @@ -869,16 +876,16 @@ if "PySide2.QtCore" in sys.modules: "QFileSelector.allSelectors": (), "QFileSelector.extraSelectors": (), "QFileSelector.select": [('PySide2.QtCore.QUrl',), ('str',)], - "QFileSelector.setExtraSelectors": ('PySide2.support.signature.typing.List',), + "QFileSelector.setExtraSelectors": ('List[str]',), # class PySide2.QtCore.QFileSystemWatcher: - "QFileSystemWatcher.__init__": [('PySide2.QtCore.QObject',), ('PySide2.support.signature.typing.List', 'PySide2.QtCore.QObject')], + "QFileSystemWatcher.__init__": [('List[str]', 'PySide2.QtCore.QObject'), ('PySide2.QtCore.QObject',)], "QFileSystemWatcher.addPath": ('str',), - "QFileSystemWatcher.addPaths": ('PySide2.support.signature.typing.List',), + "QFileSystemWatcher.addPaths": ('List[str]',), "QFileSystemWatcher.directories": (), "QFileSystemWatcher.files": (), "QFileSystemWatcher.removePath": ('str',), - "QFileSystemWatcher.removePaths": ('PySide2.support.signature.typing.List',), + "QFileSystemWatcher.removePaths": ('List[str]',), # class PySide2.QtCore.QFinalState: "QFinalState.__init__": ('PySide2.QtCore.QState',), @@ -930,7 +937,7 @@ if "PySide2.QtCore" in sys.modules: "QIODevice.openMode": (), "QIODevice.peek": ('int',), "QIODevice.pos": (), - "QIODevice.putChar": ('PySide2.support.signature.typing.Union[str, int]',), + "QIODevice.putChar": ('Union[str, int]',), "QIODevice.read": ('int',), "QIODevice.readAll": (), "QIODevice.readChannelCount": (), @@ -947,7 +954,7 @@ if "PySide2.QtCore" in sys.modules: "QIODevice.setTextModeEnabled": ('bool',), "QIODevice.size": (), "QIODevice.startTransaction": (), - "QIODevice.ungetChar": ('PySide2.support.signature.typing.Union[str, int]',), + "QIODevice.ungetChar": ('Union[str, int]',), "QIODevice.waitForBytesWritten": ('int',), "QIODevice.waitForReadyRead": ('int',), "QIODevice.write": ('PySide2.QtCore.QByteArray',), @@ -959,7 +966,7 @@ if "PySide2.QtCore" in sys.modules: "QItemSelection.__copy__": (), "QItemSelection.append": [('PySide2.QtCore.QItemSelectionRange',), ('list',)], "QItemSelection.at": ('int',), - "QItemSelection.back": [], + "QItemSelection.back": (), "QItemSelection.clear": (), "QItemSelection.constFirst": (), "QItemSelection.constLast": (), @@ -968,16 +975,16 @@ if "PySide2.QtCore" in sys.modules: "QItemSelection.detachShared": (), "QItemSelection.empty": (), "QItemSelection.endsWith": ('PySide2.QtCore.QItemSelectionRange',), - "QItemSelection.first": [], + "QItemSelection.first": (), "QItemSelection.fromSet": ('set',), "QItemSelection.fromVector": ('list',), - "QItemSelection.front": [], + "QItemSelection.front": (), "QItemSelection.indexOf": ('PySide2.QtCore.QItemSelectionRange', 'int'), "QItemSelection.indexes": (), "QItemSelection.insert": ('int', 'PySide2.QtCore.QItemSelectionRange'), "QItemSelection.isEmpty": (), "QItemSelection.isSharedWith": ('list',), - "QItemSelection.last": [], + "QItemSelection.last": (), "QItemSelection.lastIndexOf": ('PySide2.QtCore.QItemSelectionRange', 'int'), "QItemSelection.length": (), "QItemSelection.merge": ('PySide2.QtCore.QItemSelection', 'SelectionFlags'), @@ -1020,7 +1027,7 @@ if "PySide2.QtCore" in sys.modules: "QItemSelectionModel.isColumnSelected": ('int', 'PySide2.QtCore.QModelIndex'), "QItemSelectionModel.isRowSelected": ('int', 'PySide2.QtCore.QModelIndex'), "QItemSelectionModel.isSelected": ('PySide2.QtCore.QModelIndex',), - "QItemSelectionModel.model": [], + "QItemSelectionModel.model": (), "QItemSelectionModel.reset": (), "QItemSelectionModel.rowIntersectsSelection": ('int', 'PySide2.QtCore.QModelIndex'), "QItemSelectionModel.select": [('PySide2.QtCore.QItemSelection', 'SelectionFlags'), ('PySide2.QtCore.QModelIndex', 'SelectionFlags')], @@ -1061,7 +1068,7 @@ if "PySide2.QtCore" in sys.modules: "QJsonArray.count": (), "QJsonArray.empty": (), "QJsonArray.first": (), - "QJsonArray.fromStringList": ('PySide2.support.signature.typing.List',), + "QJsonArray.fromStringList": ('List[str]',), "QJsonArray.fromVariantList": ('list',), "QJsonArray.insert": ('int', 'PySide2.QtCore.QJsonValue'), "QJsonArray.isEmpty": (), @@ -1086,7 +1093,7 @@ if "PySide2.QtCore" in sys.modules: "QJsonDocument.fromBinaryData": ('PySide2.QtCore.QByteArray', 'PySide2.QtCore.QJsonDocument.DataValidation'), "QJsonDocument.fromJson": ('PySide2.QtCore.QByteArray', 'PySide2.QtCore.QJsonParseError'), "QJsonDocument.fromRawData": ('str', 'int', 'PySide2.QtCore.QJsonDocument.DataValidation'), - "QJsonDocument.fromVariant": ('PySide2.support.signature.typing.Any',), + "QJsonDocument.fromVariant": ('Any',), "QJsonDocument.isArray": (), "QJsonDocument.isEmpty": (), "QJsonDocument.isNull": (), @@ -1107,7 +1114,7 @@ if "PySide2.QtCore" in sys.modules: # class PySide2.QtCore.QJsonValue: "QJsonValue.__init__": [('PySide2.QtCore.QJsonArray',), ('PySide2.QtCore.QJsonValue',), ('PySide2.QtCore.QJsonValue.Type',), ('bool',), ('dict',), ('float',), ('int',), ('str',)], "QJsonValue.__copy__": (), - "QJsonValue.fromVariant": ('PySide2.support.signature.typing.Any',), + "QJsonValue.fromVariant": ('Any',), "QJsonValue.isArray": (), "QJsonValue.isBool": (), "QJsonValue.isDouble": (), @@ -1198,7 +1205,7 @@ if "PySide2.QtCore" in sys.modules: "QLocale.countriesForLanguage": ('PySide2.QtCore.QLocale.Language',), "QLocale.country": (), "QLocale.countryToString": ('PySide2.QtCore.QLocale.Country',), - "QLocale.createSeparatedList": ('PySide2.support.signature.typing.List',), + "QLocale.createSeparatedList": ('List[str]',), "QLocale.currencySymbol": ('PySide2.QtCore.QLocale.CurrencySymbolFormat',), "QLocale.dateFormat": ('PySide2.QtCore.QLocale.FormatType',), "QLocale.dateTimeFormat": ('PySide2.QtCore.QLocale.FormatType',), @@ -1220,7 +1227,7 @@ if "PySide2.QtCore" in sys.modules: "QLocale.percent": (), "QLocale.pmText": (), "QLocale.positiveSign": (), - "QLocale.quoteString": ['PySide2.QtCore.QLocale.QuotationStyle', 'str'], + "QLocale.quoteString": ('str', 'PySide2.QtCore.QLocale.QuotationStyle'), "QLocale.script": (), "QLocale.scriptToString": ('PySide2.QtCore.QLocale.Script',), "QLocale.setDefault": ('PySide2.QtCore.QLocale',), @@ -1240,7 +1247,7 @@ if "PySide2.QtCore" in sys.modules: "QLocale.toLongLong": ('str', 'bool'), "QLocale.toLower": ('str',), "QLocale.toShort": ('str', 'bool'), - "QLocale.toString": [('PySide2.QtCore.QDate', 'PySide2.QtCore.QLocale.FormatType'), ('PySide2.QtCore.QDate', 'str'), ('PySide2.QtCore.QDateTime', 'PySide2.QtCore.QLocale.FormatType'), ('PySide2.QtCore.QDateTime', 'str'), ('PySide2.QtCore.QTime', 'PySide2.QtCore.QLocale.FormatType'), ('PySide2.QtCore.QTime', 'str'), ('float', 'PySide2.support.signature.typing.Union[str, int]', 'int'), ('int',)], + "QLocale.toString": [('PySide2.QtCore.QDate', 'PySide2.QtCore.QLocale.FormatType'), ('PySide2.QtCore.QDate', 'str'), ('PySide2.QtCore.QDateTime', 'PySide2.QtCore.QLocale.FormatType'), ('PySide2.QtCore.QDateTime', 'str'), ('PySide2.QtCore.QTime', 'PySide2.QtCore.QLocale.FormatType'), ('PySide2.QtCore.QTime', 'str'), ('float', 'Union[str, int]', 'int'), ('int',)], "QLocale.toTime": [('str', 'PySide2.QtCore.QLocale.FormatType'), ('str', 'str')], "QLocale.toUInt": ('str', 'bool'), "QLocale.toULongLong": ('str', 'bool'), @@ -1325,7 +1332,7 @@ if "PySide2.QtCore" in sys.modules: # class PySide2.QtCore.QMetaObject: "QMetaObject.__init__": (), - "QMetaObject.cast": ['PySide2.QtCore.QObject'], + "QMetaObject.cast": ('PySide2.QtCore.QObject',), "QMetaObject.checkConnectArgs": [('PySide2.QtCore.QMetaMethod', 'PySide2.QtCore.QMetaMethod'), ('str', 'str')], "QMetaObject.classInfo": ('int',), "QMetaObject.classInfoCount": (), @@ -1391,8 +1398,8 @@ if "PySide2.QtCore" in sys.modules: "QMetaProperty.type": (), "QMetaProperty.typeName": (), "QMetaProperty.userType": (), - "QMetaProperty.write": ('PySide2.QtCore.QObject', 'PySide2.support.signature.typing.Any'), - "QMetaProperty.writeOnGadget": ('int', 'PySide2.support.signature.typing.Any'), + "QMetaProperty.write": ('PySide2.QtCore.QObject', 'Any'), + "QMetaProperty.writeOnGadget": ('int', 'Any'), # class PySide2.QtCore.QMimeData: "QMimeData.__init__": (), @@ -1410,10 +1417,10 @@ if "PySide2.QtCore" in sys.modules: "QMimeData.imageData": (), "QMimeData.removeFormat": ('str',), "QMimeData.retrieveData": ('str', 'type'), - "QMimeData.setColorData": ('PySide2.support.signature.typing.Any',), + "QMimeData.setColorData": ('Any',), "QMimeData.setData": ('str', 'PySide2.QtCore.QByteArray'), "QMimeData.setHtml": ('str',), - "QMimeData.setImageData": ('PySide2.support.signature.typing.Any',), + "QMimeData.setImageData": ('Any',), "QMimeData.setText": ('str',), "QMimeData.setUrls": ('list',), "QMimeData.text": (), @@ -1466,7 +1473,7 @@ if "PySide2.QtCore" in sys.modules: # class PySide2.QtCore.QMutex: "QMutex.__init__": ('PySide2.QtCore.QMutex.RecursionMode',), - "QMutex.isRecursive": [], + "QMutex.isRecursive": (), "QMutex.lock": (), "QMutex.tryLock": [(), ('int',)], "QMutex.try_lock": (), @@ -1485,14 +1492,14 @@ if "PySide2.QtCore" in sys.modules: "QObject.blockSignals": ('bool',), "QObject.childEvent": ('PySide2.QtCore.QChildEvent',), "QObject.children": (), - "QObject.connect": [('PySide2.QtCore.QObject', 'PySide2.QtCore.QMetaMethod', 'PySide2.QtCore.QObject', 'PySide2.QtCore.QMetaMethod', 'PySide2.QtCore.Qt.ConnectionType'), ('PySide2.QtCore.QObject', 'str', 'PySide2.QtCore.QObject', 'str', 'PySide2.QtCore.Qt.ConnectionType'), ('PySide2.QtCore.QObject', 'str', 'PySide2.support.signature.typing.Callable', 'PySide2.QtCore.Qt.ConnectionType'), ('PySide2.QtCore.QObject', 'str', 'str', 'PySide2.QtCore.Qt.ConnectionType'), ('str', 'PySide2.QtCore.QObject', 'str', 'PySide2.QtCore.Qt.ConnectionType'), ('str', 'PySide2.support.signature.typing.Callable', 'PySide2.QtCore.Qt.ConnectionType')], + "QObject.connect": [('PySide2.QtCore.QObject', 'PySide2.QtCore.QMetaMethod', 'PySide2.QtCore.QObject', 'PySide2.QtCore.QMetaMethod', 'PySide2.QtCore.Qt.ConnectionType'), ('PySide2.QtCore.QObject', 'str', 'Callable', 'PySide2.QtCore.Qt.ConnectionType'), ('PySide2.QtCore.QObject', 'str', 'PySide2.QtCore.QObject', 'str', 'PySide2.QtCore.Qt.ConnectionType'), ('PySide2.QtCore.QObject', 'str', 'str', 'PySide2.QtCore.Qt.ConnectionType'), ('str', 'Callable', 'PySide2.QtCore.Qt.ConnectionType'), ('str', 'PySide2.QtCore.QObject', 'str', 'PySide2.QtCore.Qt.ConnectionType')], "QObject.connectNotify": ('PySide2.QtCore.QMetaMethod',), "QObject.customEvent": ('PySide2.QtCore.QEvent',), "QObject.deleteLater": (), - "QObject.disconnect": [('PySide2.QtCore.QMetaObject.Connection',), ('PySide2.QtCore.QObject', 'PySide2.QtCore.QMetaMethod', 'PySide2.QtCore.QObject', 'PySide2.QtCore.QMetaMethod'), ('PySide2.QtCore.QObject', 'str'), ('PySide2.QtCore.QObject', 'str', 'PySide2.QtCore.QObject', 'str'), ('PySide2.QtCore.QObject', 'str', 'PySide2.support.signature.typing.Callable'), ('str', 'PySide2.QtCore.QObject', 'str'), ('str', 'PySide2.support.signature.typing.Callable')], + "QObject.disconnect": [('PySide2.QtCore.QMetaObject.Connection',), ('PySide2.QtCore.QObject', 'PySide2.QtCore.QMetaMethod', 'PySide2.QtCore.QObject', 'PySide2.QtCore.QMetaMethod'), ('PySide2.QtCore.QObject', 'str'), ('PySide2.QtCore.QObject', 'str', 'Callable'), ('PySide2.QtCore.QObject', 'str', 'PySide2.QtCore.QObject', 'str'), ('str', 'Callable'), ('str', 'PySide2.QtCore.QObject', 'str')], "QObject.disconnectNotify": ('PySide2.QtCore.QMetaMethod',), - "QObject.dumpObjectInfo": [], - "QObject.dumpObjectTree": [], + "QObject.dumpObjectInfo": (), + "QObject.dumpObjectTree": (), "QObject.dynamicPropertyNames": (), "QObject.emit": ('str', '...'), "QObject.event": ('PySide2.QtCore.QEvent',), @@ -1517,7 +1524,7 @@ if "PySide2.QtCore" in sys.modules: "QObject.senderSignalIndex": (), "QObject.setObjectName": ('str',), "QObject.setParent": ('PySide2.QtCore.QObject',), - "QObject.setProperty": ('str', 'PySide2.support.signature.typing.Any'), + "QObject.setProperty": ('str', 'Any'), "QObject.signalsBlocked": (), "QObject.startTimer": ('int', 'PySide2.QtCore.Qt.TimerType'), "QObject.thread": (), @@ -1605,7 +1612,7 @@ if "PySide2.QtCore" in sys.modules: "QProcess.closeReadChannel": ('PySide2.QtCore.QProcess.ProcessChannel',), "QProcess.closeWriteChannel": (), "QProcess.environment": (), - "QProcess.execute": [('str',), ('str', 'PySide2.support.signature.typing.List')], + "QProcess.execute": [('str',), ('str', 'List[str]')], "QProcess.exitCode": (), "QProcess.exitStatus": (), "QProcess.inputChannelMode": (), @@ -1623,8 +1630,8 @@ if "PySide2.QtCore" in sys.modules: "QProcess.readAllStandardOutput": (), "QProcess.readChannel": (), "QProcess.readData": ('str', 'int'), - "QProcess.setArguments": ('PySide2.support.signature.typing.List',), - "QProcess.setEnvironment": ('PySide2.support.signature.typing.List',), + "QProcess.setArguments": ('List[str]',), + "QProcess.setEnvironment": ('List[str]',), "QProcess.setInputChannelMode": ('PySide2.QtCore.QProcess.InputChannelMode',), "QProcess.setNativeArguments": ('str',), "QProcess.setProcessChannelMode": ('PySide2.QtCore.QProcess.ProcessChannelMode',), @@ -1638,8 +1645,8 @@ if "PySide2.QtCore" in sys.modules: "QProcess.setStandardOutputProcess": ('PySide2.QtCore.QProcess',), "QProcess.setWorkingDirectory": ('str',), "QProcess.setupChildProcess": (), - "QProcess.start": [('OpenMode',), ('str', 'OpenMode'), ('str', 'PySide2.support.signature.typing.List', 'OpenMode')], - "QProcess.startDetached": [('str',), ('str', 'PySide2.support.signature.typing.List'), ('str', 'PySide2.support.signature.typing.List', 'str', 'int')], + "QProcess.start": [('OpenMode',), ('str', 'List[str]', 'OpenMode'), ('str', 'OpenMode')], + "QProcess.startDetached": [('str',), ('str', 'List[str]'), ('str', 'List[str]', 'str', 'int')], "QProcess.state": (), "QProcess.systemEnvironment": (), "QProcess.terminate": (), @@ -1671,7 +1678,7 @@ if "PySide2.QtCore" in sys.modules: "QPropertyAnimation.setPropertyName": ('PySide2.QtCore.QByteArray',), "QPropertyAnimation.setTargetObject": ('PySide2.QtCore.QObject',), "QPropertyAnimation.targetObject": (), - "QPropertyAnimation.updateCurrentValue": ('PySide2.support.signature.typing.Any',), + "QPropertyAnimation.updateCurrentValue": ('Any',), "QPropertyAnimation.updateState": ('PySide2.QtCore.QAbstractAnimation.State', 'PySide2.QtCore.QAbstractAnimation.State'), # class PySide2.QtCore.QReadLocker: @@ -1818,11 +1825,11 @@ if "PySide2.QtCore" in sys.modules: "QRegExp.__init__": [(), ('PySide2.QtCore.QRegExp',), ('str', 'PySide2.QtCore.Qt.CaseSensitivity', 'PySide2.QtCore.QRegExp.PatternSyntax')], "QRegExp.__copy__": (), "QRegExp.__reduce__": (), - "QRegExp.cap": ['int'], + "QRegExp.cap": ('int',), "QRegExp.captureCount": (), - "QRegExp.capturedTexts": [], + "QRegExp.capturedTexts": (), "QRegExp.caseSensitivity": (), - "QRegExp.errorString": [], + "QRegExp.errorString": (), "QRegExp.escape": ('str',), "QRegExp.exactMatch": ('str',), "QRegExp.indexIn": ('str', 'int', 'PySide2.QtCore.QRegExp.CaretMode'), @@ -1833,7 +1840,7 @@ if "PySide2.QtCore" in sys.modules: "QRegExp.matchedLength": (), "QRegExp.pattern": (), "QRegExp.patternSyntax": (), - "QRegExp.pos": ['int'], + "QRegExp.pos": ('int',), "QRegExp.replace": ('str', 'str'), "QRegExp.setCaseSensitivity": ('PySide2.QtCore.Qt.CaseSensitivity',), "QRegExp.setMinimal": ('bool',), @@ -1847,9 +1854,9 @@ if "PySide2.QtCore" in sys.modules: "QRegularExpression.captureCount": (), "QRegularExpression.errorString": (), "QRegularExpression.escape": ('str',), - "QRegularExpression.globalMatch": ['MatchOptions', 'PySide2.QtCore.QRegularExpression.MatchType', 'int', 'str'], + "QRegularExpression.globalMatch": ('str', 'int', 'PySide2.QtCore.QRegularExpression.MatchType', 'MatchOptions'), "QRegularExpression.isValid": (), - "QRegularExpression.match": ['MatchOptions', 'PySide2.QtCore.QRegularExpression.MatchType', 'int', 'str'], + "QRegularExpression.match": ('str', 'int', 'PySide2.QtCore.QRegularExpression.MatchType', 'MatchOptions'), "QRegularExpression.namedCaptureGroups": (), "QRegularExpression.optimize": (), "QRegularExpression.pattern": (), @@ -1884,7 +1891,6 @@ if "PySide2.QtCore" in sys.modules: "QRegularExpressionMatchIterator.isValid": (), "QRegularExpressionMatchIterator.matchOptions": (), "QRegularExpressionMatchIterator.matchType": (), - "QRegularExpressionMatchIterator.next": (), "QRegularExpressionMatchIterator.peekNext": (), "QRegularExpressionMatchIterator.regularExpression": (), "QRegularExpressionMatchIterator.swap": ('PySide2.QtCore.QRegularExpressionMatchIterator',), @@ -1903,13 +1909,13 @@ if "PySide2.QtCore" in sys.modules: "QResource.lastModified": (), "QResource.locale": (), "QResource.registerResource": ('str', 'str'), - "QResource.registerResourceData": ('PySide2.support.signature.typing.Union[str, int]', 'str'), + "QResource.registerResourceData": ('Union[str, int]', 'str'), "QResource.searchPaths": (), "QResource.setFileName": ('str',), "QResource.setLocale": ('PySide2.QtCore.QLocale',), "QResource.size": (), "QResource.unregisterResource": ('str', 'str'), - "QResource.unregisterResourceData": ('PySide2.support.signature.typing.Union[str, int]', 'str'), + "QResource.unregisterResourceData": ('Union[str, int]', 'str'), # class PySide2.QtCore.QRunnable: "QRunnable.__init__": (), @@ -1976,10 +1982,10 @@ if "PySide2.QtCore" in sys.modules: "QSettings.setFallbacksEnabled": ('bool',), "QSettings.setIniCodec": [('PySide2.QtCore.QTextCodec',), ('str',)], "QSettings.setPath": ('PySide2.QtCore.QSettings.Format', 'PySide2.QtCore.QSettings.Scope', 'str'), - "QSettings.setValue": ('str', 'PySide2.support.signature.typing.Any'), + "QSettings.setValue": ('str', 'Any'), "QSettings.status": (), "QSettings.sync": (), - "QSettings.value": ('str', 'PySide2.support.signature.typing.Any'), + "QSettings.value": ('str', 'Any'), # class PySide2.QtCore.QSignalMapper: "QSignalMapper.__init__": ('PySide2.QtCore.QObject',), @@ -2074,14 +2080,14 @@ if "PySide2.QtCore" in sys.modules: "QSortFilterProxyModel.mapSelectionFromSource": ('PySide2.QtCore.QItemSelection',), "QSortFilterProxyModel.mapSelectionToSource": ('PySide2.QtCore.QItemSelection',), "QSortFilterProxyModel.mapToSource": ('PySide2.QtCore.QModelIndex',), - "QSortFilterProxyModel.match": ('PySide2.QtCore.QModelIndex', 'int', 'PySide2.support.signature.typing.Any', 'int', 'MatchFlags'), - "QSortFilterProxyModel.mimeData": ('PySide2.support.signature.typing.List',), + "QSortFilterProxyModel.match": ('PySide2.QtCore.QModelIndex', 'int', 'Any', 'int', 'MatchFlags'), + "QSortFilterProxyModel.mimeData": ('List[int]',), "QSortFilterProxyModel.mimeTypes": (), "QSortFilterProxyModel.parent": [(), ('PySide2.QtCore.QModelIndex',)], "QSortFilterProxyModel.removeColumns": ('int', 'int', 'PySide2.QtCore.QModelIndex'), "QSortFilterProxyModel.removeRows": ('int', 'int', 'PySide2.QtCore.QModelIndex'), "QSortFilterProxyModel.rowCount": ('PySide2.QtCore.QModelIndex',), - "QSortFilterProxyModel.setData": ('PySide2.QtCore.QModelIndex', 'PySide2.support.signature.typing.Any', 'int'), + "QSortFilterProxyModel.setData": ('PySide2.QtCore.QModelIndex', 'Any', 'int'), "QSortFilterProxyModel.setDynamicSortFilter": ('bool',), "QSortFilterProxyModel.setFilterCaseSensitivity": ('PySide2.QtCore.Qt.CaseSensitivity',), "QSortFilterProxyModel.setFilterFixedString": ('str',), @@ -2089,7 +2095,7 @@ if "PySide2.QtCore" in sys.modules: "QSortFilterProxyModel.setFilterRegExp": [('PySide2.QtCore.QRegExp',), ('str',)], "QSortFilterProxyModel.setFilterRole": ('int',), "QSortFilterProxyModel.setFilterWildcard": ('str',), - "QSortFilterProxyModel.setHeaderData": ('int', 'PySide2.QtCore.Qt.Orientation', 'PySide2.support.signature.typing.Any', 'int'), + "QSortFilterProxyModel.setHeaderData": ('int', 'PySide2.QtCore.Qt.Orientation', 'Any', 'int'), "QSortFilterProxyModel.setSortCaseSensitivity": ('PySide2.QtCore.Qt.CaseSensitivity',), "QSortFilterProxyModel.setSortLocaleAware": ('bool',), "QSortFilterProxyModel.setSortRole": ('int',), @@ -2106,7 +2112,7 @@ if "PySide2.QtCore" in sys.modules: # class PySide2.QtCore.QStandardPaths: "QStandardPaths.displayName": ('PySide2.QtCore.QStandardPaths.StandardLocation',), "QStandardPaths.enableTestMode": ('bool',), - "QStandardPaths.findExecutable": ('str', 'PySide2.support.signature.typing.List'), + "QStandardPaths.findExecutable": ('str', 'List[str]'), "QStandardPaths.isTestModeEnabled": (), "QStandardPaths.locate": ('PySide2.QtCore.QStandardPaths.StandardLocation', 'str', 'LocateOptions'), "QStandardPaths.locateAll": ('PySide2.QtCore.QStandardPaths.StandardLocation', 'str', 'LocateOptions'), @@ -2117,7 +2123,7 @@ if "PySide2.QtCore" in sys.modules: # class PySide2.QtCore.QState: "QState.__init__": [('PySide2.QtCore.QState',), ('PySide2.QtCore.QState.ChildMode', 'PySide2.QtCore.QState')], "QState.addTransition": [('PySide2.QtCore.QAbstractState',), ('PySide2.QtCore.QAbstractTransition',), ('PySide2.QtCore.QObject', 'str', 'PySide2.QtCore.QAbstractState'), ('object', 'PySide2.QtCore.QAbstractState')], - "QState.assignProperty": ('PySide2.QtCore.QObject', 'str', 'PySide2.support.signature.typing.Any'), + "QState.assignProperty": ('PySide2.QtCore.QObject', 'str', 'Any'), "QState.childMode": (), "QState.errorState": (), "QState.event": ('PySide2.QtCore.QEvent',), @@ -2138,7 +2144,7 @@ if "PySide2.QtCore" in sys.modules: "QStateMachine.beginSelectTransitions": ('PySide2.QtCore.QEvent',), "QStateMachine.cancelDelayedEvent": ('int',), "QStateMachine.clearError": (), - "QStateMachine.configuration": [], + "QStateMachine.configuration": (), "QStateMachine.defaultAnimations": (), "QStateMachine.endMicrostep": ('PySide2.QtCore.QEvent',), "QStateMachine.endSelectTransitions": ('PySide2.QtCore.QEvent',), @@ -2247,7 +2253,7 @@ if "PySide2.QtCore" in sys.modules: "QTextCodec.aliases": (), "QTextCodec.availableCodecs": (), "QTextCodec.availableMibs": (), - "QTextCodec.canEncode": [('PySide2.support.signature.typing.Union[str, int]',), ('str',)], + "QTextCodec.canEncode": [('Union[str, int]',), ('str',)], "QTextCodec.codecForHtml": [('PySide2.QtCore.QByteArray',), ('PySide2.QtCore.QByteArray', 'PySide2.QtCore.QTextCodec')], "QTextCodec.codecForLocale": (), "QTextCodec.codecForMib": ('int',), @@ -2304,7 +2310,7 @@ if "PySide2.QtCore" in sys.modules: "QTextStream.setIntegerBase": ('int',), "QTextStream.setLocale": ('PySide2.QtCore.QLocale',), "QTextStream.setNumberFlags": ('NumberFlags',), - "QTextStream.setPadChar": ('PySide2.support.signature.typing.Union[str, int]',), + "QTextStream.setPadChar": ('Union[str, int]',), "QTextStream.setRealNumberNotation": ('PySide2.QtCore.QTextStream.RealNumberNotation',), "QTextStream.setRealNumberPrecision": ('int',), "QTextStream.setStatus": ('PySide2.QtCore.QTextStream.Status',), @@ -2460,7 +2466,7 @@ if "PySide2.QtCore" in sys.modules: "QTimer.setInterval": ('int',), "QTimer.setSingleShot": ('bool',), "QTimer.setTimerType": ('PySide2.QtCore.Qt.TimerType',), - "QTimer.singleShot": [('int', 'PySide2.QtCore.QObject', 'str'), ('int', 'PySide2.QtCore.Qt.TimerType', 'PySide2.QtCore.QObject', 'str'), ('int', 'PySide2.support.signature.typing.Callable')], + "QTimer.singleShot": [('int', 'Callable'), ('int', 'PySide2.QtCore.QObject', 'str'), ('int', 'PySide2.QtCore.Qt.TimerType', 'PySide2.QtCore.QObject', 'str')], "QTimer.start": [(), ('int',)], "QTimer.stop": (), "QTimer.timerEvent": ('PySide2.QtCore.QTimerEvent',), @@ -2474,7 +2480,7 @@ if "PySide2.QtCore" in sys.modules: # class PySide2.QtCore.QTranslator: "QTranslator.__init__": ('PySide2.QtCore.QObject',), "QTranslator.isEmpty": (), - "QTranslator.load": [('PySide2.QtCore.QLocale', 'str', 'str', 'str', 'str'), ('PySide2.support.signature.typing.Union[str, int]', 'int', 'str'), ('str', 'str', 'str', 'str')], + "QTranslator.load": [('PySide2.QtCore.QLocale', 'str', 'str', 'str', 'str'), ('Union[str, int]', 'int', 'str'), ('str', 'str', 'str', 'str')], "QTranslator.translate": ('str', 'str', 'str', 'int'), # class PySide2.QtCore.QUrl: @@ -2491,7 +2497,7 @@ if "PySide2.QtCore" in sys.modules: "QUrl.fromEncoded": ('PySide2.QtCore.QByteArray', 'PySide2.QtCore.QUrl.ParsingMode'), "QUrl.fromLocalFile": ('str',), "QUrl.fromPercentEncoding": ('PySide2.QtCore.QByteArray',), - "QUrl.fromStringList": ('PySide2.support.signature.typing.List', 'PySide2.QtCore.QUrl.ParsingMode'), + "QUrl.fromStringList": ('List[str]', 'PySide2.QtCore.QUrl.ParsingMode'), "QUrl.fromUserInput": [('str',), ('str', 'str', 'UserInputResolutionOptions')], "QUrl.hasFragment": (), "QUrl.hasQuery": (), @@ -2512,7 +2518,7 @@ if "PySide2.QtCore" in sys.modules: "QUrl.setAuthority": ('str', 'PySide2.QtCore.QUrl.ParsingMode'), "QUrl.setFragment": ('str', 'PySide2.QtCore.QUrl.ParsingMode'), "QUrl.setHost": ('str', 'PySide2.QtCore.QUrl.ParsingMode'), - "QUrl.setIdnWhitelist": ('PySide2.support.signature.typing.List',), + "QUrl.setIdnWhitelist": ('List[str]',), "QUrl.setPassword": ('str', 'PySide2.QtCore.QUrl.ParsingMode'), "QUrl.setPath": ('str', 'PySide2.QtCore.QUrl.ParsingMode'), "QUrl.setPort": ('int',), @@ -2552,13 +2558,13 @@ if "PySide2.QtCore" in sys.modules: "QUrlQuery.removeAllQueryItems": ('str',), "QUrlQuery.removeQueryItem": ('str',), "QUrlQuery.setQuery": ('str',), - "QUrlQuery.setQueryDelimiters": ('PySide2.support.signature.typing.Union[str, int]', 'PySide2.support.signature.typing.Union[str, int]'), + "QUrlQuery.setQueryDelimiters": ('Union[str, int]', 'Union[str, int]'), "QUrlQuery.setQueryItems": ('list',), "QUrlQuery.swap": ('PySide2.QtCore.QUrlQuery',), "QUrlQuery.toString": ('PySide2.QtCore.QUrl.ComponentFormattingOption',), # class PySide2.QtCore.QUuid: - "QUuid.__init__": [(), ('PySide2.QtCore.QByteArray',), ('int', 'int', 'int', 'PySide2.support.signature.typing.Union[str, int]', 'PySide2.support.signature.typing.Union[str, int]', 'PySide2.support.signature.typing.Union[str, int]', 'PySide2.support.signature.typing.Union[str, int]', 'PySide2.support.signature.typing.Union[str, int]', 'PySide2.support.signature.typing.Union[str, int]', 'PySide2.support.signature.typing.Union[str, int]', 'PySide2.support.signature.typing.Union[str, int]'), ('str',)], + "QUuid.__init__": [(), ('PySide2.QtCore.QByteArray',), ('int', 'int', 'int', 'Union[str, int]', 'Union[str, int]', 'Union[str, int]', 'Union[str, int]', 'Union[str, int]', 'Union[str, int]', 'Union[str, int]', 'Union[str, int]'), ('str',)], "QUuid.__copy__": (), "QUuid.__reduce__": (), "QUuid.createUuid": (), @@ -2579,16 +2585,16 @@ if "PySide2.QtCore" in sys.modules: "QVariantAnimation.easingCurve": (), "QVariantAnimation.endValue": (), "QVariantAnimation.event": ('PySide2.QtCore.QEvent',), - "QVariantAnimation.interpolated": ('PySide2.support.signature.typing.Any', 'PySide2.support.signature.typing.Any', 'float'), + "QVariantAnimation.interpolated": ('Any', 'Any', 'float'), "QVariantAnimation.keyValueAt": ('float',), "QVariantAnimation.setDuration": ('int',), "QVariantAnimation.setEasingCurve": ('PySide2.QtCore.QEasingCurve',), - "QVariantAnimation.setEndValue": ('PySide2.support.signature.typing.Any',), - "QVariantAnimation.setKeyValueAt": ('float', 'PySide2.support.signature.typing.Any'), - "QVariantAnimation.setStartValue": ('PySide2.support.signature.typing.Any',), + "QVariantAnimation.setEndValue": ('Any',), + "QVariantAnimation.setKeyValueAt": ('float', 'Any'), + "QVariantAnimation.setStartValue": ('Any',), "QVariantAnimation.startValue": (), "QVariantAnimation.updateCurrentTime": ('int',), - "QVariantAnimation.updateCurrentValue": ('PySide2.support.signature.typing.Any',), + "QVariantAnimation.updateCurrentValue": ('Any',), "QVariantAnimation.updateState": ('PySide2.QtCore.QAbstractAnimation.State', 'PySide2.QtCore.QAbstractAnimation.State'), # class PySide2.QtCore.QVersionNumber: @@ -2655,18 +2661,18 @@ if "PySide2.QtCore" in sys.modules: "QXmlStreamAttributes.constLast": (), "QXmlStreamAttributes.contains": ('PySide2.QtCore.QXmlStreamAttribute',), "QXmlStreamAttributes.count": [(), ('PySide2.QtCore.QXmlStreamAttribute',)], - "QXmlStreamAttributes.data": [], + "QXmlStreamAttributes.data": (), "QXmlStreamAttributes.empty": (), "QXmlStreamAttributes.endsWith": ('PySide2.QtCore.QXmlStreamAttribute',), "QXmlStreamAttributes.fill": ('PySide2.QtCore.QXmlStreamAttribute', 'int'), - "QXmlStreamAttributes.first": [], + "QXmlStreamAttributes.first": (), "QXmlStreamAttributes.front": (), "QXmlStreamAttributes.hasAttribute": [('str',), ('str', 'str')], "QXmlStreamAttributes.indexOf": ('PySide2.QtCore.QXmlStreamAttribute', 'int'), "QXmlStreamAttributes.insert": [('int', 'PySide2.QtCore.QXmlStreamAttribute'), ('int', 'int', 'PySide2.QtCore.QXmlStreamAttribute')], "QXmlStreamAttributes.isEmpty": (), "QXmlStreamAttributes.isSharedWith": ('list',), - "QXmlStreamAttributes.last": [], + "QXmlStreamAttributes.last": (), "QXmlStreamAttributes.lastIndexOf": ('PySide2.QtCore.QXmlStreamAttribute', 'int'), "QXmlStreamAttributes.length": (), "QXmlStreamAttributes.mid": ('int', 'int'), @@ -2802,10 +2808,6 @@ if "PySide2.QtCore" in sys.modules: "QXmlStreamWriter.writeStartElement": [('str',), ('str', 'str')], "QXmlStreamWriter.writeTextElement": [('str', 'str'), ('str', 'str', 'str')], - # class PySide2.QtCore.Qt: - "Qt.qt_getEnumMetaObject": [('Alignment',), ('DockWidgetAreas',), ('DropActions',), ('Edges',), ('ImageConversionFlags',), ('InputMethodHints',), ('InputMethodQueries',), ('ItemFlags',), ('KeyboardModifiers',), ('MatchFlags',), ('MouseButtons',), ('Orientations',), ('PySide2.QtCore.Qt.ApplicationAttribute',), ('PySide2.QtCore.Qt.ApplicationState',), ('PySide2.QtCore.Qt.ArrowType',), ('PySide2.QtCore.Qt.AspectRatioMode',), ('PySide2.QtCore.Qt.Axis',), ('PySide2.QtCore.Qt.BGMode',), ('PySide2.QtCore.Qt.BrushStyle',), ('PySide2.QtCore.Qt.CaseSensitivity',), ('PySide2.QtCore.Qt.CheckState',), ('PySide2.QtCore.Qt.ChecksumType',), ('PySide2.QtCore.Qt.ClipOperation',), ('PySide2.QtCore.Qt.ConnectionType',), ('PySide2.QtCore.Qt.ContextMenuPolicy',), ('PySide2.QtCore.Qt.Corner',), ('PySide2.QtCore.Qt.CursorMoveStyle',), ('PySide2.QtCore.Qt.CursorShape',), ('PySide2.QtCore.Qt.DateFormat',), ('PySide2.QtCore.Qt.DayOfWeek',), ('PySide2.QtCore.Qt.DockWidgetArea',), ('PySide2.QtCore.Qt.DropAction',), ('PySide2.QtCore.Qt.Edge',), ('PySide2.QtCore.Qt.EnterKeyType',), ('PySide2.QtCore.Qt.FillRule',), ('PySide2.QtCore.Qt.FocusPolicy',), ('PySide2.QtCore.Qt.FocusReason',), ('PySide2.QtCore.Qt.GestureState',), ('PySide2.QtCore.Qt.GestureType',), ('PySide2.QtCore.Qt.GlobalColor',), ('PySide2.QtCore.Qt.InputMethodHint',), ('PySide2.QtCore.Qt.InputMethodQuery',), ('PySide2.QtCore.Qt.ItemDataRole',), ('PySide2.QtCore.Qt.ItemSelectionMode',), ('PySide2.QtCore.Qt.ItemSelectionOperation',), ('PySide2.QtCore.Qt.Key',), ('PySide2.QtCore.Qt.LayoutDirection',), ('PySide2.QtCore.Qt.MaskMode',), ('PySide2.QtCore.Qt.MouseEventFlag',), ('PySide2.QtCore.Qt.MouseEventSource',), ('PySide2.QtCore.Qt.NativeGestureType',), ('PySide2.QtCore.Qt.Orientation',), ('PySide2.QtCore.Qt.PenCapStyle',), ('PySide2.QtCore.Qt.PenJoinStyle',), ('PySide2.QtCore.Qt.PenStyle',), ('PySide2.QtCore.Qt.ScreenOrientation',), ('PySide2.QtCore.Qt.ScrollBarPolicy',), ('PySide2.QtCore.Qt.ScrollPhase',), ('PySide2.QtCore.Qt.ShortcutContext',), ('PySide2.QtCore.Qt.SizeHint',), ('PySide2.QtCore.Qt.SizeMode',), ('PySide2.QtCore.Qt.SortOrder',), ('PySide2.QtCore.Qt.TabFocusBehavior',), ('PySide2.QtCore.Qt.TextElideMode',), ('PySide2.QtCore.Qt.TextFlag',), ('PySide2.QtCore.Qt.TextFormat',), ('PySide2.QtCore.Qt.TextInteractionFlag',), ('PySide2.QtCore.Qt.TimeSpec',), ('PySide2.QtCore.Qt.TimerType',), ('PySide2.QtCore.Qt.ToolBarArea',), ('PySide2.QtCore.Qt.ToolButtonStyle',), ('PySide2.QtCore.Qt.TransformationMode',), ('PySide2.QtCore.Qt.WidgetAttribute',), ('PySide2.QtCore.Qt.WindowModality',), ('PySide2.QtCore.Qt.WindowState',), ('PySide2.QtCore.Qt.WindowType',), ('ScreenOrientations',), ('TextInteractionFlags',), ('ToolBarAreas',), ('TouchPointStates',), ('WindowFlags',), ('WindowStates',)], - "Qt.qt_getEnumName": [('Alignment',), ('DockWidgetAreas',), ('DropActions',), ('Edges',), ('ImageConversionFlags',), ('InputMethodHints',), ('InputMethodQueries',), ('ItemFlags',), ('KeyboardModifiers',), ('MatchFlags',), ('MouseButtons',), ('Orientations',), ('PySide2.QtCore.Qt.ApplicationAttribute',), ('PySide2.QtCore.Qt.ApplicationState',), ('PySide2.QtCore.Qt.ArrowType',), ('PySide2.QtCore.Qt.AspectRatioMode',), ('PySide2.QtCore.Qt.Axis',), ('PySide2.QtCore.Qt.BGMode',), ('PySide2.QtCore.Qt.BrushStyle',), ('PySide2.QtCore.Qt.CaseSensitivity',), ('PySide2.QtCore.Qt.CheckState',), ('PySide2.QtCore.Qt.ChecksumType',), ('PySide2.QtCore.Qt.ClipOperation',), ('PySide2.QtCore.Qt.ConnectionType',), ('PySide2.QtCore.Qt.ContextMenuPolicy',), ('PySide2.QtCore.Qt.Corner',), ('PySide2.QtCore.Qt.CursorMoveStyle',), ('PySide2.QtCore.Qt.CursorShape',), ('PySide2.QtCore.Qt.DateFormat',), ('PySide2.QtCore.Qt.DayOfWeek',), ('PySide2.QtCore.Qt.DockWidgetArea',), ('PySide2.QtCore.Qt.DropAction',), ('PySide2.QtCore.Qt.Edge',), ('PySide2.QtCore.Qt.EnterKeyType',), ('PySide2.QtCore.Qt.FillRule',), ('PySide2.QtCore.Qt.FocusPolicy',), ('PySide2.QtCore.Qt.FocusReason',), ('PySide2.QtCore.Qt.GestureState',), ('PySide2.QtCore.Qt.GestureType',), ('PySide2.QtCore.Qt.GlobalColor',), ('PySide2.QtCore.Qt.InputMethodHint',), ('PySide2.QtCore.Qt.InputMethodQuery',), ('PySide2.QtCore.Qt.ItemDataRole',), ('PySide2.QtCore.Qt.ItemSelectionMode',), ('PySide2.QtCore.Qt.ItemSelectionOperation',), ('PySide2.QtCore.Qt.Key',), ('PySide2.QtCore.Qt.LayoutDirection',), ('PySide2.QtCore.Qt.MaskMode',), ('PySide2.QtCore.Qt.MouseEventFlag',), ('PySide2.QtCore.Qt.MouseEventSource',), ('PySide2.QtCore.Qt.NativeGestureType',), ('PySide2.QtCore.Qt.Orientation',), ('PySide2.QtCore.Qt.PenCapStyle',), ('PySide2.QtCore.Qt.PenJoinStyle',), ('PySide2.QtCore.Qt.PenStyle',), ('PySide2.QtCore.Qt.ScreenOrientation',), ('PySide2.QtCore.Qt.ScrollBarPolicy',), ('PySide2.QtCore.Qt.ScrollPhase',), ('PySide2.QtCore.Qt.ShortcutContext',), ('PySide2.QtCore.Qt.SizeHint',), ('PySide2.QtCore.Qt.SizeMode',), ('PySide2.QtCore.Qt.SortOrder',), ('PySide2.QtCore.Qt.TabFocusBehavior',), ('PySide2.QtCore.Qt.TextElideMode',), ('PySide2.QtCore.Qt.TextFlag',), ('PySide2.QtCore.Qt.TextFormat',), ('PySide2.QtCore.Qt.TextInteractionFlag',), ('PySide2.QtCore.Qt.TimeSpec',), ('PySide2.QtCore.Qt.TimerType',), ('PySide2.QtCore.Qt.ToolBarArea',), ('PySide2.QtCore.Qt.ToolButtonStyle',), ('PySide2.QtCore.Qt.TransformationMode',), ('PySide2.QtCore.Qt.WidgetAttribute',), ('PySide2.QtCore.Qt.WindowModality',), ('PySide2.QtCore.Qt.WindowState',), ('PySide2.QtCore.Qt.WindowType',), ('ScreenOrientations',), ('TextInteractionFlags',), ('ToolBarAreas',), ('TouchPointStates',), ('WindowFlags',), ('WindowStates',)], - # class PySide2.QtCore.QtMsgType: # class PySide2.QtCore.Signal: @@ -2912,8 +2914,8 @@ if "PySide2.QtGui" in sys.modules: "QBitmap.__init__": [(), ('PySide2.QtCore.QSize',), ('PySide2.QtGui.QBitmap',), ('PySide2.QtGui.QPixmap',), ('int', 'int'), ('str', 'str')], "QBitmap.__copy__": (), "QBitmap.clear": (), - "QBitmap.fromData": ('PySide2.QtCore.QSize', 'PySide2.support.signature.typing.Union[str, int]', 'PySide2.QtGui.QImage.Format'), - "QBitmap.fromImage": ['ImageConversionFlags', 'PySide2.QtGui.QImage'], + "QBitmap.fromData": ('PySide2.QtCore.QSize', 'Union[str, int]', 'PySide2.QtGui.QImage.Format'), + "QBitmap.fromImage": ('PySide2.QtGui.QImage', 'ImageConversionFlags'), "QBitmap.swap": [('PySide2.QtGui.QBitmap',), ('PySide2.QtGui.QPixmap',)], "QBitmap.transformed": [('PySide2.QtGui.QMatrix',), ('PySide2.QtGui.QMatrix', 'PySide2.QtCore.Qt.TransformationMode'), ('PySide2.QtGui.QTransform',)], @@ -2956,7 +2958,7 @@ if "PySide2.QtGui" in sys.modules: "QCloseEvent.__init__": (), # class PySide2.QtGui.QColor: - "QColor.__init__": [(), ('PySide2.QtCore.Qt.GlobalColor',), ('PySide2.QtGui.QColor',), ('PySide2.support.signature.typing.Any',), ('int',), ('int', 'int', 'int', 'int'), ('str',)], + "QColor.__init__": [(), ('Any',), ('PySide2.QtCore.Qt.GlobalColor',), ('PySide2.QtGui.QColor',), ('int',), ('int', 'int', 'int', 'int'), ('str',)], "QColor.__copy__": (), "QColor.__reduce__": (), "QColor.__setstate__": ('object',), @@ -3058,7 +3060,7 @@ if "PySide2.QtGui" in sys.modules: "QContextMenuEvent.__init__": [('PySide2.QtGui.QContextMenuEvent.Reason', 'PySide2.QtCore.QPoint'), ('PySide2.QtGui.QContextMenuEvent.Reason', 'PySide2.QtCore.QPoint', 'PySide2.QtCore.QPoint'), ('PySide2.QtGui.QContextMenuEvent.Reason', 'PySide2.QtCore.QPoint', 'PySide2.QtCore.QPoint', 'KeyboardModifiers')], "QContextMenuEvent.globalPos": (), "QContextMenuEvent.globalX": (), - "QContextMenuEvent.global"+"Y": (), + "QContextMenuEvent.global""Y": (), "QContextMenuEvent.pos": (), "QContextMenuEvent.reason": (), "QContextMenuEvent.x": (), @@ -3144,7 +3146,7 @@ if "PySide2.QtGui" in sys.modules: "QEnterEvent.__init__": ('PySide2.QtCore.QPointF', 'PySide2.QtCore.QPointF', 'PySide2.QtCore.QPointF'), "QEnterEvent.globalPos": (), "QEnterEvent.globalX": (), - "QEnterEvent.global"+"Y": (), + "QEnterEvent.global""Y": (), "QEnterEvent.localPos": (), "QEnterEvent.pos": (), "QEnterEvent.screenPos": (), @@ -3183,7 +3185,7 @@ if "PySide2.QtGui" in sys.modules: "QFont.hintingPreference": (), "QFont.initialize": (), "QFont.insertSubstitution": ('str', 'str'), - "QFont.insertSubstitutions": ('str', 'PySide2.support.signature.typing.List'), + "QFont.insertSubstitutions": ('str', 'List[str]'), "QFont.isCopyOf": ('PySide2.QtGui.QFont',), "QFont.italic": (), "QFont.kerning": (), @@ -3295,30 +3297,30 @@ if "PySide2.QtGui" in sys.modules: "QFontMetrics.ascent": (), "QFontMetrics.averageCharWidth": (), "QFontMetrics.boundingRect": [('PySide2.QtCore.QRect', 'int', 'str', 'int', 'int'), ('int', 'int', 'int', 'int', 'int', 'str', 'int', 'int'), ('str',)], - "QFontMetrics.boundingRectChar": ('PySide2.support.signature.typing.Union[str, int]',), + "QFontMetrics.boundingRectChar": ('Union[str, int]',), "QFontMetrics.capHeight": (), "QFontMetrics.charWidth": ('str', 'int'), "QFontMetrics.descent": (), "QFontMetrics.elidedText": ('str', 'PySide2.QtCore.Qt.TextElideMode', 'int', 'int'), "QFontMetrics.height": (), - "QFontMetrics.inFont": ('PySide2.support.signature.typing.Union[str, int]',), + "QFontMetrics.inFont": ('Union[str, int]',), "QFontMetrics.inFontUcs4": ('int',), "QFontMetrics.leading": (), - "QFontMetrics.leftBearing": ('PySide2.support.signature.typing.Union[str, int]',), + "QFontMetrics.leftBearing": ('Union[str, int]',), "QFontMetrics.lineSpacing": (), "QFontMetrics.lineWidth": (), "QFontMetrics.maxWidth": (), "QFontMetrics.minLeftBearing": (), "QFontMetrics.minRightBearing": (), "QFontMetrics.overlinePos": (), - "QFontMetrics.rightBearing": ('PySide2.support.signature.typing.Union[str, int]',), + "QFontMetrics.rightBearing": ('Union[str, int]',), "QFontMetrics.size": ('int', 'str', 'int', 'int'), "QFontMetrics.strikeOutPos": (), "QFontMetrics.swap": ('PySide2.QtGui.QFontMetrics',), "QFontMetrics.tightBoundingRect": ('str',), "QFontMetrics.underlinePos": (), "QFontMetrics.width": [('str', 'int'), ('str', 'int', 'int')], - "QFontMetrics.widthChar": ('PySide2.support.signature.typing.Union[str, int]',), + "QFontMetrics.widthChar": ('Union[str, int]',), "QFontMetrics.xHeight": (), # class PySide2.QtGui.QFontMetricsF: @@ -3327,29 +3329,29 @@ if "PySide2.QtGui" in sys.modules: "QFontMetricsF.ascent": (), "QFontMetricsF.averageCharWidth": (), "QFontMetricsF.boundingRect": [('PySide2.QtCore.QRectF', 'int', 'str', 'int', 'int'), ('str',)], - "QFontMetricsF.boundingRectChar": ('PySide2.support.signature.typing.Union[str, int]',), + "QFontMetricsF.boundingRectChar": ('Union[str, int]',), "QFontMetricsF.capHeight": (), "QFontMetricsF.descent": (), "QFontMetricsF.elidedText": ('str', 'PySide2.QtCore.Qt.TextElideMode', 'float', 'int'), "QFontMetricsF.height": (), - "QFontMetricsF.inFont": ('PySide2.support.signature.typing.Union[str, int]',), + "QFontMetricsF.inFont": ('Union[str, int]',), "QFontMetricsF.inFontUcs4": ('int',), "QFontMetricsF.leading": (), - "QFontMetricsF.leftBearing": ('PySide2.support.signature.typing.Union[str, int]',), + "QFontMetricsF.leftBearing": ('Union[str, int]',), "QFontMetricsF.lineSpacing": (), "QFontMetricsF.lineWidth": (), "QFontMetricsF.maxWidth": (), "QFontMetricsF.minLeftBearing": (), "QFontMetricsF.minRightBearing": (), "QFontMetricsF.overlinePos": (), - "QFontMetricsF.rightBearing": ('PySide2.support.signature.typing.Union[str, int]',), + "QFontMetricsF.rightBearing": ('Union[str, int]',), "QFontMetricsF.size": ('int', 'str', 'int', 'int'), "QFontMetricsF.strikeOutPos": (), "QFontMetricsF.swap": ('PySide2.QtGui.QFontMetricsF',), "QFontMetricsF.tightBoundingRect": ('str',), "QFontMetricsF.underlinePos": (), "QFontMetricsF.width": ('str',), - "QFontMetricsF.widthChar": ('PySide2.support.signature.typing.Union[str, int]',), + "QFontMetricsF.widthChar": ('Union[str, int]',), "QFontMetricsF.xHeight": (), # class PySide2.QtGui.QGradient: @@ -3367,7 +3369,7 @@ if "PySide2.QtGui" in sys.modules: "QGradient.type": (), # class PySide2.QtGui.QGuiApplication: - "QGuiApplication.__init__": ('PySide2.support.signature.typing.List',), + "QGuiApplication.__init__": ('List[str]',), "QGuiApplication.allWindows": (), "QGuiApplication.applicationDisplayName": (), "QGuiApplication.applicationState": (), @@ -3421,7 +3423,7 @@ if "PySide2.QtGui" in sys.modules: "QHelpEvent.__init__": ('PySide2.QtCore.QEvent.Type', 'PySide2.QtCore.QPoint', 'PySide2.QtCore.QPoint'), "QHelpEvent.globalPos": (), "QHelpEvent.globalX": (), - "QHelpEvent.global"+"Y": (), + "QHelpEvent.global""Y": (), "QHelpEvent.pos": (), "QHelpEvent.x": (), "QHelpEvent.y": (), @@ -3453,7 +3455,7 @@ if "PySide2.QtGui" in sys.modules: "QIcon.pixmap": [('PySide2.QtCore.QSize', 'PySide2.QtGui.QIcon.Mode', 'PySide2.QtGui.QIcon.State'), ('PySide2.QtGui.QWindow', 'PySide2.QtCore.QSize', 'PySide2.QtGui.QIcon.Mode', 'PySide2.QtGui.QIcon.State'), ('int', 'PySide2.QtGui.QIcon.Mode', 'PySide2.QtGui.QIcon.State'), ('int', 'int', 'PySide2.QtGui.QIcon.Mode', 'PySide2.QtGui.QIcon.State')], "QIcon.setIsMask": ('bool',), "QIcon.setThemeName": ('str',), - "QIcon.setThemeSearchPaths": ('PySide2.support.signature.typing.List',), + "QIcon.setThemeSearchPaths": ('List[str]',), "QIcon.swap": ('PySide2.QtGui.QIcon',), "QIcon.themeName": (), "QIcon.themeSearchPaths": (), @@ -3478,7 +3480,7 @@ if "PySide2.QtGui" in sys.modules: "QIconEngine.write": ('PySide2.QtCore.QDataStream',), # class PySide2.QtGui.QImage: - "QImage.__init__": [(), ('PySide2.QtCore.QSize', 'PySide2.QtGui.QImage.Format'), ('PySide2.QtGui.QImage',), ('PySide2.support.signature.typing.List',), ('PySide2.support.signature.typing.Union[str, int]', 'int', 'int', 'PySide2.QtGui.QImage.Format', 'PySide2.support.signature.typing.Callable', 'int'), ('PySide2.support.signature.typing.Union[str, int]', 'int', 'int', 'int', 'PySide2.QtGui.QImage.Format', 'PySide2.support.signature.typing.Callable', 'int'), ('int', 'int', 'PySide2.QtGui.QImage.Format'), ('str', 'int', 'int', 'PySide2.QtGui.QImage.Format'), ('str', 'int', 'int', 'int', 'PySide2.QtGui.QImage.Format'), ('str', 'str')], + "QImage.__init__": [(), ('List[str]',), ('PySide2.QtCore.QSize', 'PySide2.QtGui.QImage.Format'), ('PySide2.QtGui.QImage',), ('Union[str, int]', 'int', 'int', 'PySide2.QtGui.QImage.Format', 'Callable', 'int'), ('Union[str, int]', 'int', 'int', 'int', 'PySide2.QtGui.QImage.Format', 'Callable', 'int'), ('int', 'int', 'PySide2.QtGui.QImage.Format'), ('str', 'int', 'int', 'PySide2.QtGui.QImage.Format'), ('str', 'int', 'int', 'int', 'PySide2.QtGui.QImage.Format'), ('str', 'str')], "QImage.__copy__": (), "QImage.allGray": (), "QImage.alphaChannel": (), @@ -3573,8 +3575,8 @@ if "PySide2.QtGui" in sys.modules: "QImageIOHandler.option": ('PySide2.QtGui.QImageIOHandler.ImageOption',), "QImageIOHandler.read": ('PySide2.QtGui.QImage',), "QImageIOHandler.setDevice": ('PySide2.QtCore.QIODevice',), - "QImageIOHandler.setFormat": ['PySide2.QtCore.QByteArray'], - "QImageIOHandler.setOption": ('PySide2.QtGui.QImageIOHandler.ImageOption', 'PySide2.support.signature.typing.Any'), + "QImageIOHandler.setFormat": ('PySide2.QtCore.QByteArray',), + "QImageIOHandler.setOption": ('PySide2.QtGui.QImageIOHandler.ImageOption', 'Any'), "QImageIOHandler.supportsOption": ('PySide2.QtGui.QImageIOHandler.ImageOption',), "QImageIOHandler.write": ('PySide2.QtGui.QImage',), @@ -3747,7 +3749,7 @@ if "PySide2.QtGui" in sys.modules: "QMatrix.translate": ('float', 'float'), # class PySide2.QtGui.QMatrix2x2: - "QMatrix2x2.__init__": [('PySide2.QtGui.QMatrix2x2',), ('PySide2.support.signature.typing.Sequence',)], + "QMatrix2x2.__init__": [('PySide2.QtGui.QMatrix2x2',), ('Sequence',)], "QMatrix2x2.__copy__": (), "QMatrix2x2.__reduce__": (), "QMatrix2x2.data": (), @@ -3755,7 +3757,7 @@ if "PySide2.QtGui" in sys.modules: "QMatrix2x2.transposed": (), # class PySide2.QtGui.QMatrix2x3: - "QMatrix2x3.__init__": [('PySide2.QtGui.QMatrix2x3',), ('PySide2.support.signature.typing.Sequence',)], + "QMatrix2x3.__init__": [('PySide2.QtGui.QMatrix2x3',), ('Sequence',)], "QMatrix2x3.__copy__": (), "QMatrix2x3.__reduce__": (), "QMatrix2x3.data": (), @@ -3763,7 +3765,7 @@ if "PySide2.QtGui" in sys.modules: "QMatrix2x3.transposed": (), # class PySide2.QtGui.QMatrix2x4: - "QMatrix2x4.__init__": [('PySide2.QtGui.QMatrix2x4',), ('PySide2.support.signature.typing.Sequence',)], + "QMatrix2x4.__init__": [('PySide2.QtGui.QMatrix2x4',), ('Sequence',)], "QMatrix2x4.__copy__": (), "QMatrix2x4.__reduce__": (), "QMatrix2x4.data": (), @@ -3771,7 +3773,7 @@ if "PySide2.QtGui" in sys.modules: "QMatrix2x4.transposed": (), # class PySide2.QtGui.QMatrix3x2: - "QMatrix3x2.__init__": [('PySide2.QtGui.QMatrix3x2',), ('PySide2.support.signature.typing.Sequence',)], + "QMatrix3x2.__init__": [('PySide2.QtGui.QMatrix3x2',), ('Sequence',)], "QMatrix3x2.__copy__": (), "QMatrix3x2.__reduce__": (), "QMatrix3x2.data": (), @@ -3779,7 +3781,7 @@ if "PySide2.QtGui" in sys.modules: "QMatrix3x2.transposed": (), # class PySide2.QtGui.QMatrix3x3: - "QMatrix3x3.__init__": [('PySide2.QtGui.QMatrix3x3',), ('PySide2.support.signature.typing.Sequence',)], + "QMatrix3x3.__init__": [('PySide2.QtGui.QMatrix3x3',), ('Sequence',)], "QMatrix3x3.__copy__": (), "QMatrix3x3.__reduce__": (), "QMatrix3x3.data": (), @@ -3787,7 +3789,7 @@ if "PySide2.QtGui" in sys.modules: "QMatrix3x3.transposed": (), # class PySide2.QtGui.QMatrix3x4: - "QMatrix3x4.__init__": [('PySide2.QtGui.QMatrix3x4',), ('PySide2.support.signature.typing.Sequence',)], + "QMatrix3x4.__init__": [('PySide2.QtGui.QMatrix3x4',), ('Sequence',)], "QMatrix3x4.__copy__": (), "QMatrix3x4.__reduce__": (), "QMatrix3x4.data": (), @@ -3795,7 +3797,7 @@ if "PySide2.QtGui" in sys.modules: "QMatrix3x4.transposed": (), # class PySide2.QtGui.QMatrix4x2: - "QMatrix4x2.__init__": [('PySide2.QtGui.QMatrix4x2',), ('PySide2.support.signature.typing.Sequence',)], + "QMatrix4x2.__init__": [('PySide2.QtGui.QMatrix4x2',), ('Sequence',)], "QMatrix4x2.__copy__": (), "QMatrix4x2.__reduce__": (), "QMatrix4x2.data": (), @@ -3803,7 +3805,7 @@ if "PySide2.QtGui" in sys.modules: "QMatrix4x2.transposed": (), # class PySide2.QtGui.QMatrix4x3: - "QMatrix4x3.__init__": [('PySide2.QtGui.QMatrix4x3',), ('PySide2.support.signature.typing.Sequence',)], + "QMatrix4x3.__init__": [('PySide2.QtGui.QMatrix4x3',), ('Sequence',)], "QMatrix4x3.__copy__": (), "QMatrix4x3.__reduce__": (), "QMatrix4x3.data": (), @@ -3851,7 +3853,7 @@ if "PySide2.QtGui" in sys.modules: "QMouseEvent.flags": (), "QMouseEvent.globalPos": (), "QMouseEvent.globalX": (), - "QMouseEvent.global"+"Y": (), + "QMouseEvent.global""Y": (), "QMouseEvent.localPos": (), "QMouseEvent.pos": (), "QMouseEvent.screenPos": (), @@ -3954,7 +3956,7 @@ if "PySide2.QtGui" in sys.modules: "QOpenGLContext.openGLModuleType": (), "QOpenGLContext.screen": (), "QOpenGLContext.setFormat": ('PySide2.QtGui.QSurfaceFormat',), - "QOpenGLContext.setNativeHandle": ('PySide2.support.signature.typing.Any',), + "QOpenGLContext.setNativeHandle": ('Any',), "QOpenGLContext.setScreen": ('PySide2.QtGui.QScreen',), "QOpenGLContext.setShareContext": ('PySide2.QtGui.QOpenGLContext',), "QOpenGLContext.shareContext": (), @@ -4001,7 +4003,7 @@ if "PySide2.QtGui" in sys.modules: "QOpenGLExtraFunctions.glBeginQuery": ('int', 'int'), "QOpenGLExtraFunctions.glBeginTransformFeedback": ('int',), "QOpenGLExtraFunctions.glBindBufferBase": ('int', 'int', 'int'), - "QOpenGLExtraFunctions.glBindImageTexture": ('int', 'int', 'int', 'PySide2.support.signature.typing.Union[str, int]', 'int', 'int', 'int'), + "QOpenGLExtraFunctions.glBindImageTexture": ('int', 'int', 'int', 'Union[str, int]', 'int', 'int', 'int'), "QOpenGLExtraFunctions.glBindProgramPipeline": ('int',), "QOpenGLExtraFunctions.glBindSampler": ('int', 'int'), "QOpenGLExtraFunctions.glBindTransformFeedback": ('int', 'int'), @@ -4054,6 +4056,7 @@ if "PySide2.QtGui" in sys.modules: "QOpenGLExtraFunctions.glGetQueryiv": ('int', 'int', 'int'), "QOpenGLExtraFunctions.glGetSamplerParameterfv": ('int', 'int', 'float'), "QOpenGLExtraFunctions.glGetSamplerParameteriv": ('int', 'int', 'int'), + "QOpenGLExtraFunctions.glGetStringi": ('int', 'int'), "QOpenGLExtraFunctions.glGetTexLevelParameterfv": ('int', 'int', 'int', 'float'), "QOpenGLExtraFunctions.glGetTexLevelParameteriv": ('int', 'int', 'int', 'int'), "QOpenGLExtraFunctions.glGetUniformBlockIndex": ('int', 'str'), @@ -4095,15 +4098,15 @@ if "PySide2.QtGui" in sys.modules: "QOpenGLExtraFunctions.glProgramUniform4iv": ('int', 'int', 'int', 'int'), "QOpenGLExtraFunctions.glProgramUniform4ui": ('int', 'int', 'int', 'int', 'int', 'int'), "QOpenGLExtraFunctions.glProgramUniform4uiv": ('int', 'int', 'int', 'int'), - "QOpenGLExtraFunctions.glProgramUniformMatrix2fv": ('int', 'int', 'int', 'PySide2.support.signature.typing.Union[str, int]', 'float'), - "QOpenGLExtraFunctions.glProgramUniformMatrix2x3fv": ('int', 'int', 'int', 'PySide2.support.signature.typing.Union[str, int]', 'float'), - "QOpenGLExtraFunctions.glProgramUniformMatrix2x4fv": ('int', 'int', 'int', 'PySide2.support.signature.typing.Union[str, int]', 'float'), - "QOpenGLExtraFunctions.glProgramUniformMatrix3fv": ('int', 'int', 'int', 'PySide2.support.signature.typing.Union[str, int]', 'float'), - "QOpenGLExtraFunctions.glProgramUniformMatrix3x2fv": ('int', 'int', 'int', 'PySide2.support.signature.typing.Union[str, int]', 'float'), - "QOpenGLExtraFunctions.glProgramUniformMatrix3x4fv": ('int', 'int', 'int', 'PySide2.support.signature.typing.Union[str, int]', 'float'), - "QOpenGLExtraFunctions.glProgramUniformMatrix4fv": ('int', 'int', 'int', 'PySide2.support.signature.typing.Union[str, int]', 'float'), - "QOpenGLExtraFunctions.glProgramUniformMatrix4x2fv": ('int', 'int', 'int', 'PySide2.support.signature.typing.Union[str, int]', 'float'), - "QOpenGLExtraFunctions.glProgramUniformMatrix4x3fv": ('int', 'int', 'int', 'PySide2.support.signature.typing.Union[str, int]', 'float'), + "QOpenGLExtraFunctions.glProgramUniformMatrix2fv": ('int', 'int', 'int', 'Union[str, int]', 'float'), + "QOpenGLExtraFunctions.glProgramUniformMatrix2x3fv": ('int', 'int', 'int', 'Union[str, int]', 'float'), + "QOpenGLExtraFunctions.glProgramUniformMatrix2x4fv": ('int', 'int', 'int', 'Union[str, int]', 'float'), + "QOpenGLExtraFunctions.glProgramUniformMatrix3fv": ('int', 'int', 'int', 'Union[str, int]', 'float'), + "QOpenGLExtraFunctions.glProgramUniformMatrix3x2fv": ('int', 'int', 'int', 'Union[str, int]', 'float'), + "QOpenGLExtraFunctions.glProgramUniformMatrix3x4fv": ('int', 'int', 'int', 'Union[str, int]', 'float'), + "QOpenGLExtraFunctions.glProgramUniformMatrix4fv": ('int', 'int', 'int', 'Union[str, int]', 'float'), + "QOpenGLExtraFunctions.glProgramUniformMatrix4x2fv": ('int', 'int', 'int', 'Union[str, int]', 'float'), + "QOpenGLExtraFunctions.glProgramUniformMatrix4x3fv": ('int', 'int', 'int', 'Union[str, int]', 'float'), "QOpenGLExtraFunctions.glReadBuffer": ('int',), "QOpenGLExtraFunctions.glRenderbufferStorageMultisample": ('int', 'int', 'int', 'int', 'int'), "QOpenGLExtraFunctions.glSampleMaski": ('int', 'int'), @@ -4113,7 +4116,7 @@ if "PySide2.QtGui" in sys.modules: "QOpenGLExtraFunctions.glSamplerParameteriv": ('int', 'int', 'int'), "QOpenGLExtraFunctions.glTexImage3D": ('int', 'int', 'int', 'int', 'int', 'int', 'int', 'int', 'int', 'int'), "QOpenGLExtraFunctions.glTexStorage2D": ('int', 'int', 'int', 'int', 'int'), - "QOpenGLExtraFunctions.glTexStorage2DMultisample": ('int', 'int', 'int', 'int', 'int', 'PySide2.support.signature.typing.Union[str, int]'), + "QOpenGLExtraFunctions.glTexStorage2DMultisample": ('int', 'int', 'int', 'int', 'int', 'Union[str, int]'), "QOpenGLExtraFunctions.glTexStorage3D": ('int', 'int', 'int', 'int', 'int', 'int'), "QOpenGLExtraFunctions.glTexSubImage3D": ('int', 'int', 'int', 'int', 'int', 'int', 'int', 'int', 'int', 'int', 'int'), "QOpenGLExtraFunctions.glUniform1ui": ('int', 'int'), @@ -4125,18 +4128,18 @@ if "PySide2.QtGui" in sys.modules: "QOpenGLExtraFunctions.glUniform4ui": ('int', 'int', 'int', 'int', 'int'), "QOpenGLExtraFunctions.glUniform4uiv": ('int', 'int', 'int'), "QOpenGLExtraFunctions.glUniformBlockBinding": ('int', 'int', 'int'), - "QOpenGLExtraFunctions.glUniformMatrix2x3fv": ('int', 'int', 'PySide2.support.signature.typing.Union[str, int]', 'float'), - "QOpenGLExtraFunctions.glUniformMatrix2x4fv": ('int', 'int', 'PySide2.support.signature.typing.Union[str, int]', 'float'), - "QOpenGLExtraFunctions.glUniformMatrix3x2fv": ('int', 'int', 'PySide2.support.signature.typing.Union[str, int]', 'float'), - "QOpenGLExtraFunctions.glUniformMatrix3x4fv": ('int', 'int', 'PySide2.support.signature.typing.Union[str, int]', 'float'), - "QOpenGLExtraFunctions.glUniformMatrix4x2fv": ('int', 'int', 'PySide2.support.signature.typing.Union[str, int]', 'float'), - "QOpenGLExtraFunctions.glUniformMatrix4x3fv": ('int', 'int', 'PySide2.support.signature.typing.Union[str, int]', 'float'), + "QOpenGLExtraFunctions.glUniformMatrix2x3fv": ('int', 'int', 'Union[str, int]', 'float'), + "QOpenGLExtraFunctions.glUniformMatrix2x4fv": ('int', 'int', 'Union[str, int]', 'float'), + "QOpenGLExtraFunctions.glUniformMatrix3x2fv": ('int', 'int', 'Union[str, int]', 'float'), + "QOpenGLExtraFunctions.glUniformMatrix3x4fv": ('int', 'int', 'Union[str, int]', 'float'), + "QOpenGLExtraFunctions.glUniformMatrix4x2fv": ('int', 'int', 'Union[str, int]', 'float'), + "QOpenGLExtraFunctions.glUniformMatrix4x3fv": ('int', 'int', 'Union[str, int]', 'float'), "QOpenGLExtraFunctions.glUnmapBuffer": ('int',), "QOpenGLExtraFunctions.glUseProgramStages": ('int', 'int', 'int'), "QOpenGLExtraFunctions.glValidateProgramPipeline": ('int',), "QOpenGLExtraFunctions.glVertexAttribBinding": ('int', 'int'), "QOpenGLExtraFunctions.glVertexAttribDivisor": ('int', 'int'), - "QOpenGLExtraFunctions.glVertexAttribFormat": ('int', 'int', 'int', 'PySide2.support.signature.typing.Union[str, int]', 'int'), + "QOpenGLExtraFunctions.glVertexAttribFormat": ('int', 'int', 'int', 'Union[str, int]', 'int'), "QOpenGLExtraFunctions.glVertexAttribI4i": ('int', 'int', 'int', 'int', 'int'), "QOpenGLExtraFunctions.glVertexAttribI4iv": ('int', 'int'), "QOpenGLExtraFunctions.glVertexAttribI4ui": ('int', 'int', 'int', 'int', 'int'), @@ -4202,7 +4205,7 @@ if "PySide2.QtGui" in sys.modules: "QOpenGLFunctions.glClearColor": ('float', 'float', 'float', 'float'), "QOpenGLFunctions.glClearDepthf": ('float',), "QOpenGLFunctions.glClearStencil": ('int',), - "QOpenGLFunctions.glColorMask": ('PySide2.support.signature.typing.Union[str, int]', 'PySide2.support.signature.typing.Union[str, int]', 'PySide2.support.signature.typing.Union[str, int]', 'PySide2.support.signature.typing.Union[str, int]'), + "QOpenGLFunctions.glColorMask": ('Union[str, int]', 'Union[str, int]', 'Union[str, int]', 'Union[str, int]'), "QOpenGLFunctions.glCompileShader": ('int',), "QOpenGLFunctions.glCompressedTexImage2D": ('int', 'int', 'int', 'int', 'int', 'int', 'int', 'int'), "QOpenGLFunctions.glCompressedTexSubImage2D": ('int', 'int', 'int', 'int', 'int', 'int', 'int', 'int', 'int'), @@ -4218,7 +4221,7 @@ if "PySide2.QtGui" in sys.modules: "QOpenGLFunctions.glDeleteShader": ('int',), "QOpenGLFunctions.glDeleteTextures": ('int', 'int'), "QOpenGLFunctions.glDepthFunc": ('int',), - "QOpenGLFunctions.glDepthMask": ('PySide2.support.signature.typing.Union[str, int]',), + "QOpenGLFunctions.glDepthMask": ('Union[str, int]',), "QOpenGLFunctions.glDepthRangef": ('float', 'float'), "QOpenGLFunctions.glDetachShader": ('int', 'int'), "QOpenGLFunctions.glDisable": ('int',), @@ -4248,6 +4251,7 @@ if "PySide2.QtGui" in sys.modules: "QOpenGLFunctions.glGetRenderbufferParameteriv": ('int', 'int', 'int'), "QOpenGLFunctions.glGetShaderPrecisionFormat": ('int', 'int', 'int', 'int'), "QOpenGLFunctions.glGetShaderiv": ('int', 'int', 'int'), + "QOpenGLFunctions.glGetString": ('int',), "QOpenGLFunctions.glGetTexParameterfv": ('int', 'int', 'float'), "QOpenGLFunctions.glGetTexParameteriv": ('int', 'int', 'int'), "QOpenGLFunctions.glGetUniformLocation": ('int', 'str'), @@ -4270,7 +4274,7 @@ if "PySide2.QtGui" in sys.modules: "QOpenGLFunctions.glReadPixels": ('int', 'int', 'int', 'int', 'int', 'int', 'int'), "QOpenGLFunctions.glReleaseShaderCompiler": (), "QOpenGLFunctions.glRenderbufferStorage": ('int', 'int', 'int', 'int'), - "QOpenGLFunctions.glSampleCoverage": ('float', 'PySide2.support.signature.typing.Union[str, int]'), + "QOpenGLFunctions.glSampleCoverage": ('float', 'Union[str, int]'), "QOpenGLFunctions.glScissor": ('int', 'int', 'int', 'int'), "QOpenGLFunctions.glShaderBinary": ('int', 'int', 'int', 'int', 'int'), "QOpenGLFunctions.glStencilFunc": ('int', 'int', 'int'), @@ -4301,9 +4305,9 @@ if "PySide2.QtGui" in sys.modules: "QOpenGLFunctions.glUniform4fv": ('int', 'int', 'float'), "QOpenGLFunctions.glUniform4i": ('int', 'int', 'int', 'int', 'int'), "QOpenGLFunctions.glUniform4iv": ('int', 'int', 'int'), - "QOpenGLFunctions.glUniformMatrix2fv": ('int', 'int', 'PySide2.support.signature.typing.Union[str, int]', 'float'), - "QOpenGLFunctions.glUniformMatrix3fv": ('int', 'int', 'PySide2.support.signature.typing.Union[str, int]', 'float'), - "QOpenGLFunctions.glUniformMatrix4fv": ('int', 'int', 'PySide2.support.signature.typing.Union[str, int]', 'float'), + "QOpenGLFunctions.glUniformMatrix2fv": ('int', 'int', 'Union[str, int]', 'float'), + "QOpenGLFunctions.glUniformMatrix3fv": ('int', 'int', 'Union[str, int]', 'float'), + "QOpenGLFunctions.glUniformMatrix4fv": ('int', 'int', 'Union[str, int]', 'float'), "QOpenGLFunctions.glUseProgram": ('int',), "QOpenGLFunctions.glValidateProgram": ('int',), "QOpenGLFunctions.glVertexAttrib1f": ('int', 'float'), @@ -4314,7 +4318,7 @@ if "PySide2.QtGui" in sys.modules: "QOpenGLFunctions.glVertexAttrib3fv": ('int', 'float'), "QOpenGLFunctions.glVertexAttrib4f": ('int', 'float', 'float', 'float', 'float'), "QOpenGLFunctions.glVertexAttrib4fv": ('int', 'float'), - "QOpenGLFunctions.glVertexAttribPointer": ('int', 'int', 'int', 'PySide2.support.signature.typing.Union[str, int]', 'int', 'int'), + "QOpenGLFunctions.glVertexAttribPointer": ('int', 'int', 'int', 'Union[str, int]', 'int', 'int'), "QOpenGLFunctions.glViewport": ('int', 'int', 'int', 'int'), "QOpenGLFunctions.hasOpenGLFeature": ('PySide2.QtGui.QOpenGLFunctions.OpenGLFeature',), "QOpenGLFunctions.initializeOpenGLFunctions": (), @@ -4383,7 +4387,7 @@ if "PySide2.QtGui" in sys.modules: "QOpenGLShaderProgram.setDefaultInnerTessellationLevels": ('list',), "QOpenGLShaderProgram.setDefaultOuterTessellationLevels": ('list',), "QOpenGLShaderProgram.setPatchVertexCount": ('int',), - "QOpenGLShaderProgram.setUniformValue": [('int', 'PySide2.QtCore.QPoint'), ('int', 'PySide2.QtCore.QPointF'), ('int', 'PySide2.QtCore.QSize'), ('int', 'PySide2.QtCore.QSizeF'), ('int', 'PySide2.QtGui.QColor'), ('int', 'PySide2.QtGui.QMatrix2x2'), ('int', 'PySide2.QtGui.QMatrix2x3'), ('int', 'PySide2.QtGui.QMatrix2x4'), ('int', 'PySide2.QtGui.QMatrix3x2'), ('int', 'PySide2.QtGui.QMatrix3x3'), ('int', 'PySide2.QtGui.QMatrix3x4'), ('int', 'PySide2.QtGui.QMatrix4x2'), ('int', 'PySide2.QtGui.QMatrix4x3'), ('int', 'PySide2.QtGui.QMatrix4x4'), ('int', 'PySide2.QtGui.QTransform'), ('int', 'PySide2.QtGui.QVector2D'), ('int', 'PySide2.QtGui.QVector3D'), ('int', 'PySide2.QtGui.QVector4D'), ('int', 'PySide2.support.signature.typing.List'), ('int', 'float'), ('int', 'float', 'float'), ('int', 'float', 'float', 'float'), ('int', 'float', 'float', 'float', 'float'), ('int', 'int'), ('str', 'PySide2.QtCore.QPoint'), ('str', 'PySide2.QtCore.QPointF'), ('str', 'PySide2.QtCore.QSize'), ('str', 'PySide2.QtCore.QSizeF'), ('str', 'PySide2.QtGui.QColor'), ('str', 'PySide2.QtGui.QMatrix2x2'), ('str', 'PySide2.QtGui.QMatrix2x3'), ('str', 'PySide2.QtGui.QMatrix2x4'), ('str', 'PySide2.QtGui.QMatrix3x2'), ('str', 'PySide2.QtGui.QMatrix3x3'), ('str', 'PySide2.QtGui.QMatrix3x4'), ('str', 'PySide2.QtGui.QMatrix4x2'), ('str', 'PySide2.QtGui.QMatrix4x3'), ('str', 'PySide2.QtGui.QMatrix4x4'), ('str', 'PySide2.QtGui.QTransform'), ('str', 'PySide2.QtGui.QVector2D'), ('str', 'PySide2.QtGui.QVector3D'), ('str', 'PySide2.QtGui.QVector4D'), ('str', 'PySide2.support.signature.typing.List'), ('str', 'float'), ('str', 'float', 'float'), ('str', 'float', 'float', 'float'), ('str', 'float', 'float', 'float', 'float'), ('str', 'int')], + "QOpenGLShaderProgram.setUniformValue": [('int', 'List[List[float]]'), ('int', 'PySide2.QtCore.QPoint'), ('int', 'PySide2.QtCore.QPointF'), ('int', 'PySide2.QtCore.QSize'), ('int', 'PySide2.QtCore.QSizeF'), ('int', 'PySide2.QtGui.QColor'), ('int', 'PySide2.QtGui.QMatrix2x2'), ('int', 'PySide2.QtGui.QMatrix2x3'), ('int', 'PySide2.QtGui.QMatrix2x4'), ('int', 'PySide2.QtGui.QMatrix3x2'), ('int', 'PySide2.QtGui.QMatrix3x3'), ('int', 'PySide2.QtGui.QMatrix3x4'), ('int', 'PySide2.QtGui.QMatrix4x2'), ('int', 'PySide2.QtGui.QMatrix4x3'), ('int', 'PySide2.QtGui.QMatrix4x4'), ('int', 'PySide2.QtGui.QTransform'), ('int', 'PySide2.QtGui.QVector2D'), ('int', 'PySide2.QtGui.QVector3D'), ('int', 'PySide2.QtGui.QVector4D'), ('int', 'float'), ('int', 'float', 'float'), ('int', 'float', 'float', 'float'), ('int', 'float', 'float', 'float', 'float'), ('int', 'int'), ('str', 'List[List[float]]'), ('str', 'PySide2.QtCore.QPoint'), ('str', 'PySide2.QtCore.QPointF'), ('str', 'PySide2.QtCore.QSize'), ('str', 'PySide2.QtCore.QSizeF'), ('str', 'PySide2.QtGui.QColor'), ('str', 'PySide2.QtGui.QMatrix2x2'), ('str', 'PySide2.QtGui.QMatrix2x3'), ('str', 'PySide2.QtGui.QMatrix2x4'), ('str', 'PySide2.QtGui.QMatrix3x2'), ('str', 'PySide2.QtGui.QMatrix3x3'), ('str', 'PySide2.QtGui.QMatrix3x4'), ('str', 'PySide2.QtGui.QMatrix4x2'), ('str', 'PySide2.QtGui.QMatrix4x3'), ('str', 'PySide2.QtGui.QMatrix4x4'), ('str', 'PySide2.QtGui.QTransform'), ('str', 'PySide2.QtGui.QVector2D'), ('str', 'PySide2.QtGui.QVector3D'), ('str', 'PySide2.QtGui.QVector4D'), ('str', 'float'), ('str', 'float', 'float'), ('str', 'float', 'float', 'float'), ('str', 'float', 'float', 'float', 'float'), ('str', 'int')], "QOpenGLShaderProgram.setUniformValueArray": [('int', 'float', 'int', 'int'), ('int', 'int', 'int'), ('str', 'float', 'int', 'int'), ('str', 'int', 'int')], "QOpenGLShaderProgram.shaders": (), "QOpenGLShaderProgram.uniformLocation": [('PySide2.QtCore.QByteArray',), ('str',)], @@ -4580,7 +4584,7 @@ if "PySide2.QtGui" in sys.modules: # class PySide2.QtGui.QPagedPaintDevice: "QPagedPaintDevice.__init__": (), - "QPagedPaintDevice.devicePageLayout": [], + "QPagedPaintDevice.devicePageLayout": (), "QPagedPaintDevice.margins": (), "QPagedPaintDevice.newPage": (), "QPagedPaintDevice.pageLayout": (), @@ -4707,7 +4711,7 @@ if "PySide2.QtGui" in sys.modules: "QPainter.drawEllipse": [('PySide2.QtCore.QPoint', 'int', 'int'), ('PySide2.QtCore.QPointF', 'float', 'float'), ('PySide2.QtCore.QRect',), ('PySide2.QtCore.QRectF',), ('int', 'int', 'int', 'int')], "QPainter.drawImage": [('PySide2.QtCore.QPoint', 'PySide2.QtGui.QImage'), ('PySide2.QtCore.QPoint', 'PySide2.QtGui.QImage', 'PySide2.QtCore.QRect', 'ImageConversionFlags'), ('PySide2.QtCore.QPointF', 'PySide2.QtGui.QImage'), ('PySide2.QtCore.QPointF', 'PySide2.QtGui.QImage', 'PySide2.QtCore.QRectF', 'ImageConversionFlags'), ('PySide2.QtCore.QRect', 'PySide2.QtGui.QImage'), ('PySide2.QtCore.QRect', 'PySide2.QtGui.QImage', 'PySide2.QtCore.QRect', 'ImageConversionFlags'), ('PySide2.QtCore.QRectF', 'PySide2.QtGui.QImage'), ('PySide2.QtCore.QRectF', 'PySide2.QtGui.QImage', 'PySide2.QtCore.QRectF', 'ImageConversionFlags'), ('int', 'int', 'PySide2.QtGui.QImage', 'int', 'int', 'int', 'int', 'ImageConversionFlags')], "QPainter.drawLine": [('PySide2.QtCore.QLine',), ('PySide2.QtCore.QLineF',), ('PySide2.QtCore.QPoint', 'PySide2.QtCore.QPoint'), ('PySide2.QtCore.QPointF', 'PySide2.QtCore.QPointF'), ('int', 'int', 'int', 'int')], - "QPainter.drawLines": ['list'], + "QPainter.drawLines": ('list',), "QPainter.drawPath": ('PySide2.QtGui.QPainterPath',), "QPainter.drawPicture": [('PySide2.QtCore.QPoint', 'PySide2.QtGui.QPicture'), ('PySide2.QtCore.QPointF', 'PySide2.QtGui.QPicture'), ('int', 'int', 'PySide2.QtGui.QPicture')], "QPainter.drawPie": [('PySide2.QtCore.QRect', 'int', 'int'), ('PySide2.QtCore.QRectF', 'int', 'int'), ('int', 'int', 'int', 'int', 'int', 'int')], @@ -4718,7 +4722,7 @@ if "PySide2.QtGui" in sys.modules: "QPainter.drawPolygon": [('PySide2.QtGui.QPolygon', 'PySide2.QtCore.Qt.FillRule'), ('PySide2.QtGui.QPolygonF', 'PySide2.QtCore.Qt.FillRule'), ('list', 'PySide2.QtCore.Qt.FillRule')], "QPainter.drawPolyline": [('PySide2.QtGui.QPolygon',), ('PySide2.QtGui.QPolygonF',), ('list',)], "QPainter.drawRect": [('PySide2.QtCore.QRect',), ('PySide2.QtCore.QRectF',), ('int', 'int', 'int', 'int')], - "QPainter.drawRects": ['list'], + "QPainter.drawRects": ('list',), "QPainter.drawRoundRect": [('PySide2.QtCore.QRect', 'int', 'int'), ('PySide2.QtCore.QRectF', 'int', 'int'), ('int', 'int', 'int', 'int', 'int', 'int')], "QPainter.drawRoundedRect": [('PySide2.QtCore.QRect', 'float', 'float', 'PySide2.QtCore.Qt.SizeMode'), ('PySide2.QtCore.QRectF', 'float', 'float', 'PySide2.QtCore.Qt.SizeMode'), ('int', 'int', 'int', 'int', 'float', 'float', 'PySide2.QtCore.Qt.SizeMode')], "QPainter.drawStaticText": [('PySide2.QtCore.QPoint', 'PySide2.QtGui.QStaticText'), ('PySide2.QtCore.QPointF', 'PySide2.QtGui.QStaticText'), ('int', 'int', 'PySide2.QtGui.QStaticText')], @@ -4984,7 +4988,7 @@ if "PySide2.QtGui" in sys.modules: "QPictureIO.write": (), # class PySide2.QtGui.QPixelFormat: - "QPixelFormat.__init__": [(), ('PySide2.QtGui.QPixelFormat',), ('PySide2.QtGui.QPixelFormat.ColorModel', 'PySide2.support.signature.typing.Union[str, int]', 'PySide2.support.signature.typing.Union[str, int]', 'PySide2.support.signature.typing.Union[str, int]', 'PySide2.support.signature.typing.Union[str, int]', 'PySide2.support.signature.typing.Union[str, int]', 'PySide2.support.signature.typing.Union[str, int]', 'PySide2.QtGui.QPixelFormat.AlphaUsage', 'PySide2.QtGui.QPixelFormat.AlphaPosition', 'PySide2.QtGui.QPixelFormat.AlphaPremultiplied', 'PySide2.QtGui.QPixelFormat.TypeInterpretation', 'PySide2.QtGui.QPixelFormat.ByteOrder', 'PySide2.support.signature.typing.Union[str, int]')], + "QPixelFormat.__init__": [(), ('PySide2.QtGui.QPixelFormat',), ('PySide2.QtGui.QPixelFormat.ColorModel', 'Union[str, int]', 'Union[str, int]', 'Union[str, int]', 'Union[str, int]', 'Union[str, int]', 'Union[str, int]', 'PySide2.QtGui.QPixelFormat.AlphaUsage', 'PySide2.QtGui.QPixelFormat.AlphaPosition', 'PySide2.QtGui.QPixelFormat.AlphaPremultiplied', 'PySide2.QtGui.QPixelFormat.TypeInterpretation', 'PySide2.QtGui.QPixelFormat.ByteOrder', 'Union[str, int]')], "QPixelFormat.__copy__": (), "QPixelFormat.alphaPosition": (), "QPixelFormat.alphaSize": (), @@ -5010,7 +5014,7 @@ if "PySide2.QtGui" in sys.modules: "QPixelFormat.yuvLayout": (), # class PySide2.QtGui.QPixmap: - "QPixmap.__init__": [(), ('PySide2.QtCore.QSize',), ('PySide2.QtGui.QImage',), ('PySide2.QtGui.QPixmap',), ('PySide2.support.signature.typing.List',), ('int', 'int'), ('str', 'str', 'ImageConversionFlags')], + "QPixmap.__init__": [(), ('List[str]',), ('PySide2.QtCore.QSize',), ('PySide2.QtGui.QImage',), ('PySide2.QtGui.QPixmap',), ('int', 'int'), ('str', 'str', 'ImageConversionFlags')], "QPixmap.__copy__": (), "QPixmap.cacheKey": (), "QPixmap.convertFromImage": ('PySide2.QtGui.QImage', 'ImageConversionFlags'), @@ -5033,7 +5037,7 @@ if "PySide2.QtGui" in sys.modules: "QPixmap.isNull": (), "QPixmap.isQBitmap": (), "QPixmap.load": ('str', 'str', 'ImageConversionFlags'), - "QPixmap.loadFromData": [('PySide2.QtCore.QByteArray', 'str', 'ImageConversionFlags'), ('PySide2.support.signature.typing.Union[str, int]', 'int', 'str', 'ImageConversionFlags')], + "QPixmap.loadFromData": [('PySide2.QtCore.QByteArray', 'str', 'ImageConversionFlags'), ('Union[str, int]', 'int', 'str', 'ImageConversionFlags')], "QPixmap.mask": (), "QPixmap.metric": ('PySide2.QtGui.QPaintDevice.PaintDeviceMetric',), "QPixmap.paintEngine": (), @@ -5077,11 +5081,11 @@ if "PySide2.QtGui" in sys.modules: "QPolygon.contains": ('PySide2.QtCore.QPoint',), "QPolygon.containsPoint": ('PySide2.QtCore.QPoint', 'PySide2.QtCore.Qt.FillRule'), "QPolygon.count": [(), ('PySide2.QtCore.QPoint',)], - "QPolygon.data": [], + "QPolygon.data": (), "QPolygon.empty": (), "QPolygon.endsWith": ('PySide2.QtCore.QPoint',), "QPolygon.fill": ('PySide2.QtCore.QPoint', 'int'), - "QPolygon.first": [], + "QPolygon.first": (), "QPolygon.fromList": ('list',), "QPolygon.front": (), "QPolygon.indexOf": ('PySide2.QtCore.QPoint', 'int'), @@ -5089,7 +5093,7 @@ if "PySide2.QtGui" in sys.modules: "QPolygon.intersected": ('PySide2.QtGui.QPolygon',), "QPolygon.isEmpty": (), "QPolygon.isSharedWith": ('list',), - "QPolygon.last": [], + "QPolygon.last": (), "QPolygon.lastIndexOf": ('PySide2.QtCore.QPoint', 'int'), "QPolygon.length": (), "QPolygon.mid": ('int', 'int'), @@ -5137,11 +5141,11 @@ if "PySide2.QtGui" in sys.modules: "QPolygonF.contains": ('PySide2.QtCore.QPointF',), "QPolygonF.containsPoint": ('PySide2.QtCore.QPointF', 'PySide2.QtCore.Qt.FillRule'), "QPolygonF.count": [(), ('PySide2.QtCore.QPointF',)], - "QPolygonF.data": [], + "QPolygonF.data": (), "QPolygonF.empty": (), "QPolygonF.endsWith": ('PySide2.QtCore.QPointF',), "QPolygonF.fill": ('PySide2.QtCore.QPointF', 'int'), - "QPolygonF.first": [], + "QPolygonF.first": (), "QPolygonF.fromList": ('list',), "QPolygonF.front": (), "QPolygonF.indexOf": ('PySide2.QtCore.QPointF', 'int'), @@ -5150,7 +5154,7 @@ if "PySide2.QtGui" in sys.modules: "QPolygonF.isClosed": (), "QPolygonF.isEmpty": (), "QPolygonF.isSharedWith": ('list',), - "QPolygonF.last": [], + "QPolygonF.last": (), "QPolygonF.lastIndexOf": ('PySide2.QtCore.QPointF', 'int'), "QPolygonF.length": (), "QPolygonF.mid": ('int', 'int'), @@ -5274,7 +5278,7 @@ if "PySide2.QtGui" in sys.modules: "QRawFont.style": (), "QRawFont.styleName": (), "QRawFont.supportedWritingSystems": (), - "QRawFont.supportsCharacter": [('PySide2.support.signature.typing.Union[str, int]',), ('int',)], + "QRawFont.supportsCharacter": [('Union[str, int]',), ('int',)], "QRawFont.swap": ('PySide2.QtGui.QRawFont',), "QRawFont.underlinePosition": (), "QRawFont.unitsPerEm": (), @@ -5363,9 +5367,9 @@ if "PySide2.QtGui" in sys.modules: "QSessionManager.restartHint": (), "QSessionManager.sessionId": (), "QSessionManager.sessionKey": (), - "QSessionManager.setDiscardCommand": ('PySide2.support.signature.typing.List',), - "QSessionManager.setManagerProperty": [('str', 'PySide2.support.signature.typing.List'), ('str', 'str')], - "QSessionManager.setRestartCommand": ('PySide2.support.signature.typing.List',), + "QSessionManager.setDiscardCommand": ('List[str]',), + "QSessionManager.setManagerProperty": [('str', 'List[str]'), ('str', 'str')], + "QSessionManager.setRestartCommand": ('List[str]',), "QSessionManager.setRestartHint": ('PySide2.QtGui.QSessionManager.RestartHint',), # class PySide2.QtGui.QShortcutEvent: @@ -5425,7 +5429,7 @@ if "PySide2.QtGui" in sys.modules: "QStandardItem.setCheckable": ('bool',), "QStandardItem.setChild": [('int', 'PySide2.QtGui.QStandardItem'), ('int', 'int', 'PySide2.QtGui.QStandardItem')], "QStandardItem.setColumnCount": ('int',), - "QStandardItem.setData": ('PySide2.support.signature.typing.Any', 'int'), + "QStandardItem.setData": ('Any', 'int'), "QStandardItem.setDragEnabled": ('bool',), "QStandardItem.setDropEnabled": ('bool',), "QStandardItem.setEditable": ('bool',), @@ -5481,17 +5485,17 @@ if "PySide2.QtGui" in sys.modules: "QStandardItemModel.itemData": ('PySide2.QtCore.QModelIndex',), "QStandardItemModel.itemFromIndex": ('PySide2.QtCore.QModelIndex',), "QStandardItemModel.itemPrototype": (), - "QStandardItemModel.mimeData": ('PySide2.support.signature.typing.List',), + "QStandardItemModel.mimeData": ('List[int]',), "QStandardItemModel.mimeTypes": (), "QStandardItemModel.parent": [(), ('PySide2.QtCore.QModelIndex',)], "QStandardItemModel.removeColumns": ('int', 'int', 'PySide2.QtCore.QModelIndex'), "QStandardItemModel.removeRows": ('int', 'int', 'PySide2.QtCore.QModelIndex'), "QStandardItemModel.rowCount": ('PySide2.QtCore.QModelIndex',), "QStandardItemModel.setColumnCount": ('int',), - "QStandardItemModel.setData": ('PySide2.QtCore.QModelIndex', 'PySide2.support.signature.typing.Any', 'int'), - "QStandardItemModel.setHeaderData": ('int', 'PySide2.QtCore.Qt.Orientation', 'PySide2.support.signature.typing.Any', 'int'), + "QStandardItemModel.setData": ('PySide2.QtCore.QModelIndex', 'Any', 'int'), + "QStandardItemModel.setHeaderData": ('int', 'PySide2.QtCore.Qt.Orientation', 'Any', 'int'), "QStandardItemModel.setHorizontalHeaderItem": ('int', 'PySide2.QtGui.QStandardItem'), - "QStandardItemModel.setHorizontalHeaderLabels": ('PySide2.support.signature.typing.List',), + "QStandardItemModel.setHorizontalHeaderLabels": ('List[str]',), "QStandardItemModel.setItem": [('int', 'PySide2.QtGui.QStandardItem'), ('int', 'int', 'PySide2.QtGui.QStandardItem')], "QStandardItemModel.setItemData": ('PySide2.QtCore.QModelIndex', 'dict'), "QStandardItemModel.setItemPrototype": ('PySide2.QtGui.QStandardItem',), @@ -5499,7 +5503,7 @@ if "PySide2.QtGui" in sys.modules: "QStandardItemModel.setRowCount": ('int',), "QStandardItemModel.setSortRole": ('int',), "QStandardItemModel.setVerticalHeaderItem": ('int', 'PySide2.QtGui.QStandardItem'), - "QStandardItemModel.setVerticalHeaderLabels": ('PySide2.support.signature.typing.List',), + "QStandardItemModel.setVerticalHeaderLabels": ('List[str]',), "QStandardItemModel.sibling": ('int', 'int', 'PySide2.QtCore.QModelIndex'), "QStandardItemModel.sort": ('int', 'PySide2.QtCore.Qt.SortOrder'), "QStandardItemModel.sortRole": (), @@ -5533,14 +5537,14 @@ if "PySide2.QtGui" in sys.modules: "QStatusTipEvent.tip": (), # class PySide2.QtGui.QStringListModel: - "QStringListModel.__init__": [('PySide2.QtCore.QObject',), ('PySide2.support.signature.typing.List', 'PySide2.QtCore.QObject')], + "QStringListModel.__init__": [('List[str]', 'PySide2.QtCore.QObject'), ('PySide2.QtCore.QObject',)], "QStringListModel.data": ('PySide2.QtCore.QModelIndex', 'int'), "QStringListModel.flags": ('PySide2.QtCore.QModelIndex',), "QStringListModel.insertRows": ('int', 'int', 'PySide2.QtCore.QModelIndex'), "QStringListModel.removeRows": ('int', 'int', 'PySide2.QtCore.QModelIndex'), "QStringListModel.rowCount": ('PySide2.QtCore.QModelIndex',), - "QStringListModel.setData": ('PySide2.QtCore.QModelIndex', 'PySide2.support.signature.typing.Any', 'int'), - "QStringListModel.setStringList": ('PySide2.support.signature.typing.List',), + "QStringListModel.setData": ('PySide2.QtCore.QModelIndex', 'Any', 'int'), + "QStringListModel.setStringList": ('List[str]',), "QStringListModel.sibling": ('int', 'int', 'PySide2.QtCore.QModelIndex'), "QStringListModel.sort": ('int', 'PySide2.QtCore.Qt.SortOrder'), "QStringListModel.stringList": (), @@ -5650,9 +5654,9 @@ if "PySide2.QtGui" in sys.modules: "QTabletEvent.globalPos": (), "QTabletEvent.globalPosF": (), "QTabletEvent.globalX": (), - "QTabletEvent.global"+"Y": (), + "QTabletEvent.global""Y": (), "QTabletEvent.hiResGlobalX": (), - "QTabletEvent.hiResGlobal"+"Y": (), + "QTabletEvent.hiResGlobal""Y": (), "QTabletEvent.pointerType": (), "QTabletEvent.pos": (), "QTabletEvent.posF": (), @@ -5686,7 +5690,6 @@ if "PySide2.QtGui" in sys.modules: "QTextBlock.layout": (), "QTextBlock.length": (), "QTextBlock.lineCount": (), - "QTextBlock.next": (), "QTextBlock.position": (), "QTextBlock.previous": (), "QTextBlock.revision": (), @@ -5769,7 +5772,7 @@ if "PySide2.QtGui" in sys.modules: "QTextCharFormat.setAnchor": ('bool',), "QTextCharFormat.setAnchorHref": ('str',), "QTextCharFormat.setAnchorName": ('str',), - "QTextCharFormat.setAnchorNames": ('PySide2.support.signature.typing.List',), + "QTextCharFormat.setAnchorNames": ('List[str]',), "QTextCharFormat.setFont": [('PySide2.QtGui.QFont',), ('PySide2.QtGui.QFont', 'PySide2.QtGui.QTextCharFormat.FontPropertiesInheritanceBehavior')], "QTextCharFormat.setFontCapitalization": ('PySide2.QtGui.QFont.Capitalization',), "QTextCharFormat.setFontFamily": ('str',), @@ -5867,7 +5870,7 @@ if "PySide2.QtGui" in sys.modules: # class PySide2.QtGui.QTextDocument: "QTextDocument.__init__": [('PySide2.QtCore.QObject',), ('str', 'PySide2.QtCore.QObject')], - "QTextDocument.addResource": ('int', 'PySide2.QtCore.QUrl', 'PySide2.support.signature.typing.Any'), + "QTextDocument.addResource": ('int', 'PySide2.QtCore.QUrl', 'Any'), "QTextDocument.adjustSize": (), "QTextDocument.allFormats": (), "QTextDocument.availableRedoSteps": (), @@ -6002,7 +6005,7 @@ if "PySide2.QtGui" in sys.modules: "QTextFormat.setLayoutDirection": ('PySide2.QtCore.Qt.LayoutDirection',), "QTextFormat.setObjectIndex": ('int',), "QTextFormat.setObjectType": ('int',), - "QTextFormat.setProperty": [('int', 'PySide2.support.signature.typing.Any'), ('int', 'list')], + "QTextFormat.setProperty": [('int', 'Any'), ('int', 'list')], "QTextFormat.stringProperty": ('int',), "QTextFormat.swap": ('PySide2.QtGui.QTextFormat',), "QTextFormat.toBlockFormat": (), @@ -6480,7 +6483,7 @@ if "PySide2.QtGui" in sys.modules: "QWheelEvent.globalPos": (), "QWheelEvent.globalPosF": (), "QWheelEvent.globalX": (), - "QWheelEvent.global"+"Y": (), + "QWheelEvent.global""Y": (), "QWheelEvent.inverted": (), "QWheelEvent.orientation": (), "QWheelEvent.phase": (), @@ -6979,7 +6982,7 @@ if "PySide2.QtWidgets" in sys.modules: "QAction.setAutoRepeat": ('bool',), "QAction.setCheckable": ('bool',), "QAction.setChecked": ('bool',), - "QAction.setData": ('PySide2.support.signature.typing.Any',), + "QAction.setData": ('Any',), "QAction.setDisabled": ('bool',), "QAction.setEnabled": ('bool',), "QAction.setFont": ('PySide2.QtGui.QFont',), @@ -7024,7 +7027,7 @@ if "PySide2.QtWidgets" in sys.modules: "QActionGroup.setVisible": ('bool',), # class PySide2.QtWidgets.QApplication: - "QApplication.__init__": ('PySide2.support.signature.typing.List',), + "QApplication.__init__": ('List[str]',), "QApplication.aboutQt": (), "QApplication.activeModalWidget": (), "QApplication.activePopupWidget": (), @@ -7209,6 +7212,19 @@ if "PySide2.QtWidgets" in sys.modules: "QColorDialog.standardColor": ('int',), "QColorDialog.testOption": ('PySide2.QtWidgets.QColorDialog.ColorDialogOption',), + # class PySide2.QtWidgets.QColormap: + "QColormap.__init__": ('PySide2.QtWidgets.QColormap',), + "QColormap.__copy__": (), + "QColormap.cleanup": (), + "QColormap.colorAt": ('int',), + "QColormap.colormap": (), + "QColormap.depth": (), + "QColormap.initialize": (), + "QColormap.instance": ('int',), + "QColormap.mode": (), + "QColormap.pixel": ('PySide2.QtGui.QColor',), + "QColormap.size": (), + # class PySide2.QtWidgets.QColumnView: "QColumnView.__init__": ('PySide2.QtWidgets.QWidget',), "QColumnView.columnWidths": (), @@ -7240,8 +7256,8 @@ if "PySide2.QtWidgets" in sys.modules: # class PySide2.QtWidgets.QComboBox: "QComboBox.__init__": ('PySide2.QtWidgets.QWidget',), - "QComboBox.addItem": [('PySide2.QtGui.QIcon', 'str', 'PySide2.support.signature.typing.Any'), ('str', 'PySide2.support.signature.typing.Any')], - "QComboBox.addItems": ('PySide2.support.signature.typing.List',), + "QComboBox.addItem": [('PySide2.QtGui.QIcon', 'str', 'Any'), ('str', 'Any')], + "QComboBox.addItems": ('List[str]',), "QComboBox.autoCompletion": (), "QComboBox.autoCompletionCaseSensitivity": (), "QComboBox.changeEvent": ('PySide2.QtCore.QEvent',), @@ -7255,7 +7271,7 @@ if "PySide2.QtWidgets" in sys.modules: "QComboBox.currentText": (), "QComboBox.duplicatesEnabled": (), "QComboBox.event": ('PySide2.QtCore.QEvent',), - "QComboBox.findData": ('PySide2.support.signature.typing.Any', 'int', 'MatchFlags'), + "QComboBox.findData": ('Any', 'int', 'MatchFlags'), "QComboBox.findText": ('str', 'MatchFlags'), "QComboBox.focusInEvent": ('PySide2.QtGui.QFocusEvent',), "QComboBox.focusOutEvent": ('PySide2.QtGui.QFocusEvent',), @@ -7265,9 +7281,9 @@ if "PySide2.QtWidgets" in sys.modules: "QComboBox.iconSize": (), "QComboBox.initStyleOption": ('PySide2.QtWidgets.QStyleOptionComboBox',), "QComboBox.inputMethodEvent": ('PySide2.QtGui.QInputMethodEvent',), - "QComboBox.inputMethodQuery": [('PySide2.QtCore.Qt.InputMethodQuery',), ('PySide2.QtCore.Qt.InputMethodQuery', 'PySide2.support.signature.typing.Any')], - "QComboBox.insertItem": [('int', 'PySide2.QtGui.QIcon', 'str', 'PySide2.support.signature.typing.Any'), ('int', 'str', 'PySide2.support.signature.typing.Any')], - "QComboBox.insertItems": ('int', 'PySide2.support.signature.typing.List'), + "QComboBox.inputMethodQuery": [('PySide2.QtCore.Qt.InputMethodQuery',), ('PySide2.QtCore.Qt.InputMethodQuery', 'Any')], + "QComboBox.insertItem": [('int', 'PySide2.QtGui.QIcon', 'str', 'Any'), ('int', 'str', 'Any')], + "QComboBox.insertItems": ('int', 'List[str]'), "QComboBox.insertPolicy": (), "QComboBox.insertSeparator": ('int',), "QComboBox.isEditable": (), @@ -7301,7 +7317,7 @@ if "PySide2.QtWidgets" in sys.modules: "QComboBox.setFrame": ('bool',), "QComboBox.setIconSize": ('PySide2.QtCore.QSize',), "QComboBox.setInsertPolicy": ('PySide2.QtWidgets.QComboBox.InsertPolicy',), - "QComboBox.setItemData": ('int', 'PySide2.support.signature.typing.Any', 'int'), + "QComboBox.setItemData": ('int', 'Any', 'int'), "QComboBox.setItemDelegate": ('PySide2.QtWidgets.QAbstractItemDelegate',), "QComboBox.setItemIcon": ('int', 'PySide2.QtGui.QIcon'), "QComboBox.setItemText": ('int', 'str'), @@ -7352,7 +7368,7 @@ if "PySide2.QtWidgets" in sys.modules: "QCommonStyle.unpolish": [('PySide2.QtWidgets.QApplication',), ('PySide2.QtWidgets.QWidget',)], # class PySide2.QtWidgets.QCompleter: - "QCompleter.__init__": [('PySide2.QtCore.QAbstractItemModel', 'PySide2.QtCore.QObject'), ('PySide2.QtCore.QObject',), ('PySide2.support.signature.typing.List', 'PySide2.QtCore.QObject')], + "QCompleter.__init__": [('List[str]', 'PySide2.QtCore.QObject'), ('PySide2.QtCore.QAbstractItemModel', 'PySide2.QtCore.QObject'), ('PySide2.QtCore.QObject',)], "QCompleter.caseSensitivity": (), "QCompleter.complete": ('PySide2.QtCore.QRect',), "QCompleter.completionColumn": (), @@ -7421,7 +7437,7 @@ if "PySide2.QtWidgets" in sys.modules: "QDateEdit.__init__": [('PySide2.QtCore.QDate', 'PySide2.QtWidgets.QWidget'), ('PySide2.QtWidgets.QWidget',)], # class PySide2.QtWidgets.QDateTimeEdit: - "QDateTimeEdit.__init__": [('PySide2.QtCore.QDate', 'PySide2.QtWidgets.QWidget'), ('PySide2.QtCore.QDateTime', 'PySide2.QtWidgets.QWidget'), ('PySide2.QtCore.QTime', 'PySide2.QtWidgets.QWidget'), ('PySide2.QtWidgets.QWidget',), ('PySide2.support.signature.typing.Any', 'type', 'PySide2.QtWidgets.QWidget')], + "QDateTimeEdit.__init__": [('Any', 'type', 'PySide2.QtWidgets.QWidget'), ('PySide2.QtCore.QDate', 'PySide2.QtWidgets.QWidget'), ('PySide2.QtCore.QDateTime', 'PySide2.QtWidgets.QWidget'), ('PySide2.QtCore.QTime', 'PySide2.QtWidgets.QWidget'), ('PySide2.QtWidgets.QWidget',)], "QDateTimeEdit.calendarPopup": (), "QDateTimeEdit.calendarWidget": (), "QDateTimeEdit.clear": (), @@ -7562,7 +7578,7 @@ if "PySide2.QtWidgets" in sys.modules: "QDialogButtonBox.standardButtons": (), # class PySide2.QtWidgets.QDirModel: - "QDirModel.__init__": [('PySide2.QtCore.QObject',), ('PySide2.support.signature.typing.List', 'Filters', 'SortFlags', 'PySide2.QtCore.QObject')], + "QDirModel.__init__": [('List[str]', 'Filters', 'SortFlags', 'PySide2.QtCore.QObject'), ('PySide2.QtCore.QObject',)], "QDirModel.columnCount": ('PySide2.QtCore.QModelIndex',), "QDirModel.data": ('PySide2.QtCore.QModelIndex', 'int'), "QDirModel.dropMimeData": ('PySide2.QtCore.QMimeData', 'PySide2.QtCore.Qt.DropAction', 'int', 'int', 'PySide2.QtCore.QModelIndex'), @@ -7579,7 +7595,7 @@ if "PySide2.QtWidgets" in sys.modules: "QDirModel.isDir": ('PySide2.QtCore.QModelIndex',), "QDirModel.isReadOnly": (), "QDirModel.lazyChildCount": (), - "QDirModel.mimeData": ('PySide2.support.signature.typing.List',), + "QDirModel.mimeData": ('List[int]',), "QDirModel.mimeTypes": (), "QDirModel.mkdir": ('PySide2.QtCore.QModelIndex', 'str'), "QDirModel.nameFilters": (), @@ -7589,11 +7605,11 @@ if "PySide2.QtWidgets" in sys.modules: "QDirModel.resolveSymlinks": (), "QDirModel.rmdir": ('PySide2.QtCore.QModelIndex',), "QDirModel.rowCount": ('PySide2.QtCore.QModelIndex',), - "QDirModel.setData": ('PySide2.QtCore.QModelIndex', 'PySide2.support.signature.typing.Any', 'int'), + "QDirModel.setData": ('PySide2.QtCore.QModelIndex', 'Any', 'int'), "QDirModel.setFilter": ('Filters',), "QDirModel.setIconProvider": ('PySide2.QtWidgets.QFileIconProvider',), "QDirModel.setLazyChildCount": ('bool',), - "QDirModel.setNameFilters": ('PySide2.support.signature.typing.List',), + "QDirModel.setNameFilters": ('List[str]',), "QDirModel.setReadOnly": ('bool',), "QDirModel.setResolveSymlinks": ('bool',), "QDirModel.setSorting": ('SortFlags',), @@ -7664,13 +7680,13 @@ if "PySide2.QtWidgets" in sys.modules: "QFileDialog.fileMode": (), "QFileDialog.filter": (), "QFileDialog.getExistingDirectory": ('PySide2.QtWidgets.QWidget', 'str', 'str', 'Options'), - "QFileDialog.getExistingDirectoryUrl": ('PySide2.QtWidgets.QWidget', 'str', 'PySide2.QtCore.QUrl', 'Options', 'PySide2.support.signature.typing.List'), + "QFileDialog.getExistingDirectoryUrl": ('PySide2.QtWidgets.QWidget', 'str', 'PySide2.QtCore.QUrl', 'Options', 'List[str]'), "QFileDialog.getOpenFileName": ('PySide2.QtWidgets.QWidget', 'str', 'str', 'str', 'str', 'Options'), "QFileDialog.getOpenFileNames": ('PySide2.QtWidgets.QWidget', 'str', 'str', 'str', 'str', 'Options'), - "QFileDialog.getOpenFileUrl": ('PySide2.QtWidgets.QWidget', 'str', 'PySide2.QtCore.QUrl', 'str', 'str', 'Options', 'PySide2.support.signature.typing.List'), - "QFileDialog.getOpenFileUrls": ('PySide2.QtWidgets.QWidget', 'str', 'PySide2.QtCore.QUrl', 'str', 'str', 'Options', 'PySide2.support.signature.typing.List'), + "QFileDialog.getOpenFileUrl": ('PySide2.QtWidgets.QWidget', 'str', 'PySide2.QtCore.QUrl', 'str', 'str', 'Options', 'List[str]'), + "QFileDialog.getOpenFileUrls": ('PySide2.QtWidgets.QWidget', 'str', 'PySide2.QtCore.QUrl', 'str', 'str', 'Options', 'List[str]'), "QFileDialog.getSaveFileName": ('PySide2.QtWidgets.QWidget', 'str', 'str', 'str', 'str', 'Options'), - "QFileDialog.getSaveFileUrl": ('PySide2.QtWidgets.QWidget', 'str', 'PySide2.QtCore.QUrl', 'str', 'str', 'Options', 'PySide2.support.signature.typing.List'), + "QFileDialog.getSaveFileUrl": ('PySide2.QtWidgets.QWidget', 'str', 'PySide2.QtCore.QUrl', 'str', 'str', 'Options', 'List[str]'), "QFileDialog.history": (), "QFileDialog.iconProvider": (), "QFileDialog.isNameFilterDetailsVisible": (), @@ -7700,21 +7716,21 @@ if "PySide2.QtWidgets" in sys.modules: "QFileDialog.setDirectoryUrl": ('PySide2.QtCore.QUrl',), "QFileDialog.setFileMode": ('PySide2.QtWidgets.QFileDialog.FileMode',), "QFileDialog.setFilter": ('Filters',), - "QFileDialog.setHistory": ('PySide2.support.signature.typing.List',), + "QFileDialog.setHistory": ('List[str]',), "QFileDialog.setIconProvider": ('PySide2.QtWidgets.QFileIconProvider',), "QFileDialog.setItemDelegate": ('PySide2.QtWidgets.QAbstractItemDelegate',), "QFileDialog.setLabelText": ('PySide2.QtWidgets.QFileDialog.DialogLabel', 'str'), - "QFileDialog.setMimeTypeFilters": ('PySide2.support.signature.typing.List',), + "QFileDialog.setMimeTypeFilters": ('List[str]',), "QFileDialog.setNameFilter": ('str',), "QFileDialog.setNameFilterDetailsVisible": ('bool',), - "QFileDialog.setNameFilters": ('PySide2.support.signature.typing.List',), + "QFileDialog.setNameFilters": ('List[str]',), "QFileDialog.setOption": ('PySide2.QtWidgets.QFileDialog.Option', 'bool'), "QFileDialog.setOptions": ('Options',), "QFileDialog.setProxyModel": ('PySide2.QtCore.QAbstractProxyModel',), "QFileDialog.setReadOnly": ('bool',), "QFileDialog.setResolveSymlinks": ('bool',), "QFileDialog.setSidebarUrls": ('list',), - "QFileDialog.setSupportedSchemes": ('PySide2.support.signature.typing.List',), + "QFileDialog.setSupportedSchemes": ('List[str]',), "QFileDialog.setViewMode": ('PySide2.QtWidgets.QFileDialog.ViewMode',), "QFileDialog.setVisible": ('bool',), "QFileDialog.sidebarUrls": (), @@ -7750,7 +7766,7 @@ if "PySide2.QtWidgets" in sys.modules: "QFileSystemModel.isDir": ('PySide2.QtCore.QModelIndex',), "QFileSystemModel.isReadOnly": (), "QFileSystemModel.lastModified": ('PySide2.QtCore.QModelIndex',), - "QFileSystemModel.mimeData": ('PySide2.support.signature.typing.List',), + "QFileSystemModel.mimeData": ('List[int]',), "QFileSystemModel.mimeTypes": (), "QFileSystemModel.mkdir": ('PySide2.QtCore.QModelIndex', 'str'), "QFileSystemModel.myComputer": ('int',), @@ -7763,11 +7779,11 @@ if "PySide2.QtWidgets" in sys.modules: "QFileSystemModel.rootDirectory": (), "QFileSystemModel.rootPath": (), "QFileSystemModel.rowCount": ('PySide2.QtCore.QModelIndex',), - "QFileSystemModel.setData": ('PySide2.QtCore.QModelIndex', 'PySide2.support.signature.typing.Any', 'int'), + "QFileSystemModel.setData": ('PySide2.QtCore.QModelIndex', 'Any', 'int'), "QFileSystemModel.setFilter": ('Filters',), "QFileSystemModel.setIconProvider": ('PySide2.QtWidgets.QFileIconProvider',), "QFileSystemModel.setNameFilterDisables": ('bool',), - "QFileSystemModel.setNameFilters": ('PySide2.support.signature.typing.List',), + "QFileSystemModel.setNameFilters": ('List[str]',), "QFileSystemModel.setReadOnly": ('bool',), "QFileSystemModel.setResolveSymlinks": ('bool',), "QFileSystemModel.setRootPath": ('str',), @@ -7984,7 +8000,7 @@ if "PySide2.QtWidgets" in sys.modules: "QGraphicsEllipseItem.__init__": [('PySide2.QtCore.QRectF', 'PySide2.QtWidgets.QGraphicsItem'), ('PySide2.QtWidgets.QGraphicsItem',), ('float', 'float', 'float', 'float', 'PySide2.QtWidgets.QGraphicsItem')], "QGraphicsEllipseItem.boundingRect": (), "QGraphicsEllipseItem.contains": ('PySide2.QtCore.QPointF',), - "QGraphicsEllipseItem.extension": ('PySide2.support.signature.typing.Any',), + "QGraphicsEllipseItem.extension": ('Any',), "QGraphicsEllipseItem.isObscuredBy": ('PySide2.QtWidgets.QGraphicsItem',), "QGraphicsEllipseItem.opaqueArea": (), "QGraphicsEllipseItem.paint": ('PySide2.QtGui.QPainter', 'PySide2.QtWidgets.QStyleOptionGraphicsItem', 'PySide2.QtWidgets.QWidget'), @@ -8074,7 +8090,7 @@ if "PySide2.QtWidgets" in sys.modules: "QGraphicsItem.dropEvent": ('PySide2.QtWidgets.QGraphicsSceneDragDropEvent',), "QGraphicsItem.effectiveOpacity": (), "QGraphicsItem.ensureVisible": [('PySide2.QtCore.QRectF', 'int', 'int'), ('float', 'float', 'float', 'float', 'int', 'int')], - "QGraphicsItem.extension": ('PySide2.support.signature.typing.Any',), + "QGraphicsItem.extension": ('Any',), "QGraphicsItem.filtersChildEvents": (), "QGraphicsItem.flags": (), "QGraphicsItem.focusInEvent": ('PySide2.QtGui.QFocusEvent',), @@ -8111,7 +8127,7 @@ if "PySide2.QtWidgets" in sys.modules: "QGraphicsItem.isVisibleTo": ('PySide2.QtWidgets.QGraphicsItem',), "QGraphicsItem.isWidget": (), "QGraphicsItem.isWindow": (), - "QGraphicsItem.itemChange": ('PySide2.QtWidgets.QGraphicsItem.GraphicsItemChange', 'PySide2.support.signature.typing.Any'), + "QGraphicsItem.itemChange": ('PySide2.QtWidgets.QGraphicsItem.GraphicsItemChange', 'Any'), "QGraphicsItem.itemTransform": ('PySide2.QtWidgets.QGraphicsItem', 'bool'), "QGraphicsItem.keyPressEvent": ('PySide2.QtGui.QKeyEvent',), "QGraphicsItem.keyReleaseEvent": ('PySide2.QtGui.QKeyEvent',), @@ -8165,7 +8181,7 @@ if "PySide2.QtWidgets" in sys.modules: "QGraphicsItem.setBoundingRegionGranularity": ('float',), "QGraphicsItem.setCacheMode": ('PySide2.QtWidgets.QGraphicsItem.CacheMode', 'PySide2.QtCore.QSize'), "QGraphicsItem.setCursor": ('PySide2.QtGui.QCursor',), - "QGraphicsItem.setData": ('int', 'PySide2.support.signature.typing.Any'), + "QGraphicsItem.setData": ('int', 'Any'), "QGraphicsItem.setEnabled": ('bool',), "QGraphicsItem.setFiltersChildEvents": ('bool',), "QGraphicsItem.setFlag": ('PySide2.QtWidgets.QGraphicsItem.GraphicsItemFlag', 'bool'), @@ -8195,7 +8211,7 @@ if "PySide2.QtWidgets" in sys.modules: "QGraphicsItem.shape": (), "QGraphicsItem.show": (), "QGraphicsItem.stackBefore": ('PySide2.QtWidgets.QGraphicsItem',), - "QGraphicsItem.toGraphicsObject": [], + "QGraphicsItem.toGraphicsObject": (), "QGraphicsItem.toolTip": (), "QGraphicsItem.topLevelItem": (), "QGraphicsItem.topLevelWidget": (), @@ -8312,7 +8328,7 @@ if "PySide2.QtWidgets" in sys.modules: "QGraphicsLineItem.__init__": [('PySide2.QtCore.QLineF', 'PySide2.QtWidgets.QGraphicsItem'), ('PySide2.QtWidgets.QGraphicsItem',), ('float', 'float', 'float', 'float', 'PySide2.QtWidgets.QGraphicsItem')], "QGraphicsLineItem.boundingRect": (), "QGraphicsLineItem.contains": ('PySide2.QtCore.QPointF',), - "QGraphicsLineItem.extension": ('PySide2.support.signature.typing.Any',), + "QGraphicsLineItem.extension": ('Any',), "QGraphicsLineItem.isObscuredBy": ('PySide2.QtWidgets.QGraphicsItem',), "QGraphicsLineItem.line": (), "QGraphicsLineItem.opaqueArea": (), @@ -8367,7 +8383,7 @@ if "PySide2.QtWidgets" in sys.modules: "QGraphicsPathItem.__init__": [('PySide2.QtGui.QPainterPath', 'PySide2.QtWidgets.QGraphicsItem'), ('PySide2.QtWidgets.QGraphicsItem',)], "QGraphicsPathItem.boundingRect": (), "QGraphicsPathItem.contains": ('PySide2.QtCore.QPointF',), - "QGraphicsPathItem.extension": ('PySide2.support.signature.typing.Any',), + "QGraphicsPathItem.extension": ('Any',), "QGraphicsPathItem.isObscuredBy": ('PySide2.QtWidgets.QGraphicsItem',), "QGraphicsPathItem.opaqueArea": (), "QGraphicsPathItem.paint": ('PySide2.QtGui.QPainter', 'PySide2.QtWidgets.QStyleOptionGraphicsItem', 'PySide2.QtWidgets.QWidget'), @@ -8380,7 +8396,7 @@ if "PySide2.QtWidgets" in sys.modules: "QGraphicsPixmapItem.__init__": [('PySide2.QtGui.QPixmap', 'PySide2.QtWidgets.QGraphicsItem'), ('PySide2.QtWidgets.QGraphicsItem',)], "QGraphicsPixmapItem.boundingRect": (), "QGraphicsPixmapItem.contains": ('PySide2.QtCore.QPointF',), - "QGraphicsPixmapItem.extension": ('PySide2.support.signature.typing.Any',), + "QGraphicsPixmapItem.extension": ('Any',), "QGraphicsPixmapItem.isObscuredBy": ('PySide2.QtWidgets.QGraphicsItem',), "QGraphicsPixmapItem.offset": (), "QGraphicsPixmapItem.opaqueArea": (), @@ -8399,7 +8415,7 @@ if "PySide2.QtWidgets" in sys.modules: "QGraphicsPolygonItem.__init__": [('PySide2.QtGui.QPolygonF', 'PySide2.QtWidgets.QGraphicsItem'), ('PySide2.QtWidgets.QGraphicsItem',)], "QGraphicsPolygonItem.boundingRect": (), "QGraphicsPolygonItem.contains": ('PySide2.QtCore.QPointF',), - "QGraphicsPolygonItem.extension": ('PySide2.support.signature.typing.Any',), + "QGraphicsPolygonItem.extension": ('Any',), "QGraphicsPolygonItem.fillRule": (), "QGraphicsPolygonItem.isObscuredBy": ('PySide2.QtWidgets.QGraphicsItem',), "QGraphicsPolygonItem.opaqueArea": (), @@ -8430,7 +8446,7 @@ if "PySide2.QtWidgets" in sys.modules: "QGraphicsProxyWidget.hoverMoveEvent": ('PySide2.QtWidgets.QGraphicsSceneHoverEvent',), "QGraphicsProxyWidget.inputMethodEvent": ('PySide2.QtGui.QInputMethodEvent',), "QGraphicsProxyWidget.inputMethodQuery": ('PySide2.QtCore.Qt.InputMethodQuery',), - "QGraphicsProxyWidget.itemChange": ('PySide2.QtWidgets.QGraphicsItem.GraphicsItemChange', 'PySide2.support.signature.typing.Any'), + "QGraphicsProxyWidget.itemChange": ('PySide2.QtWidgets.QGraphicsItem.GraphicsItemChange', 'Any'), "QGraphicsProxyWidget.keyPressEvent": ('PySide2.QtGui.QKeyEvent',), "QGraphicsProxyWidget.keyReleaseEvent": ('PySide2.QtGui.QKeyEvent',), "QGraphicsProxyWidget.mouseDoubleClickEvent": ('PySide2.QtWidgets.QGraphicsSceneMouseEvent',), @@ -8454,7 +8470,7 @@ if "PySide2.QtWidgets" in sys.modules: "QGraphicsRectItem.__init__": [('PySide2.QtCore.QRectF', 'PySide2.QtWidgets.QGraphicsItem'), ('PySide2.QtWidgets.QGraphicsItem',), ('float', 'float', 'float', 'float', 'PySide2.QtWidgets.QGraphicsItem')], "QGraphicsRectItem.boundingRect": (), "QGraphicsRectItem.contains": ('PySide2.QtCore.QPointF',), - "QGraphicsRectItem.extension": ('PySide2.support.signature.typing.Any',), + "QGraphicsRectItem.extension": ('Any',), "QGraphicsRectItem.isObscuredBy": ('PySide2.QtWidgets.QGraphicsItem',), "QGraphicsRectItem.opaqueArea": (), "QGraphicsRectItem.paint": ('PySide2.QtGui.QPainter', 'PySide2.QtWidgets.QStyleOptionGraphicsItem', 'PySide2.QtWidgets.QWidget'), @@ -8702,7 +8718,7 @@ if "PySide2.QtWidgets" in sys.modules: "QGraphicsSimpleTextItem.__init__": [('PySide2.QtWidgets.QGraphicsItem',), ('str', 'PySide2.QtWidgets.QGraphicsItem')], "QGraphicsSimpleTextItem.boundingRect": (), "QGraphicsSimpleTextItem.contains": ('PySide2.QtCore.QPointF',), - "QGraphicsSimpleTextItem.extension": ('PySide2.support.signature.typing.Any',), + "QGraphicsSimpleTextItem.extension": ('Any',), "QGraphicsSimpleTextItem.font": (), "QGraphicsSimpleTextItem.isObscuredBy": ('PySide2.QtWidgets.QGraphicsItem',), "QGraphicsSimpleTextItem.opaqueArea": (), @@ -8725,7 +8741,7 @@ if "PySide2.QtWidgets" in sys.modules: "QGraphicsTextItem.dragLeaveEvent": ('PySide2.QtWidgets.QGraphicsSceneDragDropEvent',), "QGraphicsTextItem.dragMoveEvent": ('PySide2.QtWidgets.QGraphicsSceneDragDropEvent',), "QGraphicsTextItem.dropEvent": ('PySide2.QtWidgets.QGraphicsSceneDragDropEvent',), - "QGraphicsTextItem.extension": ('PySide2.support.signature.typing.Any',), + "QGraphicsTextItem.extension": ('Any',), "QGraphicsTextItem.focusInEvent": ('PySide2.QtGui.QFocusEvent',), "QGraphicsTextItem.focusOutEvent": ('PySide2.QtGui.QFocusEvent',), "QGraphicsTextItem.font": (), @@ -8782,7 +8798,7 @@ if "PySide2.QtWidgets" in sys.modules: "QGraphicsView.dragMoveEvent": ('PySide2.QtGui.QDragMoveEvent',), "QGraphicsView.drawBackground": ('PySide2.QtGui.QPainter', 'PySide2.QtCore.QRectF'), "QGraphicsView.drawForeground": ('PySide2.QtGui.QPainter', 'PySide2.QtCore.QRectF'), - "QGraphicsView.drawItems": ('PySide2.QtGui.QPainter', 'int', 'PySide2.support.signature.typing.List', 'PySide2.support.signature.typing.List'), + "QGraphicsView.drawItems": ('PySide2.QtGui.QPainter', 'int', 'List[PySide2.QtWidgets.QGraphicsItem]', 'List[PySide2.QtWidgets.QStyleOptionGraphicsItem]'), "QGraphicsView.dropEvent": ('PySide2.QtGui.QDropEvent',), "QGraphicsView.ensureVisible": [('PySide2.QtCore.QRectF', 'int', 'int'), ('PySide2.QtWidgets.QGraphicsItem', 'int', 'int'), ('float', 'float', 'float', 'float', 'int', 'int')], "QGraphicsView.event": ('PySide2.QtCore.QEvent',), @@ -8885,7 +8901,7 @@ if "PySide2.QtWidgets" in sys.modules: "QGraphicsWidget.insertAction": ('PySide2.QtWidgets.QAction', 'PySide2.QtWidgets.QAction'), "QGraphicsWidget.insertActions": ('PySide2.QtWidgets.QAction', 'list'), "QGraphicsWidget.isActiveWindow": (), - "QGraphicsWidget.itemChange": ('PySide2.QtWidgets.QGraphicsItem.GraphicsItemChange', 'PySide2.support.signature.typing.Any'), + "QGraphicsWidget.itemChange": ('PySide2.QtWidgets.QGraphicsItem.GraphicsItemChange', 'Any'), "QGraphicsWidget.layout": (), "QGraphicsWidget.layoutDirection": (), "QGraphicsWidget.moveEvent": ('PySide2.QtWidgets.QGraphicsSceneMoveEvent',), @@ -8893,7 +8909,7 @@ if "PySide2.QtWidgets" in sys.modules: "QGraphicsWidget.paintWindowFrame": ('PySide2.QtGui.QPainter', 'PySide2.QtWidgets.QStyleOptionGraphicsItem', 'PySide2.QtWidgets.QWidget'), "QGraphicsWidget.palette": (), "QGraphicsWidget.polishEvent": (), - "QGraphicsWidget.propertyChange": ('str', 'PySide2.support.signature.typing.Any'), + "QGraphicsWidget.propertyChange": ('str', 'Any'), "QGraphicsWidget.rect": (), "QGraphicsWidget.releaseShortcut": ('int',), "QGraphicsWidget.removeAction": ('PySide2.QtWidgets.QAction',), @@ -9109,7 +9125,7 @@ if "PySide2.QtWidgets" in sys.modules: "QInputDialog.doubleValue": (), "QInputDialog.getDouble": ('PySide2.QtWidgets.QWidget', 'str', 'str', 'float', 'float', 'float', 'int', 'bool', 'WindowFlags'), "QInputDialog.getInt": ('PySide2.QtWidgets.QWidget', 'str', 'str', 'int', 'int', 'int', 'int', 'bool', 'WindowFlags'), - "QInputDialog.getItem": ('PySide2.QtWidgets.QWidget', 'str', 'str', 'PySide2.support.signature.typing.List', 'int', 'bool', 'bool', 'WindowFlags', 'InputMethodHints'), + "QInputDialog.getItem": ('PySide2.QtWidgets.QWidget', 'str', 'str', 'List[str]', 'int', 'bool', 'bool', 'WindowFlags', 'InputMethodHints'), "QInputDialog.getMultiLineText": ('PySide2.QtWidgets.QWidget', 'str', 'str', 'str', 'bool', 'WindowFlags', 'InputMethodHints'), "QInputDialog.getText": ('PySide2.QtWidgets.QWidget', 'str', 'str', 'PySide2.QtWidgets.QLineEdit.EchoMode', 'str', 'bool', 'WindowFlags', 'InputMethodHints'), "QInputDialog.inputMode": (), @@ -9124,7 +9140,7 @@ if "PySide2.QtWidgets" in sys.modules: "QInputDialog.open": [(), ('PySide2.QtCore.QObject', 'str')], "QInputDialog.setCancelButtonText": ('str',), "QInputDialog.setComboBoxEditable": ('bool',), - "QInputDialog.setComboBoxItems": ('PySide2.support.signature.typing.List',), + "QInputDialog.setComboBoxItems": ('List[str]',), "QInputDialog.setDoubleDecimals": ('int',), "QInputDialog.setDoubleMaximum": ('float',), "QInputDialog.setDoubleMinimum": ('float',), @@ -9150,8 +9166,8 @@ if "PySide2.QtWidgets" in sys.modules: # class PySide2.QtWidgets.QItemDelegate: "QItemDelegate.__init__": ('PySide2.QtCore.QObject',), "QItemDelegate.createEditor": ('PySide2.QtWidgets.QWidget', 'PySide2.QtWidgets.QStyleOptionViewItem', 'PySide2.QtCore.QModelIndex'), - "QItemDelegate.decoration": ('PySide2.QtWidgets.QStyleOptionViewItem', 'PySide2.support.signature.typing.Any'), - "QItemDelegate.doCheck": ('PySide2.QtWidgets.QStyleOptionViewItem', 'PySide2.QtCore.QRect', 'PySide2.support.signature.typing.Any'), + "QItemDelegate.decoration": ('PySide2.QtWidgets.QStyleOptionViewItem', 'Any'), + "QItemDelegate.doCheck": ('PySide2.QtWidgets.QStyleOptionViewItem', 'PySide2.QtCore.QRect', 'Any'), "QItemDelegate.drawBackground": ('PySide2.QtGui.QPainter', 'PySide2.QtWidgets.QStyleOptionViewItem', 'PySide2.QtCore.QModelIndex'), "QItemDelegate.drawCheck": ('PySide2.QtGui.QPainter', 'PySide2.QtWidgets.QStyleOptionViewItem', 'PySide2.QtCore.QRect', 'PySide2.QtCore.Qt.CheckState'), "QItemDelegate.drawDecoration": ('PySide2.QtGui.QPainter', 'PySide2.QtWidgets.QStyleOptionViewItem', 'PySide2.QtCore.QRect', 'PySide2.QtGui.QPixmap'), @@ -9386,7 +9402,7 @@ if "PySide2.QtWidgets" in sys.modules: "QLineEdit.initStyleOption": ('PySide2.QtWidgets.QStyleOptionFrame',), "QLineEdit.inputMask": (), "QLineEdit.inputMethodEvent": ('PySide2.QtGui.QInputMethodEvent',), - "QLineEdit.inputMethodQuery": [('PySide2.QtCore.Qt.InputMethodQuery',), ('PySide2.QtCore.Qt.InputMethodQuery', 'PySide2.support.signature.typing.Any')], + "QLineEdit.inputMethodQuery": [('PySide2.QtCore.Qt.InputMethodQuery',), ('PySide2.QtCore.Qt.InputMethodQuery', 'Any')], "QLineEdit.insert": ('str',), "QLineEdit.isClearButtonEnabled": (), "QLineEdit.isModified": (), @@ -9502,7 +9518,7 @@ if "PySide2.QtWidgets" in sys.modules: # class PySide2.QtWidgets.QListWidget: "QListWidget.__init__": ('PySide2.QtWidgets.QWidget',), "QListWidget.addItem": [('PySide2.QtWidgets.QListWidgetItem',), ('str',)], - "QListWidget.addItems": ('PySide2.support.signature.typing.List',), + "QListWidget.addItems": ('List[str]',), "QListWidget.clear": (), "QListWidget.closePersistentEditor": [('PySide2.QtCore.QModelIndex',), ('PySide2.QtWidgets.QListWidgetItem',)], "QListWidget.count": (), @@ -9515,7 +9531,7 @@ if "PySide2.QtWidgets" in sys.modules: "QListWidget.findItems": ('str', 'MatchFlags'), "QListWidget.indexFromItem": ('PySide2.QtWidgets.QListWidgetItem',), "QListWidget.insertItem": [('int', 'PySide2.QtWidgets.QListWidgetItem'), ('int', 'str')], - "QListWidget.insertItems": ('int', 'PySide2.support.signature.typing.List'), + "QListWidget.insertItems": ('int', 'List[str]'), "QListWidget.isItemHidden": ('PySide2.QtWidgets.QListWidgetItem',), "QListWidget.isItemSelected": ('PySide2.QtWidgets.QListWidgetItem',), "QListWidget.isSortingEnabled": (), @@ -9562,7 +9578,7 @@ if "PySide2.QtWidgets" in sys.modules: "QListWidgetItem.setBackground": ('PySide2.QtGui.QBrush',), "QListWidgetItem.setBackgroundColor": ('PySide2.QtGui.QColor',), "QListWidgetItem.setCheckState": ('PySide2.QtCore.Qt.CheckState',), - "QListWidgetItem.setData": ('int', 'PySide2.support.signature.typing.Any'), + "QListWidgetItem.setData": ('int', 'Any'), "QListWidgetItem.setFlags": ('ItemFlags',), "QListWidgetItem.setFont": ('PySide2.QtGui.QFont',), "QListWidgetItem.setForeground": ('PySide2.QtGui.QBrush',), @@ -9989,7 +10005,7 @@ if "PySide2.QtWidgets" in sys.modules: "QPlainTextEdit.focusOutEvent": ('PySide2.QtGui.QFocusEvent',), "QPlainTextEdit.getPaintContext": (), "QPlainTextEdit.inputMethodEvent": ('PySide2.QtGui.QInputMethodEvent',), - "QPlainTextEdit.inputMethodQuery": [('PySide2.QtCore.Qt.InputMethodQuery',), ('PySide2.QtCore.Qt.InputMethodQuery', 'PySide2.support.signature.typing.Any')], + "QPlainTextEdit.inputMethodQuery": [('PySide2.QtCore.Qt.InputMethodQuery',), ('PySide2.QtCore.Qt.InputMethodQuery', 'Any')], "QPlainTextEdit.insertFromMimeData": ('PySide2.QtCore.QMimeData',), "QPlainTextEdit.insertPlainText": ('str',), "QPlainTextEdit.isReadOnly": (), @@ -10187,7 +10203,7 @@ if "PySide2.QtWidgets" in sys.modules: "QScrollBar.wheelEvent": ('PySide2.QtGui.QWheelEvent',), # class PySide2.QtWidgets.QShortcut: - "QShortcut.__init__": [('PySide2.QtGui.QKeySequence', 'PySide2.QtWidgets.QWidget', 'PySide2.support.signature.typing.Callable', 'PySide2.QtCore.Qt.ShortcutContext'), ('PySide2.QtGui.QKeySequence', 'PySide2.QtWidgets.QWidget', 'str', 'str', 'PySide2.QtCore.Qt.ShortcutContext'), ('PySide2.QtWidgets.QWidget',)], + "QShortcut.__init__": [('PySide2.QtGui.QKeySequence', 'PySide2.QtWidgets.QWidget', 'Callable', 'PySide2.QtCore.Qt.ShortcutContext'), ('PySide2.QtGui.QKeySequence', 'PySide2.QtWidgets.QWidget', 'str', 'str', 'PySide2.QtCore.Qt.ShortcutContext'), ('PySide2.QtWidgets.QWidget',)], "QShortcut.autoRepeat": (), "QShortcut.context": (), "QShortcut.event": ('PySide2.QtCore.QEvent',), @@ -10544,7 +10560,7 @@ if "PySide2.QtWidgets" in sys.modules: # class PySide2.QtWidgets.QStyledItemDelegate: "QStyledItemDelegate.__init__": ('PySide2.QtCore.QObject',), "QStyledItemDelegate.createEditor": ('PySide2.QtWidgets.QWidget', 'PySide2.QtWidgets.QStyleOptionViewItem', 'PySide2.QtCore.QModelIndex'), - "QStyledItemDelegate.displayText": ('PySide2.support.signature.typing.Any', 'PySide2.QtCore.QLocale'), + "QStyledItemDelegate.displayText": ('Any', 'PySide2.QtCore.QLocale'), "QStyledItemDelegate.editorEvent": ('PySide2.QtCore.QEvent', 'PySide2.QtCore.QAbstractItemModel', 'PySide2.QtWidgets.QStyleOptionViewItem', 'PySide2.QtCore.QModelIndex'), "QStyledItemDelegate.eventFilter": ('PySide2.QtCore.QObject', 'PySide2.QtCore.QEvent'), "QStyledItemDelegate.initStyleOption": ('PySide2.QtWidgets.QStyleOptionViewItem', 'PySide2.QtCore.QModelIndex'), @@ -10625,7 +10641,7 @@ if "PySide2.QtWidgets" in sys.modules: "QTabBar.setSelectionBehaviorOnRemove": ('PySide2.QtWidgets.QTabBar.SelectionBehavior',), "QTabBar.setShape": ('PySide2.QtWidgets.QTabBar.Shape',), "QTabBar.setTabButton": ('int', 'PySide2.QtWidgets.QTabBar.ButtonPosition', 'PySide2.QtWidgets.QWidget'), - "QTabBar.setTabData": ('int', 'PySide2.support.signature.typing.Any'), + "QTabBar.setTabData": ('int', 'Any'), "QTabBar.setTabEnabled": ('int', 'bool'), "QTabBar.setTabIcon": ('int', 'PySide2.QtGui.QIcon'), "QTabBar.setTabText": ('int', 'str'), @@ -10833,7 +10849,7 @@ if "PySide2.QtWidgets" in sys.modules: "QTableWidget.setCurrentCell": [('int', 'int'), ('int', 'int', 'SelectionFlags')], "QTableWidget.setCurrentItem": [('PySide2.QtWidgets.QTableWidgetItem',), ('PySide2.QtWidgets.QTableWidgetItem', 'SelectionFlags')], "QTableWidget.setHorizontalHeaderItem": ('int', 'PySide2.QtWidgets.QTableWidgetItem'), - "QTableWidget.setHorizontalHeaderLabels": ('PySide2.support.signature.typing.List',), + "QTableWidget.setHorizontalHeaderLabels": ('List[str]',), "QTableWidget.setItem": ('int', 'int', 'PySide2.QtWidgets.QTableWidgetItem'), "QTableWidget.setItemPrototype": ('PySide2.QtWidgets.QTableWidgetItem',), "QTableWidget.setItemSelected": ('PySide2.QtWidgets.QTableWidgetItem', 'bool'), @@ -10842,7 +10858,7 @@ if "PySide2.QtWidgets" in sys.modules: "QTableWidget.setRowCount": ('int',), "QTableWidget.setSortingEnabled": ('bool',), "QTableWidget.setVerticalHeaderItem": ('int', 'PySide2.QtWidgets.QTableWidgetItem'), - "QTableWidget.setVerticalHeaderLabels": ('PySide2.support.signature.typing.List',), + "QTableWidget.setVerticalHeaderLabels": ('List[str]',), "QTableWidget.sortItems": ('int', 'PySide2.QtCore.Qt.SortOrder'), "QTableWidget.supportedDropActions": (), "QTableWidget.takeHorizontalHeaderItem": ('int',), @@ -10871,7 +10887,7 @@ if "PySide2.QtWidgets" in sys.modules: "QTableWidgetItem.setBackground": ('PySide2.QtGui.QBrush',), "QTableWidgetItem.setBackgroundColor": ('PySide2.QtGui.QColor',), "QTableWidgetItem.setCheckState": ('PySide2.QtCore.Qt.CheckState',), - "QTableWidgetItem.setData": ('int', 'PySide2.support.signature.typing.Any'), + "QTableWidgetItem.setData": ('int', 'Any'), "QTableWidgetItem.setFlags": ('ItemFlags',), "QTableWidgetItem.setFont": ('PySide2.QtGui.QFont',), "QTableWidgetItem.setForeground": ('PySide2.QtGui.QBrush',), @@ -10944,7 +10960,7 @@ if "PySide2.QtWidgets" in sys.modules: "QTextBrowser.searchPaths": (), "QTextBrowser.setOpenExternalLinks": ('bool',), "QTextBrowser.setOpenLinks": ('bool',), - "QTextBrowser.setSearchPaths": ('PySide2.support.signature.typing.List',), + "QTextBrowser.setSearchPaths": ('List[str]',), "QTextBrowser.setSource": ('PySide2.QtCore.QUrl',), "QTextBrowser.source": (), @@ -10989,7 +11005,7 @@ if "PySide2.QtWidgets" in sys.modules: "QTextEdit.fontUnderline": (), "QTextEdit.fontWeight": (), "QTextEdit.inputMethodEvent": ('PySide2.QtGui.QInputMethodEvent',), - "QTextEdit.inputMethodQuery": [('PySide2.QtCore.Qt.InputMethodQuery',), ('PySide2.QtCore.Qt.InputMethodQuery', 'PySide2.support.signature.typing.Any')], + "QTextEdit.inputMethodQuery": [('PySide2.QtCore.Qt.InputMethodQuery',), ('PySide2.QtCore.Qt.InputMethodQuery', 'Any')], "QTextEdit.insertFromMimeData": ('PySide2.QtCore.QMimeData',), "QTextEdit.insertHtml": ('str',), "QTextEdit.insertPlainText": ('str',), @@ -11284,7 +11300,7 @@ if "PySide2.QtWidgets" in sys.modules: "QTreeWidget.expandItem": ('PySide2.QtWidgets.QTreeWidgetItem',), "QTreeWidget.findItems": ('str', 'MatchFlags', 'int'), "QTreeWidget.headerItem": (), - "QTreeWidget.indexFromItem": ['PySide2.QtWidgets.QTreeWidgetItem', 'int'], + "QTreeWidget.indexFromItem": ('PySide2.QtWidgets.QTreeWidgetItem', 'int'), "QTreeWidget.indexOfTopLevelItem": ('PySide2.QtWidgets.QTreeWidgetItem',), "QTreeWidget.insertTopLevelItem": ('int', 'PySide2.QtWidgets.QTreeWidgetItem'), "QTreeWidget.insertTopLevelItems": ('int', 'list'), @@ -11310,7 +11326,7 @@ if "PySide2.QtWidgets" in sys.modules: "QTreeWidget.setFirstItemColumnSpanned": ('PySide2.QtWidgets.QTreeWidgetItem', 'bool'), "QTreeWidget.setHeaderItem": ('PySide2.QtWidgets.QTreeWidgetItem',), "QTreeWidget.setHeaderLabel": ('str',), - "QTreeWidget.setHeaderLabels": ('PySide2.support.signature.typing.List',), + "QTreeWidget.setHeaderLabels": ('List[str]',), "QTreeWidget.setItemExpanded": ('PySide2.QtWidgets.QTreeWidgetItem', 'bool'), "QTreeWidget.setItemHidden": ('PySide2.QtWidgets.QTreeWidgetItem', 'bool'), "QTreeWidget.setItemSelected": ('PySide2.QtWidgets.QTreeWidgetItem', 'bool'), @@ -11326,7 +11342,7 @@ if "PySide2.QtWidgets" in sys.modules: "QTreeWidget.visualItemRect": ('PySide2.QtWidgets.QTreeWidgetItem',), # class PySide2.QtWidgets.QTreeWidgetItem: - "QTreeWidgetItem.__init__": [('PySide2.QtWidgets.QTreeWidget', 'PySide2.QtWidgets.QTreeWidgetItem', 'int'), ('PySide2.QtWidgets.QTreeWidget', 'PySide2.support.signature.typing.List', 'int'), ('PySide2.QtWidgets.QTreeWidget', 'int'), ('PySide2.QtWidgets.QTreeWidgetItem',), ('PySide2.QtWidgets.QTreeWidgetItem', 'PySide2.QtWidgets.QTreeWidgetItem', 'int'), ('PySide2.QtWidgets.QTreeWidgetItem', 'PySide2.support.signature.typing.List', 'int'), ('PySide2.QtWidgets.QTreeWidgetItem', 'int'), ('PySide2.support.signature.typing.List', 'int'), ('int',)], + "QTreeWidgetItem.__init__": [('List[str]', 'int'), ('PySide2.QtWidgets.QTreeWidget', 'List[str]', 'int'), ('PySide2.QtWidgets.QTreeWidget', 'PySide2.QtWidgets.QTreeWidgetItem', 'int'), ('PySide2.QtWidgets.QTreeWidget', 'int'), ('PySide2.QtWidgets.QTreeWidgetItem',), ('PySide2.QtWidgets.QTreeWidgetItem', 'List[str]', 'int'), ('PySide2.QtWidgets.QTreeWidgetItem', 'PySide2.QtWidgets.QTreeWidgetItem', 'int'), ('PySide2.QtWidgets.QTreeWidgetItem', 'int'), ('int',)], "QTreeWidgetItem.addChild": ('PySide2.QtWidgets.QTreeWidgetItem',), "QTreeWidgetItem.addChildren": ('list',), "QTreeWidgetItem.background": ('int',), @@ -11358,7 +11374,7 @@ if "PySide2.QtWidgets" in sys.modules: "QTreeWidgetItem.setBackgroundColor": ('int', 'PySide2.QtGui.QColor'), "QTreeWidgetItem.setCheckState": ('int', 'PySide2.QtCore.Qt.CheckState'), "QTreeWidgetItem.setChildIndicatorPolicy": ('PySide2.QtWidgets.QTreeWidgetItem.ChildIndicatorPolicy',), - "QTreeWidgetItem.setData": ('int', 'int', 'PySide2.support.signature.typing.Any'), + "QTreeWidgetItem.setData": ('int', 'int', 'Any'), "QTreeWidgetItem.setDisabled": ('bool',), "QTreeWidgetItem.setExpanded": ('bool',), "QTreeWidgetItem.setFirstColumnSpanned": ('bool',), @@ -11778,7 +11794,6 @@ if "PySide2.QtWidgets" in sys.modules: "QWizard.field": ('str',), "QWizard.hasVisitedPage": ('int',), "QWizard.initializePage": ('int',), - "QWizard.next": (), "QWizard.nextId": (), "QWizard.options": (), "QWizard.page": ('int',), @@ -11792,7 +11807,7 @@ if "PySide2.QtWidgets" in sys.modules: "QWizard.setButtonLayout": ('list',), "QWizard.setButtonText": ('PySide2.QtWidgets.QWizard.WizardButton', 'str'), "QWizard.setDefaultProperty": ('str', 'str', 'str'), - "QWizard.setField": ('str', 'PySide2.support.signature.typing.Any'), + "QWizard.setField": ('str', 'Any'), "QWizard.setOption": ('PySide2.QtWidgets.QWizard.WizardOption', 'bool'), "QWizard.setOptions": ('WizardOptions',), "QWizard.setPage": ('int', 'PySide2.QtWidgets.QWizardPage'), @@ -11827,7 +11842,7 @@ if "PySide2.QtWidgets" in sys.modules: "QWizardPage.registerField": ('str', 'PySide2.QtWidgets.QWidget', 'str', 'str'), "QWizardPage.setButtonText": ('PySide2.QtWidgets.QWizard.WizardButton', 'str'), "QWizardPage.setCommitPage": ('bool',), - "QWizardPage.setField": ('str', 'PySide2.support.signature.typing.Any'), + "QWizardPage.setField": ('str', 'Any'), "QWizardPage.setFinalPage": ('bool',), "QWizardPage.setPixmap": ('PySide2.QtWidgets.QWizard.WizardPixmap', 'PySide2.QtGui.QPixmap'), "QWizardPage.setSubTitle": ('str',), @@ -11886,7 +11901,7 @@ if "PySide2.QtPrintSupport" in sys.modules: "QPrintEngine.newPage": (), "QPrintEngine.printerState": (), "QPrintEngine.property": ('PySide2.QtPrintSupport.QPrintEngine.PrintEnginePropertyKey',), - "QPrintEngine.setProperty": ('PySide2.QtPrintSupport.QPrintEngine.PrintEnginePropertyKey', 'PySide2.support.signature.typing.Any'), + "QPrintEngine.setProperty": ('PySide2.QtPrintSupport.QPrintEngine.PrintEnginePropertyKey', 'Any'), # class PySide2.QtPrintSupport.QPrintPreviewDialog: "QPrintPreviewDialog.__init__": [('PySide2.QtPrintSupport.QPrinter', 'PySide2.QtWidgets.QWidget', 'WindowFlags'), ('PySide2.QtWidgets.QWidget', 'WindowFlags')], @@ -12134,7 +12149,7 @@ if "PySide2.QtSql" in sys.modules: "QSqlField.precision": (), "QSqlField.requiredStatus": (), "QSqlField.setAutoValue": ('bool',), - "QSqlField.setDefaultValue": ('PySide2.support.signature.typing.Any',), + "QSqlField.setDefaultValue": ('Any',), "QSqlField.setGenerated": ('bool',), "QSqlField.setLength": ('int',), "QSqlField.setName": ('str',), @@ -12144,7 +12159,7 @@ if "PySide2.QtSql" in sys.modules: "QSqlField.setRequiredStatus": ('PySide2.QtSql.QSqlField.RequiredStatus',), "QSqlField.setSqlType": ('int',), "QSqlField.setType": ('type',), - "QSqlField.setValue": ('PySide2.support.signature.typing.Any',), + "QSqlField.setValue": ('Any',), "QSqlField.type": (), "QSqlField.typeID": (), "QSqlField.value": (), @@ -12163,9 +12178,9 @@ if "PySide2.QtSql" in sys.modules: # class PySide2.QtSql.QSqlQuery: "QSqlQuery.__init__": [('PySide2.QtSql.QSqlDatabase',), ('PySide2.QtSql.QSqlQuery',), ('PySide2.QtSql.QSqlResult',), ('str', 'PySide2.QtSql.QSqlDatabase')], "QSqlQuery.__copy__": (), - "QSqlQuery.addBindValue": ('PySide2.support.signature.typing.Any', 'ParamType'), + "QSqlQuery.addBindValue": ('Any', 'ParamType'), "QSqlQuery.at": (), - "QSqlQuery.bindValue": [('int', 'PySide2.support.signature.typing.Any', 'ParamType'), ('str', 'PySide2.support.signature.typing.Any', 'ParamType')], + "QSqlQuery.bindValue": [('int', 'Any', 'ParamType'), ('str', 'Any', 'ParamType')], "QSqlQuery.boundValue": [('int',), ('str',)], "QSqlQuery.boundValues": (), "QSqlQuery.clear": (), @@ -12184,7 +12199,6 @@ if "PySide2.QtSql" in sys.modules: "QSqlQuery.lastError": (), "QSqlQuery.lastInsertId": (), "QSqlQuery.lastQuery": (), - "QSqlQuery.next": (), "QSqlQuery.nextResult": (), "QSqlQuery.numRowsAffected": (), "QSqlQuery.numericalPrecisionPolicy": (), @@ -12224,7 +12238,7 @@ if "PySide2.QtSql" in sys.modules: "QSqlQueryModel.record": [(), ('int',)], "QSqlQueryModel.removeColumns": ('int', 'int', 'PySide2.QtCore.QModelIndex'), "QSqlQueryModel.rowCount": ('PySide2.QtCore.QModelIndex',), - "QSqlQueryModel.setHeaderData": ('int', 'PySide2.QtCore.Qt.Orientation', 'PySide2.support.signature.typing.Any', 'int'), + "QSqlQueryModel.setHeaderData": ('int', 'PySide2.QtCore.Qt.Orientation', 'Any', 'int'), "QSqlQueryModel.setLastError": ('PySide2.QtSql.QSqlError',), "QSqlQueryModel.setQuery": [('PySide2.QtSql.QSqlQuery',), ('str', 'PySide2.QtSql.QSqlDatabase')], @@ -12248,7 +12262,7 @@ if "PySide2.QtSql" in sys.modules: "QSqlRecord.replace": ('int', 'PySide2.QtSql.QSqlField'), "QSqlRecord.setGenerated": [('int', 'bool'), ('str', 'bool')], "QSqlRecord.setNull": [('int',), ('str',)], - "QSqlRecord.setValue": [('int', 'PySide2.support.signature.typing.Any'), ('str', 'PySide2.support.signature.typing.Any')], + "QSqlRecord.setValue": [('int', 'Any'), ('str', 'Any')], "QSqlRecord.value": [('int',), ('str',)], # class PySide2.QtSql.QSqlRelation: @@ -12277,7 +12291,7 @@ if "PySide2.QtSql" in sys.modules: "QSqlRelationalTableModel.revertRow": ('int',), "QSqlRelationalTableModel.select": (), "QSqlRelationalTableModel.selectStatement": (), - "QSqlRelationalTableModel.setData": ('PySide2.QtCore.QModelIndex', 'PySide2.support.signature.typing.Any', 'int'), + "QSqlRelationalTableModel.setData": ('PySide2.QtCore.QModelIndex', 'Any', 'int'), "QSqlRelationalTableModel.setJoinMode": ('PySide2.QtSql.QSqlRelationalTableModel.JoinMode',), "QSqlRelationalTableModel.setRelation": ('int', 'PySide2.QtSql.QSqlRelation'), "QSqlRelationalTableModel.setTable": ('str',), @@ -12285,9 +12299,9 @@ if "PySide2.QtSql" in sys.modules: # class PySide2.QtSql.QSqlResult: "QSqlResult.__init__": ('PySide2.QtSql.QSqlDriver',), - "QSqlResult.addBindValue": ('PySide2.support.signature.typing.Any', 'ParamType'), + "QSqlResult.addBindValue": ('Any', 'ParamType'), "QSqlResult.at": (), - "QSqlResult.bindValue": [('int', 'PySide2.support.signature.typing.Any', 'ParamType'), ('str', 'PySide2.support.signature.typing.Any', 'ParamType')], + "QSqlResult.bindValue": [('int', 'Any', 'ParamType'), ('str', 'Any', 'ParamType')], "QSqlResult.bindValueType": [('int',), ('str',)], "QSqlResult.bindingSyntax": (), "QSqlResult.boundValue": [('int',), ('str',)], @@ -12362,7 +12376,7 @@ if "PySide2.QtSql" in sys.modules: "QSqlTableModel.select": (), "QSqlTableModel.selectRow": ('int',), "QSqlTableModel.selectStatement": (), - "QSqlTableModel.setData": ('PySide2.QtCore.QModelIndex', 'PySide2.support.signature.typing.Any', 'int'), + "QSqlTableModel.setData": ('PySide2.QtCore.QModelIndex', 'Any', 'int'), "QSqlTableModel.setEditStrategy": ('PySide2.QtSql.QSqlTableModel.EditStrategy',), "QSqlTableModel.setFilter": ('str',), "QSqlTableModel.setPrimaryKey": ('PySide2.QtSql.QSqlIndex',), @@ -12427,7 +12441,7 @@ if "PySide2.QtNetwork" in sys.modules: "QAbstractSocket.setReadBufferSize": ('int',), "QAbstractSocket.setSocketDescriptor": ('int', 'PySide2.QtNetwork.QAbstractSocket.SocketState', 'OpenMode'), "QAbstractSocket.setSocketError": ('PySide2.QtNetwork.QAbstractSocket.SocketError',), - "QAbstractSocket.setSocketOption": ('PySide2.QtNetwork.QAbstractSocket.SocketOption', 'PySide2.support.signature.typing.Any'), + "QAbstractSocket.setSocketOption": ('PySide2.QtNetwork.QAbstractSocket.SocketOption', 'Any'), "QAbstractSocket.setSocketState": ('PySide2.QtNetwork.QAbstractSocket.SocketState',), "QAbstractSocket.socketDescriptor": (), "QAbstractSocket.socketOption": ('PySide2.QtNetwork.QAbstractSocket.SocketOption',), @@ -12447,7 +12461,7 @@ if "PySide2.QtNetwork" in sys.modules: "QAuthenticator.options": (), "QAuthenticator.password": (), "QAuthenticator.realm": (), - "QAuthenticator.setOption": ('str', 'PySide2.support.signature.typing.Any'), + "QAuthenticator.setOption": ('str', 'Any'), "QAuthenticator.setPassword": ('str',), "QAuthenticator.setRealm": ('str',), "QAuthenticator.setUser": ('str',), @@ -12458,7 +12472,7 @@ if "PySide2.QtNetwork" in sys.modules: "QHostAddress.__copy__": (), "QHostAddress.clear": (), "QHostAddress.isEqual": ('PySide2.QtNetwork.QHostAddress', 'ConversionMode'), - "QHostAddress.isInSubnet": [('PySide2.QtNetwork.QHostAddress', 'int'), ('PySide2.support.signature.typing.Tuple',)], + "QHostAddress.isInSubnet": [('PySide2.QtNetwork.QHostAddress', 'int'), ('Tuple[Any, Any]',)], "QHostAddress.isLoopback": (), "QHostAddress.isMulticast": (), "QHostAddress.isNull": (), @@ -12716,7 +12730,7 @@ if "PySide2.QtNetwork" in sys.modules: "QNetworkProxy.rawHeaderList": (), "QNetworkProxy.setApplicationProxy": ('PySide2.QtNetwork.QNetworkProxy',), "QNetworkProxy.setCapabilities": ('Capabilities',), - "QNetworkProxy.setHeader": ('PySide2.QtNetwork.QNetworkRequest.KnownHeaders', 'PySide2.support.signature.typing.Any'), + "QNetworkProxy.setHeader": ('PySide2.QtNetwork.QNetworkRequest.KnownHeaders', 'Any'), "QNetworkProxy.setHostName": ('str',), "QNetworkProxy.setPassword": ('str',), "QNetworkProxy.setPort": ('int',), @@ -12773,10 +12787,10 @@ if "PySide2.QtNetwork" in sys.modules: "QNetworkReply.rawHeaderList": (), "QNetworkReply.readBufferSize": (), "QNetworkReply.request": (), - "QNetworkReply.setAttribute": ('PySide2.QtNetwork.QNetworkRequest.Attribute', 'PySide2.support.signature.typing.Any'), + "QNetworkReply.setAttribute": ('PySide2.QtNetwork.QNetworkRequest.Attribute', 'Any'), "QNetworkReply.setError": ('PySide2.QtNetwork.QNetworkReply.NetworkError', 'str'), "QNetworkReply.setFinished": ('bool',), - "QNetworkReply.setHeader": ('PySide2.QtNetwork.QNetworkRequest.KnownHeaders', 'PySide2.support.signature.typing.Any'), + "QNetworkReply.setHeader": ('PySide2.QtNetwork.QNetworkRequest.KnownHeaders', 'Any'), "QNetworkReply.setOperation": ('PySide2.QtNetwork.QNetworkAccessManager.Operation',), "QNetworkReply.setRawHeader": ('PySide2.QtCore.QByteArray', 'PySide2.QtCore.QByteArray'), "QNetworkReply.setReadBufferSize": ('int',), @@ -12792,7 +12806,7 @@ if "PySide2.QtNetwork" in sys.modules: # class PySide2.QtNetwork.QNetworkRequest: "QNetworkRequest.__init__": [('PySide2.QtCore.QUrl',), ('PySide2.QtNetwork.QNetworkRequest',)], "QNetworkRequest.__copy__": (), - "QNetworkRequest.attribute": ('PySide2.QtNetwork.QNetworkRequest.Attribute', 'PySide2.support.signature.typing.Any'), + "QNetworkRequest.attribute": ('PySide2.QtNetwork.QNetworkRequest.Attribute', 'Any'), "QNetworkRequest.hasRawHeader": ('PySide2.QtCore.QByteArray',), "QNetworkRequest.header": ('PySide2.QtNetwork.QNetworkRequest.KnownHeaders',), "QNetworkRequest.maximumRedirectsAllowed": (), @@ -12800,8 +12814,8 @@ if "PySide2.QtNetwork" in sys.modules: "QNetworkRequest.priority": (), "QNetworkRequest.rawHeader": ('PySide2.QtCore.QByteArray',), "QNetworkRequest.rawHeaderList": (), - "QNetworkRequest.setAttribute": ('PySide2.QtNetwork.QNetworkRequest.Attribute', 'PySide2.support.signature.typing.Any'), - "QNetworkRequest.setHeader": ('PySide2.QtNetwork.QNetworkRequest.KnownHeaders', 'PySide2.support.signature.typing.Any'), + "QNetworkRequest.setAttribute": ('PySide2.QtNetwork.QNetworkRequest.Attribute', 'Any'), + "QNetworkRequest.setHeader": ('PySide2.QtNetwork.QNetworkRequest.KnownHeaders', 'Any'), "QNetworkRequest.setMaximumRedirectsAllowed": ('int',), "QNetworkRequest.setOriginatingObject": ('PySide2.QtCore.QObject',), "QNetworkRequest.setPriority": ('PySide2.QtNetwork.QNetworkRequest.Priority',), @@ -12830,7 +12844,7 @@ if "PySide2.QtNetwork" in sys.modules: "QNetworkSession.open": (), "QNetworkSession.reject": (), "QNetworkSession.sessionProperty": ('str',), - "QNetworkSession.setSessionProperty": ('str', 'PySide2.support.signature.typing.Any'), + "QNetworkSession.setSessionProperty": ('str', 'Any'), "QNetworkSession.state": (), "QNetworkSession.stop": (), "QNetworkSession.usagePolicies": (), @@ -12995,7 +13009,7 @@ if "PySide2.QtNetwork" in sys.modules: "QSslSocket.setProtocol": ('PySide2.QtNetwork.QSsl.SslProtocol',), "QSslSocket.setReadBufferSize": ('int',), "QSslSocket.setSocketDescriptor": ('int', 'PySide2.QtNetwork.QAbstractSocket.SocketState', 'OpenMode'), - "QSslSocket.setSocketOption": ('PySide2.QtNetwork.QAbstractSocket.SocketOption', 'PySide2.support.signature.typing.Any'), + "QSslSocket.setSocketOption": ('PySide2.QtNetwork.QAbstractSocket.SocketOption', 'Any'), "QSslSocket.setSslConfiguration": ('PySide2.QtNetwork.QSslConfiguration',), "QSslSocket.socketOption": ('PySide2.QtNetwork.QAbstractSocket.SocketOption',), "QSslSocket.sslConfiguration": (), @@ -13059,7 +13073,7 @@ if "PySide2.QtTest" in sys.modules: # class PySide2.QtTest.QTest: "QTest.addColumnInternal": ('int', 'str'), - "QTest.asciiToKey": ('PySide2.support.signature.typing.Union[str, int]',), + "QTest.asciiToKey": ('Union[str, int]',), "QTest.compare_string_helper": ('str', 'str', 'str', 'str', 'str', 'int'), "QTest.createTouchDevice": ('PySide2.QtGui.QTouchDevice.DeviceType',), "QTest.currentAppName": (), @@ -13067,11 +13081,11 @@ if "PySide2.QtTest" in sys.modules: "QTest.currentTestFailed": (), "QTest.currentTestFunction": (), "QTest.ignoreMessage": [('PySide2.QtCore.QtMsgType', 'PySide2.QtCore.QRegularExpression'), ('PySide2.QtCore.QtMsgType', 'str')], - "QTest.keyClick": [('PySide2.QtGui.QWindow', 'PySide2.QtCore.Qt.Key', 'KeyboardModifiers', 'int'), ('PySide2.QtGui.QWindow', 'PySide2.support.signature.typing.Union[str, int]', 'KeyboardModifiers', 'int'), ('PySide2.QtWidgets.QWidget', 'PySide2.QtCore.Qt.Key', 'KeyboardModifiers', 'int'), ('PySide2.QtWidgets.QWidget', 'PySide2.support.signature.typing.Union[str, int]', 'KeyboardModifiers', 'int')], + "QTest.keyClick": [('PySide2.QtGui.QWindow', 'PySide2.QtCore.Qt.Key', 'KeyboardModifiers', 'int'), ('PySide2.QtGui.QWindow', 'Union[str, int]', 'KeyboardModifiers', 'int'), ('PySide2.QtWidgets.QWidget', 'PySide2.QtCore.Qt.Key', 'KeyboardModifiers', 'int'), ('PySide2.QtWidgets.QWidget', 'Union[str, int]', 'KeyboardModifiers', 'int')], "QTest.keyClicks": ('PySide2.QtWidgets.QWidget', 'str', 'KeyboardModifiers', 'int'), - "QTest.keyEvent": [('PySide2.QtTest.QTest.KeyAction', 'PySide2.QtGui.QWindow', 'PySide2.QtCore.Qt.Key', 'KeyboardModifiers', 'int'), ('PySide2.QtTest.QTest.KeyAction', 'PySide2.QtGui.QWindow', 'PySide2.support.signature.typing.Union[str, int]', 'KeyboardModifiers', 'int'), ('PySide2.QtTest.QTest.KeyAction', 'PySide2.QtWidgets.QWidget', 'PySide2.QtCore.Qt.Key', 'KeyboardModifiers', 'int'), ('PySide2.QtTest.QTest.KeyAction', 'PySide2.QtWidgets.QWidget', 'PySide2.support.signature.typing.Union[str, int]', 'KeyboardModifiers', 'int')], - "QTest.keyPress": [('PySide2.QtGui.QWindow', 'PySide2.QtCore.Qt.Key', 'KeyboardModifiers', 'int'), ('PySide2.QtGui.QWindow', 'PySide2.support.signature.typing.Union[str, int]', 'KeyboardModifiers', 'int'), ('PySide2.QtWidgets.QWidget', 'PySide2.QtCore.Qt.Key', 'KeyboardModifiers', 'int'), ('PySide2.QtWidgets.QWidget', 'PySide2.support.signature.typing.Union[str, int]', 'KeyboardModifiers', 'int')], - "QTest.keyRelease": [('PySide2.QtGui.QWindow', 'PySide2.QtCore.Qt.Key', 'KeyboardModifiers', 'int'), ('PySide2.QtGui.QWindow', 'PySide2.support.signature.typing.Union[str, int]', 'KeyboardModifiers', 'int'), ('PySide2.QtWidgets.QWidget', 'PySide2.QtCore.Qt.Key', 'KeyboardModifiers', 'int'), ('PySide2.QtWidgets.QWidget', 'PySide2.support.signature.typing.Union[str, int]', 'KeyboardModifiers', 'int')], + "QTest.keyEvent": [('PySide2.QtTest.QTest.KeyAction', 'PySide2.QtGui.QWindow', 'PySide2.QtCore.Qt.Key', 'KeyboardModifiers', 'int'), ('PySide2.QtTest.QTest.KeyAction', 'PySide2.QtGui.QWindow', 'Union[str, int]', 'KeyboardModifiers', 'int'), ('PySide2.QtTest.QTest.KeyAction', 'PySide2.QtWidgets.QWidget', 'PySide2.QtCore.Qt.Key', 'KeyboardModifiers', 'int'), ('PySide2.QtTest.QTest.KeyAction', 'PySide2.QtWidgets.QWidget', 'Union[str, int]', 'KeyboardModifiers', 'int')], + "QTest.keyPress": [('PySide2.QtGui.QWindow', 'PySide2.QtCore.Qt.Key', 'KeyboardModifiers', 'int'), ('PySide2.QtGui.QWindow', 'Union[str, int]', 'KeyboardModifiers', 'int'), ('PySide2.QtWidgets.QWidget', 'PySide2.QtCore.Qt.Key', 'KeyboardModifiers', 'int'), ('PySide2.QtWidgets.QWidget', 'Union[str, int]', 'KeyboardModifiers', 'int')], + "QTest.keyRelease": [('PySide2.QtGui.QWindow', 'PySide2.QtCore.Qt.Key', 'KeyboardModifiers', 'int'), ('PySide2.QtGui.QWindow', 'Union[str, int]', 'KeyboardModifiers', 'int'), ('PySide2.QtWidgets.QWidget', 'PySide2.QtCore.Qt.Key', 'KeyboardModifiers', 'int'), ('PySide2.QtWidgets.QWidget', 'Union[str, int]', 'KeyboardModifiers', 'int')], "QTest.keyToAscii": ('PySide2.QtCore.Qt.Key',), "QTest.mouseClick": [('PySide2.QtGui.QWindow', 'PySide2.QtCore.Qt.MouseButton', 'KeyboardModifiers', 'PySide2.QtCore.QPoint', 'int'), ('PySide2.QtWidgets.QWidget', 'PySide2.QtCore.Qt.MouseButton', 'KeyboardModifiers', 'PySide2.QtCore.QPoint', 'int')], "QTest.mouseDClick": [('PySide2.QtGui.QWindow', 'PySide2.QtCore.Qt.MouseButton', 'KeyboardModifiers', 'PySide2.QtCore.QPoint', 'int'), ('PySide2.QtWidgets.QWidget', 'PySide2.QtCore.Qt.MouseButton', 'KeyboardModifiers', 'PySide2.QtCore.QPoint', 'int')], @@ -13081,12 +13095,12 @@ if "PySide2.QtTest" in sys.modules: "QTest.mouseRelease": [('PySide2.QtGui.QWindow', 'PySide2.QtCore.Qt.MouseButton', 'KeyboardModifiers', 'PySide2.QtCore.QPoint', 'int'), ('PySide2.QtWidgets.QWidget', 'PySide2.QtCore.Qt.MouseButton', 'KeyboardModifiers', 'PySide2.QtCore.QPoint', 'int')], "QTest.qElementData": ('str', 'int'), "QTest.qExpectFail": ('str', 'str', 'PySide2.QtTest.QTest.TestFailMode', 'str', 'int'), - "QTest.qFindTestData": ['int', 'str', 'str', 'str'], + "QTest.qFindTestData": ('str', 'str', 'int', 'str'), "QTest.qGlobalData": ('str', 'int'), "QTest.qSkip": ('str', 'str', 'int'), "QTest.qWaitForWindowActive": ('PySide2.QtWidgets.QWidget', 'int'), "QTest.qWaitForWindowExposed": ('PySide2.QtWidgets.QWidget', 'int'), - "QTest.sendKeyEvent": [('PySide2.QtTest.QTest.KeyAction', 'PySide2.QtGui.QWindow', 'PySide2.QtCore.Qt.Key', 'PySide2.support.signature.typing.Union[str, int]', 'KeyboardModifiers', 'int'), ('PySide2.QtTest.QTest.KeyAction', 'PySide2.QtGui.QWindow', 'PySide2.QtCore.Qt.Key', 'str', 'KeyboardModifiers', 'int'), ('PySide2.QtTest.QTest.KeyAction', 'PySide2.QtWidgets.QWidget', 'PySide2.QtCore.Qt.Key', 'PySide2.support.signature.typing.Union[str, int]', 'KeyboardModifiers', 'int'), ('PySide2.QtTest.QTest.KeyAction', 'PySide2.QtWidgets.QWidget', 'PySide2.QtCore.Qt.Key', 'str', 'KeyboardModifiers', 'int')], + "QTest.sendKeyEvent": [('PySide2.QtTest.QTest.KeyAction', 'PySide2.QtGui.QWindow', 'PySide2.QtCore.Qt.Key', 'Union[str, int]', 'KeyboardModifiers', 'int'), ('PySide2.QtTest.QTest.KeyAction', 'PySide2.QtGui.QWindow', 'PySide2.QtCore.Qt.Key', 'str', 'KeyboardModifiers', 'int'), ('PySide2.QtTest.QTest.KeyAction', 'PySide2.QtWidgets.QWidget', 'PySide2.QtCore.Qt.Key', 'Union[str, int]', 'KeyboardModifiers', 'int'), ('PySide2.QtTest.QTest.KeyAction', 'PySide2.QtWidgets.QWidget', 'PySide2.QtCore.Qt.Key', 'str', 'KeyboardModifiers', 'int')], "QTest.setBenchmarkResult": ('float', 'PySide2.QtTest.QTest.QBenchmarkMetric'), "QTest.setMainSourcePath": ('str', 'str'), "QTest.simulateEvent": [('PySide2.QtGui.QWindow', 'bool', 'int', 'KeyboardModifiers', 'str', 'bool', 'int'), ('PySide2.QtWidgets.QWidget', 'bool', 'int', 'KeyboardModifiers', 'str', 'bool', 'int')], @@ -13134,7 +13148,7 @@ if "PySide2.QtWinExtras" in sys.modules: "QWinJumpListCategory.__init__": ('str',), "QWinJumpListCategory.addDestination": ('str',), "QWinJumpListCategory.addItem": ('PySide2.QtWinExtras.QWinJumpListItem',), - "QWinJumpListCategory.addLink": [('PySide2.QtGui.QIcon', 'str', 'str', 'PySide2.support.signature.typing.List'), ('str', 'str', 'PySide2.support.signature.typing.List')], + "QWinJumpListCategory.addLink": [('PySide2.QtGui.QIcon', 'str', 'str', 'List[str]'), ('str', 'str', 'List[str]')], "QWinJumpListCategory.addSeparator": (), "QWinJumpListCategory.clear": (), "QWinJumpListCategory.count": (), @@ -13152,7 +13166,7 @@ if "PySide2.QtWinExtras" in sys.modules: "QWinJumpListItem.description": (), "QWinJumpListItem.filePath": (), "QWinJumpListItem.icon": (), - "QWinJumpListItem.setArguments": ('PySide2.support.signature.typing.List',), + "QWinJumpListItem.setArguments": ('List[str]',), "QWinJumpListItem.setDescription": ('str',), "QWinJumpListItem.setFilePath": ('str',), "QWinJumpListItem.setIcon": ('PySide2.QtGui.QIcon',), @@ -13561,7 +13575,6 @@ if "PySide2.QtXml" in sys.modules: "QXmlInputSource.data": (), "QXmlInputSource.fetchData": (), "QXmlInputSource.fromRawData": ('PySide2.QtCore.QByteArray', 'bool'), - "QXmlInputSource.next": (), "QXmlInputSource.reset": (), "QXmlInputSource.setData": [('PySide2.QtCore.QByteArray',), ('str',)], @@ -13612,7 +13625,7 @@ if "PySide2.QtXml" in sys.modules: "QXmlReader.hasFeature": ('str',), "QXmlReader.hasProperty": ('str',), "QXmlReader.lexicalHandler": (), - "QXmlReader.parse": ['PySide2.QtXml.QXmlInputSource'], + "QXmlReader.parse": ('PySide2.QtXml.QXmlInputSource',), "QXmlReader.property": ('str', 'bool'), "QXmlReader.setContentHandler": ('PySide2.QtXml.QXmlContentHandler',), "QXmlReader.setDTDHandler": ('PySide2.QtXml.QXmlDTDHandler',), @@ -13683,7 +13696,7 @@ if "PySide2.QtXmlPatterns" in sys.modules: # class PySide2.QtXmlPatterns.QAbstractXmlReceiver: "QAbstractXmlReceiver.__init__": (), - "QAbstractXmlReceiver.atomicValue": ('PySide2.support.signature.typing.Any',), + "QAbstractXmlReceiver.atomicValue": ('Any',), "QAbstractXmlReceiver.attribute": ('PySide2.QtXmlPatterns.QXmlName', 'str'), "QAbstractXmlReceiver.characters": ('str',), "QAbstractXmlReceiver.comment": ('str',), @@ -13710,7 +13723,7 @@ if "PySide2.QtXmlPatterns" in sys.modules: # class PySide2.QtXmlPatterns.QXmlFormatter: "QXmlFormatter.__init__": ('PySide2.QtXmlPatterns.QXmlQuery', 'PySide2.QtCore.QIODevice'), - "QXmlFormatter.atomicValue": ('PySide2.support.signature.typing.Any',), + "QXmlFormatter.atomicValue": ('Any',), "QXmlFormatter.attribute": ('PySide2.QtXmlPatterns.QXmlName', 'str'), "QXmlFormatter.characters": ('str',), "QXmlFormatter.comment": ('str',), @@ -13725,7 +13738,7 @@ if "PySide2.QtXmlPatterns" in sys.modules: "QXmlFormatter.startOfSequence": (), # class PySide2.QtXmlPatterns.QXmlItem: - "QXmlItem.__init__": [(), ('PySide2.QtXmlPatterns.QXmlItem',), ('PySide2.QtXmlPatterns.QXmlNodeModelIndex',), ('PySide2.support.signature.typing.Any',)], + "QXmlItem.__init__": [(), ('Any',), ('PySide2.QtXmlPatterns.QXmlItem',), ('PySide2.QtXmlPatterns.QXmlNodeModelIndex',)], "QXmlItem.__copy__": (), "QXmlItem.isAtomicValue": (), "QXmlItem.isNode": (), @@ -13778,7 +13791,6 @@ if "PySide2.QtXmlPatterns" in sys.modules: "QXmlResultItems.__init__": (), "QXmlResultItems.current": (), "QXmlResultItems.hasError": (), - "QXmlResultItems.next": (), # class PySide2.QtXmlPatterns.QXmlSchema: "QXmlSchema.__init__": [(), ('PySide2.QtXmlPatterns.QXmlSchema',)], @@ -13804,7 +13816,7 @@ if "PySide2.QtXmlPatterns" in sys.modules: # class PySide2.QtXmlPatterns.QXmlSerializer: "QXmlSerializer.__init__": ('PySide2.QtXmlPatterns.QXmlQuery', 'PySide2.QtCore.QIODevice'), - "QXmlSerializer.atomicValue": ('PySide2.support.signature.typing.Any',), + "QXmlSerializer.atomicValue": ('Any',), "QXmlSerializer.attribute": ('PySide2.QtXmlPatterns.QXmlName', 'str'), "QXmlSerializer.characters": ('str',), "QXmlSerializer.codec": (), @@ -13858,17 +13870,17 @@ if "PySide2.QtHelp" in sys.modules: # class PySide2.QtHelp.QHelpEngineCore: "QHelpEngineCore.__init__": ('str', 'PySide2.QtCore.QObject'), - "QHelpEngineCore.addCustomFilter": ('str', 'PySide2.support.signature.typing.List'), + "QHelpEngineCore.addCustomFilter": ('str', 'List[str]'), "QHelpEngineCore.autoSaveFilter": (), "QHelpEngineCore.collectionFile": (), "QHelpEngineCore.copyCollectionFile": ('str',), "QHelpEngineCore.currentFilter": (), "QHelpEngineCore.customFilters": (), - "QHelpEngineCore.customValue": ('str', 'PySide2.support.signature.typing.Any'), + "QHelpEngineCore.customValue": ('str', 'Any'), "QHelpEngineCore.documentationFileName": ('str',), "QHelpEngineCore.error": (), "QHelpEngineCore.fileData": ('PySide2.QtCore.QUrl',), - "QHelpEngineCore.files": ('str', 'PySide2.support.signature.typing.List', 'str'), + "QHelpEngineCore.files": ('str', 'List[str]', 'str'), "QHelpEngineCore.filterAttributeSets": ('str',), "QHelpEngineCore.filterAttributes": [(), ('str',)], "QHelpEngineCore.findFile": ('PySide2.QtCore.QUrl',), @@ -13883,7 +13895,7 @@ if "PySide2.QtHelp" in sys.modules: "QHelpEngineCore.setAutoSaveFilter": ('bool',), "QHelpEngineCore.setCollectionFile": ('str',), "QHelpEngineCore.setCurrentFilter": ('str',), - "QHelpEngineCore.setCustomValue": ('str', 'PySide2.support.signature.typing.Any'), + "QHelpEngineCore.setCustomValue": ('str', 'Any'), "QHelpEngineCore.setupData": (), "QHelpEngineCore.unregisterDocumentation": ('str',), @@ -13911,9 +13923,10 @@ if "PySide2.QtHelp" in sys.modules: "QHelpSearchEngine.search": [('list',), ('str',)], "QHelpSearchEngine.searchInput": (), "QHelpSearchEngine.searchResultCount": (), + "QHelpSearchEngine.searchResults": ('int', 'int'), # class PySide2.QtHelp.QHelpSearchQuery: - "QHelpSearchQuery.__init__": [(), ('PySide2.QtHelp.QHelpSearchQuery',), ('PySide2.QtHelp.QHelpSearchQuery.FieldName', 'PySide2.support.signature.typing.List')], + "QHelpSearchQuery.__init__": [(), ('PySide2.QtHelp.QHelpSearchQuery',), ('PySide2.QtHelp.QHelpSearchQuery.FieldName', 'List[str]')], "QHelpSearchQuery.__copy__": (), # class PySide2.QtHelp.QHelpSearchQueryWidget: @@ -13929,6 +13942,12 @@ if "PySide2.QtHelp" in sys.modules: "QHelpSearchQueryWidget.setQuery": ('list',), "QHelpSearchQueryWidget.setSearchInput": ('str',), + # class PySide2.QtHelp.QHelpSearchResult: + "QHelpSearchResult.__init__": [(), ('PySide2.QtCore.QUrl', 'str', 'str'), ('PySide2.QtHelp.QHelpSearchResult',)], + "QHelpSearchResult.snippet": (), + "QHelpSearchResult.title": (), + "QHelpSearchResult.url": (), + # class PySide2.QtHelp.QHelpSearchResultWidget: "QHelpSearchResultWidget.changeEvent": ('PySide2.QtCore.QEvent',), "QHelpSearchResultWidget.linkAt": ('PySide2.QtCore.QPoint',), @@ -14033,7 +14052,7 @@ if "PySide2.QtMultimedia" in sys.modules: "QAudioBuffer.__copy__": (), "QAudioBuffer.byteCount": (), "QAudioBuffer.constData": (), - "QAudioBuffer.data": [], + "QAudioBuffer.data": (), "QAudioBuffer.duration": (), "QAudioBuffer.format": (), "QAudioBuffer.frameCount": (), @@ -14048,7 +14067,7 @@ if "PySide2.QtMultimedia" in sys.modules: "QAudioDecoder.bufferAvailable": (), "QAudioDecoder.duration": (), "QAudioDecoder.errorString": (), - "QAudioDecoder.hasSupport": ('str', 'PySide2.support.signature.typing.List'), + "QAudioDecoder.hasSupport": ('str', 'List[str]'), "QAudioDecoder.position": (), "QAudioDecoder.read": (), "QAudioDecoder.setAudioFormat": ('PySide2.QtMultimedia.QAudioFormat',), @@ -14111,7 +14130,7 @@ if "PySide2.QtMultimedia" in sys.modules: "QAudioEncoderSettings.setChannelCount": ('int',), "QAudioEncoderSettings.setCodec": ('str',), "QAudioEncoderSettings.setEncodingMode": ('PySide2.QtMultimedia.QMultimedia.EncodingMode',), - "QAudioEncoderSettings.setEncodingOption": ('str', 'PySide2.support.signature.typing.Any'), + "QAudioEncoderSettings.setEncodingOption": ('str', 'Any'), "QAudioEncoderSettings.setEncodingOptions": ('dict',), "QAudioEncoderSettings.setQuality": ('PySide2.QtMultimedia.QMultimedia.EncodingQuality',), "QAudioEncoderSettings.setSampleRate": ('int',), @@ -14281,7 +14300,7 @@ if "PySide2.QtMultimedia" in sys.modules: "QCameraExposureControl.actualValue": ('PySide2.QtMultimedia.QCameraExposureControl.ExposureParameter',), "QCameraExposureControl.isParameterSupported": ('PySide2.QtMultimedia.QCameraExposureControl.ExposureParameter',), "QCameraExposureControl.requestedValue": ('PySide2.QtMultimedia.QCameraExposureControl.ExposureParameter',), - "QCameraExposureControl.setValue": ('PySide2.QtMultimedia.QCameraExposureControl.ExposureParameter', 'PySide2.support.signature.typing.Any'), + "QCameraExposureControl.setValue": ('PySide2.QtMultimedia.QCameraExposureControl.ExposureParameter', 'Any'), # class PySide2.QtMultimedia.QCameraFocusZone: "QCameraFocusZone.__init__": [(), ('PySide2.QtCore.QRectF', 'PySide2.QtMultimedia.QCameraFocusZone.FocusZoneStatus'), ('PySide2.QtMultimedia.QCameraFocusZone',)], @@ -14323,9 +14342,9 @@ if "PySide2.QtMultimedia" in sys.modules: # class PySide2.QtMultimedia.QCameraImageProcessingControl: "QCameraImageProcessingControl.__init__": ('PySide2.QtCore.QObject',), "QCameraImageProcessingControl.isParameterSupported": ('PySide2.QtMultimedia.QCameraImageProcessingControl.ProcessingParameter',), - "QCameraImageProcessingControl.isParameterValueSupported": ('PySide2.QtMultimedia.QCameraImageProcessingControl.ProcessingParameter', 'PySide2.support.signature.typing.Any'), + "QCameraImageProcessingControl.isParameterValueSupported": ('PySide2.QtMultimedia.QCameraImageProcessingControl.ProcessingParameter', 'Any'), "QCameraImageProcessingControl.parameter": ('PySide2.QtMultimedia.QCameraImageProcessingControl.ProcessingParameter',), - "QCameraImageProcessingControl.setParameter": ('PySide2.QtMultimedia.QCameraImageProcessingControl.ProcessingParameter', 'PySide2.support.signature.typing.Any'), + "QCameraImageProcessingControl.setParameter": ('PySide2.QtMultimedia.QCameraImageProcessingControl.ProcessingParameter', 'Any'), # class PySide2.QtMultimedia.QCameraInfo: "QCameraInfo.__init__": [('PySide2.QtCore.QByteArray',), ('PySide2.QtMultimedia.QCamera',), ('PySide2.QtMultimedia.QCameraInfo',)], @@ -14369,7 +14388,7 @@ if "PySide2.QtMultimedia" in sys.modules: # class PySide2.QtMultimedia.QCameraViewfinderSettingsControl: "QCameraViewfinderSettingsControl.__init__": ('PySide2.QtCore.QObject',), "QCameraViewfinderSettingsControl.isViewfinderParameterSupported": ('PySide2.QtMultimedia.QCameraViewfinderSettingsControl.ViewfinderParameter',), - "QCameraViewfinderSettingsControl.setViewfinderParameter": ('PySide2.QtMultimedia.QCameraViewfinderSettingsControl.ViewfinderParameter', 'PySide2.support.signature.typing.Any'), + "QCameraViewfinderSettingsControl.setViewfinderParameter": ('PySide2.QtMultimedia.QCameraViewfinderSettingsControl.ViewfinderParameter', 'Any'), "QCameraViewfinderSettingsControl.viewfinderParameter": ('PySide2.QtMultimedia.QCameraViewfinderSettingsControl.ViewfinderParameter',), # class PySide2.QtMultimedia.QCameraViewfinderSettingsControl2: @@ -14405,7 +14424,7 @@ if "PySide2.QtMultimedia" in sys.modules: "QImageEncoderSettings.quality": (), "QImageEncoderSettings.resolution": (), "QImageEncoderSettings.setCodec": ('str',), - "QImageEncoderSettings.setEncodingOption": ('str', 'PySide2.support.signature.typing.Any'), + "QImageEncoderSettings.setEncodingOption": ('str', 'Any'), "QImageEncoderSettings.setEncodingOptions": ('dict',), "QImageEncoderSettings.setQuality": ('PySide2.QtMultimedia.QMultimedia.EncodingQuality',), "QImageEncoderSettings.setResolution": [('PySide2.QtCore.QSize',), ('int', 'int')], @@ -14478,7 +14497,7 @@ if "PySide2.QtMultimedia" in sys.modules: "QMediaPlayer.currentNetworkConfiguration": (), "QMediaPlayer.duration": (), "QMediaPlayer.errorString": (), - "QMediaPlayer.hasSupport": ('str', 'PySide2.support.signature.typing.List', 'Flags'), + "QMediaPlayer.hasSupport": ('str', 'List[str]', 'Flags'), "QMediaPlayer.isAudioAvailable": (), "QMediaPlayer.isMuted": (), "QMediaPlayer.isSeekable": (), @@ -14548,7 +14567,6 @@ if "PySide2.QtMultimedia" in sys.modules: "QMediaPlaylist.mediaCount": (), "QMediaPlaylist.mediaObject": (), "QMediaPlaylist.moveMedia": ('int', 'int'), - "QMediaPlaylist.next": (), "QMediaPlaylist.nextIndex": ('int',), "QMediaPlaylist.playbackMode": (), "QMediaPlaylist.previous": (), @@ -14584,7 +14602,7 @@ if "PySide2.QtMultimedia" in sys.modules: "QMediaRecorder.setContainerFormat": ('str',), "QMediaRecorder.setEncodingSettings": ('PySide2.QtMultimedia.QAudioEncoderSettings', 'PySide2.QtMultimedia.QVideoEncoderSettings', 'str'), "QMediaRecorder.setMediaObject": ('PySide2.QtMultimedia.QMediaObject',), - "QMediaRecorder.setMetaData": ('str', 'PySide2.support.signature.typing.Any'), + "QMediaRecorder.setMetaData": ('str', 'Any'), "QMediaRecorder.setMuted": ('bool',), "QMediaRecorder.setOutputLocation": ('PySide2.QtCore.QUrl',), "QMediaRecorder.setVideoSettings": ('PySide2.QtMultimedia.QVideoEncoderSettings',), @@ -14792,7 +14810,7 @@ if "PySide2.QtMultimedia" in sys.modules: "QVideoEncoderSettings.setBitRate": ('int',), "QVideoEncoderSettings.setCodec": ('str',), "QVideoEncoderSettings.setEncodingMode": ('PySide2.QtMultimedia.QMultimedia.EncodingMode',), - "QVideoEncoderSettings.setEncodingOption": ('str', 'PySide2.support.signature.typing.Any'), + "QVideoEncoderSettings.setEncodingOption": ('str', 'Any'), "QVideoEncoderSettings.setEncodingOptions": ('dict',), "QVideoEncoderSettings.setFrameRate": ('float',), "QVideoEncoderSettings.setQuality": ('PySide2.QtMultimedia.QMultimedia.EncodingQuality',), @@ -14813,7 +14831,7 @@ if "PySide2.QtMultimedia" in sys.modules: "QVideoFrame.__init__": [(), ('PySide2.QtGui.QImage',), ('PySide2.QtMultimedia.QAbstractVideoBuffer', 'PySide2.QtCore.QSize', 'PySide2.QtMultimedia.QVideoFrame.PixelFormat'), ('PySide2.QtMultimedia.QVideoFrame',), ('int', 'PySide2.QtCore.QSize', 'int', 'PySide2.QtMultimedia.QVideoFrame.PixelFormat')], "QVideoFrame.__copy__": (), "QVideoFrame.availableMetaData": (), - "QVideoFrame.bits": [], + "QVideoFrame.bits": (), "QVideoFrame.bytesPerLine": [(), ('int',)], "QVideoFrame.endTime": (), "QVideoFrame.fieldType": (), @@ -14834,7 +14852,7 @@ if "PySide2.QtMultimedia" in sys.modules: "QVideoFrame.planeCount": (), "QVideoFrame.setEndTime": ('int',), "QVideoFrame.setFieldType": ('PySide2.QtMultimedia.QVideoFrame.FieldType',), - "QVideoFrame.setMetaData": ('str', 'PySide2.support.signature.typing.Any'), + "QVideoFrame.setMetaData": ('str', 'Any'), "QVideoFrame.setStartTime": ('int',), "QVideoFrame.size": (), "QVideoFrame.startTime": (), @@ -14868,7 +14886,7 @@ if "PySide2.QtMultimedia" in sys.modules: "QVideoSurfaceFormat.setFrameRate": ('float',), "QVideoSurfaceFormat.setFrameSize": [('PySide2.QtCore.QSize',), ('int', 'int')], "QVideoSurfaceFormat.setPixelAspectRatio": [('PySide2.QtCore.QSize',), ('int', 'int')], - "QVideoSurfaceFormat.setProperty": ('str', 'PySide2.support.signature.typing.Any'), + "QVideoSurfaceFormat.setProperty": ('str', 'Any'), "QVideoSurfaceFormat.setScanLineDirection": ('PySide2.QtMultimedia.QVideoSurfaceFormat.Direction',), "QVideoSurfaceFormat.setViewport": ('PySide2.QtCore.QRect',), "QVideoSurfaceFormat.setYCbCrColorSpace": ('PySide2.QtMultimedia.QVideoSurfaceFormat.YCbCrColorSpace',), @@ -14911,7 +14929,7 @@ if "PySide2.QtMultimediaWidgets" in sys.modules: "QGraphicsVideoItem.__init__": ('PySide2.QtWidgets.QGraphicsItem',), "QGraphicsVideoItem.aspectRatioMode": (), "QGraphicsVideoItem.boundingRect": (), - "QGraphicsVideoItem.itemChange": ('PySide2.QtWidgets.QGraphicsItem.GraphicsItemChange', 'PySide2.support.signature.typing.Any'), + "QGraphicsVideoItem.itemChange": ('PySide2.QtWidgets.QGraphicsItem.GraphicsItemChange', 'Any'), "QGraphicsVideoItem.mediaObject": (), "QGraphicsVideoItem.nativeSize": (), "QGraphicsVideoItem.offset": (), @@ -15268,7 +15286,7 @@ if "PySide2.QtQml" in sys.modules: "QJSEngine.newObject": (), "QJSEngine.newQMetaObject": ('PySide2.QtCore.QMetaObject',), "QJSEngine.newQObject": ('PySide2.QtCore.QObject',), - "QJSEngine.toScriptValue": ('PySide2.support.signature.typing.Any',), + "QJSEngine.toScriptValue": ('Any',), # class PySide2.QtQml.QJSValue: "QJSValue.__init__": [('PySide2.QtQml.QJSValue',), ('PySide2.QtQml.QJSValue.SpecialValue',), ('bool',), ('float',), ('int',), ('str',)], @@ -15314,7 +15332,6 @@ if "PySide2.QtQml" in sys.modules: "QJSValueIterator.__init__": ('PySide2.QtQml.QJSValue',), "QJSValueIterator.hasNext": (), "QJSValueIterator.name": (), - "QJSValueIterator.next": (), "QJSValueIterator.value": (), # class PySide2.QtQml.QQmlAbstractUrlInterceptor: @@ -15325,7 +15342,7 @@ if "PySide2.QtQml" in sys.modules: "QQmlApplicationEngine.__init__": [('PySide2.QtCore.QObject',), ('PySide2.QtCore.QUrl', 'PySide2.QtCore.QObject'), ('str', 'PySide2.QtCore.QObject')], "QQmlApplicationEngine.load": [('PySide2.QtCore.QUrl',), ('str',)], "QQmlApplicationEngine.loadData": ('PySide2.QtCore.QByteArray', 'PySide2.QtCore.QUrl'), - "QQmlApplicationEngine.rootObjects": [], + "QQmlApplicationEngine.rootObjects": (), # class PySide2.QtQml.QQmlComponent: "QQmlComponent.__init__": [('PySide2.QtCore.QObject',), ('PySide2.QtQml.QQmlEngine', 'PySide2.QtCore.QObject'), ('PySide2.QtQml.QQmlEngine', 'PySide2.QtCore.QUrl', 'PySide2.QtCore.QObject'), ('PySide2.QtQml.QQmlEngine', 'PySide2.QtCore.QUrl', 'PySide2.QtQml.QQmlComponent.CompilationMode', 'PySide2.QtCore.QObject'), ('PySide2.QtQml.QQmlEngine', 'str', 'PySide2.QtCore.QObject'), ('PySide2.QtQml.QQmlEngine', 'str', 'PySide2.QtQml.QQmlComponent.CompilationMode', 'PySide2.QtCore.QObject')], @@ -15357,7 +15374,7 @@ if "PySide2.QtQml" in sys.modules: "QQmlContext.resolvedUrl": ('PySide2.QtCore.QUrl',), "QQmlContext.setBaseUrl": ('PySide2.QtCore.QUrl',), "QQmlContext.setContextObject": ('PySide2.QtCore.QObject',), - "QQmlContext.setContextProperty": [('str', 'PySide2.QtCore.QObject'), ('str', 'PySide2.support.signature.typing.Any')], + "QQmlContext.setContextProperty": [('str', 'Any'), ('str', 'PySide2.QtCore.QObject')], # class PySide2.QtQml.QQmlDebuggingEnabler: "QQmlDebuggingEnabler.__init__": ('bool',), @@ -15366,7 +15383,7 @@ if "PySide2.QtQml" in sys.modules: "QQmlDebuggingEnabler.inspectorServices": (), "QQmlDebuggingEnabler.nativeDebuggerServices": (), "QQmlDebuggingEnabler.profilerServices": (), - "QQmlDebuggingEnabler.setServices": ('PySide2.support.signature.typing.List',), + "QQmlDebuggingEnabler.setServices": ('List[str]',), "QQmlDebuggingEnabler.startDebugConnector": ('str', 'dict'), "QQmlDebuggingEnabler.startTcpDebugServer": ('int', 'PySide2.QtQml.QQmlDebuggingEnabler.StartMode', 'str'), @@ -15395,13 +15412,13 @@ if "PySide2.QtQml" in sys.modules: "QQmlEngine.rootContext": (), "QQmlEngine.setBaseUrl": ('PySide2.QtCore.QUrl',), "QQmlEngine.setContextForObject": ('PySide2.QtCore.QObject', 'PySide2.QtQml.QQmlContext'), - "QQmlEngine.setImportPathList": ('PySide2.support.signature.typing.List',), + "QQmlEngine.setImportPathList": ('List[str]',), "QQmlEngine.setIncubationController": ('PySide2.QtQml.QQmlIncubationController',), "QQmlEngine.setNetworkAccessManagerFactory": ('PySide2.QtQml.QQmlNetworkAccessManagerFactory',), "QQmlEngine.setObjectOwnership": ('PySide2.QtCore.QObject', 'PySide2.QtQml.QQmlEngine.ObjectOwnership'), "QQmlEngine.setOfflineStoragePath": ('str',), "QQmlEngine.setOutputWarningsToStandardError": ('bool',), - "QQmlEngine.setPluginPathList": ('PySide2.support.signature.typing.List',), + "QQmlEngine.setPluginPathList": ('List[str]',), "QQmlEngine.setUrlInterceptor": ('PySide2.QtQml.QQmlAbstractUrlInterceptor',), "QQmlEngine.trimComponentCache": (), "QQmlEngine.urlInterceptor": (), @@ -15476,7 +15493,7 @@ if "PySide2.QtQml" in sys.modules: "QQmlFileSelector.__init__": ('PySide2.QtQml.QQmlEngine', 'PySide2.QtCore.QObject'), "QQmlFileSelector.get": ('PySide2.QtQml.QQmlEngine',), "QQmlFileSelector.selector": (), - "QQmlFileSelector.setExtraSelectors": ['PySide2.support.signature.typing.List'], + "QQmlFileSelector.setExtraSelectors": ('List[str]',), "QQmlFileSelector.setSelector": ('PySide2.QtCore.QFileSelector',), # class PySide2.QtQml.QQmlImageProviderBase: @@ -15555,18 +15572,18 @@ if "PySide2.QtQml" in sys.modules: "QQmlProperty.read": [(), ('PySide2.QtCore.QObject', 'str'), ('PySide2.QtCore.QObject', 'str', 'PySide2.QtQml.QQmlContext'), ('PySide2.QtCore.QObject', 'str', 'PySide2.QtQml.QQmlEngine')], "QQmlProperty.reset": (), "QQmlProperty.type": (), - "QQmlProperty.write": [('PySide2.QtCore.QObject', 'str', 'PySide2.support.signature.typing.Any'), ('PySide2.QtCore.QObject', 'str', 'PySide2.support.signature.typing.Any', 'PySide2.QtQml.QQmlContext'), ('PySide2.QtCore.QObject', 'str', 'PySide2.support.signature.typing.Any', 'PySide2.QtQml.QQmlEngine'), ('PySide2.support.signature.typing.Any',)], + "QQmlProperty.write": [('Any',), ('PySide2.QtCore.QObject', 'str', 'Any'), ('PySide2.QtCore.QObject', 'str', 'Any', 'PySide2.QtQml.QQmlContext'), ('PySide2.QtCore.QObject', 'str', 'Any', 'PySide2.QtQml.QQmlEngine')], # class PySide2.QtQml.QQmlPropertyMap: "QQmlPropertyMap.__init__": ('PySide2.QtCore.QObject',), "QQmlPropertyMap.clear": ('str',), "QQmlPropertyMap.contains": ('str',), "QQmlPropertyMap.count": (), - "QQmlPropertyMap.insert": ('str', 'PySide2.support.signature.typing.Any'), + "QQmlPropertyMap.insert": ('str', 'Any'), "QQmlPropertyMap.isEmpty": (), "QQmlPropertyMap.keys": (), "QQmlPropertyMap.size": (), - "QQmlPropertyMap.updateValue": ('str', 'PySide2.support.signature.typing.Any'), + "QQmlPropertyMap.updateValue": ('str', 'Any'), "QQmlPropertyMap.value": ('str',), # class PySide2.QtQml.QQmlPropertyValueSource: @@ -15768,7 +15785,7 @@ if "PySide2.QtQuick" in sys.modules: # class PySide2.QtQuick.QQuickItemGrabResult: "QQuickItemGrabResult.event": ('PySide2.QtCore.QEvent',), "QQuickItemGrabResult.image": (), - "QQuickItemGrabResult.saveToFile": ['str'], + "QQuickItemGrabResult.saveToFile": ('str',), "QQuickItemGrabResult.url": (), # class PySide2.QtQuick.QQuickPaintedItem: @@ -15923,7 +15940,7 @@ if "PySide2.QtQuick" in sys.modules: # class PySide2.QtQuick.QSGBasicGeometryNode: "QSGBasicGeometryNode.__init__": ('PySide2.QtQuick.QSGNode.NodeType',), "QSGBasicGeometryNode.clipList": (), - "QSGBasicGeometryNode.geometry": [], + "QSGBasicGeometryNode.geometry": (), "QSGBasicGeometryNode.matrix": (), "QSGBasicGeometryNode.setGeometry": ('PySide2.QtQuick.QSGGeometry',), "QSGBasicGeometryNode.setRendererClipList": ('PySide2.QtQuick.QSGClipNode',), @@ -15958,9 +15975,9 @@ if "PySide2.QtQuick" in sys.modules: "QSGGeometry.defaultAttributes_TexturedPoint2D": (), "QSGGeometry.drawingMode": (), "QSGGeometry.indexCount": (), - "QSGGeometry.indexData": [], - "QSGGeometry.indexDataAsUInt": [], - "QSGGeometry.indexDataAsUShort": [], + "QSGGeometry.indexData": (), + "QSGGeometry.indexDataAsUInt": (), + "QSGGeometry.indexDataAsUShort": (), "QSGGeometry.indexDataPattern": (), "QSGGeometry.indexType": (), "QSGGeometry.lineWidth": (), @@ -15976,10 +15993,10 @@ if "PySide2.QtQuick" in sys.modules: "QSGGeometry.updateRectGeometry": ('PySide2.QtQuick.QSGGeometry', 'PySide2.QtCore.QRectF'), "QSGGeometry.updateTexturedRectGeometry": ('PySide2.QtQuick.QSGGeometry', 'PySide2.QtCore.QRectF', 'PySide2.QtCore.QRectF'), "QSGGeometry.vertexCount": (), - "QSGGeometry.vertexData": [], - "QSGGeometry.vertexDataAsColoredPoint2D": [], - "QSGGeometry.vertexDataAsPoint2D": [], - "QSGGeometry.vertexDataAsTexturedPoint2D": [], + "QSGGeometry.vertexData": (), + "QSGGeometry.vertexDataAsColoredPoint2D": (), + "QSGGeometry.vertexDataAsPoint2D": (), + "QSGGeometry.vertexDataAsTexturedPoint2D": (), "QSGGeometry.vertexDataPattern": (), # class PySide2.QtQuick.QSGGeometryNode: @@ -16160,7 +16177,7 @@ if "PySide2.QtTextToSpeech" in sys.modules: "QTextToSpeechEngine.__init__": ('PySide2.QtCore.QObject',), "QTextToSpeechEngine.availableLocales": (), "QTextToSpeechEngine.availableVoices": (), - "QTextToSpeechEngine.createVoice": ('str', 'PySide2.QtTextToSpeech.QVoice.Gender', 'PySide2.QtTextToSpeech.QVoice.Age', 'PySide2.support.signature.typing.Any'), + "QTextToSpeechEngine.createVoice": ('str', 'PySide2.QtTextToSpeech.QVoice.Gender', 'PySide2.QtTextToSpeech.QVoice.Age', 'Any'), "QTextToSpeechEngine.locale": (), "QTextToSpeechEngine.pause": (), "QTextToSpeechEngine.pitch": (), @@ -16265,7 +16282,7 @@ if "PySide2.QtDataVisualization" in sys.modules: dict.update({ # class PySide2.QtDataVisualization.QtDataVisualization: - "QtDataVisualization.qDefaultSurfaceFormat": ['bool'], + "QtDataVisualization.qDefaultSurfaceFormat": ('bool',), }) # Module PySide2.QtUiTools @@ -16299,7 +16316,7 @@ if "PySide2.QtAxContainer" in sys.modules: dict.update({ # class PySide2.QtAxContainer.QAxBase: - "QAxBase.argumentsToList": ('PySide2.support.signature.typing.Any', 'PySide2.support.signature.typing.Any', 'PySide2.support.signature.typing.Any', 'PySide2.support.signature.typing.Any', 'PySide2.support.signature.typing.Any', 'PySide2.support.signature.typing.Any', 'PySide2.support.signature.typing.Any', 'PySide2.support.signature.typing.Any'), + "QAxBase.argumentsToList": ('Any', 'Any', 'Any', 'Any', 'Any', 'Any', 'Any', 'Any'), "QAxBase.asVariant": (), "QAxBase.className": (), "QAxBase.clear": (), @@ -16307,7 +16324,7 @@ if "PySide2.QtAxContainer" in sys.modules: "QAxBase.disableClassInfo": (), "QAxBase.disableEventSink": (), "QAxBase.disableMetaObject": (), - "QAxBase.dynamicCall": [('str', 'PySide2.support.signature.typing.Any', 'PySide2.support.signature.typing.Any', 'PySide2.support.signature.typing.Any', 'PySide2.support.signature.typing.Any', 'PySide2.support.signature.typing.Any', 'PySide2.support.signature.typing.Any', 'PySide2.support.signature.typing.Any', 'PySide2.support.signature.typing.Any'), ('str', 'list'), ('str', 'list', 'int')], + "QAxBase.dynamicCall": [('str', 'Any', 'Any', 'Any', 'Any', 'Any', 'Any', 'Any', 'Any'), ('str', 'list'), ('str', 'list', 'int')], "QAxBase.fallbackMetaObject": (), "QAxBase.generateDocumentation": (), "QAxBase.indexOfVerb": ('str',), @@ -16317,7 +16334,7 @@ if "PySide2.QtAxContainer" in sys.modules: "QAxBase.propertyBag": (), "QAxBase.propertyWritable": ('str',), "QAxBase.qObject": (), - "QAxBase.querySubObject": [('str', 'PySide2.support.signature.typing.Any', 'PySide2.support.signature.typing.Any', 'PySide2.support.signature.typing.Any', 'PySide2.support.signature.typing.Any', 'PySide2.support.signature.typing.Any', 'PySide2.support.signature.typing.Any', 'PySide2.support.signature.typing.Any', 'PySide2.support.signature.typing.Any'), ('str', 'list')], + "QAxBase.querySubObject": [('str', 'Any', 'Any', 'Any', 'Any', 'Any', 'Any', 'Any', 'Any'), ('str', 'list')], "QAxBase.setControl": ('str',), "QAxBase.setPropertyBag": ('dict',), "QAxBase.setPropertyWritable": ('str', 'bool'), @@ -16332,7 +16349,7 @@ if "PySide2.QtAxContainer" in sys.modules: # class PySide2.QtAxContainer.QAxScript: "QAxScript.__init__": ('str', 'PySide2.QtAxContainer.QAxScriptManager'), - "QAxScript.call": [('str', 'PySide2.support.signature.typing.Any', 'PySide2.support.signature.typing.Any', 'PySide2.support.signature.typing.Any', 'PySide2.support.signature.typing.Any', 'PySide2.support.signature.typing.Any', 'PySide2.support.signature.typing.Any', 'PySide2.support.signature.typing.Any', 'PySide2.support.signature.typing.Any'), ('str', 'list')], + "QAxScript.call": [('str', 'Any', 'Any', 'Any', 'Any', 'Any', 'Any', 'Any', 'Any'), ('str', 'list')], "QAxScript.functions": ('PySide2.QtAxContainer.QAxScript.FunctionFlags',), "QAxScript.load": ('str', 'str'), "QAxScript.scriptCode": (), @@ -16349,7 +16366,7 @@ if "PySide2.QtAxContainer" in sys.modules: # class PySide2.QtAxContainer.QAxScriptManager: "QAxScriptManager.__init__": ('PySide2.QtCore.QObject',), "QAxScriptManager.addObject": ('PySide2.QtAxContainer.QAxBase',), - "QAxScriptManager.call": [('str', 'PySide2.support.signature.typing.Any', 'PySide2.support.signature.typing.Any', 'PySide2.support.signature.typing.Any', 'PySide2.support.signature.typing.Any', 'PySide2.support.signature.typing.Any', 'PySide2.support.signature.typing.Any', 'PySide2.support.signature.typing.Any', 'PySide2.support.signature.typing.Any'), ('str', 'list')], + "QAxScriptManager.call": [('str', 'Any', 'Any', 'Any', 'Any', 'Any', 'Any', 'Any', 'Any'), ('str', 'list')], "QAxScriptManager.functions": ('PySide2.QtAxContainer.QAxScript.FunctionFlags',), "QAxScriptManager.load": [('str', 'str'), ('str', 'str', 'str')], "QAxScriptManager.registerEngine": ('str', 'str', 'str'), @@ -16437,7 +16454,7 @@ if "PySide2.QtWebEngineWidgets" in sys.modules: "QWebEnginePage.action": ('PySide2.QtWebEngineWidgets.QWebEnginePage.WebAction',), "QWebEnginePage.backgroundColor": (), "QWebEnginePage.certificateError": ('PySide2.QtWebEngineWidgets.QWebEngineCertificateError',), - "QWebEnginePage.chooseFiles": ('PySide2.QtWebEngineWidgets.QWebEnginePage.FileSelectionMode', 'PySide2.support.signature.typing.List', 'PySide2.support.signature.typing.List'), + "QWebEnginePage.chooseFiles": ('PySide2.QtWebEngineWidgets.QWebEnginePage.FileSelectionMode', 'List[str]', 'List[str]'), "QWebEnginePage.contentsSize": (), "QWebEnginePage.createStandardContextMenu": (), "QWebEnginePage.createWindow": ('PySide2.QtWebEngineWidgets.QWebEnginePage.WebWindowType',), @@ -16500,7 +16517,7 @@ if "PySide2.QtWebEngineWidgets" in sys.modules: "QWebEngineProfile.setPersistentCookiesPolicy": ('PySide2.QtWebEngineWidgets.QWebEngineProfile.PersistentCookiesPolicy',), "QWebEngineProfile.setPersistentStoragePath": ('str',), "QWebEngineProfile.setSpellCheckEnabled": ('bool',), - "QWebEngineProfile.setSpellCheckLanguages": ('PySide2.support.signature.typing.List',), + "QWebEngineProfile.setSpellCheckLanguages": ('List[str]',), "QWebEngineProfile.spellCheckLanguages": (), "QWebEngineProfile.storageName": (), "QWebEngineProfile.visitedLinksContainsUrl": ('PySide2.QtCore.QUrl',), diff --git a/sources/pyside2/tests/registry/init_platform.py b/sources/pyside2/tests/registry/init_platform.py index a8e692d98..1ff83f47e 100644 --- a/sources/pyside2/tests/registry/init_platform.py +++ b/sources/pyside2/tests/registry/init_platform.py @@ -1,6 +1,6 @@ ############################################################################# ## -## Copyright (C) 2017 The Qt Company Ltd. +## Copyright (C) 2018 The Qt Company Ltd. ## Contact: https://www.qt.io/licensing/ ## ## This file is part of PySide2. diff --git a/sources/pyside2/tests/signals/signal_signature_test.py b/sources/pyside2/tests/signals/signal_signature_test.py index 349619aac..e94c1722d 100644 --- a/sources/pyside2/tests/signals/signal_signature_test.py +++ b/sources/pyside2/tests/signals/signal_signature_test.py @@ -34,7 +34,11 @@ import unittest from PySide2.QtCore import * from helper import UsesQCoreApplication +called = False +name = "Old" class Obj(QObject): + dummySignalArgs = Signal(str) + numberSignal = Signal(int) def __init__(self): QObject.__init__(self) self.signal = '' @@ -42,8 +46,20 @@ class Obj(QObject): def connectNotify(self, signal): self.signal = signal + @staticmethod + def static_method(): + global called + called = True + + @staticmethod + def static_method_args(arg="default"): + global name + name = arg + def callback(arg=None): pass +def callback_empty(): + pass class TestConnectNotifyWithNewStyleSignals(UsesQCoreApplication): '''Test case for signal signature received by QObject::connectNotify().''' @@ -65,12 +81,34 @@ class TestConnectNotifyWithNewStyleSignals(UsesQCoreApplication): def testNewStyle(self): sender = Obj() - sender.destroyed.connect(callback) + sender.destroyed.connect(callback_empty) self.assertEqual(sender.signal.methodSignature(), 'destroyed()') sender.destroyed[QObject].connect(callback) self.assertEqual(sender.signal.methodSignature(), 'destroyed(QObject*)') + def testStaticSlot(self): + global called + sender = Obj() + sender.connect(sender, SIGNAL("dummySignal()"), Obj.static_method) + sender.emit(SIGNAL("dummySignal()")) + self.assertTrue(called) + + + def testStaticSlotArgs(self): + global name + sender = Obj() + sender.dummySignalArgs.connect(Obj.static_method_args) + sender.dummySignalArgs[str].emit("New") + self.assertEqual(name, "New") + + def testLambdaSlot(self): + sender = Obj() + sender.numberSignal[int].connect(lambda x: 42) + with self.assertRaises(IndexError): + sender.numberSignal[str].emit("test") + + if __name__ == '__main__': unittest.main() |
