diff options
147 files changed, 4948 insertions, 2264 deletions
diff --git a/.gitmodules b/.gitmodules index 435806e6b..46377b89a 100644 --- a/.gitmodules +++ b/.gitmodules @@ -2,6 +2,3 @@ path = sources/pyside2-tools branch = 5.9 url = ../pyside-tools.git -[submodule "wiki"] - path = wiki - url = https://github.com/PySide/pyside2.wiki.git diff --git a/build_history/blacklist.txt b/build_history/blacklist.txt index 468a10c32..5da9fc427 100644 --- a/build_history/blacklist.txt +++ b/build_history/blacklist.txt @@ -10,6 +10,8 @@ linux darwin win32 +[Qt3DExtras::qt3dextras_test] + linux [QtCore::qfile_test] win32 darwin py3 diff --git a/docs/conf.py b/docs/conf.py index 4233ec510..61e4c7132 100644 --- a/docs/conf.py +++ b/docs/conf.py @@ -185,10 +185,6 @@ html_static_path = ['_static'] # 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 = {} diff --git a/examples/3d/simple3d.py b/examples/3d/simple3d.py new file mode 100644 index 000000000..a34d19821 --- /dev/null +++ b/examples/3d/simple3d.py @@ -0,0 +1,164 @@ +#!/usr/bin/env python + +############################################################################# +## +## Copyright (C) 2018 The Qt Company Ltd. +## Contact: http://www.qt.io/licensing/ +## +## This file is part of the PySide examples of the Qt Toolkit. +## +## $QT_BEGIN_LICENSE:BSD$ +## 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$ +## +############################################################################# + +"""PySide2 port of the qt3d/simple-cpp example from Qt v5.x""" + +import sys +from PySide2.QtCore import(Property, QObject, QPropertyAnimation, 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.sphereRotateTransformAnimation = QPropertyAnimation(self.sphereTransform) + self.sphereRotateTransformAnimation.setTargetObject(self.controller) + self.sphereRotateTransformAnimation.setPropertyName("angle") + self.sphereRotateTransformAnimation.setStartValue(0) + self.sphereRotateTransformAnimation.setEndValue(360) + self.sphereRotateTransformAnimation.setDuration(10000) + self.sphereRotateTransformAnimation.setLoopCount(-1) + self.sphereRotateTransformAnimation.start() + + self.sphereEntity.addComponent(self.sphereMesh) + self.sphereEntity.addComponent(self.sphereTransform) + self.sphereEntity.addComponent(self.material) + +if __name__ == '__main__': + app = QGuiApplication(sys.argv) + view = Window() + view.show() + sys.exit(app.exec_()) diff --git a/examples/charts/audio.py b/examples/charts/audio.py new file mode 100644 index 000000000..94da12cfd --- /dev/null +++ b/examples/charts/audio.py @@ -0,0 +1,128 @@ +#!/usr/bin/python + +############################################################################# +## +## Copyright (C) 2018 The Qt Company Ltd. +## Contact: http://www.qt.io/licensing/ +## +## This file is part of the PySide examples of the Qt Toolkit. +## +## $QT_BEGIN_LICENSE:BSD$ +## 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$ +## +############################################################################# + +"""PySide2 port of the charts/audio example from Qt v5.x""" + +import os +import sys +from PySide2.QtCharts import QtCharts +from PySide2.QtCore import QPointF, QRect, QSize +from PySide2.QtMultimedia import (QAudio, QAudioDeviceInfo, QAudioFormat, + QAudioInput) +from PySide2.QtWidgets import QApplication, QMainWindow, QMessageBox + +sampleCount = 2000 +resolution = 4 + +class MainWindow(QMainWindow): + def __init__(self, device): + super(MainWindow, self).__init__() + + self.series = QtCharts.QLineSeries() + self.chart = QtCharts.QChart() + self.chart.addSeries(self.series) + self.axisX = QtCharts.QValueAxis() + self.axisX.setRange(0, sampleCount) + self.axisX.setLabelFormat("%g") + self.axisX.setTitleText("Samples") + self.axisY = QtCharts.QValueAxis() + self.axisY.setRange(-1, 1) + self.axisY.setTitleText("Audio level") + self.chart.setAxisX(self.axisX, self.series) + self.chart.setAxisY(self.axisY, self.series) + self.chart.legend().hide() + self.chart.setTitle("Data from the microphone ({})".format(device.deviceName())) + + formatAudio = QAudioFormat() + formatAudio.setSampleRate(8000) + formatAudio.setChannelCount(1) + formatAudio.setSampleSize(8) + formatAudio.setCodec("audio/pcm") + formatAudio.setByteOrder(QAudioFormat.LittleEndian) + formatAudio.setSampleType(QAudioFormat.UnSignedInt) + + self.audioInput = QAudioInput(device, formatAudio, self) + self.ioDevice = self.audioInput.start() + self.ioDevice.readyRead.connect(self._readyRead) + + self.chartView = QtCharts.QChartView(self.chart) + self.setCentralWidget(self.chartView) + + self.buffer = [QPointF(x, 0) for x in range(sampleCount)] + self.series.append(self.buffer) + + def closeEvent(self, event): + if self.audioInput is not None: + self.audioInput.stop() + event.accept() + + def _readyRead(self): + data = self.ioDevice.readAll() + availableSamples = data.size() // resolution + start = 0 + if (availableSamples < sampleCount): + start = sampleCount - availableSamples + for s in range(start): + self.buffer[s].setY(self.buffer[s + availableSamples].y()) + + dataIndex = 0 + for s in range(start, sampleCount): + value = (ord(data[dataIndex]) - 128) / 128 + self.buffer[s].setY(value) + dataIndex = dataIndex + resolution + self.series.replace(self.buffer) + +if __name__ == '__main__': + app = QApplication(sys.argv) + + inputDevice = QAudioDeviceInfo.defaultInputDevice() + if (inputDevice.isNull()): + QMessageBox.warning(None, "audio", "There is no audio input device available.") + sys.exit(-1) + + mainWin = MainWindow(inputDevice) + mainWin.setWindowTitle("audio") + availableGeometry = app.desktop().availableGeometry(mainWin) + size = availableGeometry.height() * 3 / 4 + mainWin.resize(size, size) + mainWin.show() + sys.exit(app.exec_()) diff --git a/examples/scriptableapplication/CMakeLists.txt b/examples/scriptableapplication/CMakeLists.txt new file mode 100644 index 000000000..40e29346a --- /dev/null +++ b/examples/scriptableapplication/CMakeLists.txt @@ -0,0 +1,187 @@ +cmake_minimum_required(VERSION 3.1) +cmake_policy(VERSION 3.1) + +# Enable policy to run automoc on generated files. +if(POLICY CMP0071) + cmake_policy(SET CMP0071 NEW) +endif() + +project(scriptableapplication) + +# Set CPP standard to C++11 minimum. +set(CMAKE_CXX_STANDARD 11) + +# Find required Qt packages. +find_package(Qt5 5.9 REQUIRED COMPONENTS Core Gui Widgets) + +# Macro to get various pyside / python include / link flags. +macro(pyside2_config option output_var) + if(${ARGC} GREATER 2) + set(is_list ${ARGV2}) + else() + set(is_list "") + endif() + + execute_process( + COMMAND python "${CMAKE_SOURCE_DIR}/pyside2_config.py" ${option} + OUTPUT_VARIABLE ${output_var} + OUTPUT_STRIP_TRAILING_WHITESPACE) + + if ("${${output_var}}" STREQUAL "") + message(FATAL_ERROR "Got empty string when running: pyside2_config.py ${option}") + endif() + if(is_list) + string (REPLACE " " ";" ${output_var} "${${output_var}}") + endif() +endmacro() + +# Get relevant general paths, include paths and linker flags. +pyside2_config(--pyside2 PYSIDE2_PATH) +set(SHIBOKEN_PATH "${PYSIDE2_PATH}/shiboken2") + +if(NOT EXISTS ${SHIBOKEN_PATH}) + message(FATAL_ERROR "Shiboken executable not found at path: ${SHIBOKEN_PATH}") +endif() + +pyside2_config(--python-include PYTHON_INCLUDE_DIR) +pyside2_config(--pyside2-include PYSIDE2_INCLUDE_DIR 1) +pyside2_config(--python-link-cmake PYTHON_LINKING_DATA 1) +pyside2_config(--pyside2-shared-libraries-cmake PYSIDE2_SHARED_LIBRARIES 1) + +# Get all relevant Qt include dirs, to pass them on to shiboken. +get_property(QT_CORE_INCLUDE_DIRS TARGET Qt5::Core PROPERTY INTERFACE_INCLUDE_DIRECTORIES) +get_property(QT_GUI_INCLUDE_DIRS TARGET Qt5::Gui PROPERTY INTERFACE_INCLUDE_DIRECTORIES) +get_property(QT_WIDGETS_INCLUDE_DIRS TARGET Qt5::Widgets PROPERTY INTERFACE_INCLUDE_DIRECTORIES) +set(QT_INCLUDE_DIRS ${QT_CORE_INCLUDE_DIRS} ${QT_GUI_INCLUDE_DIRS} ${QT_WIDGETS_INCLUDE_DIRS}) +set(INCLUDES "") +foreach(INCLUDE_DIR ${QT_INCLUDE_DIRS}) + list(APPEND INCLUDES "-I${INCLUDE_DIR}") +endforeach() + +# Set up the options to pass to shiboken. +set(WRAPPED_HEADER ${CMAKE_SOURCE_DIR}/wrappedclasses.h) +set(TYPESYSTEM_FILE ${CMAKE_SOURCE_DIR}/scriptableapplication.xml) + +set(SHIBOKEN_OPTIONS --generator-set=shiboken --enable-parent-ctor-heuristic + --enable-pyside-extensions --enable-return-value-heuristic --use-isnull-as-nb_nonzero + --avoid-protected-hack + ${INCLUDES} + -I${CMAKE_SOURCE_DIR} + -T${CMAKE_SOURCE_DIR} + -T${PYSIDE2_PATH}/typesystems + --output-directory=${CMAKE_CURRENT_BINARY_DIR} + ) + +# Specify which sources will be generated by shiboken, and their dependencies. +set(GENERATED_SOURCES + ${CMAKE_CURRENT_BINARY_DIR}/AppLib/applib_module_wrapper.cpp + ${CMAKE_CURRENT_BINARY_DIR}/AppLib/mainwindow_wrapper.cpp) + +set(GENERATED_SOURCES_DEPENDENCIES + ${WRAPPED_HEADER} + ${TYPESYSTEM_FILE} + ) + +# Add custom target to run shiboken. +add_custom_command(OUTPUT ${GENERATED_SOURCES} + COMMAND ${SHIBOKEN_PATH} + ${SHIBOKEN_OPTIONS} ${WRAPPED_HEADER} ${TYPESYSTEM_FILE} + DEPENDS ${GENERATED_SOURCES_DEPENDENCIES} + WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} + COMMENT "Running generator for ${TYPESYSTEM_FILE}.") + +# Set the CPP files. +set(SOURCES + mainwindow.cpp + pythonutils.cpp + ${GENERATED_SOURCES} + ) + +# We need to include the headers for the module bindings that we use. +set(PYSIDE2_ADDITIONAL_INCLUDES "") +foreach(INCLUDE_DIR ${PYSIDE2_INCLUDE_DIR}) + list(APPEND PYSIDE2_ADDITIONAL_INCLUDES "${INCLUDE_DIR}/QtCore") + list(APPEND PYSIDE2_ADDITIONAL_INCLUDES "${INCLUDE_DIR}/QtGui") + list(APPEND PYSIDE2_ADDITIONAL_INCLUDES "${INCLUDE_DIR}/QtWidgets") +endforeach() + +# ============================================================================================= +# !!! (The section below is deployment related, so in a real world application you will want to +# take care of this properly with some custom script or tool). +# ============================================================================================= +# Enable rpaths so that the example can be executed from the build dir. +set(CMAKE_SKIP_BUILD_RPATH FALSE) +set(CMAKE_BUILD_WITH_INSTALL_RPATH FALSE) +SET(CMAKE_INSTALL_RPATH "") +set(CMAKE_INSTALL_RPATH_USE_LINK_PATH TRUE) +# ============================================================================================= +# !!! End of dubious section. +# ============================================================================================= + +# Declare executable so we can enable automoc. +add_executable(${PROJECT_NAME} main.cpp) + +# Enable automoc. +set_property(TARGET ${PROJECT_NAME} PROPERTY AUTOMOC 1) + +# Add the rest of the sources. +target_sources(${PROJECT_NAME} PUBLIC ${SOURCES}) + +# Apply relevant include and link flags. +target_include_directories(${PROJECT_NAME} PRIVATE ${PYTHON_INCLUDE_DIR}) +target_include_directories(${PROJECT_NAME} PRIVATE ${PYSIDE2_INCLUDE_DIR}) +target_include_directories(${PROJECT_NAME} PRIVATE ${PYSIDE2_ADDITIONAL_INCLUDES}) +target_include_directories(${PROJECT_NAME} PRIVATE ${CMAKE_SOURCE_DIR}) + +target_link_libraries(${PROJECT_NAME} PRIVATE Qt5::Widgets) +target_link_libraries(${PROJECT_NAME} PRIVATE ${PYSIDE2_SHARED_LIBRARIES}) + +# Find and link to the python library. +list(GET PYTHON_LINKING_DATA 0 PYTHON_LIBDIR) +list(GET PYTHON_LINKING_DATA 1 PYTHON_LIB) +find_library(PYTHON_LINK_FLAGS ${PYTHON_LIB} HINTS ${PYTHON_LIBDIR}) +target_link_libraries(${PROJECT_NAME} PRIVATE ${PYTHON_LINK_FLAGS}) + +# Same as CONFIG += no_keywords to avoid syntax errors in object.h due to the usage of the word Slot +target_compile_definitions(${PROJECT_NAME} PRIVATE QT_NO_KEYWORDS) + +if(WIN32) + # ============================================================================================= + # !!! (The section below is deployment related, so in a real world application you will want to + # take care of this properly (this is simply to eliminate errors that users usually encounter. + # ============================================================================================= + # Circumvent some "#pragma comment(lib)"s in "include/pyconfig.h" which might force to link + # against a wrong python shared library. + + set(PYTHON_VERSIONS_LIST 3 32 33 34 35 36 37 38) + set(PYTHON_ADDITIONAL_LINK_FLAGS "") + foreach(VER ${PYTHON_VERSIONS_LIST}) + set(PYTHON_ADDITIONAL_LINK_FLAGS + "${PYTHON_ADDITIONAL_LINK_FLAGS} /NODEFAULTLIB:\"python${VER}_d.lib\"") + set(PYTHON_ADDITIONAL_LINK_FLAGS + "${PYTHON_ADDITIONAL_LINK_FLAGS} /NODEFAULTLIB:\"python${VER}.lib\"") + endforeach() + + set_target_properties(${PROJECT_NAME} PROPERTIES LINK_FLAGS "${PYTHON_ADDITIONAL_LINK_FLAGS}") + + # Add custom target to hard link PySide2 shared libraries (just like in qmake example), so you + # don't have to set PATH manually to point to the PySide2 package. + foreach(LIBRARY_PATH ${PYSIDE2_SHARED_LIBRARIES}) + string(REGEX REPLACE ".lib$" ".dll" LIBRARY_PATH ${LIBRARY_PATH}) + get_filename_component(BASE_NAME ${LIBRARY_PATH} NAME) + file(TO_NATIVE_PATH ${LIBRARY_PATH} SOURCE_PATH) + file(TO_NATIVE_PATH "${CMAKE_CURRENT_BINARY_DIR}/${BASE_NAME}" DEST_PATH) + add_custom_command(OUTPUT "${BASE_NAME}" + COMMAND mklink /H "${DEST_PATH}" "${SOURCE_PATH}" + DEPENDS ${LIBRARY_PATH} + WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} + COMMENT "Creating hardlink to PySide2 shared library ${BASE_NAME}") + + # Fake target that depends on the previous one, but has special ALL keyword, which means + # it will always be executed. + add_custom_target("fake_${BASE_NAME}" ALL DEPENDS ${BASE_NAME}) + endforeach() + # ============================================================================================= + # !!! End of dubious section. + # ============================================================================================= +endif() diff --git a/examples/scriptableapplication/README.CMake.txt b/examples/scriptableapplication/README.CMake.txt new file mode 100644 index 000000000..ea658efd5 --- /dev/null +++ b/examples/scriptableapplication/README.CMake.txt @@ -0,0 +1,28 @@ +For general information read README.txt instead. + +To build this example you will need: +* A recent version of CMake (3.1+) +* Make sure that a --standalone PySide2 package (bundled with Qt libraries) is installed into the + current active Python environment (system or virtualenv) +* qmake to be in your PATH (so that CMake find_package(Qt5) works; used for include headers) +* use the same Qt version for building the example application, as was used for building +* PySide2, this is to ensure binary compatibility between the newly generated bindings libraries, + the PySide2 libraries and the Qt libraries. + +For Windows you will also need: +* Visual studio environment to be active in your terminal +* Correct visual studio architecture chosen (32 vs 64 bit) +* Make sure that your Qt + Python + PySide + CMake app build configuration is the same (either or + all Release (which is more likely) or all Debug). + +You can build this example by executing the following commands (slightly adapted to your file +system) in a terminal: + +cd ~/pyside-setup/examples/scriptableapplication +(or cd C:\pyside-setup\examples\scriptableapplication) +mkdir build +cd build +cmake -H.. -B. -G "Unix Makefiles" -DCMAKE_BUILD_TYPE=Release +(or cmake -H.. -B. -G "NMake Makefiles JOM" -DCMAKE_BUILD_TYPE=Release) +make (or nmake / jom) +./scriptableapplication (or scriptableapplication.exe) diff --git a/examples/scriptableapplication/pyside2_config.py b/examples/scriptableapplication/pyside2_config.py index c81d81827..361043aef 100644 --- a/examples/scriptableapplication/pyside2_config.py +++ b/examples/scriptableapplication/pyside2_config.py @@ -73,6 +73,15 @@ def sharedLibraryGlobPattern(): glob = '*.' + sharedLibrarySuffix() return glob if sys.platform == 'win32' else 'lib' + glob +def filterPySide2SharedLibraries(list): + def predicate(item): + basename = os.path.basename(item) + if 'shiboken' in basename or 'pyside2' in basename: + return True + return False + result = [item for item in list if predicate(item)] + return result + # Return qmake link option for a library file name def linkOption(lib): baseName = os.path.splitext(os.path.basename(lib))[0] @@ -99,54 +108,86 @@ def pythonVersion(): def pythonInclude(): return sysconfig.get_python_inc() -def pythonLink(): +def pythonLinkQmake(): + flags = pythonLinkData() + if sys.platform == 'win32' or sys.platform == 'darwin': + return '-L{} -l{}'.format(flags['libdir'], flags['lib']) + + # Linux and anything else + return '-l{}'.format(flags['lib']) + +def pythonLinkCmake(): + flags = pythonLinkData() + libdir = flags['libdir'] + lib = re.sub(r'.dll$', '.lib', flags['lib']) + return '{} {}'.format(libdir, lib) + +def pythonLinkData(): # @TODO Fix to work with static builds of Python libdir = sysconfig.get_config_var('LIBDIR') version = pythonVersion() version_no_dots = version.replace('.', '') + flags = {} + flags['libdir'] = libdir if sys.platform == 'win32': suffix = '_d' if any([tup[0].endswith('_d.pyd') for tup in imp.get_suffixes()]) else '' - return "-L%s -lpython%s%s" % (libdir, version_no_dots, suffix) + flags['lib'] = 'python{}{}'.format(version_no_dots, suffix) - if sys.platform == 'darwin': - return '-L%s -lpython%s' % (libdir, version) + elif sys.platform == 'darwin': + flags['lib'] = 'python{}'.format(version) # Linux and anything else - if sys.version_info[0] < 3: - suffix = '_d' if any([tup[0].endswith('_d.so') for tup in imp.get_suffixes()]) else '' - return "-lpython%s%s" % (version, suffix) else: - return "-lpython%s%s" % (version, sys.abiflags) + if sys.version_info[0] < 3: + suffix = '_d' if any([tup[0].endswith('_d.so') for tup in imp.get_suffixes()]) else '' + flags['lib'] = 'python{}{}'.format(version, suffix) + else: + flags['lib'] = 'python{}{}'.format(version, sys.abiflags) + + return flags def pyside2Include(): pySide2 = findPySide2() if pySide2 is None: return None - return "%s/include/PySide2 %s/include/shiboken2" % (pySide2, pySide2) + return "{0}/include/PySide2 {0}/include/shiboken2".format(pySide2) def pyside2Link(): pySide2 = findPySide2() if pySide2 is None: return None - link = "-L%s" % pySide2 - for lib in glob.glob(os.path.join(pySide2, sharedLibraryGlobPattern())): + link = "-L{}".format(pySide2) + glob_result = glob.glob(os.path.join(pySide2, sharedLibraryGlobPattern())) + for lib in filterPySide2SharedLibraries(glob_result): link += ' ' link += linkOption(lib) return link -def pyside2SharedLibraries(): +def pyside2SharedLibrariesData(): pySide2 = findPySide2() if pySide2 is None: return None + glob_result = glob.glob(os.path.join(pySide2, sharedLibraryGlobPattern())) + filtered_libs = filterPySide2SharedLibraries(glob_result) + libs = [] if sys.platform == 'win32': - libs = [] - for lib in glob.glob(os.path.join(pySide2, sharedLibraryGlobPattern())): + for lib in filtered_libs: libs.append(os.path.realpath(lib)) + else: + for lib in filtered_libs: + libs.append(lib) + return libs + +def pyside2SharedLibraries(): + libs = pyside2SharedLibrariesData() + if libs is None: + return None + + if sys.platform == 'win32': if not libs: return '' - dlls = '' for lib in libs: dll = os.path.splitext(lib)[0] + '.dll' @@ -154,10 +195,15 @@ def pyside2SharedLibraries(): return dlls else: - libs = '' - for lib in glob.glob(os.path.join(pySide2, sharedLibraryGlobPattern())): - libs += ' ' + lib - return libs + libs_string = '' + for lib in libs: + libs_string += ' ' + lib + return libs_string + +def pyside2SharedLibrariesCmake(): + libs = pyside2SharedLibrariesData() + result = ' '.join(libs) + return result def clangBinPath(): source = 'LLVM_INSTALL_DIR' @@ -207,7 +253,13 @@ if option == '--python-include' or option == '-a': print(i) if option == '--python-link' or option == '-a': - l = pythonLink() + l = pythonLinkQmake() + if l is None: + sys.exit('Unable to locate Python') + print(l) + +if option == '--python-link-cmake' or option == '-a': + l = pythonLinkCmake() if l is None: sys.exit('Unable to locate Python') print(l) @@ -215,7 +267,13 @@ if option == '--python-link' or option == '-a': if option == '--pyside2-shared-libraries' or option == '-a': l = pyside2SharedLibraries() if l is None: - sys.exit('Unable to locate the PySide sahred libraries') + sys.exit('Unable to locate the PySide2 shared libraries') + print(l) + +if option == '--pyside2-shared-libraries-cmake' or option == '-a': + l = pyside2SharedLibrariesCmake() + if l is None: + sys.exit('Unable to locate the PySide2 shared libraries') print(l) if option == '--clang-bin-dir' or option == '-a': diff --git a/examples/scriptableapplication/scriptableapplication.pro b/examples/scriptableapplication/scriptableapplication.pro index 2719160f3..9f888f6a0 100644 --- a/examples/scriptableapplication/scriptableapplication.pro +++ b/examples/scriptableapplication/scriptableapplication.pro @@ -74,11 +74,9 @@ win32:QMAKE_EXTRA_COMPILERS += hard_link_libraries INCLUDEPATH += $$WRAPPER_DIR -# fixme: Hack to find wrappers -PACKAGE_DIR = $$PWD/../../pyside_package/PySide2 - -INCLUDEPATH += $$PACKAGE_DIR/include/PySide2/QtWidgets \ - $$PACKAGE_DIR/include/PySide2/QtGui $$PACKAGE_DIR/include/PySide2/QtCore +for(i, PYSIDE2_INCLUDE) { + INCLUDEPATH += $$i/QtWidgets $$i/QtGui $$i/QtCore +} SOURCES += \ main.cpp \ @@ -42,10 +42,10 @@ from distutils.version import LooseVersion """This is a distutils setup-script for the PySide2 project -To build the PySide2, simply execute: - python setup.py build --qmake=</path/to/qt/bin/qmake> [--cmake=</path/to/cmake>] [--openssl=</path/to/openssl/bin>] +To build PySide2 simply execute: + python setup.py build --qmake=</path/to/qt/bin/qmake> [--cmake=</path/to/cmake>] [only Windows --openssl=</path/to/openssl/bin>] or - python setup.py install --qmake=</path/to/qt/bin/qmake> [--cmake=</path/to/cmake>] [--openssl=</path/to/openssl/bin>] + python setup.py install --qmake=</path/to/qt/bin/qmake> [--cmake=</path/to/cmake>] [only Windows --openssl=</path/to/openssl/bin>] to build and install into your current Python installation. On Linux and macOS you can use option --standalone, to embed Qt libraries into the PySide2 package. @@ -59,10 +59,10 @@ option is not specified. You can use option --only-package, if you want to create more binary packages (bdist_wheel, bdist_egg, ...) without rebuilding entire PySide2 every time: # First time we create bdist_wheel with full PySide2 build - python setup.py bdist_wheel --qmake=c:\Qt\4.8.5\bin\qmake.exe --cmake=c:\tools\cmake\bin\cmake.exe --openssl=c:\libs\OpenSSL32bit\bin + python setup.py bdist_wheel --qmake=c:\Qt\5.6\bin\qmake.exe --cmake=c:\tools\cmake\bin\cmake.exe --openssl=c:\libs\OpenSSL32bit\bin # Then we create bdist_egg reusing PySide2 build with option --only-package - python setup.py bdist_egg --only-package --qmake=c:\Qt\4.8.5\bin\qmake.exe --cmake=c:\tools\cmake\bin\cmake.exe --opnessl=c:\libs\OpenSSL32bit\bin + python setup.py bdist_egg --only-package --qmake=c:\Qt\5.6\bin\qmake.exe --cmake=c:\tools\cmake\bin\cmake.exe --opnessl=c:\libs\OpenSSL32bit\bin You can use the option --qt-conf-prefix to pass a path relative to the PySide2 installed package, which will be embedded into an auto-generated qt.conf registered in the Qt resource system. This @@ -81,6 +81,7 @@ For development purposes the following options might be of use, when using "setu --skip-make-install will not run make install (or equivalent) for each built module, --skip-packaging will skip creation of the python package, --ignore-git will skip the fetching and checkout steps for supermodule and all submodules. + --verbose-build will output the compiler invocation with command line arguments, etc. REQUIREMENTS: - Python: 2.6, 2.7, 3.3, 3.4, 3.5 and 3.6 are supported @@ -88,11 +89,36 @@ REQUIREMENTS: - Qt: 5.5 and 5.6 are supported. Specify the path to qmake with --qmake option or add qmake to the system path. OPTIONAL: -OpenSSL: You can specify the location of OpenSSL DLLs with option --opnessl=</path/to/openssl/bin>. - You can download OpenSSL for windows here: http://slproweb.com/products/Win32OpenSSL.html +OpenSSL: + Specifying the --openssl option is only required on Windows. It is a no-op for other platforms. + You can specify the location of OpenSSL DLLs with option --openssl=</path/to/openssl/bin>. + You can download OpenSSL for Windows here: http://slproweb.com/products/Win32OpenSSL.html + + Official Qt packages do not link to the SSL library directly, but rather try to find the library + at runtime. + + On Windows, official Qt builds will try to pick up OpenSSL libraries at application path, + system registry, or in the PATH environment variable. + On macOS, official Qt builds use SecureTransport (provided by OS) instead of OpenSSL. + On Linux, official Qt builds will try to pick up the system OpenSSL library. + + Note: this means that Qt packages that directly link to the OpenSSL shared libraries, are not + currently compatible with standalone PySide2 packages. OS X SDK: You can specify which OS X SDK should be used for compilation with the option --osx-sysroot=</path/to/sdk>. For e.g. "--osx-sysroot=/Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.11.sdk/". + +OS X Minimum deployment target: + You can specify the OS X minimum deployment target with the --osx-deployment-target=<x> option. + For example "--osx-deployment-target=10.10". + + OS X provides the ability to set what is the minimum OS version on which a binary will run. This + means that a build can be done on the latest OS X version with latest XCode and SDK versions, + but the built application / library can run on older OS versions. + + Note: if the option is not set, CMake will try to query the MACOSX_DEPLOYMENT_TARGET environment + variable, and if that is empty, it will try to deduce a value internally (afaik based on + current OS X version and on the chosen SDK version). """ __version__ = "2.0.0.dev0" @@ -101,12 +127,10 @@ containedModules = ['shiboken2', 'pyside2'] submodules = { '2.0.0.dev0': [ - ["pyside2-tools", "dev"], - ["wiki", "master", ".."], + ["pyside2-tools", "dev"] ], '5.9': [ - ["pyside2-tools", "5.9"], - ["wiki", "master", ".."] + ["pyside2-tools", "5.9"] ], '5.6': [ ["pyside2-tools", "5.6"], @@ -155,6 +179,8 @@ old_submodules = { ], } +pyside_package_dir_name = "pyside_package" + try: import setuptools except ImportError: @@ -178,6 +204,7 @@ from distutils.sysconfig import get_python_lib from distutils.spawn import find_executable from distutils.command.build import build as _build from distutils.command.build_ext import build_ext as _build_ext +from distutils.util import get_platform from setuptools import setup, Extension from setuptools.command.install import install as _install @@ -186,6 +213,14 @@ from setuptools.command.bdist_egg import bdist_egg as _bdist_egg from setuptools.command.develop import develop as _develop from setuptools.command.build_py import build_py as _build_py +wheel_module_exists = False +try: + from wheel.bdist_wheel import bdist_wheel as _bdist_wheel + from wheel.bdist_wheel import safer_name as _safer_name + wheel_module_exists = True +except ImportError: + pass + from qtinfo import QtInfo from utils import rmtree, detectClang from utils import makefile @@ -199,7 +234,8 @@ from utils import init_msvc_env from utils import regenerate_qt_resources from utils import filter_match from utils import osx_fix_rpaths_for_library -from utils import download_and_extract_7z +from utils import copy_icu_libs +from utils import find_files_using_glob from textwrap import dedent # guess a close folder name for extensions @@ -252,6 +288,7 @@ OPTION_BUILDTESTS = has_option("build-tests") OPTION_OSXARCH = option_value("osx-arch") OPTION_OSX_USE_LIBCPP = has_option("osx-use-libc++") OPTION_OSX_SYSROOT = option_value("osx-sysroot") +OPTION_OSX_DEPLOYMENT_TARGET = option_value("osx-deployment-target") OPTION_XVFB = has_option("use-xvfb") OPTION_REUSE_BUILD = has_option("reuse-build") OPTION_SKIP_CMAKE = has_option("skip-cmake") @@ -261,7 +298,13 @@ OPTION_MODULE_SUBSET = option_value("module-subset") OPTION_RPATH_VALUES = option_value("rpath") OPTION_QT_CONF_PREFIX = option_value("qt-conf-prefix") OPTION_QT_SRC = option_value("qt-src-dir") -OPTION_ICULIB = option_value("iculib-url") +OPTION_ICULIB = option_value("iculib-url") # Deprecated +OPTION_VERBOSE_BUILD = has_option("verbose-build") + +# This is used automatically by distutils.command.install object, to specify final installation +# location. +OPTION_FINAL_INSTALL_PREFIX = option_value("prefix") + if OPTION_QT_VERSION is None: OPTION_QT_VERSION = "5" @@ -325,11 +368,7 @@ else: if OPTION_ICULIB: if not OPTION_STANDALONE: - print("--iculib-url is usable only when creating standalone wheel with --standalone switch") - sys.exit(1) - if sys.platform != "linux": - print("--iculib-url is usable only when creating standalone wheels in Linux") - sys.exit(1) + print("--iculib-url option is a no-op option and will be removed soon.") # Show available versions if OPTION_LISTVERSIONS: @@ -363,6 +402,9 @@ Use --list-versions option to get list of available versions""" % OPTION_VERSION sys.exit(1) __version__ = OPTION_VERSION +def is_debug_python(): + return getattr(sys, "gettotalrefcount", None) is not None + # Return a prefix suitable for the _install/_build directory def prefix(): virtualEnvName = os.environ.get('VIRTUAL_ENV', None) @@ -370,6 +412,8 @@ def prefix(): name += str(sys.version_info[0]) if OPTION_DEBUG: name += 'd' + if is_debug_python(): + name += 'p' return name # Initialize, pull and checkout submodules @@ -432,7 +476,7 @@ def prepareBuild(): if os.path.isdir(".git") and not OPTION_IGNOREGIT and not OPTION_ONLYPACKAGE and not OPTION_REUSE_BUILD: prepareSubModules() # Clean up temp and package folders - for n in ["pyside_package", "build", "PySide2-%s" % __version__]: + for n in [pyside_package_dir_name, "build", "PySide2-%s" % __version__]: d = os.path.join(script_dir, n) if os.path.isdir(d): print("Removing %s" % d) @@ -442,7 +486,8 @@ def prepareBuild(): print('***** problem removing "{}"'.format(d)) print('ignored error: {}'.format(e)) # Prepare package folders - for pkg in ["pyside_package/PySide2", "pyside_package/pyside2uic"]: + ppdn = pyside_package_dir_name + for pkg in [os.path.join(ppdn, "PySide2"), os.path.join(ppdn, "pyside2uic")]: pkg_dir = os.path.join(script_dir, pkg) os.makedirs(pkg_dir) # locate Qt sources for the documentation @@ -456,10 +501,40 @@ def prepareBuild(): else: # SDK: Use 'Src' directory qtSrcDir = os.path.join(os.path.dirname(installPrefix), 'Src', 'qtbase') +def get_qt_version(computed_qtinfo = None): + if not computed_qtinfo: + qtinfo = QtInfo(QMAKE_COMMAND) + else: + qtinfo = computed_qtinfo + + qt_version = qtinfo.version + + if not qt_version: + log.error("Failed to query the Qt version with qmake %s" % self.qtinfo.qmake_command) + sys.exit(1) + + return qt_version + class pyside_install(_install): - def _init(self, *args, **kwargs): + def __init__(self, *args, **kwargs): _install.__init__(self, *args, **kwargs) + def initialize_options (self): + _install.initialize_options(self) + + if sys.platform == 'darwin': + # Because we change the plat_name to include a correct deployment target on macOS + # distutils thinks we are cross-compiling, and throws an exception when trying to + # execute setup.py install. + # The check looks like this + #if self.warn_dir and build_plat != get_platform(): + # raise DistutilsPlatformError("Can't install when " + # "cross-compiling") + # Obviously get_platform will return the old deployment target. + # The fix is to disable the warn_dir flag, which was created for bdist_* derived classes + # to override, for similar cases. + self.warn_dir = False + def run(self): _install.run(self) log.info('*** Install completed') @@ -490,6 +565,32 @@ class pyside_build_ext(_build_ext): def run(self): pass +if wheel_module_exists: + class pyside_build_wheel(_bdist_wheel): + def __init__(self, *args, **kwargs): + _bdist_wheel.__init__(self, *args, **kwargs) + + @property + def wheel_dist_name(self): + # Slightly modified version of wheel's wheel_dist_name method, to add the Qt version + # as well. + # Example: PySide2-5.6-5.6.4-cp27-cp27m-macosx_10_10_intel.whl + # The PySide2 version is "5.6. The built against Qt version is "5.6.4. + qt_version = get_qt_version() + wheel_version = "{}-{}".format(__version__, qt_version) + components = (_safer_name(self.distribution.get_name()), + wheel_version) + if self.build_number: + components += (self.build_number,) + return '-'.join(components) + + def finalize_options(self): + if sys.platform == 'darwin': + # Override the platform name to contain the correct minimum deployment target. + # This is used in the final wheel name. + self.plat_name = pyside_build.macos_plat_name() + _bdist_wheel.finalize_options(self) + # pyside_build_py and pyside_install_lib are reimplemented to preserve symlinks when # distutils / setuptools copy files to various directories through the different build stages. class pyside_build_py(_build_py): @@ -529,6 +630,22 @@ class pyside_build(_build): def __init__(self, *args, **kwargs): _build.__init__(self, *args, **kwargs) + def finalize_options(self): + os_name_backup = os.name + if sys.platform == 'darwin': + self.plat_name = pyside_build.macos_plat_name() + # This is a hack to circumvent the dubious check in distutils.commands.build -> + # finalize_options, which only allows setting the plat_name for windows NT. + # That is not the case for the wheel module though (which does allow setting plat_name), + # so we circumvent by faking the os name when finalizing the options, and then restoring + # the original os name. + os.name = "nt" + + _build.finalize_options(self) + + if sys.platform == 'darwin': + os.name = os_name_backup + def initialize_options(self): _build.initialize_options(self) self.make_path = None @@ -708,10 +825,7 @@ class pyside_build(_build): self.qtinfo = QtInfo(QMAKE_COMMAND) qt_dir = os.path.dirname(OPTION_QMAKE) - qt_version = self.qtinfo.version - if not qt_version: - log.error("Failed to query the Qt version with qmake %s" % self.qtinfo.qmake_command) - sys.exit(1) + qt_version = get_qt_version(self.qtinfo) # Update the PATH environment variable additionalPaths = [py_scripts_dir, qt_dir] @@ -748,6 +862,7 @@ class pyside_build(_build): self.make_generator = make_generator self.debug = OPTION_DEBUG self.script_dir = script_dir + self.pyside_package_dir = os.path.join(self.script_dir, pyside_package_dir_name) self.sources_dir = sources_dir self.build_dir = build_dir self.install_dir = install_dir @@ -759,6 +874,13 @@ class pyside_build(_build): self.site_packages_dir = get_python_lib(1, 0, prefix=install_dir) self.build_tests = OPTION_BUILDTESTS + setuptools_install_prefix = get_python_lib(1) + if OPTION_FINAL_INSTALL_PREFIX: + setuptools_install_prefix = OPTION_FINAL_INSTALL_PREFIX + + # Save the shiboken build dir path for clang deployment purposes. + self.shiboken_build_dir = os.path.join(self.build_dir, "shiboken2") + log.info("=" * 30) log.info("Package version: %s" % __version__) log.info("Build type: %s" % self.build_type) @@ -768,11 +890,27 @@ class pyside_build(_build): log.info("Make generator: %s" % self.make_generator) log.info("Make jobs: %s" % OPTION_JOBS) log.info("-" * 3) + log.info("Script directory: %s" % self.script_dir) log.info("Sources directory: %s" % self.sources_dir) - log.info("Build directory: %s" % self.build_dir) - log.info("Install directory: %s" % self.install_dir) - log.info("Python site-packages install directory: %s" % self.site_packages_dir) + + log.info(dedent(""" + Building PySide2 will create and touch directories in the following order: + make build directory (py*_build/*/*) -> + make install directory (py*_install/*/*) -> + {} directory (pyside_package/*) -> + setuptools build directory (build/*/*) -> + setuptools install directory (usually path-installed-python/lib/python*/site-packages/*) + """).format(pyside_package_dir_name)) + + log.info("make build directory: %s" % self.build_dir) + log.info("make install directory: %s" % self.install_dir) + log.info("%s directory: %s" % (pyside_package_dir_name, self.pyside_package_dir)) + log.info("setuptools build directory: %s" % os.path.join(self.script_dir, "build")) + log.info("setuptools install directory: %s" % setuptools_install_prefix) + log.info("make-installed site-packages directory: %s \n" + " (only relevant for copying files from 'make install directory' " + "to '%s directory'" % (self.site_packages_dir, pyside_package_dir_name)) log.info("-" * 3) log.info("Python executable: %s" % self.py_executable) log.info("Python includes: %s" % self.py_include_dir) @@ -786,7 +924,8 @@ class pyside_build(_build): log.info("Qt docs: %s" % self.qtinfo.docs_dir) log.info("Qt plugins: %s" % self.qtinfo.plugins_dir) log.info("-" * 3) - log.info("OpenSSL libs: %s" % OPTION_OPENSSL) + if sys.platform == 'win32': + log.info("OpenSSL dll directory: %s" % OPTION_OPENSSL) log.info("=" * 30) # Prepare folders @@ -830,6 +969,26 @@ class pyside_build(_build): log.info("Skipped preparing and building packages.") log.info('*** Build completed') + @staticmethod + def macos_min_deployment_target(): + # If no explicit minimum deployment target is provided to setup.py, then use the current + # build OS version. Otherwise use the provided version. + current_os_version, _, _ = platform.mac_ver() + current_os_version = '.'.join(current_os_version.split('.')[:2]) + deployment_target = current_os_version + if OPTION_OSX_DEPLOYMENT_TARGET: + deployment_target = OPTION_OSX_DEPLOYMENT_TARGET + + return deployment_target + + @staticmethod + def macos_plat_name(): + deployment_target = pyside_build.macos_min_deployment_target() + # Example triple "macosx-10.12-x86_64". + plat = get_platform().split("-") + plat_name = "{}-{}-{}".format(plat[0], deployment_target, plat[2]) + return plat_name + def build_patchelf(self): if not sys.platform.startswith('linux'): return @@ -906,6 +1065,9 @@ class pyside_build(_build): if self.build_type.lower() == 'debug': cmake_cmd.append("-DPYTHON_DEBUG_LIBRARY=%s" % self.py_library) + if OPTION_VERBOSE_BUILD: + cmake_cmd.append("-DCMAKE_VERBOSE_MAKEFILE:BOOL=ON") + if extension.lower() == "pyside2": pyside_qt_conf_prefix = '' if OPTION_QT_CONF_PREFIX: @@ -944,6 +1106,14 @@ class pyside_build(_build): latest_sdk_path = latest_sdk_path[0] cmake_cmd.append("-DCMAKE_OSX_SYSROOT={0}".format(latest_sdk_path)) + # Set macOS minimum deployment target (version). + # This is required so that calling run_process -> distutils.spawn() does not + # set its own minimum deployment target environment variable which is + # based on the python interpreter sysconfig value. Doing so could break the + # detected clang include paths for example. + deployment_target = pyside_build.macos_min_deployment_target() + cmake_cmd.append("-DCMAKE_OSX_DEPLOYMENT_TARGET={0}".format(deployment_target)) + os.environ['MACOSX_DEPLOYMENT_TARGET'] = deployment_target if not OPTION_SKIP_CMAKE: log.info("Configuring module %s (%s)..." % (extension, module_src_dir)) @@ -991,7 +1161,7 @@ class pyside_build(_build): "install_dir": self.install_dir, "build_dir": self.build_dir, "script_dir": self.script_dir, - "dist_dir": os.path.join(self.script_dir, 'pyside_package'), + "pyside_package_dir": self.pyside_package_dir, "ssl_libs_dir": OPTION_OPENSSL, "py_version": self.py_version, "qt_version": self.qtinfo.version, @@ -1016,38 +1186,36 @@ class pyside_build(_build): print('setup.py/prepare_packages: ', e) raise - def get_built_pyside_modules(self, vars): - # Get list of built modules, so that we copy only required Qt libraries. - pyside_package_dir = vars['dist_dir'] - built_modules_path = os.path.join(pyside_package_dir, "PySide2", "_built_modules.py") + def get_built_pyside_config(self, vars): + # Get config that contains list of built modules, and SOVERSIONs of the built libraries. + pyside_package_dir = vars['pyside_package_dir'] + config_path = os.path.join(pyside_package_dir, "PySide2", "_config.py") try: - with open(built_modules_path) as f: + with open(config_path) as f: scoped_locals = {} - code = compile(f.read(), built_modules_path, 'exec') + code = compile(f.read(), config_path, 'exec') exec(code, scoped_locals, scoped_locals) - return scoped_locals['built_modules'] + config = {} + config['built_modules'] = scoped_locals['built_modules'] + config['shiboken_library_soversion'] = scoped_locals['shiboken_library_soversion'] + config['pyside_library_soversion'] = scoped_locals['pyside_library_soversion'] + return config except IOError as e: - print("get_built_pyside_modules: Couldn't find file: {}.".format(built_modules_path)) + print("get_built_pyside_config: Couldn't find file: {}.".format(config_path)) raise def prepare_packages_posix(self, vars): executables = [] - if sys.platform.startswith('linux'): - so_ext = '.so' - so_star = so_ext + '*' - elif sys.platform == 'darwin': - so_ext = '.dylib' - so_star = so_ext # <build>/shiboken2/doc/html/* -> <setup>/PySide2/docs/shiboken2 copydir( "{build_dir}/shiboken2/doc/html", - "{dist_dir}/PySide2/docs/shiboken2", + "{pyside_package_dir}/PySide2/docs/shiboken2", force=False, vars=vars) # <install>/lib/site-packages/PySide2/* -> <setup>/PySide2 copydir( "{site_packages_dir}/PySide2", - "{dist_dir}/PySide2", + "{pyside_package_dir}/PySide2", vars=vars) # <install>/lib/site-packages/shiboken2.so -> <setup>/PySide2/shiboken2.so shiboken_module_name = 'shiboken2.so' @@ -1059,29 +1227,29 @@ class pyside_build(_build): vars.update({'shiboken_module_name': shiboken_module_name}) copyfile( "{site_packages_dir}/{shiboken_module_name}", - "{dist_dir}/PySide2/{shiboken_module_name}", + "{pyside_package_dir}/PySide2/{shiboken_module_name}", vars=vars) # <install>/lib/site-packages/pyside2uic/* -> <setup>/pyside2uic copydir( "{site_packages_dir}/pyside2uic", - "{dist_dir}/pyside2uic", + "{pyside_package_dir}/pyside2uic", force=False, vars=vars) if sys.version_info[0] > 2: - rmtree("{dist_dir}/pyside2uic/port_v2".format(**vars)) + rmtree("{pyside_package_dir}/pyside2uic/port_v2".format(**vars)) else: - rmtree("{dist_dir}/pyside2uic/port_v3".format(**vars)) + rmtree("{pyside_package_dir}/pyside2uic/port_v3".format(**vars)) # <install>/bin/pyside2-uic -> PySide2/scripts/uic.py makefile( - "{dist_dir}/PySide2/scripts/__init__.py", + "{pyside_package_dir}/PySide2/scripts/__init__.py", vars=vars) copyfile( "{install_dir}/bin/pyside2-uic", - "{dist_dir}/PySide2/scripts/uic.py", + "{pyside_package_dir}/PySide2/scripts/uic.py", force=False, vars=vars) # <install>/bin/* -> PySide2/ executables.extend(copydir( "{install_dir}/bin/", - "{dist_dir}/PySide2", + "{pyside_package_dir}/PySide2", filter=[ "pyside2-lupdate", "pyside2-rcc", @@ -1089,52 +1257,63 @@ class pyside_build(_build): ], recursive=False, vars=vars)) # <install>/lib/lib* -> PySide2/ + config = self.get_built_pyside_config(vars) + def adjusted_lib_name(name, version): + postfix = '' + if sys.platform.startswith('linux'): + postfix = '.so.' + version + elif sys.platform == 'darwin': + postfix = '.' + version + '.dylib' + return name + postfix copydir( "{install_dir}/lib/", - "{dist_dir}/PySide2", + "{pyside_package_dir}/PySide2", filter=[ - "libpyside*" + so_star, - "libshiboken*" + so_star, + adjusted_lib_name("libpyside*", config['pyside_library_soversion']), + adjusted_lib_name("libshiboken*", config['shiboken_library_soversion']), ], - recursive=False, vars=vars) + recursive=False, vars=vars, force_copy_symlinks=True) # <install>/share/PySide2/typesystems/* -> <setup>/PySide2/typesystems copydir( "{install_dir}/share/PySide2/typesystems", - "{dist_dir}/PySide2/typesystems", + "{pyside_package_dir}/PySide2/typesystems", vars=vars) # <install>/include/* -> <setup>/PySide2/include copydir( "{install_dir}/include", - "{dist_dir}/PySide2/include", + "{pyside_package_dir}/PySide2/include", vars=vars) # <source>/pyside2/PySide2/support/* -> <setup>/PySide2/support/* copydir( "{build_dir}/pyside2/PySide2/support", - "{dist_dir}/PySide2/support", + "{pyside_package_dir}/PySide2/support", vars=vars) if not OPTION_NOEXAMPLES: # examples/* -> <setup>/PySide2/examples copydir(os.path.join(self.script_dir, "examples"), - "{dist_dir}/PySide2/examples", + "{pyside_package_dir}/PySide2/examples", force=False, vars=vars) # Re-generate examples Qt resource files for Python 3 compatibility if sys.version_info[0] == 3: - examples_path = "{dist_dir}/PySide2/examples".format(**vars) + examples_path = "{pyside_package_dir}/PySide2/examples".format(**vars) pyside_rcc_path = "{install_dir}/bin/pyside2-rcc".format(**vars) pyside_rcc_options = '-py3' regenerate_qt_resources(examples_path, pyside_rcc_path, pyside_rcc_options) # Copy Qt libs to package if OPTION_STANDALONE: - vars['built_modules'] = self.get_built_pyside_modules(vars) + vars['built_modules'] = config['built_modules'] if sys.platform == 'darwin': self.prepare_standalone_package_osx(executables, vars) else: self.prepare_standalone_package_linux(executables, vars) + # Copy over clang before rpath patching. + self.prepare_standalone_clang(is_win=False) + # Update rpath to $ORIGIN if sys.platform.startswith('linux') or sys.platform.startswith('darwin'): - self.update_rpath("{dist_dir}/PySide2".format(**vars), executables) + self.update_rpath("{pyside_package_dir}/PySide2".format(**vars), executables) def qt_is_framework_build(self): if os.path.isdir(self.qtinfo.headers_dir + "/../lib/QtCore.framework"): @@ -1144,68 +1323,46 @@ class pyside_build(_build): def prepare_standalone_package_linux(self, executables, vars): built_modules = vars['built_modules'] - def _print_warn(): - print(dedent("""\ - *********************************************************** - If one is using Qt binaries provided by QtCompany's CI, - those aren't working as expected! - *********************************************************** - """)) - - # To get working QtCompany Qt CI binaries we have to extract the ICU libs - # If no link provided we'll use the libs from qt-project - icuUrl = "" - if OPTION_ICULIB: - icuUrl = OPTION_ICULIB - else: - qt_version = self.qtinfo.version - url_pre = "http://master.qt.io/development_releases/prebuilt/icu/prebuilt/" - if qt_version.startswith("5.6"): - icuUrl = url_pre + "56.1/icu-linux-g++-Rhel6.6-x64.7z" - else: - icuUrl = url_pre + "56.1/icu-linux-g++-Rhel7.2-x64.7z" - - if find_executable("7z"): - try: - download_and_extract_7z(icuUrl, "{qt_lib_dir}".format(**vars)) - except RuntimeError as e: - # The Qt libs now requires patching to system ICU - # OR it is possible that Qt was built without ICU and - # Works as such - print("Failed to download and extract %s" % icuUrl) - print(str(e)) - _print_warn() - else: - print("Install 7z into PATH to extract ICU libs") - _print_warn() - # <qt>/lib/* -> <setup>/PySide2/Qt/lib - copydir("{qt_lib_dir}", "{dist_dir}/PySide2/Qt/lib", + destination_lib_dir = "{pyside_package_dir}/PySide2/Qt/lib" + copydir("{qt_lib_dir}", destination_lib_dir, filter=[ "libQt5*.so.?", "libicu*.so.??", ], recursive=False, vars=vars, force_copy_symlinks=True) + # Check if ICU libraries were copied over to the destination Qt libdir. + resolved_destination_lib_dir = destination_lib_dir.format(**vars) + maybe_icu_libs = find_files_using_glob(resolved_destination_lib_dir, "libicu*") + + # If no ICU libraries are present in the Qt libdir (like when Qt is built against system + # ICU, or in the Coin CI where ICU libs are in a different directory) try to + # find out / resolve which ICU libs are used by QtCore (if used at all) using a custom + # written ldd, and copy the ICU libs to the Pyside Qt dir if necessary. We choose the QtCore + # lib to inspect, by checking which QtCore library the shiboken2 executable uses. + if not maybe_icu_libs: + copy_icu_libs(resolved_destination_lib_dir) + if 'WebEngineWidgets' in built_modules: - copydir("{qt_lib_execs_dir}", "{dist_dir}/PySide2/Qt/libexec", + copydir("{qt_lib_execs_dir}", "{pyside_package_dir}/PySide2/Qt/libexec", filter=None, recursive=False, vars=vars) - copydir("{qt_prefix_dir}/resources", "{dist_dir}/PySide2/Qt/resources", + copydir("{qt_prefix_dir}/resources", "{pyside_package_dir}/PySide2/Qt/resources", filter=None, recursive=False, vars=vars) # <qt>/plugins/* -> <setup>/PySide2/Qt/plugins - copydir("{qt_plugins_dir}", "{dist_dir}/PySide2/Qt/plugins", + copydir("{qt_plugins_dir}", "{pyside_package_dir}/PySide2/Qt/plugins", filter=["*.so"], recursive=True, vars=vars) # <qt>/qml/* -> <setup>/PySide2/Qt/qml - copydir("{qt_qml_dir}", "{dist_dir}/PySide2/Qt/qml", + copydir("{qt_qml_dir}", "{pyside_package_dir}/PySide2/Qt/qml", filter=None, force=False, recursive=True, @@ -1213,7 +1370,7 @@ class pyside_build(_build): # <qt>/translations/* -> <setup>/PySide2/Qt/translations - copydir("{qt_translations_dir}", "{dist_dir}/PySide2/Qt/translations", + copydir("{qt_translations_dir}", "{pyside_package_dir}/PySide2/Qt/translations", filter=["*.qm"], force=False, vars=vars) @@ -1233,14 +1390,8 @@ class pyside_build(_build): def framework_dir_filter(dir_name, parent_full_path, dir_full_path): if '.framework' in dir_name: - if dir_name in ['QtWebEngine.framework', 'QtWebEngineCore.framework', \ - 'QtPositioning.framework', 'QtLocation.framework'] and \ - 'QtWebEngineWidgets.framework' in framework_built_modules: - return True - if dir_name in ['QtCLucene.framework'] and \ - 'QtHelp.framework' in framework_built_modules: - return True - if dir_name not in framework_built_modules: + if dir_name.startswith('QtWebEngine') and \ + 'QtWebEngineWidgets.framework' not in framework_built_modules: return False if dir_name in ['Headers', 'fonts']: return False @@ -1252,41 +1403,55 @@ class pyside_build(_build): return False return general_dir_filter(dir_name, parent_full_path, dir_full_path) - copydir("{qt_lib_dir}", "{dist_dir}/PySide2/Qt/lib", + copydir("{qt_lib_dir}", "{pyside_package_dir}/PySide2/Qt/lib", recursive=True, vars=vars, ignore=["*.la", "*.a", "*.cmake", "*.pc", "*.prl"], dir_filter_function=framework_dir_filter) - else: - if 'WebEngineWidgets' in built_modules: - built_modules.extend(['WebEngine', 'WebEngineCore', 'Positioning', 'Location']) - if 'Help' in built_modules: - built_modules.extend(['CLucene']) - prefixed_built_modules = ['*Qt5' + name + '*.dylib' for name in built_modules] - copydir("{qt_lib_dir}", "{dist_dir}/PySide2/Qt/lib", - filter=prefixed_built_modules, - recursive=True, vars=vars) + # Fix rpath for WebEngine process executable. The already present rpath does not work + # because it assumes a symlink from Versions/5/Helpers, thus adding two more levels of + # directory hierarchy. + if 'QtWebEngineWidgets.framework' in framework_built_modules: + qt_lib_path = "{pyside_package_dir}/PySide2/Qt/lib".format(**vars) + bundle = "QtWebEngineCore.framework/Helpers/QtWebEngineProcess.app" + binary = "Contents/MacOS/QtWebEngineProcess" + webengine_process_path = os.path.join(bundle, binary) + final_path = os.path.join(qt_lib_path, webengine_process_path) + rpath = "@loader_path/../../../../../" + osx_fix_rpaths_for_library(final_path, rpath) + else: + ignored_modules = [] + if 'WebEngineWidgets' not in built_modules: + ignored_modules.extend(['libQt5WebEngine*.dylib']) + if 'WebKit' not in built_modules: + ignored_modules.extend(['libQt5WebKit*.dylib']) + accepted_modules = ['libQt5*.5.dylib'] + + copydir("{qt_lib_dir}", "{pyside_package_dir}/PySide2/Qt/lib", + filter=accepted_modules, + ignore=ignored_modules, + recursive=True, vars=vars, force_copy_symlinks=True) if 'WebEngineWidgets' in built_modules: - copydir("{qt_lib_execs_dir}", "{dist_dir}/PySide2/Qt/libexec", + copydir("{qt_lib_execs_dir}", "{pyside_package_dir}/PySide2/Qt/libexec", filter=None, recursive=False, vars=vars) - copydir("{qt_prefix_dir}/resources", "{dist_dir}/PySide2/Qt/resources", + copydir("{qt_prefix_dir}/resources", "{pyside_package_dir}/PySide2/Qt/resources", filter=None, recursive=False, vars=vars) # <qt>/plugins/* -> <setup>/PySide2/Qt/plugins - copydir("{qt_plugins_dir}", "{dist_dir}/PySide2/Qt/plugins", + copydir("{qt_plugins_dir}", "{pyside_package_dir}/PySide2/Qt/plugins", filter=["*.dylib"], recursive=True, dir_filter_function=general_dir_filter, vars=vars) # <qt>/qml/* -> <setup>/PySide2/Qt/qml - copydir("{qt_qml_dir}", "{dist_dir}/PySide2/Qt/qml", + copydir("{qt_qml_dir}", "{pyside_package_dir}/PySide2/Qt/qml", filter=None, recursive=True, force=False, @@ -1294,7 +1459,7 @@ class pyside_build(_build): vars=vars) # <qt>/translations/* -> <setup>/PySide2/Qt/translations - copydir("{qt_translations_dir}", "{dist_dir}/PySide2/Qt/translations", + copydir("{qt_translations_dir}", "{pyside_package_dir}/PySide2/Qt/translations", filter=["*.qm"], force=False, vars=vars) @@ -1304,21 +1469,21 @@ class pyside_build(_build): # <install>/lib/site-packages/PySide2/* -> <setup>/PySide2 copydir( "{site_packages_dir}/PySide2", - "{dist_dir}/PySide2", + "{pyside_package_dir}/PySide2", vars=vars) - built_modules = self.get_built_pyside_modules(vars) + built_modules = self.get_built_pyside_config(vars)['built_modules'] if self.debug or self.build_type == 'RelWithDebInfo': # <build>/pyside2/PySide2/*.pdb -> <setup>/PySide2 copydir( "{build_dir}/pyside2/PySide2", - "{dist_dir}/PySide2", + "{pyside_package_dir}/PySide2", filter=pdbs, recursive=False, vars=vars) # <build>/shiboken2/doc/html/* -> <setup>/PySide2/docs/shiboken2 copydir( "{build_dir}/shiboken2/doc/html", - "{dist_dir}/PySide2/docs/shiboken2", + "{pyside_package_dir}/PySide2/docs/shiboken2", force=False, vars=vars) # <install>/lib/site-packages/shiboken2.pyd -> <setup>/PySide2/shiboken2.pyd shiboken_module_name = 'shiboken2.pyd' @@ -1330,79 +1495,79 @@ class pyside_build(_build): vars.update({'shiboken_module_name': shiboken_module_name}) copyfile( "{site_packages_dir}/{shiboken_module_name}", - "{dist_dir}/PySide2/{shiboken_module_name}", + "{pyside_package_dir}/PySide2/{shiboken_module_name}", vars=vars) if self.debug or self.build_type == 'RelWithDebInfo': copydir( "{build_dir}/shiboken2/shibokenmodule", - "{dist_dir}/PySide2", + "{pyside_package_dir}/PySide2", filter=pdbs, recursive=False, vars=vars) # <install>/lib/site-packages/pyside2uic/* -> <setup>/pyside2uic copydir( "{site_packages_dir}/pyside2uic", - "{dist_dir}/pyside2uic", + "{pyside_package_dir}/pyside2uic", force=False, vars=vars) if sys.version_info[0] > 2: - rmtree("{dist_dir}/pyside2uic/port_v2".format(**vars)) + rmtree("{pyside_package_dir}/pyside2uic/port_v2".format(**vars)) else: - rmtree("{dist_dir}/pyside2uic/port_v3".format(**vars)) + rmtree("{pyside_package_dir}/pyside2uic/port_v3".format(**vars)) # <install>/bin/pyside2-uic -> PySide2/scripts/uic.py makefile( - "{dist_dir}/PySide2/scripts/__init__.py", + "{pyside_package_dir}/PySide2/scripts/__init__.py", vars=vars) copyfile( "{install_dir}/bin/pyside2-uic", - "{dist_dir}/PySide2/scripts/uic.py", + "{pyside_package_dir}/PySide2/scripts/uic.py", force=False, vars=vars) # <install>/bin/*.exe,*.dll,*.pdb -> PySide2/ copydir( "{install_dir}/bin/", - "{dist_dir}/PySide2", + "{pyside_package_dir}/PySide2", filter=["*.exe", "*.dll"] + pdbs, recursive=False, vars=vars) # <install>/lib/*.lib -> PySide2/ copydir( "{install_dir}/lib/", - "{dist_dir}/PySide2", + "{pyside_package_dir}/PySide2", filter=["*.lib"], recursive=False, vars=vars) # <install>/share/PySide2/typesystems/* -> <setup>/PySide2/typesystems copydir( "{install_dir}/share/PySide2/typesystems", - "{dist_dir}/PySide2/typesystems", + "{pyside_package_dir}/PySide2/typesystems", vars=vars) # <install>/include/* -> <setup>/PySide2/include copydir( "{install_dir}/include", - "{dist_dir}/PySide2/include", + "{pyside_package_dir}/PySide2/include", vars=vars) # <source>/pyside2/PySide2/support/* -> <setup>/PySide2/support/* copydir( "{build_dir}/pyside2/PySide2/support", - "{dist_dir}/PySide2/support", + "{pyside_package_dir}/PySide2/support", vars=vars) if not OPTION_NOEXAMPLES: # examples/* -> <setup>/PySide2/examples copydir(os.path.join(self.script_dir, "examples"), - "{dist_dir}/PySide2/examples", + "{pyside_package_dir}/PySide2/examples", force=False, vars=vars) # Re-generate examples Qt resource files for Python 3 compatibility if sys.version_info[0] == 3: - examples_path = "{dist_dir}/PySide2/examples".format(**vars) + examples_path = "{pyside_package_dir}/PySide2/examples".format(**vars) pyside_rcc_path = "{install_dir}/bin/pyside2-rcc".format(**vars) pyside_rcc_options = '-py3' regenerate_qt_resources(examples_path, pyside_rcc_path, pyside_rcc_options) # <ssl_libs>/* -> <setup>/PySide2/openssl - copydir("{ssl_libs_dir}", "{dist_dir}/PySide2/openssl", + copydir("{ssl_libs_dir}", "{pyside_package_dir}/PySide2/openssl", filter=[ "libeay32.dll", "ssleay32.dll"], force=False, vars=vars) # <qt>/bin/*.dll -> <setup>/PySide2 - copydir("{qt_bin_dir}", "{dist_dir}/PySide2", + copydir("{qt_bin_dir}", "{pyside_package_dir}/PySide2", filter=[ "*.dll", "designer.exe", @@ -1414,61 +1579,63 @@ class pyside_build(_build): recursive=False, vars=vars) if self.debug: # <qt>/bin/*d4.dll -> <setup>/PySide2 - copydir("{qt_bin_dir}", "{dist_dir}/PySide2", + copydir("{qt_bin_dir}", "{pyside_package_dir}/PySide2", filter=["*d4.dll"] + pdbs, recursive=False, vars=vars) if self.debug or self.build_type == 'RelWithDebInfo': # <qt>/lib/*.pdb -> <setup>/PySide2 - copydir("{qt_lib_dir}", "{dist_dir}/PySide2", + copydir("{qt_lib_dir}", "{pyside_package_dir}/PySide2", filter=["*.pdb"], recursive=False, vars=vars) # I think these are the qt-mobility DLLs, at least some are, # so let's copy them too # <qt>/lib/*.dll -> <setup>/PySide2 - copydir("{qt_lib_dir}", "{dist_dir}/PySide2", + copydir("{qt_lib_dir}", "{pyside_package_dir}/PySide2", filter=["*.dll"], ignore=["*d?.dll"], recursive=False, vars=vars) if self.debug: # <qt>/lib/*d4.dll -> <setup>/PySide2 - copydir("{qt_lib_dir}", "{dist_dir}/PySide2", + copydir("{qt_lib_dir}", "{pyside_package_dir}/PySide2", filter=["*d?.dll"], recursive=False, vars=vars) if self.debug or self.build_type == 'RelWithDebInfo': # <qt>/lib/*pdb -> <setup>/PySide2 - copydir("{qt_lib_dir}", "{dist_dir}/PySide2", + copydir("{qt_lib_dir}", "{pyside_package_dir}/PySide2", filter=pdbs, recursive=False, vars=vars) # <qt>/plugins/* -> <setup>/PySide2/plugins - copydir("{qt_plugins_dir}", "{dist_dir}/PySide2/plugins", + copydir("{qt_plugins_dir}", "{pyside_package_dir}/PySide2/plugins", filter=["*.dll"] + pdbs, vars=vars) # <qt>/translations/* -> <setup>/PySide2/translations - copydir("{qt_translations_dir}", "{dist_dir}/PySide2/translations", + copydir("{qt_translations_dir}", "{pyside_package_dir}/PySide2/translations", filter=["*.qm"], force=False, vars=vars) # <qt>/qml/* -> <setup>/PySide2/qml - copydir("{qt_qml_dir}", "{dist_dir}/PySide2/qml", + copydir("{qt_qml_dir}", "{pyside_package_dir}/PySide2/qml", filter=None, force=False, recursive=True, vars=vars) if 'WebEngineWidgets' in built_modules: - copydir("{qt_prefix_dir}/resources", "{dist_dir}/PySide2/resources", + copydir("{qt_prefix_dir}/resources", "{pyside_package_dir}/PySide2/resources", filter=None, recursive=False, vars=vars) - copydir("{qt_bin_dir}", "{dist_dir}/PySide2", + copydir("{qt_bin_dir}", "{pyside_package_dir}/PySide2", filter=["QtWebEngineProcess*.exe"], recursive=False, vars=vars) + self.prepare_standalone_clang(is_win=True) + # pdb files for libshiboken and libpyside if self.debug or self.build_type == 'RelWithDebInfo': # XXX dbgPostfix gives problems - the structure in shiboken2/data should be re-written! @@ -1479,15 +1646,65 @@ class pyside_build(_build): # @TODO Change the shared library name on Windows. copydir( "{build_dir}/shiboken2/libshiboken", - "{dist_dir}/PySide2", + "{pyside_package_dir}/PySide2", filter=pdbs, recursive=False, vars=vars) copydir( "{build_dir}/pyside2/libpyside", - "{dist_dir}/PySide2", + "{pyside_package_dir}/PySide2", filter=pdbs, recursive=False, vars=vars) + def prepare_standalone_clang(self, is_win = False): + """ Copies the libclang library to the pyside package so that shiboken exceutable works. """ + log.info('Finding path to the libclang shared library.') + cmake_cmd = [ + OPTION_CMAKE, + "-L", # Lists variables + "-N", # Just inspects the cache (faster) + "--build", # Specifies the build dir + self.shiboken_build_dir + ] + out = run_process_output(cmake_cmd) + lines = [s.strip() for s in out] + pattern = re.compile(r"CLANG_LIBRARY:FILEPATH=(.+)$") + + clang_lib_path = None + for line in lines: + match = pattern.search(line) + if match: + clang_lib_path = match.group(1) + break + + if not clang_lib_path: + raise RuntimeError("Could not finding location of libclang library from CMake cache.") + + if is_win: + # clang_lib_path points to the static import library (lib/libclang.lib), whereas we want + # to copy the shared library (bin/libclang.dll). + clang_lib_path = re.sub(r'lib/libclang.lib$', 'bin/libclang.dll', clang_lib_path) + + # Path to directory containing clang. + clang_lib_dir = os.path.dirname(clang_lib_path) + + # The name of the clang file found by CMake. + basename = os.path.basename(clang_lib_path) + + # We want to copy the library and all the symlinks for now, thus the wildcard. + clang_filter = basename + "*" + + # Destination is the package folder near the other extension modules. + destination_dir = "{}/PySide2".format(os.path.join(self.script_dir, 'pyside_package')) + if os.path.exists(clang_lib_path): + log.info('Copying libclang shared library to the pyside package.') + + copydir(clang_lib_dir, destination_dir, + filter=[clang_filter], + recursive=False) + else: + raise RuntimeError("Error copying libclang library " + "from {} to {}. ".format(clang_lib_path, destination_dir)) + def update_rpath(self, package_path, executables): if sys.platform.startswith('linux'): pyside_libs = [lib for lib in os.listdir(package_path) if filter_match( @@ -1552,6 +1769,18 @@ except IOError: README = CHANGES = '' +cmd_class_dict = { + 'build': pyside_build, + 'build_py': pyside_build_py, + 'build_ext': pyside_build_ext, + 'bdist_egg': pyside_bdist_egg, + 'develop': pyside_develop, + 'install': pyside_install, + 'install_lib': pyside_install_lib +} +if wheel_module_exists: + cmd_class_dict['bdist_wheel'] = pyside_build_wheel + setup( name = "PySide2", version = __version__, @@ -1596,7 +1825,7 @@ setup( packages = ['PySide2', 'pyside2uic', 'pyside2uic.Compiler', 'pyside2uic.port_v%s' % (sys.version_info[0]) ], - package_dir = {'': 'pyside_package'}, + package_dir = {'': pyside_package_dir_name}, include_package_data = True, zip_safe = False, entry_points = { @@ -1604,16 +1833,7 @@ setup( 'pyside2-uic = PySide2.scripts.uic:main', ] }, - cmdclass = { - 'build': pyside_build, - 'build_py': pyside_build_py, - 'build_ext': pyside_build_ext, - 'bdist_egg': pyside_bdist_egg, - 'develop': pyside_develop, - 'install': pyside_install, - 'install_lib': pyside_install_lib - }, - + cmdclass = cmd_class_dict, # Add a bogus extension module (will never be built here since we are # overriding the build command to do it using cmake) so things like # bdist_egg will know that there are extension modules and will name the diff --git a/sources/pyside2/CMakeLists.txt b/sources/pyside2/CMakeLists.txt index bfd8eb5be..b16bcb55e 100644 --- a/sources/pyside2/CMakeLists.txt +++ b/sources/pyside2/CMakeLists.txt @@ -167,6 +167,7 @@ set(BINDING_API_MICRO_VERSION "0") set(BINDING_API_RELEASE_LEVEL "alpha") # alpha, beta, rc, or final set(BINDING_API_SERIAL 0) # leave as 0 when release level is final set(BINDING_API_VERSION "${BINDING_API_MAJOR_VERSION}.${BINDING_API_MINOR_VERSION}.${BINDING_API_MICRO_VERSION}" CACHE STRING "PySide version" FORCE) +set(PYSIDE_SO_VERSION ${BINDING_API_MAJOR_VERSION}.${BINDING_API_MINOR_VERSION}) if (BINDING_API_RELEASE_LEVEL STREQUAL "final") set(BINDING_API_VERSION_FULL "${BINDING_API_MAJOR_VERSION}.${BINDING_API_MINOR_VERSION}.${BINDING_API_MICRO_VERSION}" CACHE STRING "PySide version [full]" FORCE) @@ -221,15 +222,38 @@ if(GIT_FOUND) endif() endif() +# Used by setup.py to know which symlink to resolve and copy in to the final package, in order to +# avoid resolving all symlinks and thus copying unnecessary duplicate files. +set(config_py_shiboken_library_version "") +set(config_py_pyside_library_version "") + 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") + # _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") - get_filename_component(_qt_dir ${QT_INCLUDE_DIR} DIRECTORY) - get_filename_component(_module_dir "${${_name_dir}}/../../../" ABSOLUTE) + # 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") @@ -243,7 +267,9 @@ macro(COLLECT_MODULE_IF_FOUND shortname) set(module_state "essential") endif() - if(${${_name_found}} AND ${_qt_dir} STREQUAL ${_module_dir}) + # 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}) @@ -290,6 +316,9 @@ 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 AND Qt5Core_VERSION VERSION_LESS 5.10.0) # 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) diff --git a/sources/pyside2/PySide2/CMakeLists.txt b/sources/pyside2/PySide2/CMakeLists.txt index d868e3172..21db337e9 100644 --- a/sources/pyside2/PySide2/CMakeLists.txt +++ b/sources/pyside2/PySide2/CMakeLists.txt @@ -7,11 +7,8 @@ configure_file("${CMAKE_CURRENT_SOURCE_DIR}/global.h.in" configure_file("${CMAKE_CURRENT_SOURCE_DIR}/__init__.py.in" "${CMAKE_CURRENT_BINARY_DIR}/__init__.py" @ONLY) -configure_file("${CMAKE_CURRENT_SOURCE_DIR}/_built_modules.py.in" - "${CMAKE_CURRENT_BINARY_DIR}/_built_modules.py" @ONLY) - -configure_file("${CMAKE_CURRENT_SOURCE_DIR}/_utils.py.in" - "${CMAKE_CURRENT_BINARY_DIR}/_utils.py" @ONLY) +configure_file("${CMAKE_CURRENT_SOURCE_DIR}/_config.py.in" + "${CMAKE_CURRENT_BINARY_DIR}/_config.py" @ONLY) configure_file("${CMAKE_CURRENT_SOURCE_DIR}/support/__init__.py" "${CMAKE_CURRENT_BINARY_DIR}/support/__init__.py" COPYONLY) @@ -70,9 +67,7 @@ endforeach() # install install(FILES "${CMAKE_CURRENT_BINARY_DIR}/__init__.py" DESTINATION "${PYTHON_SITE_PACKAGES}/${BINDING_NAME}${pyside2_SUFFIX}") -install(FILES "${CMAKE_CURRENT_BINARY_DIR}/_built_modules.py" - DESTINATION "${PYTHON_SITE_PACKAGES}/${BINDING_NAME}${pyside2_SUFFIX}") -install(FILES ${CMAKE_CURRENT_BINARY_DIR}/_utils.py +install(FILES "${CMAKE_CURRENT_BINARY_DIR}/_config.py" DESTINATION "${PYTHON_SITE_PACKAGES}/${BINDING_NAME}${pyside2_SUFFIX}") install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/typesystem_templates.xml DESTINATION share/PySide2${pyside_SUFFIX}/typesystems) 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/PySide2/Qt3DLogic/typesystem_3dlogic.xml b/sources/pyside2/PySide2/Qt3DLogic/typesystem_3dlogic.xml new file mode 100644 index 000000000..d448fd29a --- /dev/null +++ b/sources/pyside2/PySide2/Qt3DLogic/typesystem_3dlogic.xml @@ -0,0 +1,49 @@ +<?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.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/QtCore/typesystem_core_common.xml b/sources/pyside2/PySide2/QtCore/typesystem_core_common.xml index fc2fc3013..11111d96c 100644 --- a/sources/pyside2/PySide2/QtCore/typesystem_core_common.xml +++ b/sources/pyside2/PySide2/QtCore/typesystem_core_common.xml @@ -268,7 +268,7 @@ </primitive-type> <inject-code class="native" position="beginning"> - bool py2kStrCheck(PyObject* obj) + bool py2kStrCheck(PyObject *obj) { #ifdef IS_PY3K return false; @@ -283,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); @@ -316,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> @@ -369,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()); @@ -409,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); @@ -432,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]; @@ -456,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; } @@ -469,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; @@ -498,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; @@ -507,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); @@ -523,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); @@ -536,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); } @@ -547,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> @@ -561,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)"> @@ -581,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> @@ -598,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; @@ -612,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); @@ -763,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); @@ -777,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); @@ -833,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; @@ -894,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" /> @@ -1002,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; @@ -1030,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); @@ -1052,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)); @@ -1080,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)); @@ -1149,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()))); } }; @@ -1217,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 { @@ -1227,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> @@ -1261,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); } @@ -1307,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> @@ -1455,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())); } }; @@ -1527,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()))); } }; @@ -1665,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())); } }; @@ -1762,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> @@ -1968,8 +1966,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; @@ -2268,7 +2266,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"> @@ -2331,7 +2329,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> @@ -2587,10 +2585,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; } @@ -2801,8 +2799,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; @@ -2850,7 +2848,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> @@ -3099,7 +3097,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> @@ -3117,6 +3115,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*)"> @@ -3124,14 +3124,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, @@ -3154,12 +3154,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), @@ -3168,8 +3168,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) @@ -3219,7 +3219,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(); @@ -3669,7 +3669,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> @@ -3903,9 +3903,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); } @@ -4029,11 +4029,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); } @@ -4058,7 +4058,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); @@ -4086,9 +4086,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> @@ -4121,7 +4121,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); @@ -4134,7 +4134,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); @@ -4208,17 +4208,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> @@ -4288,4 +4288,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/QtGui/typesystem_gui_common.xml b/sources/pyside2/PySide2/QtGui/typesystem_gui_common.xml index 5dbc5f163..12b0f3115 100644 --- a/sources/pyside2/PySide2/QtGui/typesystem_gui_common.xml +++ b/sources/pyside2/PySide2/QtGui/typesystem_gui_common.xml @@ -309,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"> @@ -321,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> @@ -438,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"> @@ -491,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); @@ -503,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); @@ -538,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); @@ -606,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)); @@ -649,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"> @@ -818,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 *)"> @@ -1001,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> @@ -1316,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) { @@ -1344,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) { @@ -1392,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) { @@ -1420,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) { @@ -1448,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) { @@ -1613,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> @@ -1626,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> @@ -2003,9 +2005,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> @@ -2016,9 +2018,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> @@ -2035,9 +2037,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> @@ -2084,13 +2086,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); @@ -2981,7 +2983,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); } @@ -3011,7 +3013,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); } @@ -3041,8 +3043,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); diff --git a/sources/pyside2/PySide2/QtWidgets/typesystem_widgets_common.xml b/sources/pyside2/PySide2/QtWidgets/typesystem_widgets_common.xml index 2c380dacb..0555d9a53 100644 --- a/sources/pyside2/PySide2/QtWidgets/typesystem_widgets_common.xml +++ b/sources/pyside2/PySide2/QtWidgets/typesystem_widgets_common.xml @@ -215,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> @@ -223,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> @@ -267,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 *)"> @@ -277,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); } @@ -435,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()" /> @@ -2149,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"> @@ -2510,10 +2536,13 @@ </modify-function> <modify-function signature="clear()"> <inject-code class="target" position="beginning"> + Shiboken::BindingManager& bm = Shiboken::BindingManager::instance(); for (int i = 0; i < %CPPSELF.count(); i++) { QWidget* widget = %CPPSELF.widget(i); - Shiboken::AutoDecRef pyWidget(%CONVERTTOPYTHON[QWidget*](widget)); - Shiboken::Object::setParent(0, pyWidget); + if (bm.hasWrapper(widget)) { + Shiboken::AutoDecRef pyWidget(%CONVERTTOPYTHON[QWidget*](widget)); + Shiboken::Object::releaseOwnership(pyWidget); + } } %CPPSELF.%FUNCTION_NAME(); </inject-code> @@ -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/__init__.py.in b/sources/pyside2/PySide2/__init__.py.in index 77390af46..92e52a81a 100644 --- a/sources/pyside2/PySide2/__init__.py.in +++ b/sources/pyside2/PySide2/__init__.py.in @@ -12,31 +12,20 @@ __version_info__ = (@BINDING_API_MAJOR_VERSION@, @BINDING_API_MINOR_VERSION@, def _setupQtDirectories(): import sys import os - from . import _utils - os.environ["PYSIDE_PACKAGE_DIR"] = os.path.abspath(os.path.dirname(__file__)) + pyside_package_dir = os.path.abspath(os.path.dirname(__file__)) + # Used by signature module. + os.environ["PYSIDE_PACKAGE_DIR"] = pyside_package_dir - pysideDir = _utils.get_pyside_dir() - - # Register PySide qt.conf to override the built-in - # configuration variables, if there is no default qt.conf in - # executable folder - prefix = pysideDir.replace('\\', '/') - _utils.register_qt_conf(prefix=prefix, - binaries=prefix, - plugins=prefix+"/plugins", - imports=prefix+"/imports", - translations=prefix+"/translations") - - # On Windows add the PySide\openssl folder (if it exists) to the - # PATH so the SSL DLLs can be found when Qt tries to dynamically - # load them. Tell Qt to load them and then reset the PATH. + # On Windows add the PySide2\openssl folder (if it exists) to the + # PATH so that the SSL DLLs can be found when Qt tries to dynamically + # load them. Tell Qt to load them and then reset the PATH. if sys.platform == 'win32': - opensslDir = os.path.join(pysideDir, 'openssl') - if os.path.exists(opensslDir): + openssl_dir = os.path.join(pyside_package_dir, 'openssl') + if os.path.exists(openssl_dir): path = os.environ['PATH'] try: - os.environ['PATH'] = opensslDir + os.pathsep + path + os.environ['PATH'] = os.path.join(openssl_dir, path) try: from . import QtNetwork except ImportError: diff --git a/sources/pyside2/PySide2/_built_modules.py.in b/sources/pyside2/PySide2/_built_modules.py.in deleted file mode 100644 index 4e491d081..000000000 --- a/sources/pyside2/PySide2/_built_modules.py.in +++ /dev/null @@ -1,3 +0,0 @@ -built_modules = list(name for name in - "@all_module_shortnames@" - .split(";")) diff --git a/sources/pyside2/PySide2/_config.py.in b/sources/pyside2/PySide2/_config.py.in new file mode 100644 index 000000000..db8a17210 --- /dev/null +++ b/sources/pyside2/PySide2/_config.py.in @@ -0,0 +1,6 @@ +built_modules = list(name for name in + "@all_module_shortnames@" + .split(";")) + +shiboken_library_soversion = str(@SHIBOKEN_SO_VERSION@) +pyside_library_soversion = str(@PYSIDE_SO_VERSION@) diff --git a/sources/pyside2/PySide2/_utils.py.in b/sources/pyside2/PySide2/_utils.py.in deleted file mode 100644 index 64a5a0567..000000000 --- a/sources/pyside2/PySide2/_utils.py.in +++ /dev/null @@ -1,289 +0,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$ -## -############################################################################# - -import sys -import os -import fnmatch - - -if sys.platform == 'win32': - # On Windows get the PySide package path in case sensitive format. - # Even if the file system on Windows is case insensitive, - # some parts in Qt environment such as qml imports path, - # requires to be in case sensitive format. - import ctypes - from ctypes import POINTER, WinError, sizeof, byref, create_unicode_buffer - from ctypes.wintypes import MAX_PATH, LPCWSTR, LPWSTR, DWORD - - GetShortPathNameW = ctypes.windll.kernel32.GetShortPathNameW - GetShortPathNameW.argtypes = [LPCWSTR, LPWSTR, DWORD] - GetShortPathNameW.restype = DWORD - - GetLongPathNameW = ctypes.windll.kernel32.GetLongPathNameW - GetLongPathNameW.argtypes = [LPCWSTR, LPWSTR, DWORD] - GetLongPathNameW.restype = DWORD - - PY_2 = sys.version_info[0] < 3 - - if PY_2: - def u(x): - return unicode(x) - def u_fs(x): - return unicode(x, sys.getfilesystemencoding()) - else: - def u(x): - return x - def u_fs(x): - return x - - def _get_win32_short_name(s): - """ Returns short name """ - buf_size = MAX_PATH - for i in range(2): - buf = create_unicode_buffer(u('\0') * (buf_size + 1)) - r = GetShortPathNameW(u_fs(s), buf, buf_size) - if r == 0: - raise WinError() - if r < buf_size: - if PY_2: - return buf.value.encode(sys.getfilesystemencoding()) - return buf.value - buf_size = r - raise WinError() - - def _get_win32_long_name(s): - """ Returns long name """ - buf_size = MAX_PATH - for i in range(2): - buf = create_unicode_buffer(u('\0') * (buf_size + 1)) - r = GetLongPathNameW(u_fs(s), buf, buf_size) - if r == 0: - raise WinError() - if r < buf_size: - if PY_2: - return buf.value.encode(sys.getfilesystemencoding()) - return buf.value - buf_size = r - raise WinError() - - def _get_win32_case_sensitive_name(s): - """ Returns long name in case sensitive format """ - path = _get_win32_long_name(_get_win32_short_name(s)) - return path - - def get_pyside_dir(): - try: - from . import QtCore - except ImportError: - return _get_win32_case_sensitive_name(os.path.abspath(os.path.dirname(__file__))) - else: - return _get_win32_case_sensitive_name(os.path.abspath(os.path.dirname(QtCore.__file__))) - -else: - def get_pyside_dir(): - try: - from . import QtCore - except ImportError: - return os.path.abspath(os.path.dirname(__file__)) - else: - return os.path.abspath(os.path.dirname(QtCore.__file__)) - - -def _filter_match(name, patterns): - for pattern in patterns: - if pattern is None: - continue - if fnmatch.fnmatch(name, pattern): - return True - return False - - -def _dir_contains(dir, filter): - names = os.listdir(dir) - for name in names: - srcname = os.path.join(dir, name) - if not os.path.isdir(srcname) and _filter_match(name, filter): - return True - return False - - -def _rcc_write_number(out, number, width): - dividend = 1 - if width == 2: - dividend = 256 - elif width == 3: - dividend = 65536 - elif width == 4: - dividend = 16777216 - while dividend >= 1: - tmp = int(number / dividend) - out.append("%02x" % tmp) - number -= tmp * dividend - dividend = int(dividend / 256) - - -def _rcc_write_data(out, data): - _rcc_write_number(out, len(data), 4) - for d in data: - _rcc_write_number(out, ord(d), 1) - - -def _get_qt_conf_resource(prefix, binaries, plugins, imports, translations): - """ - Generate Qt resource with embedded qt.conf - """ - qt_conf_template = "\ -[Paths]\x0d\x0a\ -Prefix = %(prefix)s\x0d\x0a\ -Binaries = %(binaries)s\x0d\x0a\ -Imports = %(imports)s\x0d\x0a\ -Plugins = %(plugins)s\x0d\x0a\ -Translations = %(translations)s" - - rc_data_input = qt_conf_template % {"prefix": prefix, - "binaries": binaries, - "plugins": plugins, - "imports": imports, - "translations": translations} - rc_data_ouput = [] - _rcc_write_data(rc_data_ouput, rc_data_input) - - # The rc_struct and rc_name was pre-generated by pyside-rcc from file: - # <!DOCTYPE RCC><RCC version="1.0"> - # <qresource> - # <file>qt/etc/qt.conf</file> - # </qresource> - # </RCC> - PY_2 = sys.version_info[0] < 3 - if PY_2: - rc_struct = "\ -\x00\x00\x00\x00\x00\x02\x00\x00\x00\x01\x00\x00\x00\x01\x00\x00\x00\x00\ -\x00\x02\x00\x00\x00\x01\x00\x00\x00\x02\x00\x00\x00\x0a\x00\x02\x00\x00\ -\x00\x01\x00\x00\x00\x03\x00\x00\x00\x16\x00\x00\x00\x00\x00\x01\x00\x00\ -\x00\x00" - rc_name = "\ -\x00\x02\x00\x00\x07\x84\x00q\x00t\x00\x03\x00\x00l\xa3\x00e\x00t\x00c\x00\ -\x07\x08t\xa6\xa6\x00q\x00t\x00.\x00c\x00o\x00n\x00f" - rc_data = "".join(rc_data_ouput).decode('hex') - else: - rc_struct = b"\ -\x00\x00\x00\x00\x00\x02\x00\x00\x00\x01\x00\x00\x00\x01\x00\x00\x00\x00\ -\x00\x02\x00\x00\x00\x01\x00\x00\x00\x02\x00\x00\x00\x0a\x00\x02\x00\x00\ -\x00\x01\x00\x00\x00\x03\x00\x00\x00\x16\x00\x00\x00\x00\x00\x01\x00\x00\ -\x00\x00" - rc_name = b"\ -\x00\x02\x00\x00\x07\x84\x00q\x00t\x00\x03\x00\x00l\xa3\x00e\x00t\x00c\x00\ -\x07\x08t\xa6\xa6\x00q\x00t\x00.\x00c\x00o\x00n\x00f" - rc_data = bytes.fromhex("".join(rc_data_ouput)) - - return rc_struct, rc_name, rc_data - - -def register_qt_conf(prefix, binaries, plugins, imports, translations, - force=False): - """ - Register qt.conf in Qt resource system to override the built-in - configuration variables, if there is no default qt.conf in - executable folder and another qt.conf is not already registered in - Qt resource system. - """ - try: - from . import QtCore - except ImportError: - return - - # Check folder structure - if not prefix or not os.path.exists(prefix): - if force: - raise RuntimeError("Invalid prefix path specified: %s" % prefix) - else: - return - if not binaries or not os.path.exists(binaries): - if force: - raise RuntimeError("Invalid binaries path specified: %s" % binaries) - else: - return - else: - # Check if required Qt libs exists in binaries folder - if sys.platform == 'win32': - pattern = ["Qt5Core*.dll"] - else: - pattern = ["libQtCore.so.*"] - if not _dir_contains(binaries, pattern): - if force: - raise RuntimeError("QtCore lib not found in folder: %s" % \ - binaries) - else: - return - if not plugins or not os.path.exists(plugins): - if force: - raise RuntimeError("Invalid plugins path specified: %s" % plugins) - else: - return - if not imports or not os.path.exists(imports): - if force: - raise RuntimeError("Invalid imports path specified: %s" % imports) - else: - return - if not translations or not os.path.exists(translations): - if force: - raise RuntimeError("Invalid translations path specified: %s" \ - % translations) - else: - return - - # Check if there is no default qt.conf in executable folder - exec_prefix = os.path.dirname(sys.executable) - qtconf_path = os.path.join(exec_prefix, 'qt.conf') - if os.path.exists(qtconf_path) and not force: - return - - # Check if another qt.conf is not already registered in Qt resource system - if QtCore.QFile.exists(":/qt/etc/qt.conf") and not force: - return - - # Keep these variables alive - global rc_struct, rc_name, rc_data - rc_struct, rc_name, rc_data = _get_qt_conf_resource(prefix, binaries, - plugins, imports, - translations) - QtCore.qRegisterResourceData(0x01, rc_struct, rc_name, rc_data) - - # Initialize the Qt library by querying the QLibraryInfo - prefixPath = QtCore.QLibraryInfo.location(QtCore.QLibraryInfo.PrefixPath) diff --git a/sources/pyside2/PySide2/support/signature/mapping.py b/sources/pyside2/PySide2/support/signature/mapping.py index 367e1c04d..2bedbb1bf 100644 --- a/sources/pyside2/PySide2/support/signature/mapping.py +++ b/sources/pyside2/PySide2/support/signature/mapping.py @@ -282,7 +282,9 @@ def init_QtCore(): "zero(unsigned int)": 0, "zero(PySide2.QtCore.QPoint)": Default("PySide2.QtCore.QPoint"), "zero(unsigned char)": 0, - "zero(PySide2.QtCore.QEvent.Type)": None + "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/support/signature/parser.py b/sources/pyside2/PySide2/support/signature/parser.py index c55973632..b067f245b 100644 --- a/sources/pyside2/PySide2/support/signature/parser.py +++ b/sources/pyside2/PySide2/support/signature/parser.py @@ -82,10 +82,18 @@ def _parse_line(line): """ ret = re.match(line_re, line, re.VERBOSE).groupdict() arglist = ret["arglist"] + # The following is a split re. The string is broken into pieces which are + # between the recognized strings. Because the re has groups, both the + # strings and the delimiters are returned, where the strings are not + # interesting at all: They are just the commata. + # Note that it is necessary to put the characters with special handling in + # the first group (comma, brace, angle bracket). + # Then they are not recognized there, and we can handle them differently + # in the following expressions. arglist = list(x.strip() for x in re.split(r""" ( (?: # inner group is not capturing - [^,()] # no commas or braces + [^,()<>] # no commas or braces or angle brackets | \( (?: @@ -96,6 +104,10 @@ def _parse_line(line): \) )* \) + | + < # or one angle bracket pair + [^<>]* + > )+ # longest possible span ) # this list is interspersed with "," and surrounded by "" """, arglist, flags=re.VERBOSE) diff --git a/sources/pyside2/cmake/Macros/PySideModules.cmake b/sources/pyside2/cmake/Macros/PySideModules.cmake index 83d43976a..36488912d 100644 --- a/sources/pyside2/cmake/Macros/PySideModules.cmake +++ b/sources/pyside2/cmake/Macros/PySideModules.cmake @@ -174,16 +174,22 @@ macro(check_qt_class module class optional_source_files dropped_entries) "int main() { sizeof(${class}); }\n" ) + # Because Qt is built with -fPIC (by default), the compile tests also have to have that. + get_property(ADDITIONAL_FLAGS TARGET Qt5::Core PROPERTY INTERFACE_COMPILE_OPTIONS) + + # Don't add version tagging, because for some reason linker fails with: + # (.qtversion[qt_version_tag]+0x0): undefined reference to `qt_version_tag' # 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(CUSTOM_CPP_STANDARD ${CMAKE_CXX11_EXTENSION_COMPILE_OPTION}) + + set(ADDITIONAL_FLAGS "${ADDITIONAL_FLAGS} -DQT_NO_VERSION_TAGGING ${CMAKE_CXX11_EXTENSION_COMPILE_OPTION}") try_compile(Q_WORKS ${CMAKE_BINARY_DIR} ${SRC_FILE} CMAKE_FLAGS "-DINCLUDE_DIRECTORIES=${QT_INCLUDE_DIR};${Qt5${_module_no_qt_prefix}_INCLUDE_DIRS}" - "-DCOMPILE_DEFINITIONS:STRING=${CUSTOM_CPP_STANDARD}" + "-DCOMPILE_DEFINITIONS:STRING=${ADDITIONAL_FLAGS}" OUTPUT_VARIABLE OUTPUT) file(APPEND ${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/CMakeCheckQtClassTest.log ${OUTPUT}) diff --git a/sources/pyside2/doc/CMakeLists.txt b/sources/pyside2/doc/CMakeLists.txt index 5a7679102..326e5ae7d 100644 --- a/sources/pyside2/doc/CMakeLists.txt +++ b/sources/pyside2/doc/CMakeLists.txt @@ -21,25 +21,41 @@ file(REMOVE ${CMAKE_CURRENT_LIST_DIR}/pyside.qdocconf ${CMAKE_CURRENT_LIST_DIR}/ # - Configure the module docconf file # - Write shiboken header consisting of pyside2_global.h and module includes # - Build include path for qdoc for shiboken -set(QDOC_INCPATH -I "${QT_INCLUDE_DIR}") + +# 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(module ${all_module_shortnames}) - string(TOLOWER "${module}" lowerModule) - set(docConf "${CMAKE_CURRENT_LIST_DIR}/qtmodules/pyside-qt${lowerModule}.qdocconf.in") +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") - - # -- @TODO fix this for macOS frameworks. - list(APPEND QDOC_INCPATH -I) - list(APPEND QDOC_INCPATH "${QT_INCLUDE_DIR}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\"/>") + # 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() 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/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/droparea.cpp b/sources/pyside2/doc/codesnippets/doc/src/snippets/droparea.cpp index 160064627..954feb402 100644 --- a/sources/pyside2/doc/codesnippets/doc/src/snippets/droparea.cpp +++ b/sources/pyside2/doc/codesnippets/doc/src/snippets/droparea.cpp @@ -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/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/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/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/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/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 8df1d73b2..8df1d73b2 100644 --- a/sources/pyside2/doc/codesnippets/examples/sql/relationaltablemodel/relationaltablemodel.cpp +++ b/sources/pyside2/doc/codesnippets/examples/relationaltablemodel/relationaltablemodel.cpp 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/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/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-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-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-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-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/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/libpyside/CMakeLists.txt b/sources/pyside2/libpyside/CMakeLists.txt index 0e21f4063..3069b1ca2 100644 --- a/sources/pyside2/libpyside/CMakeLists.txt +++ b/sources/pyside2/libpyside/CMakeLists.txt @@ -96,7 +96,7 @@ target_link_libraries(pyside2 set_target_properties(pyside2 PROPERTIES VERSION ${BINDING_API_VERSION} - SOVERSION "${BINDING_API_MAJOR_VERSION}.${BINDING_API_MINOR_VERSION}" + SOVERSION "${PYSIDE_SO_VERSION}" OUTPUT_NAME "pyside2${pyside2_SUFFIX}${SHIBOKEN_PYTHON_SHARED_LIBRARY_SUFFIX}" DEFINE_SYMBOL PYSIDE_EXPORTS) diff --git a/sources/pyside2/libpyside/pysidesignal.cpp b/sources/pyside2/libpyside/pysidesignal.cpp index e213ff069..04b1cf1f4 100644 --- a/sources/pyside2/libpyside/pysidesignal.cpp +++ b/sources/pyside2/libpyside/pysidesignal.cpp @@ -433,7 +433,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 +564,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/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/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/QtWidgets/CMakeLists.txt b/sources/pyside2/tests/QtWidgets/CMakeLists.txt index 60a1d7d6f..4efd9d803 100644 --- a/sources/pyside2/tests/QtWidgets/CMakeLists.txt +++ b/sources/pyside2/tests/QtWidgets/CMakeLists.txt @@ -117,8 +117,10 @@ PYSIDE_TEST(qstring_qkeysequence_test.py) PYSIDE_TEST(qstyle_test.py) PYSIDE_TEST(qtableview_test.py) 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) 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/pysidetest/utils_test.py b/sources/pyside2/tests/QtWidgets/qtabwidgetclear_test.py index 30f283312..8e9b36fab 100644 --- a/sources/pyside2/tests/pysidetest/utils_test.py +++ b/sources/pyside2/tests/QtWidgets/qtabwidgetclear_test.py @@ -1,6 +1,6 @@ ############################################################################# ## -## Copyright (C) 2016 The Qt Company Ltd. +## Copyright (C) 2018 The Qt Company Ltd. ## Contact: https://www.qt.io/licensing/ ## ## This file is part of the test suite of PySide2. @@ -27,25 +27,37 @@ ############################################################################# import unittest -import sys -import os +from PySide2.QtWidgets import QMainWindow, QTabWidget, QTextEdit, QSplitter +from helper import UsesQApplication -if sys.platform == 'win32': - from PySide2._utils import _get_win32_case_sensitive_name +class TabWidgetClear(QMainWindow): + def __init__(self): + QMainWindow.__init__(self) + self.tabWidget = QTabWidget(self) + self.setCentralWidget(self.tabWidget) + self.editBox = QTextEdit(self) + self.tabWidget.addTab(self.getSplitter(), 'Test') - class Win32UtilsTest(unittest.TestCase): - def testWin32CaseSensitiveName(self): - from tempfile import mkdtemp - caseSensitiveName = 'CaseSensitiveName' - tmpdir = mkdtemp(caseSensitiveName) - try: - path = _get_win32_case_sensitive_name(tmpdir.lower()) - self.assertTrue(path.endswith(caseSensitiveName)) - finally: - if os.path.exists(tmpdir): - os.rmdir(tmpdir) + def getSplitter(self): + splitter = QSplitter() + splitter.addWidget(self.editBox) + return splitter + def toggle(self): + self.tabWidget.clear() + self.getSplitter() + +class TestTabWidgetClear(UsesQApplication): + + def testClear(self): + self.window = TabWidgetClear() + self.window.show() + try: + self.window.toggle() + except RuntimeError as e: + # This should never happened, PYSIDE-213 + raise e 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 9db55e524..c6d3bb13b 100644 --- a/sources/pyside2/tests/pysidetest/CMakeLists.txt +++ b/sources/pyside2/tests/pysidetest/CMakeLists.txt @@ -138,7 +138,6 @@ PYSIDE_TEST(signalemissionfrompython_test.py) PYSIDE_TEST(version_test.py) PYSIDE_TEST(typedef_signal_test.py) PYSIDE_TEST(bug_1016.py) -PYSIDE_TEST(utils_test.py) PYSIDE_TEST(mixin_signal_slots_test.py) PYSIDE_TEST(signal_slot_warning.py) PYSIDE_TEST(all_modules_load_test.py) 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/shiboken2/ApiExtractor/abstractmetabuilder.cpp b/sources/shiboken2/ApiExtractor/abstractmetabuilder.cpp index 38000785f..37b82e99f 100644 --- a/sources/shiboken2/ApiExtractor/abstractmetabuilder.cpp +++ b/sources/shiboken2/ApiExtractor/abstractmetabuilder.cpp @@ -177,7 +177,7 @@ static QString msgNoFunctionForModification(const QString &signature, const QStr if (f) str << ", "; str << allFunctions.at(f)->minimalSignature(); - } + } } else { str << " Possible candidates: " << possibleSignatures.join(QLatin1String(", ")); } @@ -197,6 +197,10 @@ void AbstractMetaBuilderPrivate::checkFunctionModifications() continue; const ComplexTypeEntry* centry = static_cast<const ComplexTypeEntry*>(entry); + + if (!(centry->codeGeneration() & TypeEntry::GenerateTargetLang)) + continue; + FunctionModificationList modifications = centry->functionModifications(); for (const FunctionModification &modification : qAsConst(modifications)) { @@ -585,6 +589,7 @@ void AbstractMetaBuilderPrivate::traverseDom(const FileModelItem &dom) && !entry->isContainer() && !entry->isCustom() && !entry->isVariant() + && (entry->generateCode() & TypeEntry::GenerateTargetLang) && !AbstractMetaClass::findClass(m_metaClasses, entry->qualifiedCppName())) { qCWarning(lcShiboken).noquote().nospace() << QStringLiteral("type '%1' is specified in typesystem, but not defined. This could potentially lead to compilation errors.") @@ -606,7 +611,7 @@ void AbstractMetaBuilderPrivate::traverseDom(const FileModelItem &dom) .arg(signature); } } - } else if (entry->isEnum()) { + } else if (entry->isEnum() && (entry->generateCode() & TypeEntry::GenerateTargetLang)) { const QString name = ((EnumTypeEntry*) entry)->targetLangQualifier(); AbstractMetaClass *cls = AbstractMetaClass::findClass(m_metaClasses, name); @@ -1079,10 +1084,13 @@ AbstractMetaEnum *AbstractMetaBuilderPrivate::traverseEnum(EnumModelItem enumIte return 0; } - if (!typeEntry || !typeEntry->isEnum()) { - qCWarning(lcShiboken).noquote().nospace() - << QStringLiteral("enum '%1' does not have a type entry or is not an enum") + if ((!typeEntry || !typeEntry->isEnum())) { + if (!m_currentClass || + (m_currentClass->typeEntry()->codeGeneration() & TypeEntry::GenerateTargetLang)) { + qCWarning(lcShiboken).noquote().nospace() + << QStringLiteral("enum '%1' does not have a type entry or is not an enum") .arg(qualifiedName); + } m_rejectedEnums.insert(qualifiedName, AbstractMetaBuilder::NotInTypeSystem); return 0; } @@ -1434,9 +1442,11 @@ AbstractMetaField *AbstractMetaBuilderPrivate::traverseField(VariableModelItem f if (!metaType || !ok) { const QString type = TypeInfo::resolveType(fieldType, currentScope()).qualifiedName().join(colonColon()); - qCWarning(lcShiboken).noquote().nospace() - << QStringLiteral("skipping field '%1::%2' with unmatched type '%3'") - .arg(m_currentClass->name(), fieldName, type); + if (m_currentClass->typeEntry()->codeGeneration() & TypeEntry::GenerateTargetLang) { + qCWarning(lcShiboken).noquote().nospace() + << QStringLiteral("skipping field '%1::%2' with unmatched type '%3'") + .arg(m_currentClass->name(), fieldName, type); + } delete metaField; return 0; } @@ -2730,12 +2740,9 @@ int AbstractMetaBuilderPrivate::findOutValueFromString(const QString &stringValu } for (AbstractMetaEnum *metaEnum : qAsConst(m_globalEnums)) { - const AbstractMetaEnumValueList &values = metaEnum->values(); - for (const AbstractMetaEnumValue *ev : values) { - if (ev->name() == stringValue) { - ok = true; - return ev->value(); - } + if (const AbstractMetaEnumValue *ev = metaEnum->findEnumValue(stringValue)) { + ok = true; + return ev->value(); } } diff --git a/sources/shiboken2/ApiExtractor/abstractmetalang.cpp b/sources/shiboken2/ApiExtractor/abstractmetalang.cpp index 840466108..4e507cd38 100644 --- a/sources/shiboken2/ApiExtractor/abstractmetalang.cpp +++ b/sources/shiboken2/ApiExtractor/abstractmetalang.cpp @@ -1938,61 +1938,26 @@ AbstractMetaEnum *AbstractMetaClass::findEnum(const QString &enumName) if (typeEntry()->designatedInterface()) return extractInterface()->findEnum(enumName); - return 0; + return nullptr; } - - - -/*! Recursivly searches for the enum value named \a enumValueName in - this class and its superclasses and interfaces. Values belonging to - \a meta_enum are excluded from the search. +/*! Recursively searches for the enum value named \a enumValueName in + this class and its superclasses and interfaces. */ -AbstractMetaEnumValue *AbstractMetaClass::findEnumValue(const QString &enumValueName, AbstractMetaEnum *meta_enum) -{ - for (AbstractMetaEnum *e : qAsConst(m_enums)) { - if (e != meta_enum) - continue; - const AbstractMetaEnumValueList &values = e->values(); - for (AbstractMetaEnumValue *v : values) { - if (v->name() == enumValueName) - return v; - } - } - - if (typeEntry()->designatedInterface()) - return extractInterface()->findEnumValue(enumValueName, meta_enum); - - if (baseClass()) - return baseClass()->findEnumValue(enumValueName, meta_enum); - - return 0; -} - - -/*! - * Searches through all of this class' enums for a value matching the - * name \a enumValueName. The name is excluding the class/namespace - * prefix. The function recursivly searches interfaces and baseclasses - * of this class. - */ -AbstractMetaEnum *AbstractMetaClass::findEnumForValue(const QString &enumValueName) +AbstractMetaEnumValue *AbstractMetaClass::findEnumValue(const QString &enumValueName) { for (AbstractMetaEnum *e : qAsConst(m_enums)) { - const AbstractMetaEnumValueList &values = e->values(); - for (AbstractMetaEnumValue *v : values) { - if (v->name() == enumValueName) - return e; - } + if (AbstractMetaEnumValue *v = e->findEnumValue(enumValueName)) + return v; } if (typeEntry()->designatedInterface()) - return extractInterface()->findEnumForValue(enumValueName); + return extractInterface()->findEnumValue(enumValueName); if (baseClass()) - return baseClass()->findEnumForValue(enumValueName); + return baseClass()->findEnumValue(enumValueName); - return 0; + return nullptr; } @@ -2332,29 +2297,23 @@ AbstractMetaEnum *AbstractMetaClass::findEnum(const AbstractMetaClassList &class AbstractMetaEnumValue *AbstractMetaClass::findEnumValue(const AbstractMetaClassList &classes, const QString &name) { - QStringList lst = name.split(QLatin1String("::")); + const QVector<QStringRef> lst = name.splitRef(QLatin1String("::")); if (lst.size() > 1) { - QString prefixName = lst.at(0); - QString enumName = lst.at(1); - - AbstractMetaClass* cl = findClass(classes, prefixName); - if (cl) - return cl->findEnumValue(enumName, 0); + const QStringRef prefixName = lst.at(0); + const QStringRef enumName = lst.at(1); + if (AbstractMetaClass *cl = findClass(classes, prefixName.toString())) + return cl->findEnumValue(enumName.toString()); } for (AbstractMetaClass *metaClass : classes) { - const AbstractMetaEnumList &enums = metaClass->enums(); - for (AbstractMetaEnum *metaEnum : enums) { - AbstractMetaEnumValue* enumValue = metaClass->findEnumValue(name, metaEnum); - if (enumValue) - return enumValue; - } + if (AbstractMetaEnumValue *enumValue = metaClass->findEnumValue(name)) + return enumValue; } qCWarning(lcShiboken).noquote().nospace() << QStringLiteral("no matching enum '%1'").arg(name); - return 0; + return nullptr; } /*! @@ -2461,6 +2420,29 @@ AbstractMetaEnum::~AbstractMetaEnum() qDeleteAll(m_enumValues); } +template <class String> +AbstractMetaEnumValue *findMatchingEnumValue(const AbstractMetaEnumValueList &list, const String &value) +{ + for (AbstractMetaEnumValue *enumValue : list) { + if (enumValue->name() == value) + return enumValue; + } + return nullptr; +} + +// Find enum values for "enum Enum { e1 }" either for "e1" or "Enum::e1" +AbstractMetaEnumValue *AbstractMetaEnum::findEnumValue(const QString &value) const +{ + if (isAnonymous()) + return findMatchingEnumValue(m_enumValues, value); + const int sepPos = value.indexOf(QLatin1String("::")); + if (sepPos == -1) + return findMatchingEnumValue(m_enumValues, value); + return name() == value.leftRef(sepPos) + ? findMatchingEnumValue(m_enumValues, value.rightRef(value.size() - sepPos - 2)) + : nullptr; +} + QString AbstractMetaEnum::name() const { return m_typeEntry->targetLangName(); diff --git a/sources/shiboken2/ApiExtractor/abstractmetalang.h b/sources/shiboken2/ApiExtractor/abstractmetalang.h index 83c1c334f..45a55e570 100644 --- a/sources/shiboken2/ApiExtractor/abstractmetalang.h +++ b/sources/shiboken2/ApiExtractor/abstractmetalang.h @@ -74,7 +74,9 @@ public: Documentation() {} Documentation(const QString& value, Format fmt = Documentation::Native) - : m_data(value), m_format(fmt) {} + : m_data(value.trimmed()), m_format(fmt) {} + + bool isEmpty() const { return m_data.isEmpty(); } QString value() const { @@ -83,7 +85,8 @@ public: void setValue(const QString& value, Format fmt = Documentation::Native) { - m_data = value; m_format = fmt; + m_data = value.trimmed(); + m_format = fmt; } Documentation::Format format() const @@ -1152,6 +1155,8 @@ public: m_enumValues << enumValue; } + AbstractMetaEnumValue *findEnumValue(const QString &value) const; + QString name() const; QString qualifier() const; @@ -1380,8 +1385,7 @@ public: } AbstractMetaEnum *findEnum(const QString &enumName); - AbstractMetaEnum *findEnumForValue(const QString &enumName); - AbstractMetaEnumValue *findEnumValue(const QString &enumName, AbstractMetaEnum *meta_enum); + AbstractMetaEnumValue *findEnumValue(const QString &enumName); AbstractMetaClassList interfaces() const { diff --git a/sources/shiboken2/ApiExtractor/doc/conf.py.in b/sources/shiboken2/ApiExtractor/doc/conf.py.in index 70750c899..3a42707ad 100644 --- a/sources/shiboken2/ApiExtractor/doc/conf.py.in +++ b/sources/shiboken2/ApiExtractor/doc/conf.py.in @@ -151,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/shiboken2/ApiExtractor/docparser.cpp b/sources/shiboken2/ApiExtractor/docparser.cpp index bae438f18..1d1783f05 100644 --- a/sources/shiboken2/ApiExtractor/docparser.cpp +++ b/sources/shiboken2/ApiExtractor/docparser.cpp @@ -29,6 +29,8 @@ #include "abstractmetalang.h" #include "typesystem.h" #include <QtCore/QDebug> +#include <QtCore/QDir> +#include <QtCore/QTextStream> #include <QtXmlPatterns/QXmlQuery> #include <QBuffer> @@ -49,7 +51,7 @@ QString DocParser::getDocumentation(QXmlQuery& xquery, const QString& query, const DocModificationList& mods) const { QString doc = execXQuery(xquery, query); - return applyDocModifications(mods, doc); + return applyDocModifications(mods, doc.trimmed()); } QString DocParser::execXQuery(QXmlQuery& xquery, const QString& query) const @@ -69,6 +71,77 @@ QString DocParser::execXQuery(QXmlQuery& xquery, const QString& query) const return result; } +bool DocParser::skipForQuery(const AbstractMetaFunction *func) +{ + // Skip private functions and copies created by AbstractMetaClass::fixFunctions() + if (!func || func->isPrivate() + || func->isModifiedRemoved() + || func->declaringClass() != func->ownerClass() + || func->isCastOperator()) { + return true; + } + switch (func->functionType()) { + case AbstractMetaFunction::MoveConstructorFunction: + case AbstractMetaFunction::AssignmentOperatorFunction: + case AbstractMetaFunction::MoveAssignmentOperatorFunction: + return true; + default: + break; + } + return false; +} + +AbstractMetaFunctionList DocParser::documentableFunctions(const AbstractMetaClass *metaClass) +{ + AbstractMetaFunctionList result = metaClass->functionsInTargetLang(); + for (int i = result.size() - 1; i >= 0; --i) { + if (DocParser::skipForQuery(result.at(i)) || result.at(i)->isUserAdded()) + result.removeAt(i); + } + return result; +} + +QString DocParser::msgCannotFindDocumentation(const QString &fileName, + const char *what, const QString &name, + const QString &query) +{ + QString result; + QTextStream(&result) << "Cannot find documentation for " << what + << ' ' << name << " in:\n " << QDir::toNativeSeparators(fileName) + << "\n using query:\n " << query; + return result; +} + +QString DocParser::msgCannotFindDocumentation(const QString &fileName, + const AbstractMetaClass *metaClass, + const AbstractMetaFunction *function, + const QString &query) +{ + return msgCannotFindDocumentation(fileName, "function", + metaClass->name() + QLatin1String("::") + function->name() + QLatin1String("()"), + query); +} + +QString DocParser::msgCannotFindDocumentation(const QString &fileName, + const AbstractMetaClass *metaClass, + const AbstractMetaEnum *e, + const QString &query) +{ + return msgCannotFindDocumentation(fileName, "enum", + metaClass->name() + QLatin1String("::") + e->name(), + query); +} + +QString DocParser::msgCannotFindDocumentation(const QString &fileName, + const AbstractMetaClass *metaClass, + const AbstractMetaField *f, + const QString &query) +{ + return msgCannotFindDocumentation(fileName, "field", + metaClass->name() + QLatin1String("::") + f->name(), + query); +} + namespace { @@ -100,7 +173,7 @@ struct XslResources QString DocParser::applyDocModifications(const DocModificationList& mods, const QString& xml) const { - if (mods.isEmpty()) + if (mods.isEmpty() || xml.isEmpty()) return xml; bool hasXPathBasedModification = false; @@ -169,6 +242,6 @@ QString DocParser::applyDocModifications(const DocModificationList& mods, const } Q_ASSERT(result != xml); - return result; + return result.trimmed(); } diff --git a/sources/shiboken2/ApiExtractor/docparser.h b/sources/shiboken2/ApiExtractor/docparser.h index 5573f6851..1770815b0 100644 --- a/sources/shiboken2/ApiExtractor/docparser.h +++ b/sources/shiboken2/ApiExtractor/docparser.h @@ -29,6 +29,7 @@ #define DOCPARSER_H #include "typesystem_typedefs.h" +#include "abstractmetalang_typedefs.h" #include <QtCore/QString> @@ -110,10 +111,31 @@ public: */ virtual Documentation retrieveModuleDocumentation(const QString& name) = 0; + static bool skipForQuery(const AbstractMetaFunction *func); + protected: QString getDocumentation(QXmlQuery& xquery, const QString& query, const DocModificationList& mods) const; + + static AbstractMetaFunctionList documentableFunctions(const AbstractMetaClass *metaClass); + + static QString msgCannotFindDocumentation(const QString &fileName, + const char *what, const QString &name, + const QString &query); + static QString msgCannotFindDocumentation(const QString &fileName, + const AbstractMetaClass *metaClass, + const AbstractMetaFunction *function, + const QString &query); + static QString msgCannotFindDocumentation(const QString &fileName, + const AbstractMetaClass *metaClass, + const AbstractMetaEnum *e, + const QString &query); + static QString msgCannotFindDocumentation(const QString &fileName, + const AbstractMetaClass *metaClass, + const AbstractMetaField *f, + const QString &query); + private: QString m_packageName; QString m_docDataDir; diff --git a/sources/shiboken2/ApiExtractor/doxygenparser.cpp b/sources/shiboken2/ApiExtractor/doxygenparser.cpp index 6b90fe6fc..1cffa3b67 100644 --- a/sources/shiboken2/ApiExtractor/doxygenparser.cpp +++ b/sources/shiboken2/ApiExtractor/doxygenparser.cpp @@ -96,20 +96,16 @@ void DoxygenParser::fillDocumentation(AbstractMetaClass* metaClass) xquery.setFocus(QUrl(doxyFilePath)); // Get class documentation - QString classDoc = getDocumentation(xquery, QLatin1String("/doxygen/compounddef/detaileddescription"), + const QString classQuery = QLatin1String("/doxygen/compounddef/detaileddescription"); + QString classDoc = getDocumentation(xquery, classQuery, metaClass->typeEntry()->docModifications()); - if (classDoc.isEmpty()) { - qCWarning(lcShiboken).noquote().nospace() - << "Can't find documentation for class \"" << metaClass->name() << "\"."; - } + if (classDoc.isEmpty()) + qCWarning(lcShiboken(), "%s", qPrintable(msgCannotFindDocumentation(doxyFilePath, "class", metaClass->name(), classQuery))); metaClass->setDocumentation(classDoc); //Functions Documentation - const AbstractMetaFunctionList &funcs = metaClass->functionsInTargetLang(); + const AbstractMetaFunctionList &funcs = DocParser::documentableFunctions(metaClass); for (AbstractMetaFunction *func : funcs) { - if (!func || func->isPrivate()) - continue; - QString query = QLatin1String("/doxygen/compounddef/sectiondef"); // properties if (func->isPropertyReader() || func->isPropertyWriter() @@ -150,6 +146,10 @@ void DoxygenParser::fillDocumentation(AbstractMetaClass* metaClass) query += QLatin1String("/../detaileddescription)[1]"); } QString doc = getDocumentation(xquery, query, DocModificationList()); + if (doc.isEmpty()) { + qCWarning(lcShiboken(), "%s", + qPrintable(msgCannotFindDocumentation(doxyFilePath, metaClass, func, query))); + } func->setDocumentation(doc); isProperty = false; } @@ -163,6 +163,10 @@ void DoxygenParser::fillDocumentation(AbstractMetaClass* metaClass) QString query = QLatin1String("/doxygen/compounddef/sectiondef/memberdef/name[text()=\"") + field->name() + QLatin1String("\"]/../detaileddescription"); QString doc = getDocumentation(xquery, query, DocModificationList()); + if (doc.isEmpty()) { + qCWarning(lcShiboken(), "%s", + qPrintable(msgCannotFindDocumentation(doxyFilePath, metaClass, field, query))); + } field->setDocumentation(doc); } @@ -172,6 +176,10 @@ void DoxygenParser::fillDocumentation(AbstractMetaClass* metaClass) QString query = QLatin1String("/doxygen/compounddef/sectiondef/memberdef[@kind=\"enum\"]/name[text()=\"") + meta_enum->name() + QLatin1String("\"]/.."); QString doc = getDocumentation(xquery, query, DocModificationList()); + if (doc.isEmpty()) { + qCWarning(lcShiboken(), "%s", + qPrintable(msgCannotFindDocumentation(doxyFilePath, metaClass, meta_enum, query))); + } meta_enum->setDocumentation(doc); } diff --git a/sources/shiboken2/ApiExtractor/qtdocparser.cpp b/sources/shiboken2/ApiExtractor/qtdocparser.cpp index 99cf15e48..0ac87bd16 100644 --- a/sources/shiboken2/ApiExtractor/qtdocparser.cpp +++ b/sources/shiboken2/ApiExtractor/qtdocparser.cpp @@ -34,6 +34,7 @@ #include <QtXmlPatterns/QXmlQuery> #include <QtCore/QDir> #include <QtCore/QFile> +#include <QtCore/QTextStream> #include <QUrl> Documentation QtDocParser::retrieveModuleDocumentation() @@ -41,6 +42,45 @@ Documentation QtDocParser::retrieveModuleDocumentation() return retrieveModuleDocumentation(packageName()); } +static void formatFunctionArgTypeQuery(QTextStream &str, const AbstractMetaArgument *arg) +{ + const AbstractMetaType *metaType = arg->type(); + if (metaType->isConstant()) + str << "const " ; + switch (metaType->typeUsagePattern()) { + case AbstractMetaType::PrimitivePattern: + str << metaType->name(); + break; + case AbstractMetaType::FlagsPattern: { + // Modify qualified name "QFlags<Qt::AlignmentFlag>" with name "Alignment" + // to "Qt::Alignment" as seen by qdoc. + const FlagsTypeEntry *flagsEntry = static_cast<const FlagsTypeEntry *>(metaType->typeEntry()); + QString name = flagsEntry->qualifiedCppName(); + if (name.endsWith(QLatin1Char('>')) && name.startsWith(QLatin1String("QFlags<"))) { + const int lastColon = name.lastIndexOf(QLatin1Char(':')); + if (lastColon != -1) { + name.replace(lastColon + 1, name.size() - lastColon - 1, metaType->name()); + name.remove(0, 7); + } else { + name = metaType->name(); // QFlags<> of enum in global namespace + } + } + str << name; + } + break; + default: // Fully qualify enums (Qt::AlignmentFlag), nested classes, etc. + str << metaType->typeEntry()->qualifiedCppName(); + break; + } + + if (metaType->referenceType() == LValueReference) + str << " &"; + else if (metaType->referenceType() == RValueReference) + str << " &&"; + else if (metaType->indirections()) + str << ' ' << QByteArray(metaType->indirections(), '*'); +} + void QtDocParser::fillDocumentation(AbstractMetaClass* metaClass) { if (!metaClass) @@ -68,14 +108,16 @@ void QtDocParser::fillDocumentation(AbstractMetaClass* metaClass) } QXmlQuery xquery; - xquery.setFocus(QUrl::fromLocalFile(sourceFile.absoluteFilePath())); + const QString sourceFileName = sourceFile.absoluteFilePath(); + xquery.setFocus(QUrl::fromLocalFile(sourceFileName)); QString className = metaClass->name(); // Class/Namespace documentation - QString type = metaClass->isNamespace() ? QLatin1String("namespace") : QLatin1String("class"); - QString query = QLatin1String("/WebXML/document/") + type + QLatin1String("[@name=\"") - + className + QLatin1String("\"]/description"); + const QString classQuery = QLatin1String("/WebXML/document/") + + (metaClass->isNamespace() ? QLatin1String("namespace") : QLatin1String("class")) + + QLatin1String("[@name=\"") + className + QLatin1String("\"]"); + QString query = classQuery + QLatin1String("/description"); DocModificationList signedModifs, classModifs; const DocModificationList &mods = metaClass->typeEntry()->docModifications(); @@ -87,56 +129,43 @@ void QtDocParser::fillDocumentation(AbstractMetaClass* metaClass) } Documentation doc(getDocumentation(xquery, query, classModifs)); + if (doc.isEmpty()) + qCWarning(lcShiboken(), "%s", qPrintable(msgCannotFindDocumentation(sourceFileName, "class", className, query))); metaClass->setDocumentation(doc); //Functions Documentation - const AbstractMetaFunctionList &funcs = metaClass->functionsInTargetLang(); + const AbstractMetaFunctionList &funcs = DocParser::documentableFunctions(metaClass); for (AbstractMetaFunction *func : funcs) { - if (!func || func->isPrivate()) - continue; - - QString query = QLatin1String("/WebXML/document/") + type - + QLatin1String("[@name=\"") + className + QLatin1String("\"]"); + query.clear(); + QTextStream str(&query); + str << classQuery; // properties if (func->isPropertyReader() || func->isPropertyWriter() || func->isPropertyResetter()) { - query += QLatin1String("/property[@name=\"") + func->propertySpec()->name() - + QLatin1String("\"]"); + str << "/property[@name=\"" << func->propertySpec()->name() << "\"]"; } else { // normal methods - QString isConst = func->isConstant() ? QLatin1String("true") : QLatin1String("false"); - query += QLatin1String("/function[@name=\"") + func->originalName() - + QLatin1String("\" and count(parameter)=") - + QString::number(func->arguments().count()) - + QLatin1String(" and @const=\"") + isConst + QLatin1String("\"]"); + str << "/function[@name=\"" << func->originalName() << "\" and count(parameter)=" + << func->arguments().count() << " and @const=\"" + << (func->isConstant() ? "true" : "false") << "\"]"; const AbstractMetaArgumentList &arguments = func->arguments(); for (int i = 0, size = arguments.size(); i < size; ++i) { - const AbstractMetaArgument *arg = arguments.at(i); - QString type = arg->type()->name(); - - if (arg->type()->isConstant()) - type.prepend(QLatin1String("const ")); - - if (arg->type()->referenceType() == LValueReference) { - type += QLatin1String(" &"); - } else if (arg->type()->referenceType() == RValueReference) { - type += QLatin1String(" &&"); - } else if (arg->type()->indirections()) { - type += QLatin1Char(' '); - for (int j = 0, max = arg->type()->indirections(); j < max; ++j) - type += QLatin1Char('*'); - } - query += QLatin1String("/parameter[") + QString::number(i + 1) - + QLatin1String("][@left=\"") + type + QLatin1String("\"]/.."); + str << "/parameter[" << (i + 1) << "][@type=\""; + formatFunctionArgTypeQuery(str, arguments.at(i)); + str << "\"]/.."; } } - query += QLatin1String("/description"); + str << "/description"; DocModificationList funcModifs; for (const DocModification &funcModif : qAsConst(signedModifs)) { if (funcModif.signature() == func->minimalSignature()) funcModifs.append(funcModif); } doc.setValue(getDocumentation(xquery, query, funcModifs)); + if (doc.isEmpty()) { + qCWarning(lcShiboken(), "%s", + qPrintable(msgCannotFindDocumentation(sourceFileName, metaClass, func, query))); + } func->setDocumentation(doc); } #if 0 @@ -154,11 +183,14 @@ void QtDocParser::fillDocumentation(AbstractMetaClass* metaClass) // Enums const AbstractMetaEnumList &enums = metaClass->enums(); for (AbstractMetaEnum *meta_enum : enums) { - QString query = QLatin1String("/WebXML/document/") + type - + QLatin1String("[@name=\"") - + className + QLatin1String("\"]/enum[@name=\"") - + meta_enum->name() + QLatin1String("\"]/description"); + query.clear(); + QTextStream(&query) << classQuery << "/enum[@name=\"" + << meta_enum->name() << "\"]/description"; doc.setValue(getDocumentation(xquery, query, DocModificationList())); + if (doc.isEmpty()) { + qCWarning(lcShiboken(), "%s", + qPrintable(msgCannotFindDocumentation(sourceFileName, metaClass, meta_enum, query))); + } meta_enum->setDocumentation(doc); } } @@ -187,5 +219,8 @@ Documentation QtDocParser::retrieveModuleDocumentation(const QString& name) // Module documentation QString query = QLatin1String("/WebXML/document/page[@name=\"") + moduleName + QLatin1String("\"]/description"); - return Documentation(getDocumentation(xquery, query, DocModificationList())); + const Documentation doc = getDocumentation(xquery, query, DocModificationList()); + if (doc.isEmpty()) + qCWarning(lcShiboken(), "%s", qPrintable(msgCannotFindDocumentation(sourceFile, "module", name, query))); + return doc; } diff --git a/sources/shiboken2/ApiExtractor/tests/testarrayargument.cpp b/sources/shiboken2/ApiExtractor/tests/testarrayargument.cpp index 7c9d20ede..cbeb216c9 100644 --- a/sources/shiboken2/ApiExtractor/tests/testarrayargument.cpp +++ b/sources/shiboken2/ApiExtractor/tests/testarrayargument.cpp @@ -128,7 +128,7 @@ void TestArrayArgument::testArrayArgumentWithSizeDefinedByEnumValue() AbstractMetaEnum* someEnum = classA->findEnum(QLatin1String("SomeEnum")); QVERIFY(someEnum); - AbstractMetaEnumValue* nvalues = classA->findEnumValue(QLatin1String("NValues"), someEnum); + AbstractMetaEnumValue *nvalues = classA->findEnumValue(QLatin1String("NValues")); QVERIFY(nvalues); const AbstractMetaArgument* arg = classA->functions().last()->arguments().first(); @@ -159,14 +159,7 @@ void TestArrayArgument::testArrayArgumentWithSizeDefinedByEnumValueFromGlobalEnu AbstractMetaEnum* someEnum = builder->globalEnums().first(); QVERIFY(someEnum); - AbstractMetaEnumValue* nvalues = 0; - const AbstractMetaEnumValueList &values = someEnum->values(); - for (AbstractMetaEnumValue *enumValue : values) { - if (enumValue->name() == QLatin1String("NValues")) { - nvalues = enumValue; - break; - } - } + const AbstractMetaEnumValue *nvalues = someEnum->findEnumValue(QLatin1String("NValues")); QVERIFY(nvalues); const AbstractMetaArgument* arg = classA->functions().last()->arguments().first(); diff --git a/sources/shiboken2/ApiExtractor/tests/testenum.cpp b/sources/shiboken2/ApiExtractor/tests/testenum.cpp index 98e56b86e..55c098840 100644 --- a/sources/shiboken2/ApiExtractor/tests/testenum.cpp +++ b/sources/shiboken2/ApiExtractor/tests/testenum.cpp @@ -83,6 +83,10 @@ void TestEnum::testEnumCppSignature() AbstractMetaEnumList classEnums = classA->enums(); QCOMPARE(classEnums.first()->name(), QLatin1String("ClassEnum")); + AbstractMetaEnumValue *e = AbstractMetaClass::findEnumValue(classes, QLatin1String("CA")); + QVERIFY(e); + e = AbstractMetaClass::findEnumValue(classes, QLatin1String("ClassEnum::CA")); + QVERIFY(e); } void TestEnum::testEnumWithApiVersion() diff --git a/sources/shiboken2/ApiExtractor/tests/testmodifydocumentation.cpp b/sources/shiboken2/ApiExtractor/tests/testmodifydocumentation.cpp index 96bd0251b..d56186479 100644 --- a/sources/shiboken2/ApiExtractor/tests/testmodifydocumentation.cpp +++ b/sources/shiboken2/ApiExtractor/tests/testmodifydocumentation.cpp @@ -66,7 +66,7 @@ void TestModifyDocumentation::testModifyDocumentation() <para>Paragraph number 1</para>\n\ <para>Paragraph number 2</para>\n\ <para>Some changed contents here</para>\n\ -</description>\n")); +</description>")); } // We expand QTEST_MAIN macro but using QCoreApplication instead of QApplication diff --git a/sources/shiboken2/CMakeLists.txt b/sources/shiboken2/CMakeLists.txt index b9dd0a7f9..006924ad9 100644 --- a/sources/shiboken2/CMakeLists.txt +++ b/sources/shiboken2/CMakeLists.txt @@ -15,6 +15,7 @@ set(shiboken_MAJOR_VERSION "2") set(shiboken_MINOR_VERSION "0") set(shiboken_MICRO_VERSION "0") set(shiboken2_VERSION "${shiboken_MAJOR_VERSION}.${shiboken_MINOR_VERSION}.${shiboken_MICRO_VERSION}") +set(shiboken2_library_so_version "${shiboken_MAJOR_VERSION}.${shiboken_MINOR_VERSION}") option(BUILD_TESTS "Build tests." TRUE) option(USE_PYTHON_VERSION "Use specific python version to build shiboken2." "") diff --git a/sources/shiboken2/data/Shiboken2Config-spec.cmake.in b/sources/shiboken2/data/Shiboken2Config-spec.cmake.in index 9a30d7b4d..576bed0e2 100644 --- a/sources/shiboken2/data/Shiboken2Config-spec.cmake.in +++ b/sources/shiboken2/data/Shiboken2Config-spec.cmake.in @@ -25,6 +25,7 @@ SET(SHIBOKEN_PYTHON_LIBRARIES "@SBK_PYTHON_LIBRARIES@") SET(SHIBOKEN_PYTHON_EXTENSION_SUFFIX "@PYTHON_EXTENSION_SUFFIX@") SET(SHIBOKEN_PYTHON_SHARED_LIBRARY_SUFFIX "@PYTHON_SHARED_LIBRARY_SUFFIX@") SET(SHIBOKEN_PYTHON_CONFIG_SUFFIX "@PYTHON_CONFIG_SUFFIX@") +SET(SHIBOKEN_SO_VERSION "@shiboken2_library_so_version@") message(STATUS "libshiboken built for @SHIBOKEN_BUILD_TYPE@") @SBK_ADD_PY_DEBUG_DEFINITION@ diff --git a/sources/shiboken2/doc/conf.py.in b/sources/shiboken2/doc/conf.py.in index ed61d2695..5dc7b868d 100644 --- a/sources/shiboken2/doc/conf.py.in +++ b/sources/shiboken2/doc/conf.py.in @@ -131,10 +131,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 = { '' : ''} @@ -154,8 +150,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/shiboken2/generator/qtdoc/qtdocgenerator.cpp b/sources/shiboken2/generator/qtdoc/qtdocgenerator.cpp index 1310f5ac0..fb4de46d2 100644 --- a/sources/shiboken2/generator/qtdoc/qtdocgenerator.cpp +++ b/sources/shiboken2/generator/qtdoc/qtdocgenerator.cpp @@ -35,6 +35,7 @@ #include <typedatabase.h> #include <algorithm> #include <QtCore/QStack> +#include <QtCore/QRegularExpression> #include <QtCore/QTextStream> #include <QtCore/QXmlStreamReader> #include <QtCore/QFile> @@ -46,37 +47,36 @@ static Indentor INDENT; static bool shouldSkip(const AbstractMetaFunction* func) { - bool skipable = func->isConstructor() - || func->isModifiedRemoved() - || func->declaringClass() != func->ownerClass() - || func->isCastOperator() - || func->name() == QLatin1String("operator="); - - // Search a const clone - if (!skipable && !func->isConstant()) { - const AbstractMetaArgumentList funcArgs = func->arguments(); - const AbstractMetaFunctionList &ownerFunctions = func->ownerClass()->functions(); - for (AbstractMetaFunction *f : ownerFunctions) { - if (f != func - && f->isConstant() - && f->name() == func->name() - && f->arguments().count() == funcArgs.count()) { - // Compare each argument - bool cloneFound = true; - - const AbstractMetaArgumentList fargs = f->arguments(); - for (int i = 0, max = funcArgs.count(); i < max; ++i) { - if (funcArgs.at(i)->type()->typeEntry() != fargs.at(i)->type()->typeEntry()) { - cloneFound = false; - break; - } + // Constructors go to separate section + if (DocParser::skipForQuery(func) || func->isConstructor()) + return true; + + // Search a const clone (QImage::bits() vs QImage::bits() const) + if (func->isConstant()) + return false; + + const AbstractMetaArgumentList funcArgs = func->arguments(); + const AbstractMetaFunctionList &ownerFunctions = func->ownerClass()->functions(); + for (AbstractMetaFunction *f : ownerFunctions) { + if (f != func + && f->isConstant() + && f->name() == func->name() + && f->arguments().count() == funcArgs.count()) { + // Compare each argument + bool cloneFound = true; + + const AbstractMetaArgumentList fargs = f->arguments(); + for (int i = 0, max = funcArgs.count(); i < max; ++i) { + if (funcArgs.at(i)->type()->typeEntry() != fargs.at(i)->type()->typeEntry()) { + cloneFound = false; + break; } - if (cloneFound) - return true; } + if (cloneFound) + return true; } } - return skipable; + return false; } static bool functionSort(const AbstractMetaFunction* func1, const AbstractMetaFunction* func2) @@ -84,28 +84,101 @@ static bool functionSort(const AbstractMetaFunction* func1, const AbstractMetaFu return func1->name() < func2->name(); } -static QString createRepeatedChar(int i, char c) +class Pad { - QString out; - for (int j = 0; j < i; ++j) - out += QLatin1Char(c); +public: + explicit Pad(char c, int count) : m_char(c), m_count(count) {} + + void write(QTextStream &str) const + { + for (int i = 0; i < m_count; ++i) + str << m_char; + } - return out; +private: + const char m_char; + const int m_count; +}; + +inline QTextStream &operator<<(QTextStream &str, const Pad &pad) +{ + pad.write(str); + return str; } -static QString escape(QString str) +template <class String> +static int writeEscapedRstText(QTextStream &str, const String &s) +{ + int escaped = 0; + for (const QChar &c : s) { + if (c == QLatin1Char('*') || c == QLatin1Char('_')) { + str << '\\'; + ++escaped; + } + str << c; + } + return s.size() + escaped; +} + +class escape +{ +public: + explicit escape(const QStringRef &s) : m_string(s) {} + + void write(QTextStream &str) const { writeEscapedRstText(str, m_string); } + +private: + const QStringRef m_string; +}; + +inline QTextStream &operator<<(QTextStream &str, const escape &e) { - str.replace(QLatin1Char('*'), QLatin1String("\\*")); - str.replace(QLatin1Char('_'), QLatin1String("\\_")); + e.write(str); return str; } -static QString escape(const QStringRef& strref) +// Return last character of a QString-buffered stream. +static QChar lastChar(const QTextStream &str) { - QString str = strref.toString(); - return escape(str); + const QString *string = str.string(); + Q_ASSERT(string); + return string->isEmpty() ? QChar() : *(string->crbegin()); } +static QTextStream &ensureEndl(QTextStream &s) +{ + if (lastChar(s) != QLatin1Char('\n')) + s << endl; + return s; +} + +static QString msgTagWarning(const QXmlStreamReader &reader, const QString &context, + const QString &tag, const QString &message) +{ + QString result; + QTextStream str(&result); + str << "While handling <"; + const QStringRef currentTag = reader.name(); + if (currentTag.isEmpty()) + str << tag; + else + str << currentTag; + str << "> in " << context << ", line "<< reader.lineNumber() + << ": " << message; + return result; +} + +static QString msgFallbackWarning(const QXmlStreamReader &reader, const QString &context, + const QString &tag, const QString &location, const QString &identifier, + const QString &fallback) +{ + QString message = QLatin1String("Falling back to \"") + + QDir::toNativeSeparators(fallback) + QLatin1String("\" for \"") + location + + QLatin1Char('"'); + if (!identifier.isEmpty()) + message += QLatin1String(" [") + identifier + QLatin1Char(']'); + return msgTagWarning(reader, context, tag, message); +} QtXmlToSphinx::QtXmlToSphinx(QtDocGenerator* generator, const QString& doc, const QString& context) : m_context(context), m_generator(generator), m_insideBold(false), m_insideItalic(false) @@ -198,32 +271,30 @@ QString QtXmlToSphinx::popOutputBuffer() return strcpy; } -QString QtXmlToSphinx::expandFunction(const QString& function) +QString QtXmlToSphinx::expandFunction(const QString& function) const { - QStringList functionSpec = function.split(QLatin1Char('.')); - QString className = functionSpec.first(); - const AbstractMetaClass* metaClass = 0; - const AbstractMetaClassList &classes = m_generator->classes(); - for (const AbstractMetaClass *cls : classes) { - if (cls->name() == className) { - metaClass = cls; - break; + const int firstDot = function.indexOf(QLatin1Char('.')); + const AbstractMetaClass *metaClass = nullptr; + if (firstDot != -1) { + const QStringRef className = function.leftRef(firstDot); + const AbstractMetaClassList &classes = m_generator->classes(); + for (const AbstractMetaClass *cls : classes) { + if (cls->name() == className) { + metaClass = cls; + break; + } } } - if (metaClass) { - functionSpec.removeFirst(); - return metaClass->typeEntry()->qualifiedTargetLangName() - + QLatin1Char('.') + functionSpec.join(QLatin1Char('.')); - } else { - return function; - } + return metaClass + ? metaClass->typeEntry()->qualifiedTargetLangName() + + function.right(function.size() - firstDot) + : function; } -QString QtXmlToSphinx::resolveContextForMethod(const QString& methodName) +QString QtXmlToSphinx::resolveContextForMethod(const QString& methodName) const { - // avoid constLast to stay Qt 5.5 compatible - QString currentClass = m_context.split(QLatin1Char('.')).last(); + const QStringRef currentClass = m_context.splitRef(QLatin1Char('.')).constLast(); const AbstractMetaClass* metaClass = 0; const AbstractMetaClassList &classes = m_generator->classes(); @@ -300,88 +371,99 @@ QString QtXmlToSphinx::transform(const QString& doc) return retval; } -QString QtXmlToSphinx::readFromLocations(const QStringList& locations, const QString& path, const QString& identifier) +static QString resolveFile(const QStringList &locations, const QString &path) { - QString result; - bool ok = false; for (QString location : locations) { location.append(QLatin1Char('/')); location.append(path); - result = readFromLocation(location, identifier, &ok); - if (ok) - break; - } - if (!ok) { - qCDebug(lcShiboken).noquote().nospace() << "Couldn't read code snippet file: {" - << locations.join(QLatin1Char('|')) << '}' << path; + if (QFileInfo::exists(location)) + return location; } - return result; + return QString(); +} +QString QtXmlToSphinx::readFromLocations(const QStringList &locations, const QString &path, + const QString &identifier, QString *errorMessage) +{ + QString result; + const QString resolvedPath = resolveFile(locations, path); + if (resolvedPath.isEmpty()) { + QTextStream(errorMessage) << "Could not resolve \"" << path << "\" in \"" + << locations.join(QLatin1String("\", \"")); + return QString(); // null + } + qCDebug(lcShiboken).noquote().nospace() << "snippet file " << path + << " [" << identifier << ']' << " resolved to " << resolvedPath; + return readFromLocation(resolvedPath, identifier, errorMessage); } -QString QtXmlToSphinx::readFromLocation(const QString& location, const QString& identifier, bool* ok) +QString QtXmlToSphinx::readFromLocation(const QString &location, const QString &identifier, + QString *errorMessage) { QFile inputFile; inputFile.setFileName(location); if (!inputFile.open(QIODevice::ReadOnly)) { - if (!ok) { - qCDebug(lcShiboken).noquote().nospace() << "Couldn't read code snippet file: " - << QDir::toNativeSeparators(inputFile.fileName()); - } else { - *ok = false; - } - return QString(); + QTextStream(errorMessage) << "Could not read code snippet file: " + << QDir::toNativeSeparators(inputFile.fileName()) + << ": " << inputFile.errorString(); + return QString(); // null } - QRegExp searchString(QLatin1String("//!\\s*\\[") + identifier + QLatin1String("\\]")); - QRegExp codeSnippetCode(QLatin1String("//!\\s*\\[[\\w\\d\\s]+\\]")); - QString code; + QString code = QLatin1String(""); // non-null + if (identifier.isEmpty()) { + while (!inputFile.atEnd()) + code += QString::fromUtf8(inputFile.readLine()); + return code; + } + + const QRegularExpression searchString(QLatin1String("//!\\s*\\[") + + identifier + QLatin1String("\\]")); + Q_ASSERT(searchString.isValid()); + static const QRegularExpression codeSnippetCode(QLatin1String("//!\\s*\\[[\\w\\d\\s]+\\]")); + Q_ASSERT(codeSnippetCode.isValid()); - bool identifierIsEmpty = identifier.isEmpty(); bool getCode = false; while (!inputFile.atEnd()) { QString line = QString::fromUtf8(inputFile.readLine()); - if (identifierIsEmpty) { - code += line; - } else if (getCode && !line.contains(searchString)) { + if (getCode && !line.contains(searchString)) { line.remove(codeSnippetCode); code += line; } else if (line.contains(searchString)) { if (getCode) break; - else - getCode = true; + getCode = true; } } - if (!identifierIsEmpty && !getCode) { - qCDebug(lcShiboken).noquote().nospace() << "Code snippet file found (" - << location << "), but snippet " << identifier << " not found."; + if (!getCode) { + QTextStream(errorMessage) << "Code snippet file found (" + << QDir::toNativeSeparators(location) << "), but snippet [" + << identifier << "] not found."; + return QString(); // null } - if (ok) - *ok = true; return code; } void QtXmlToSphinx::handleHeadingTag(QXmlStreamReader& reader) { - static QString heading; + static int headingSize = 0; static char type; static char types[] = { '-', '^' }; QXmlStreamReader::TokenType token = reader.tokenType(); if (token == QXmlStreamReader::StartElement) { - uint typeIdx = reader.attributes().value(QLatin1String("level")).toString().toUInt(); + uint typeIdx = reader.attributes().value(QLatin1String("level")).toUInt(); if (typeIdx >= sizeof(types)) type = types[sizeof(types)-1]; else type = types[typeIdx]; } else if (token == QXmlStreamReader::EndElement) { - m_output << createRepeatedChar(heading.length(), type) << endl << endl; + m_output << Pad(type, headingSize) << endl << endl; } else if (token == QXmlStreamReader::Characters) { - heading = escape(reader.text()).trimmed(); - m_output << endl << endl << heading << endl; + m_output << endl << endl; + headingSize = writeEscapedRstText(m_output, reader.text().trimmed()); + m_output << endl; } } @@ -399,14 +481,14 @@ void QtXmlToSphinx::handleParaTag(QXmlStreamReader& reader) m_output << INDENT << result << endl << endl; } else if (token == QXmlStreamReader::Characters) { - QString text = escape(reader.text()); - if (!m_output.string()->isEmpty()) { + const QStringRef text = reader.text(); + const QChar end = lastChar(m_output); + if (!text.isEmpty() && INDENT.indent == 0 && !end.isNull()) { QChar start = text[0]; - QChar end = m_output.string()->at(m_output.string()->length() - 1); if ((end == QLatin1Char('*') || end == QLatin1Char('`')) && start != QLatin1Char(' ') && !start.isPunct()) m_output << '\\'; } - m_output << INDENT << text; + m_output << INDENT << escape(text); } } @@ -417,7 +499,7 @@ void QtXmlToSphinx::handleItalicTag(QXmlStreamReader& reader) m_insideItalic = !m_insideItalic; m_output << '*'; } else if (token == QXmlStreamReader::Characters) { - m_output << escape(reader.text()).trimmed(); + m_output << escape(reader.text().trimmed()); } } @@ -428,7 +510,7 @@ void QtXmlToSphinx::handleBoldTag(QXmlStreamReader& reader) m_insideBold = !m_insideBold; m_output << "**"; } else if (token == QXmlStreamReader::Characters) { - m_output << escape(reader.text()).trimmed(); + m_output << escape(reader.text().trimmed()); } } @@ -438,16 +520,102 @@ void QtXmlToSphinx::handleArgumentTag(QXmlStreamReader& reader) if (token == QXmlStreamReader::StartElement || token == QXmlStreamReader::EndElement) m_output << "``"; else if (token == QXmlStreamReader::Characters) - m_output << reader.text().toString().trimmed(); + m_output << reader.text().trimmed(); +} + +static inline QString functionLinkType() { return QStringLiteral("function"); } +static inline QString classLinkType() { return QStringLiteral("class"); } + +static inline QString fixLinkType(const QStringRef &type) +{ + // TODO: create a flag PROPERTY-AS-FUNCTION to ask if the properties + // are recognized as such or not in the binding + if (type == QLatin1String("property")) + return functionLinkType(); + if (type == QLatin1String("typedef")) + return classLinkType(); + return type.toString(); +} + +static inline QString linkSourceAttribute(const QString &type) +{ + if (type == functionLinkType() || type == classLinkType()) + return QLatin1String("raw"); + return type == QLatin1String("enum") || type == QLatin1String("page") + ? type : QLatin1String("href"); } +// "See also" links may appear as nested links: +// <see-also>QAbstractXmlReceiver<link raw="isValid()" href="qxmlquery.html#isValid" type="function">isValid()</link> +// which is handled in handleLinkTag +// or direct text: +// <see-also>rootIsDecorated()</see-also> +// which is handled here. + void QtXmlToSphinx::handleSeeAlsoTag(QXmlStreamReader& reader) { - QXmlStreamReader::TokenType token = reader.tokenType(); - if (token == QXmlStreamReader::StartElement) + switch (reader.tokenType()) { + case QXmlStreamReader::StartElement: m_output << INDENT << ".. seealso:: "; - else if (token == QXmlStreamReader::EndElement) + break; + case QXmlStreamReader::Characters: { + // Direct embedded link: <see-also>rootIsDecorated()</see-also> + const QStringRef textR = reader.text().trimmed(); + if (!textR.isEmpty()) { + const QString text = textR.toString(); + if (m_seeAlsoContext.isNull()) { + const QString type = text.endsWith(QLatin1String("()")) + ? functionLinkType() : classLinkType(); + m_seeAlsoContext.reset(handleLinkStart(type, text)); + } + handleLinkText(m_seeAlsoContext.data(), text); + } + } + break; + case QXmlStreamReader::EndElement: + if (!m_seeAlsoContext.isNull()) { // direct, no nested </link> seen + handleLinkEnd(m_seeAlsoContext.data()); + m_seeAlsoContext.reset(); + } m_output << endl; + break; + default: + break; + } +} + +static inline QString fallbackPathAttribute() { return QStringLiteral("path"); } + +static inline bool snippetComparison() +{ + return ReportHandler::debugLevel() >= ReportHandler::FullDebug; +} + +template <class Indent> // const char*/class Indentor +void formatSnippet(QTextStream &str, Indent indent, const QString &snippet) +{ + const QVector<QStringRef> lines = snippet.splitRef(QLatin1Char('\n')); + for (const QStringRef &line : lines) { + if (!line.trimmed().isEmpty()) + str << indent << line; + str << endl; + } +} + +static QString msgSnippetComparison(const QString &location, const QString &identifier, + const QString &pythonCode, const QString &fallbackCode) +{ + QString result; + QTextStream str(&result); + str << "Python snippet " << location; + if (!identifier.isEmpty()) + str << " [" << identifier << ']'; + str << ":\n"; + formatSnippet(str, " ", pythonCode); + str << "Corresponding fallback snippet:\n"; + formatSnippet(str, " ", fallbackCode); + str << "-- end --\n"; + return result; } void QtXmlToSphinx::handleSnippetTag(QXmlStreamReader& reader) @@ -462,22 +630,38 @@ void QtXmlToSphinx::handleSnippetTag(QXmlStreamReader& reader) } QString location = reader.attributes().value(QLatin1String("location")).toString(); QString identifier = reader.attributes().value(QLatin1String("identifier")).toString(); - QString code = readFromLocations(m_generator->codeSnippetDirs(), location, identifier); + QString errorMessage; + const QString pythonCode = + readFromLocations(m_generator->codeSnippetDirs(), location, identifier, &errorMessage); + if (!errorMessage.isEmpty()) + qCWarning(lcShiboken, "%s", qPrintable(msgTagWarning(reader, m_context, m_lastTagName, errorMessage))); + // Fall back to C++ snippet when "path" attribute is present. + // Also read fallback snippet when comparison is desired. + QString fallbackCode; + if ((pythonCode.isNull() || snippetComparison()) + && reader.attributes().hasAttribute(fallbackPathAttribute())) { + const QString fallback = reader.attributes().value(fallbackPathAttribute()).toString(); + if (QFileInfo::exists(fallback)) { + if (pythonCode.isNull()) + qCWarning(lcShiboken, "%s", qPrintable(msgFallbackWarning(reader, m_context, m_lastTagName, location, identifier, fallback))); + fallbackCode = readFromLocation(fallback, identifier, &errorMessage); + if (!errorMessage.isEmpty()) + qCWarning(lcShiboken, "%s", qPrintable(msgTagWarning(reader, m_context, m_lastTagName, errorMessage))); + } + } + + if (!pythonCode.isEmpty() && !fallbackCode.isEmpty() && snippetComparison()) + qCDebug(lcShiboken, "%s", qPrintable(msgSnippetComparison(location, identifier, pythonCode, fallbackCode))); + if (!consecutiveSnippet) m_output << INDENT << "::\n\n"; Indentation indentation(INDENT); - if (code.isEmpty()) { + const QString code = pythonCode.isNull() ? fallbackCode : pythonCode; + if (code.isEmpty()) m_output << INDENT << "<Code snippet \"" << location << ':' << identifier << "\" not found>" << endl; - } else { - const QStringList lines = code.split(QLatin1Char('\n')); - for (const QString &line : lines) { - if (!QString(line).trimmed().isEmpty()) - m_output << INDENT << line; - - m_output << endl; - } - } + else + formatSnippet(m_output, INDENT, code); m_output << endl; } } @@ -494,7 +678,7 @@ void QtXmlToSphinx::handleDotsTag(QXmlStreamReader& reader) Indentation indentation(INDENT); pushOutputBuffer(); m_output << INDENT; - int indent = reader.attributes().value(QLatin1String("indent")).toString().toInt(); + int indent = reader.attributes().value(QLatin1String("indent")).toInt(); for (int i = 0; i < indent; ++i) m_output << ' '; } else if (token == QXmlStreamReader::Characters) { @@ -514,7 +698,7 @@ void QtXmlToSphinx::handleTableTag(QXmlStreamReader& reader) // write the table on m_output m_currentTable.enableHeader(m_tableHasHeader); m_currentTable.normalize(); - m_output << m_currentTable; + m_output << ensureEndl << m_currentTable; m_currentTable.clear(); } } @@ -542,8 +726,8 @@ void QtXmlToSphinx::handleItemTag(QXmlStreamReader& reader) m_currentTable << TableRow(); TableRow& row = m_currentTable.last(); TableCell cell; - cell.colSpan = reader.attributes().value(QLatin1String("colspan")).toString().toShort(); - cell.rowSpan = reader.attributes().value(QLatin1String("rowspan")).toString().toShort(); + cell.colSpan = reader.attributes().value(QLatin1String("colspan")).toShort(); + cell.rowSpan = reader.attributes().value(QLatin1String("rowspan")).toShort(); row << cell; pushOutputBuffer(); } else if (token == QXmlStreamReader::EndElement) { @@ -583,8 +767,8 @@ void QtXmlToSphinx::handleListTag(QXmlStreamReader& reader) if (listType == QLatin1String("bullet")) { m_output << endl; for (const TableCell &cell : m_currentTable.constFirst()) { - QStringList itemLines = cell.data.split(QLatin1Char('\n')); - m_output << INDENT << "* " << itemLines.first() << endl; + const QVector<QStringRef> itemLines = cell.data.splitRef(QLatin1Char('\n')); + m_output << INDENT << "* " << itemLines.constFirst() << endl; for (int i = 1, max = itemLines.count(); i < max; ++i) m_output << INDENT << " " << itemLines[i] << endl; } @@ -592,7 +776,7 @@ void QtXmlToSphinx::handleListTag(QXmlStreamReader& reader) } else if (listType == QLatin1String("enum")) { m_currentTable.enableHeader(m_tableHasHeader); m_currentTable.normalize(); - m_output << m_currentTable; + m_output << ensureEndl << m_currentTable; } } m_currentTable.clear(); @@ -601,114 +785,172 @@ void QtXmlToSphinx::handleListTag(QXmlStreamReader& reader) void QtXmlToSphinx::handleLinkTag(QXmlStreamReader& reader) { - static QString l_linktag; - static QString l_linkref; - static QString l_linktext; - static QString l_linktagending; - static QString l_type; - QXmlStreamReader::TokenType token = reader.tokenType(); - if (token == QXmlStreamReader::StartElement) { - l_linktagending = QLatin1String("` "); - if (m_insideBold) { - l_linktag.prepend(QLatin1String("**")); - l_linktagending.append(QLatin1String("**")); - } else if (m_insideItalic) { - l_linktag.prepend(QLatin1Char('*')); - l_linktagending.append(QLatin1Char('*')); - } - l_type = reader.attributes().value(QLatin1String("type")).toString(); - - // TODO: create a flag PROPERTY-AS-FUNCTION to ask if the properties - // are recognized as such or not in the binding - if (l_type == QLatin1String("property")) - l_type = QLatin1String("function"); - - if (l_type == QLatin1String("typedef")) - l_type = QLatin1String("class"); - - QString linkSource; - if (l_type == QLatin1String("function") || l_type == QLatin1String("class")) { - linkSource = QLatin1String("raw"); - } else if (l_type == QLatin1String("enum")) { - linkSource = QLatin1String("enum"); - } else if (l_type == QLatin1String("page")) { - linkSource = QLatin1String("page"); + switch (reader.tokenType()) { + case QXmlStreamReader::StartElement: { + // <link> embedded in <see-also> means the characters of <see-also> are no link. + m_seeAlsoContext.reset(); + const QString type = fixLinkType(reader.attributes().value(QLatin1String("type"))); + const QString ref = reader.attributes().value(linkSourceAttribute(type)).toString(); + m_linkContext.reset(handleLinkStart(type, ref)); + } + break; + case QXmlStreamReader::Characters: + Q_ASSERT(!m_linkContext.isNull()); + handleLinkText(m_linkContext.data(), reader.text().toString()); + break; + case QXmlStreamReader::EndElement: + Q_ASSERT(!m_linkContext.isNull()); + handleLinkEnd(m_linkContext.data()); + m_linkContext.reset(); + break; + default: + break; + } +} + +QtXmlToSphinx::LinkContext *QtXmlToSphinx::handleLinkStart(const QString &type, const QString &ref) const +{ + LinkContext *result = new LinkContext(ref, type); + + result->linkTagEnding = QLatin1String("` "); + if (m_insideBold) { + result->linkTag.prepend(QLatin1String("**")); + result->linkTagEnding.append(QLatin1String("**")); + } else if (m_insideItalic) { + result->linkTag.prepend(QLatin1Char('*')); + result->linkTagEnding.append(QLatin1Char('*')); + } + + result->linkRef.replace(QLatin1String("::"), QLatin1String(".")); + result->linkRef.remove(QLatin1String("()")); + + if (result->type == functionLinkType() && !m_context.isEmpty()) { + result->linkTag = QLatin1String(" :meth:`"); + const QVector<QStringRef> rawlinklist = result->linkRef.splitRef(QLatin1Char('.')); + if (rawlinklist.size() == 1 || rawlinklist.constFirst() == m_context) { + QString context = resolveContextForMethod(rawlinklist.constLast().toString()); + if (!result->linkRef.startsWith(context)) + result->linkRef.prepend(context + QLatin1Char('.')); } else { - linkSource = QLatin1String("href"); + result->linkRef = expandFunction(result->linkRef); } - - l_linkref = reader.attributes().value(linkSource).toString(); - l_linkref.replace(QLatin1String("::"), QLatin1String(".")); - l_linkref.remove(QLatin1String("()")); - - if (l_type == QLatin1String("function") && !m_context.isEmpty()) { - l_linktag = QLatin1String(" :meth:`"); - QStringList rawlinklist = l_linkref.split(QLatin1Char('.')); - if (rawlinklist.size() == 1 || rawlinklist.first() == m_context) { - QString context = resolveContextForMethod(rawlinklist.last()); - if (!l_linkref.startsWith(context)) - l_linkref.prepend(context + QLatin1Char('.')); - } else { - l_linkref = expandFunction(l_linkref); - } - } else if (l_type == QLatin1String("function") && m_context.isEmpty()) { - l_linktag = QLatin1String(" :func:`"); - } else if (l_type == QLatin1String("class")) { - l_linktag = QLatin1String(" :class:`"); - TypeEntry* type = TypeDatabase::instance()->findType(l_linkref); - if (type) { - l_linkref = type->qualifiedTargetLangName(); - } else { // fall back to the old heuristic if the type wasn't found. - QStringList rawlinklist = l_linkref.split(QLatin1Char('.')); - QStringList splittedContext = m_context.split(QLatin1Char('.')); - if (rawlinklist.size() == 1 || rawlinklist.first() == splittedContext.last()) { - splittedContext.removeLast(); - l_linkref.prepend(QLatin1Char('~') + splittedContext.join(QLatin1Char('.')) - + QLatin1Char('.')); - } + } else if (result->type == functionLinkType() && m_context.isEmpty()) { + result->linkTag = QLatin1String(" :func:`"); + } else if (result->type == classLinkType()) { + result->linkTag = QLatin1String(" :class:`"); + if (const TypeEntry *type = TypeDatabase::instance()->findType(result->linkRef)) { + result->linkRef = type->qualifiedTargetLangName(); + } else { // fall back to the old heuristic if the type wasn't found. + const QVector<QStringRef> rawlinklist = result->linkRef.splitRef(QLatin1Char('.')); + QStringList splittedContext = m_context.split(QLatin1Char('.')); + if (rawlinklist.size() == 1 || rawlinklist.constFirst() == splittedContext.constLast()) { + splittedContext.removeLast(); + result->linkRef.prepend(QLatin1Char('~') + splittedContext.join(QLatin1Char('.')) + + QLatin1Char('.')); } - } else if (l_type == QLatin1String("enum")) { - l_linktag = QLatin1String(" :attr:`"); - } else if (l_type == QLatin1String("page") && l_linkref == m_generator->moduleName()) { - l_linktag = QLatin1String(" :mod:`"); - } else { - l_linktag = QLatin1String(" :ref:`"); } + } else if (result->type == QLatin1String("enum")) { + result->linkTag = QLatin1String(" :attr:`"); + } else if (result->type == QLatin1String("page") && result->linkRef == m_generator->moduleName()) { + result->linkTag = QLatin1String(" :mod:`"); + } else { + result->linkTag = QLatin1String(" :ref:`"); + } + return result; +} - } else if (token == QXmlStreamReader::Characters) { - QString linktext = reader.text().toString(); - linktext.replace(QLatin1String("::"), QLatin1String(".")); - // avoid constLast to stay Qt 5.5 compatible - QString item = l_linkref.split(QLatin1Char('.')).last(); - if (l_linkref == linktext - || (l_linkref + QLatin1String("()")) == linktext - || item == linktext - || (item + QLatin1String("()")) == linktext) - l_linktext.clear(); - else - l_linktext = linktext + QLatin1Char('<'); - } else if (token == QXmlStreamReader::EndElement) { - if (!l_linktext.isEmpty()) - l_linktagending.prepend(QLatin1Char('>')); - m_output << l_linktag << l_linktext << escape(l_linkref) << l_linktagending; +void QtXmlToSphinx::handleLinkText(LinkContext *linkContext, QString linktext) const +{ + linktext.replace(QLatin1String("::"), QLatin1String(".")); + const QStringRef item = linkContext->linkRef.splitRef(QLatin1Char('.')).constLast(); + if (linkContext->linkRef == linktext + || (linkContext->linkRef + QLatin1String("()")) == linktext + || item == linktext + || (item + QLatin1String("()")) == linktext) { + linkContext->linkText.clear(); + } else { + linkContext->linkText = linktext + QLatin1Char('<'); } } +void QtXmlToSphinx::handleLinkEnd(LinkContext *linkContext) +{ + if (!linkContext->linkText.isEmpty()) + linkContext->linkTagEnding.prepend(QLatin1Char('>')); + m_output << linkContext->linkTag << linkContext->linkText; + writeEscapedRstText(m_output, linkContext->linkRef); + m_output << linkContext->linkTagEnding; +} + +// Copy images that are placed in a subdirectory "images" under the webxml files +// by qdoc to a matching subdirectory under the "rst/PySide2/<module>" directory +static bool copyImage(const QString &href, const QString &docDataDir, + const QString &context, const QString &outputDir, + QString *errorMessage) +{ + const QChar slash = QLatin1Char('/'); + const int lastSlash = href.lastIndexOf(slash); + const QString imagePath = lastSlash != -1 ? href.left(lastSlash) : QString(); + const QString imageFileName = lastSlash != -1 ? href.right(href.size() - lastSlash - 1) : href; + QFileInfo imageSource(docDataDir + slash + href); + if (!imageSource.exists()) { + QTextStream(errorMessage) << "Image " << href << " does not exist in " + << QDir::toNativeSeparators(docDataDir); + return false; + } + // Determine directory from context, "Pyside2.QtGui.QPainter" ->"Pyside2/QtGui". + // FIXME: Not perfect yet, should have knowledge about namespaces (DataVis3D) or + // nested classes "Pyside2.QtGui.QTouchEvent.QTouchPoint". + QString relativeTargetDir = context; + const int lastDot = relativeTargetDir.lastIndexOf(QLatin1Char('.')); + if (lastDot != -1) + relativeTargetDir.truncate(lastDot); + relativeTargetDir.replace(QLatin1Char('.'), slash); + if (!imagePath.isEmpty()) + relativeTargetDir += slash + imagePath; + + const QString targetDir = outputDir + slash + relativeTargetDir; + const QString targetFileName = targetDir + slash + imageFileName; + if (QFileInfo::exists(targetFileName)) + return true; + if (!QFileInfo::exists(targetDir)) { + const QDir outDir(outputDir); + if (!outDir.mkpath(relativeTargetDir)) { + QTextStream(errorMessage) << "Cannot create " << QDir::toNativeSeparators(relativeTargetDir) + << " under " << QDir::toNativeSeparators(outputDir); + return false; + } + } + + QFile source(imageSource.absoluteFilePath()); + if (!source.copy(targetFileName)) { + QTextStream(errorMessage) << "Cannot copy " << QDir::toNativeSeparators(source.fileName()) + << " to " << QDir::toNativeSeparators(targetFileName) << ": " + << source.errorString(); + return false; + } + qCDebug(lcShiboken()).noquote().nospace() << __FUNCTION__ << " href=\"" + << href << "\", context=\"" << context << "\", docDataDir=\"" + << docDataDir << "\", outputDir=\"" << outputDir << "\", copied \"" + << source.fileName() << "\"->\"" << targetFileName << '"'; + return true; +} + void QtXmlToSphinx::handleImageTag(QXmlStreamReader& reader) { QXmlStreamReader::TokenType token = reader.tokenType(); if (token == QXmlStreamReader::StartElement) { QString href = reader.attributes().value(QLatin1String("href")).toString(); - QString packageName = m_generator->packageName(); - packageName.replace(QLatin1Char('.'), QLatin1Char('/')); - QDir dir(m_generator->outputDirectory() + QLatin1Char('/') + packageName); - QString imgPath = dir.relativeFilePath(m_generator->libSourceDir() + QLatin1String("/doc/src/")) - + QLatin1Char('/') + href; + QString errorMessage; + if (!copyImage(href,m_generator->docDataDir(), m_context, + m_generator->outputDirectory(), &errorMessage)) { + qCWarning(lcShiboken, "%s", qPrintable(errorMessage)); + } if (reader.name() == QLatin1String("image")) - m_output << INDENT << ".. image:: " << imgPath << endl << endl; + m_output << INDENT << ".. image:: " << href << endl << endl; else - m_output << ".. image:: " << imgPath << ' '; + m_output << ".. image:: " << href << ' '; } } @@ -719,8 +961,8 @@ void QtXmlToSphinx::handleRawTag(QXmlStreamReader& reader) QString format = reader.attributes().value(QLatin1String("format")).toString(); m_output << INDENT << ".. raw:: " << format.toLower() << endl << endl; } else if (token == QXmlStreamReader::Characters) { - const QStringList lst(reader.text().toString().split(QLatin1Char('\n'))); - for (const QString &row : lst) + const QVector<QStringRef> lst(reader.text().split(QLatin1Char('\n'))); + for (const QStringRef &row : lst) m_output << INDENT << INDENT << row << endl; } else if (token == QXmlStreamReader::EndElement) { m_output << endl << endl; @@ -734,8 +976,8 @@ void QtXmlToSphinx::handleCodeTag(QXmlStreamReader& reader) m_output << INDENT << "::" << endl << endl; INDENT.indent++; } else if (token == QXmlStreamReader::Characters) { - const QStringList lst(reader.text().toString().split(QLatin1Char('\n'))); - for (const QString &row : lst) + const QVector<QStringRef> lst(reader.text().split(QLatin1Char('\n'))); + for (const QStringRef &row : lst) m_output << INDENT << INDENT << row << endl; } else if (token == QXmlStreamReader::EndElement) { m_output << endl << endl; @@ -797,23 +1039,17 @@ void QtXmlToSphinx::handleQuoteFileTag(QXmlStreamReader& reader) QXmlStreamReader::TokenType token = reader.tokenType(); if (token == QXmlStreamReader::Characters) { QString location = reader.text().toString(); - QString identifier; location.prepend(m_generator->libSourceDir() + QLatin1Char('/')); - QString code = readFromLocation(location, identifier); - + QString errorMessage; + QString code = readFromLocation(location, QString(), &errorMessage); + if (!errorMessage.isEmpty()) + qCWarning(lcShiboken(), "%s", qPrintable(msgTagWarning(reader, m_context, m_lastTagName, errorMessage))); m_output << INDENT << "::\n\n"; Indentation indentation(INDENT); - if (code.isEmpty()) { + if (code.isEmpty()) m_output << INDENT << "<Code snippet \"" << location << "\" not found>" << endl; - } else { - const QStringList lines = code.split(QLatin1Char('\n')); - for (const QString &line : lines) { - if (!QString(line).trimmed().isEmpty()) - m_output << INDENT << line; - - m_output << endl; - } - } + else + formatCode(m_output, code, INDENT); m_output << endl; } } @@ -882,13 +1118,14 @@ QTextStream& operator<<(QTextStream& s, const QtXmlToSphinx::Table &table) } // calc width and height of each column and row - QVector<int> colWidths(table.first().count()); + const int headerColumnCount = table.constFirst().count(); + QVector<int> colWidths(headerColumnCount); QVector<int> rowHeights(table.count()); for (int i = 0, maxI = table.count(); i < maxI; ++i) { const QtXmlToSphinx::TableRow& row = table[i]; for (int j = 0, maxJ = std::min(row.count(), colWidths.size()); j < maxJ; ++j) { - const QStringList rowLines = row[j].data.split(QLatin1Char('\n')); // cache this would be a good idea - for (const QString &str : rowLines) + const QVector<QStringRef> rowLines = row[j].data.splitRef(QLatin1Char('\n')); // cache this would be a good idea + for (const QStringRef &str : rowLines) colWidths[j] = std::max(colWidths[j], str.count()); rowHeights[i] = std::max(rowHeights[i], row[j].data.count(QLatin1Char('\n')) + 1); } @@ -900,7 +1137,7 @@ QTextStream& operator<<(QTextStream& s, const QtXmlToSphinx::Table &table) // create a horizontal line to be used later. QString horizontalLine = QLatin1String("+"); for (int i = 0, max = colWidths.count(); i < max; ++i) { - horizontalLine += createRepeatedChar(colWidths[i], '-'); + horizontalLine += QString(colWidths.at(i), QLatin1Char('-')); horizontalLine += QLatin1Char('+'); } @@ -910,7 +1147,7 @@ QTextStream& operator<<(QTextStream& s, const QtXmlToSphinx::Table &table) // print line s << INDENT << '+'; - for (int col = 0, max = colWidths.count(); col < max; ++col) { + for (int col = 0; col < headerColumnCount; ++col) { char c; if (col >= row.length() || row[col].rowSpan == -1) c = ' '; @@ -918,16 +1155,17 @@ QTextStream& operator<<(QTextStream& s, const QtXmlToSphinx::Table &table) c = '='; else c = '-'; - s << createRepeatedChar(colWidths[col], c) << '+'; + s << Pad(c, colWidths.at(col)) << '+'; } s << endl; // Print the table cells for (int rowLine = 0; rowLine < rowHeights[i]; ++rowLine) { // for each line in a row - for (int j = 0, maxJ = std::min(row.count(), colWidths.size()); j < maxJ; ++j) { // for each column + int j = 0; + for (int maxJ = std::min(row.count(), headerColumnCount); j < maxJ; ++j) { // for each column const QtXmlToSphinx::TableCell& cell = row[j]; - QStringList rowLines = cell.data.split(QLatin1Char('\n')); // FIXME: Cache this!!! + const QVector<QStringRef> rowLines = cell.data.splitRef(QLatin1Char('\n')); // FIXME: Cache this!!! if (!j) // First column, so we need print the identation s << INDENT; @@ -935,10 +1173,13 @@ QTextStream& operator<<(QTextStream& s, const QtXmlToSphinx::Table &table) s << '|'; else s << ' '; - s << qSetFieldWidth(colWidths[j]) << left; - s << (rowLine < rowLines.count() ? rowLines[rowLine] : QString()); - s << qSetFieldWidth(0); + if (rowLine < rowLines.count()) + s << qSetFieldWidth(colWidths[j]) << left << rowLines.at(rowLine) << qSetFieldWidth(0); + else + s << Pad(' ', colWidths.at(j)); } + for ( ; j < headerColumnCount; ++j) // pad + s << '|' << Pad(' ', colWidths.at(j)); s << '|' << endl; } } @@ -1012,7 +1253,8 @@ QString QtDocGenerator::fileNameForContext(GeneratorContext &context) const } } -void QtDocGenerator::writeFormatedText(QTextStream& s, const Documentation& doc, const AbstractMetaClass* metaClass) +void QtDocGenerator::writeFormattedText(QTextStream &s, const Documentation &doc, + const AbstractMetaClass *metaClass) { QString metaClassName; @@ -1023,17 +1265,24 @@ void QtDocGenerator::writeFormatedText(QTextStream& s, const Documentation& doc, QtXmlToSphinx x(this, doc.value(), metaClassName); s << x; } else { - const QStringList lines = doc.value().split(QLatin1Char('\n')); - QRegExp regex(QLatin1String("\\S")); // non-space character + const QString &value = doc.value(); + const QVector<QStringRef> lines = value.splitRef(QLatin1Char('\n')); int typesystemIndentation = std::numeric_limits<int>().max(); - // check how many spaces must be removed from the begining of each line - for (const QString &line : lines) { - int idx = line.indexOf(regex); - if (idx >= 0) - typesystemIndentation = qMin(typesystemIndentation, idx); + // check how many spaces must be removed from the beginning of each line + for (const QStringRef &line : lines) { + const auto it = std::find_if(line.cbegin(), line.cend(), + [] (QChar c) { return !c.isSpace(); }); + if (it != line.cend()) + typesystemIndentation = qMin(typesystemIndentation, int(it - line.cbegin())); + } + if (typesystemIndentation == std::numeric_limits<int>().max()) + typesystemIndentation = 0; + for (const QStringRef &line : lines) { + s << INDENT + << (typesystemIndentation > 0 && typesystemIndentation < line.size() + ? line.right(line.size() - typesystemIndentation) : line) + << endl; } - for (QString line : lines) - s << INDENT << line.remove(0, typesystemIndentation) << endl; } s << endl; @@ -1072,7 +1321,7 @@ void QtDocGenerator::generateClass(QTextStream &s, GeneratorContext &classContex s << ".. _" << className << ":" << endl << endl; s << className << endl; - s << createRepeatedChar(className.count(), '*') << endl << endl; + s << Pad('*', className.count()) << endl << endl; s << ".. inheritance-diagram:: " << className << endl << " :parts: 2" << endl << endl; // TODO: This would be a parameter in the future... @@ -1089,12 +1338,13 @@ void QtDocGenerator::generateClass(QTextStream &s, GeneratorContext &classContex AbstractMetaFunctionList functionList = metaClass->functions(); qSort(functionList.begin(), functionList.end(), functionSort); - s << "Detailed Description\n" - "--------------------\n\n"; + s << endl + << "Detailed Description\n" + "--------------------\n\n"; writeInjectDocumentation(s, TypeSystem::DocModificationPrepend, metaClass, 0); if (!writeInjectDocumentation(s, TypeSystem::DocModificationReplace, metaClass, 0)) - writeFormatedText(s, metaClass->documentation(), metaClass); + writeFormattedText(s, metaClass->documentation(), metaClass); if (!metaClass->isNamespace()) writeConstructors(s, metaClass); @@ -1164,7 +1414,8 @@ void QtDocGenerator::writeFunctionList(QTextStream& s, const AbstractMetaClass* if ((functionList.size() > 0) || (staticFunctionList.size() > 0)) { QtXmlToSphinx::Table functionTable; - s << "Synopsis" << endl + s << endl + << "Synopsis" << endl << "--------" << endl << endl; writeFunctionBlock(s, QLatin1String("Functions"), functionList); @@ -1186,7 +1437,7 @@ void QtDocGenerator::writeFunctionBlock(QTextStream& s, const QString& title, QS s << ".. container:: function_list" << endl << endl; Indentation indentation(INDENT); for (const QString &func : qAsConst(functions)) - s << '*' << INDENT << func << endl; + s << INDENT << '*' << ' ' << func << endl; s << endl << endl; } @@ -1199,7 +1450,7 @@ void QtDocGenerator::writeEnums(QTextStream& s, const AbstractMetaClass* cppClas const AbstractMetaEnumList &enums = cppClass->enums(); for (AbstractMetaEnum *en : enums) { s << section_title << getClassTargetFullName(cppClass) << '.' << en->name() << endl << endl; - writeFormatedText(s, en->documentation(), cppClass); + writeFormattedText(s, en->documentation(), cppClass); if (en->typeEntry() && (en->typeEntry()->version() != 0)) s << ".. note:: This enum was introduced or modified in Qt " << en->typeEntry()->version() << endl; @@ -1215,7 +1466,7 @@ void QtDocGenerator::writeFields(QTextStream& s, const AbstractMetaClass* cppCla for (AbstractMetaField *field : fields) { s << section_title << getClassTargetFullName(cppClass) << "." << field->name() << endl << endl; //TODO: request for member ‘documentation’ is ambiguous - writeFormatedText(s, field->AbstractMetaAttributes::documentation(), cppClass); + writeFormattedText(s, field->AbstractMetaAttributes::documentation(), cppClass); } } @@ -1224,15 +1475,16 @@ void QtDocGenerator::writeConstructors(QTextStream& s, const AbstractMetaClass* static const QString sectionTitle = QLatin1String(".. class:: "); static const QString sectionTitleSpace = QString(sectionTitle.size(), QLatin1Char(' ')); - const AbstractMetaFunctionList lst = cppClass->queryFunctions(AbstractMetaClass::Constructors | AbstractMetaClass::Visible); + AbstractMetaFunctionList lst = cppClass->queryFunctions(AbstractMetaClass::Constructors | AbstractMetaClass::Visible); + for (int i = lst.size() - 1; i >= 0; --i) { + if (lst.at(i)->isModifiedRemoved() || lst.at(i)->functionType() == AbstractMetaFunction::MoveConstructorFunction) + lst.removeAt(i); + } bool first = true; QHash<QString, AbstractMetaArgument*> arg_map; - for (AbstractMetaFunction *func : lst) { - if (func->isModifiedRemoved()) - continue; - + for (AbstractMetaFunction *func : qAsConst(lst)) { if (first) { first = false; s << sectionTitle; @@ -1252,13 +1504,13 @@ void QtDocGenerator::writeConstructors(QTextStream& s, const AbstractMetaClass* for (QHash<QString, AbstractMetaArgument*>::const_iterator it = arg_map.cbegin(), end = arg_map.cend(); it != end; ++it) { Indentation indentation(INDENT); - writeParamerteType(s, cppClass, it.value()); + writeParameterType(s, cppClass, it.value()); } s << endl; - for (AbstractMetaFunction *func : lst) - writeFormatedText(s, func->documentation(), cppClass); + for (AbstractMetaFunction *func : qAsConst(lst)) + writeFormattedText(s, func->documentation(), cppClass); } QString QtDocGenerator::parseArgDocStyle(const AbstractMetaClass* cppClass, const AbstractMetaFunction* func) @@ -1393,7 +1645,7 @@ bool QtDocGenerator::writeInjectDocumentation(QTextStream& s, continue; doc.setValue(mod.code() , fmt); - writeFormatedText(s, doc, cppClass); + writeFormattedText(s, doc, cppClass); didSomething = true; } } @@ -1469,13 +1721,14 @@ QString QtDocGenerator::translateToPythonType(const AbstractMetaType* type, cons return strType; } -void QtDocGenerator::writeParamerteType(QTextStream& s, const AbstractMetaClass* cppClass, const AbstractMetaArgument* arg) +void QtDocGenerator::writeParameterType(QTextStream& s, const AbstractMetaClass* cppClass, const AbstractMetaArgument* arg) { s << INDENT << ":param " << arg->name() << ": " << translateToPythonType(arg->type(), cppClass) << endl; } -void QtDocGenerator::writeFunctionParametersType(QTextStream& s, const AbstractMetaClass* cppClass, const AbstractMetaFunction* func) +void QtDocGenerator::writeFunctionParametersType(QTextStream &s, const AbstractMetaClass *cppClass, + const AbstractMetaFunction *func) { Indentation indentation(INDENT); @@ -1486,7 +1739,7 @@ void QtDocGenerator::writeFunctionParametersType(QTextStream& s, const AbstractM if (func->argumentRemoved(arg->argumentIndex() + 1)) continue; - writeParamerteType(s, cppClass, arg); + writeParameterType(s, cppClass, arg); } if (!func->isConstructor() && func->type()) { @@ -1524,7 +1777,7 @@ void QtDocGenerator::writeFunction(QTextStream& s, bool writeDoc, const Abstract s << endl; writeInjectDocumentation(s, TypeSystem::DocModificationPrepend, cppClass, func); if (!writeInjectDocumentation(s, TypeSystem::DocModificationReplace, cppClass, func)) - writeFormatedText(s, func->documentation(), cppClass); + writeFormattedText(s, func->documentation(), cppClass); writeInjectDocumentation(s, TypeSystem::DocModificationAppend, cppClass, func); } } @@ -1604,7 +1857,7 @@ bool QtDocGenerator::finishGeneration() QString title = it.key(); s << title << endl; - s << createRepeatedChar(title.length(), '*') << endl << endl; + s << Pad('*', title.length()) << endl << endl; /* Avoid showing "Detailed Description for *every* class in toc tree */ Indentation indentation(INDENT); diff --git a/sources/shiboken2/generator/qtdoc/qtdocgenerator.h b/sources/shiboken2/generator/qtdoc/qtdocgenerator.h index 6ba9e7907..1977f3019 100644 --- a/sources/shiboken2/generator/qtdoc/qtdocgenerator.h +++ b/sources/shiboken2/generator/qtdoc/qtdocgenerator.h @@ -30,6 +30,7 @@ #include <QtCore/QStack> #include <QtCore/QHash> +#include <QtCore/QScopedPointer> #include <QtCore/QTextStream> #include <QXmlStreamReader> #include "generator.h" @@ -101,8 +102,19 @@ public: } private: - QString resolveContextForMethod(const QString& methodName); - QString expandFunction(const QString& function); + struct LinkContext + { + LinkContext(const QString &ref, const QString &lType) : linkRef(ref), type(lType) {} + + QString linkTag; + QString linkRef; + QString linkText; + QString linkTagEnding; + QString type; + }; + + QString resolveContextForMethod(const QString& methodName) const; + QString expandFunction(const QString& function) const; QString transform(const QString& doc); void handleHeadingTag(QXmlStreamReader& reader); @@ -133,6 +145,10 @@ private: void handleUselessTag(QXmlStreamReader& reader); void handleAnchorTag(QXmlStreamReader& reader); + LinkContext *handleLinkStart(const QString &type, const QString &ref) const; + void handleLinkText(LinkContext *linkContext, QString linktext) const; + void handleLinkEnd(LinkContext *linkContext); + typedef void (QtXmlToSphinx::*TagHandler)(QXmlStreamReader&); QHash<QString, TagHandler> m_handlerMap; QStack<TagHandler> m_handlers; @@ -143,6 +159,8 @@ private: Table m_currentTable; + QScopedPointer<LinkContext> m_linkContext; // for <link> + QScopedPointer<LinkContext> m_seeAlsoContext; // for <see-also>foo()</see-also> bool m_tableHasHeader; QString m_context; QtDocGenerator* m_generator; @@ -151,8 +169,10 @@ private: QString m_lastTagName; QString m_opened_anchor; - QString readFromLocations(const QStringList& locations, const QString& path, const QString& identifier); - QString readFromLocation(const QString& location, const QString& identifier, bool* ok = 0); + QString readFromLocations(const QStringList &locations, const QString &path, + const QString &identifier, QString *errorMessage); + QString readFromLocation(const QString &location, const QString &identifier, + QString *errorMessage); void pushOutputBuffer(); QString popOutputBuffer(); void writeTable(Table& table); @@ -179,6 +199,8 @@ public: return m_libSourceDir; } + QString docDataDir() const { return m_docDataDir; } + bool doSetup(const QMap<QString, QString>& args); const char* name() const @@ -209,13 +231,15 @@ private: void writeArguments(QTextStream &s, const AbstractMetaClass *cppClass, const AbstractMetaFunction *func); void writeFunctionSignature(QTextStream& s, const AbstractMetaClass* cppClass, const AbstractMetaFunction* func); void writeFunction(QTextStream& s, bool writeDoc, const AbstractMetaClass* cppClass, const AbstractMetaFunction* func); - void writeFunctionParametersType(QTextStream &s, const AbstractMetaClass *cppClass, const AbstractMetaFunction* func); + void writeFunctionParametersType(QTextStream &s, const AbstractMetaClass *cppClass, + const AbstractMetaFunction* func); void writeFunctionList(QTextStream& s, const AbstractMetaClass* cppClass); void writeFunctionBlock(QTextStream& s, const QString& title, QStringList& functions); - void writeParamerteType(QTextStream &s, const AbstractMetaClass *cppClass, const AbstractMetaArgument *arg); + void writeParameterType(QTextStream &s, const AbstractMetaClass *cppClass, const AbstractMetaArgument *arg); void writeConstructors(QTextStream &s, const AbstractMetaClass *cppClass); - void writeFormatedText(QTextStream& s, const Documentation& doc, const AbstractMetaClass* metaclass = 0); + void writeFormattedText(QTextStream &s, const Documentation &doc, + const AbstractMetaClass *metaclass = nullptr); bool writeInjectDocumentation(QTextStream& s, TypeSystem::DocModificationMode mode, const AbstractMetaClass* cppClass, const AbstractMetaFunction* func); void writeDocSnips(QTextStream &s, const CodeSnipList &codeSnips, TypeSystem::CodeSnipPosition position, TypeSystem::Language language); diff --git a/sources/shiboken2/generator/shiboken2/cppgenerator.cpp b/sources/shiboken2/generator/shiboken2/cppgenerator.cpp index 838770e89..7a688d1da 100644 --- a/sources/shiboken2/generator/shiboken2/cppgenerator.cpp +++ b/sources/shiboken2/generator/shiboken2/cppgenerator.cpp @@ -1070,7 +1070,8 @@ void CppGenerator::writeEnumConverterFunctions(QTextStream& s, const TypeEntry* code.clear(); - c << INDENT << "int castCppIn = *((" << cppTypeName << "*)cppIn);" << endl; + c << INDENT << "const int castCppIn = int(*reinterpret_cast<const " + << cppTypeName << " *>(cppIn));" << endl; c << INDENT; c << "return "; if (enumType->isFlags()) @@ -4519,6 +4520,9 @@ void CppGenerator::writeEnumInitialization(QTextStream& s, const AbstractMetaEnu enumValueText = QLatin1String("(long) "); if (cppEnum->enclosingClass()) enumValueText += cppEnum->enclosingClass()->qualifiedCppName() + QLatin1String("::"); + // Fully qualify the value which is required for C++ 11 enum classes. + if (!cppEnum->isAnonymous()) + enumValueText += cppEnum->name() + QLatin1String("::"); enumValueText += enumValue->name(); } else { enumValueText += QString::number(enumValue->value()); diff --git a/sources/shiboken2/generator/shiboken2/shibokengenerator.cpp b/sources/shiboken2/generator/shiboken2/shibokengenerator.cpp index 82f21f6d0..d64719bb8 100644 --- a/sources/shiboken2/generator/shiboken2/shibokengenerator.cpp +++ b/sources/shiboken2/generator/shiboken2/shibokengenerator.cpp @@ -60,22 +60,46 @@ static QRegularExpression placeHolderRegex(int index) return QRegularExpression(QLatin1Char('%') + QString::number(index) + QStringLiteral("\\b")); } -static QString resolveScopePrefix(const AbstractMetaClass* scope, const QString& value) +// Return a prefix to fully qualify value, eg: +// resolveScopePrefix("Class::NestedClass::Enum::Value1", "Enum::Value1") +// -> "Class::NestedClass::") +static QString resolveScopePrefix(const QStringList &scopeList, const QString &value) { - if (!scope) - return QString(); - QString name; - QStringList parts = scope->qualifiedCppName().split(QLatin1String("::"), QString::SkipEmptyParts); - for(int i = (parts.size() - 1) ; i >= 0; i--) { - if (!value.startsWith(parts[i] + QLatin1String("::"))) - name = parts[i] + QLatin1String("::") + name; - else + for (int i = scopeList.size() - 1 ; i >= 0; --i) { + const QString prefix = scopeList.at(i) + QLatin1String("::"); + if (value.startsWith(prefix)) name.clear(); + else + name.prepend(prefix); } - return name; } + +static inline QStringList splitClassScope(const AbstractMetaClass *scope) +{ + return scope->qualifiedCppName().split(QLatin1String("::"), QString::SkipEmptyParts); +} + +static QString resolveScopePrefix(const AbstractMetaClass *scope, const QString &value) +{ + return scope + ? resolveScopePrefix(splitClassScope(scope), value) + : QString(); +} + +static QString resolveScopePrefix(const AbstractMetaEnum *metaEnum, + const QString &value) +{ + QStringList parts; + if (const AbstractMetaClass *scope = metaEnum->enclosingClass()) + parts.append(splitClassScope(scope)); + // Fully qualify the value which is required for C++ 11 enum classes. + if (!metaEnum->isAnonymous()) + parts.append(metaEnum->name()); + return resolveScopePrefix(parts, value); +} + ShibokenGenerator::ShibokenGenerator() : Generator() { if (m_pythonPrimitiveTypeName.isEmpty()) @@ -417,33 +441,91 @@ static QString cpythonEnumFlagsName(QString moduleName, QString qualifiedCppName return result; } +// Return the scope for fully qualifying the enumeration including trailing "::". static QString searchForEnumScope(const AbstractMetaClass* metaClass, const QString& value) { - QString enumValueName = value.trimmed(); - if (!metaClass) return QString(); const AbstractMetaEnumList &enums = metaClass->enums(); - for (const AbstractMetaEnum* metaEnum : enums) { - const AbstractMetaEnumValueList &values = metaEnum->values(); - for (const AbstractMetaEnumValue *enumValue : values) { - if (enumValueName == enumValue->name()) - return metaClass->qualifiedCppName(); - } + for (const AbstractMetaEnum *metaEnum : enums) { + if (metaEnum->findEnumValue(value)) + return resolveScopePrefix(metaEnum, value); } // PYSIDE-331: We need to also search the base classes. - QString ret = searchForEnumScope(metaClass->enclosingClass(), enumValueName); + QString ret = searchForEnumScope(metaClass->enclosingClass(), value); if (ret.isEmpty()) - ret = searchForEnumScope(metaClass->baseClass(), enumValueName); + ret = searchForEnumScope(metaClass->baseClass(), value); return ret; } +// Handle QFlags<> for guessScopeForDefaultValue() +QString ShibokenGenerator::guessScopeForDefaultFlagsValue(const AbstractMetaFunction *func, + const AbstractMetaArgument *arg, + const QString &value) const +{ + // Numeric values -> "Options(42)" + static const QRegularExpression numberRegEx(QStringLiteral("^\\d+$")); // Numbers to flags + Q_ASSERT(numberRegEx.isValid()); + if (numberRegEx.match(value).hasMatch()) { + QString typeName = translateTypeForWrapperMethod(arg->type(), func->implementingClass()); + if (arg->type()->isConstant()) + typeName.remove(0, sizeof("const ") / sizeof(char) - 1); + switch (arg->type()->referenceType()) { + case NoReference: + break; + case LValueReference: + typeName.chop(1); + break; + case RValueReference: + typeName.chop(2); + break; + } + return typeName + QLatin1Char('(') + value + QLatin1Char(')'); + } + + // "Options(Option1 | Option2)" -> "Options(Class::Enum::Option1 | Class::Enum::Option2)" + static const QRegularExpression enumCombinationRegEx(QStringLiteral("^([A-Za-z_][\\w:]*)\\(([^,\\(\\)]*)\\)$")); // FlagName(EnumItem|EnumItem|...) + Q_ASSERT(enumCombinationRegEx.isValid()); + const QRegularExpressionMatch match = enumCombinationRegEx.match(value); + if (match.hasMatch()) { + const QString expression = match.captured(2).trimmed(); + if (expression.isEmpty()) + return value; + const QStringList enumItems = expression.split(QLatin1Char('|')); + const QString scope = searchForEnumScope(func->implementingClass(), + enumItems.constFirst().trimmed()); + if (scope.isEmpty()) + return value; + QString result; + QTextStream str(&result); + str << match.captured(1) << '('; // Flag name + for (int i = 0, size = enumItems.size(); i < size; ++i) { + if (i) + str << '|'; + str << scope << enumItems.at(i).trimmed(); + } + str << ')'; + return result; + } + // A single flag "Option1" -> "Class::Enum::Option1" + return searchForEnumScope(func->implementingClass(), value) + value; +} + /* * This function uses some heuristics to find out the scope for a given - * argument default value. New situations may arise in the future and + * argument default value since they must be fully qualified when used outside the class: + * class A { + * enum Enum { e1, e1 }; + * void foo(Enum e = e1); + * } + * should be qualified to: + * A::Enum cppArg0 = A::Enum::e1; + * + * New situations may arise in the future and * this method should be updated, do it with care. */ -QString ShibokenGenerator::guessScopeForDefaultValue(const AbstractMetaFunction* func, const AbstractMetaArgument* arg) +QString ShibokenGenerator::guessScopeForDefaultValue(const AbstractMetaFunction *func, + const AbstractMetaArgument *arg) const { QString value = getDefaultValue(func, arg); @@ -462,53 +544,11 @@ QString ShibokenGenerator::guessScopeForDefaultValue(const AbstractMetaFunction* return value; QString prefix; - QString suffix; - if (arg->type()->isEnum()) { - const AbstractMetaEnum* metaEnum = findAbstractMetaEnum(arg->type()); - if (metaEnum) - prefix = resolveScopePrefix(metaEnum->enclosingClass(), value); + if (const AbstractMetaEnum* metaEnum = findAbstractMetaEnum(arg->type())) + prefix = resolveScopePrefix(metaEnum, value); } else if (arg->type()->isFlags()) { - static const QRegularExpression numberRegEx(QStringLiteral("^\\d+$")); // Numbers to flags - Q_ASSERT(numberRegEx.isValid()); - if (numberRegEx.match(value).hasMatch()) { - QString typeName = translateTypeForWrapperMethod(arg->type(), func->implementingClass()); - if (arg->type()->isConstant()) - typeName.remove(0, sizeof("const ") / sizeof(char) - 1); - switch (arg->type()->referenceType()) { - case NoReference: - break; - case LValueReference: - typeName.chop(1); - break; - case RValueReference: - typeName.chop(2); - break; - } - prefix = typeName + QLatin1Char('('); - suffix = QLatin1Char(')'); - } - - static const QRegularExpression enumCombinationRegEx(QStringLiteral("^([A-Za-z_][\\w:]*)\\(([^,\\(\\)]*)\\)$")); // FlagName(EnumItem|EnumItem|...) - Q_ASSERT(enumCombinationRegEx.isValid()); - const QRegularExpressionMatch match = enumCombinationRegEx.match(value); - if (prefix.isEmpty() && match.hasMatch()) { - QString flagName = match.captured(1); - QStringList enumItems = match.captured(2).split(QLatin1Char('|')); - QString scope = searchForEnumScope(func->implementingClass(), enumItems.constFirst()); - if (!scope.isEmpty()) - scope.append(QLatin1String("::")); - - QStringList fixedEnumItems; - for (const QString &enumItem : qAsConst(enumItems)) - fixedEnumItems << QString(scope + enumItem); - - if (!fixedEnumItems.isEmpty()) { - prefix = flagName + QLatin1Char('('); - value = fixedEnumItems.join(QLatin1Char('|')); - suffix = QLatin1Char(')'); - } - } + value = guessScopeForDefaultFlagsValue(func, arg, value); } else if (arg->type()->typeEntry()->isValue()) { const AbstractMetaClass *metaClass = AbstractMetaClass::findClass(classes(), arg->type()->typeEntry()); if (enumValueRegEx.match(value).hasMatch() && value != QLatin1String("NULL")) @@ -541,9 +581,6 @@ QString ShibokenGenerator::guessScopeForDefaultValue(const AbstractMetaFunction* if (!prefix.isEmpty()) value.prepend(prefix); - if (!suffix.isEmpty()) - value.append(suffix); - return value; } diff --git a/sources/shiboken2/generator/shiboken2/shibokengenerator.h b/sources/shiboken2/generator/shiboken2/shibokengenerator.h index a8a270612..5ed7f79f6 100644 --- a/sources/shiboken2/generator/shiboken2/shibokengenerator.h +++ b/sources/shiboken2/generator/shiboken2/shibokengenerator.h @@ -411,7 +411,11 @@ public: QString cpythonWrapperCPtr(const TypeEntry* type, QString argName); /// Guesses the scope to where belongs an argument's default value. - QString guessScopeForDefaultValue(const AbstractMetaFunction* func, const AbstractMetaArgument* arg); + QString guessScopeForDefaultValue(const AbstractMetaFunction *func, + const AbstractMetaArgument *arg) const; + QString guessScopeForDefaultFlagsValue(const AbstractMetaFunction *func, + const AbstractMetaArgument *arg, + const QString &value) const; QString cpythonEnumName(const EnumTypeEntry* enumEntry); QString cpythonEnumName(const AbstractMetaEnum* metaEnum); diff --git a/sources/shiboken2/libshiboken/CMakeLists.txt b/sources/shiboken2/libshiboken/CMakeLists.txt index 90b44aa76..e87cf07fd 100644 --- a/sources/shiboken2/libshiboken/CMakeLists.txt +++ b/sources/shiboken2/libshiboken/CMakeLists.txt @@ -31,7 +31,7 @@ set(libshiboken_MAJOR_VERSION ${shiboken_MAJOR_VERSION}) set(libshiboken_MINOR_VERSION ${shiboken_MINOR_VERSION}) set(libshiboken_MICRO_VERSION ${shiboken_MICRO_VERSION}) set(libshiboken_VERSION "${libshiboken_MAJOR_VERSION}.${libshiboken_MINOR_VERSION}.${libshiboken_MICRO_VERSION}") -set(libshiboken_SOVERSION "${libshiboken_MAJOR_VERSION}.${libshiboken_MINOR_VERSION}") +set(libshiboken_SOVERSION "${shiboken2_library_so_version}") set(libshiboken_SRC basewrapper.cpp diff --git a/sources/shiboken2/libshiboken/basewrapper.cpp b/sources/shiboken2/libshiboken/basewrapper.cpp index d697d0732..d7d37971c 100644 --- a/sources/shiboken2/libshiboken/basewrapper.cpp +++ b/sources/shiboken2/libshiboken/basewrapper.cpp @@ -679,14 +679,6 @@ bool canCallConstructor(PyTypeObject* myType, PyTypeObject* ctorType) return true; } - -bool hasExternalCppConversions(SbkObjectType*) { return false; } // DEPRECATED. -bool isExternalConvertible(SbkObjectType *, PyObject *) { return false; } // DEPRECATED. -void setExternalCppConversionFunction(SbkObjectType*, ExtendedToCppFunc) {} // DEPRECATED. -void setExternalIsConvertibleFunction(SbkObjectType*, ExtendedIsConvertibleFunc) {} // DEPRECATED. -void* callExternalCppConversion(SbkObjectType*, PyObject*) { return 0; } // DEPRECATED. - - bool hasCast(SbkObjectType* type) { return type->d->mi_specialcast != 0; @@ -719,18 +711,6 @@ void setTypeDiscoveryFunctionV2(SbkObjectType* self, TypeDiscoveryFuncV2 func) self->d->type_discovery = func; } -void setTypeDiscoveryFunction(SbkObjectType* self, TypeDiscoveryFunc func) -{ - self->d->type_discovery = (TypeDiscoveryFuncV2)func; -} - -TypeDiscoveryFunc getTypeDiscoveryFunction(SbkObjectType* self) -{ - // This is an illegal cast because the return value is different, - // but nobody ever used this function, so... =] - return (TypeDiscoveryFunc)self->d->type_discovery; -} - void copyMultimpleheritance(SbkObjectType* self, SbkObjectType* other) { self->d->mi_init = other->d->mi_init; @@ -1053,11 +1033,6 @@ void makeValid(SbkObject* self) } } -bool hasParentInfo(SbkObject* pyObj) -{ - return pyObj->d->parentInfo != 0; -} - void* cppPointer(SbkObject* pyObj, PyTypeObject* desiredType) { PyTypeObject* type = Py_TYPE(pyObj); diff --git a/sources/shiboken2/libshiboken/basewrapper.h b/sources/shiboken2/libshiboken/basewrapper.h index bd2d6820f..f6a7352f7 100644 --- a/sources/shiboken2/libshiboken/basewrapper.h +++ b/sources/shiboken2/libshiboken/basewrapper.h @@ -151,14 +151,6 @@ LIBSHIBOKEN_API bool isUserType(PyTypeObject* pyObj); */ LIBSHIBOKEN_API bool canCallConstructor(PyTypeObject* myType, PyTypeObject* ctorType); - -LIBSHIBOKEN_API bool hasExternalCppConversions(SbkObjectType*); // DEPRECATED. -LIBSHIBOKEN_API bool isExternalConvertible(SbkObjectType*, PyObject*); // DEPRECATED. -LIBSHIBOKEN_API void setExternalCppConversionFunction(SbkObjectType*, ExtendedToCppFunc); // DEPRECATED. -LIBSHIBOKEN_API void setExternalIsConvertibleFunction(SbkObjectType*, ExtendedIsConvertibleFunc); // DEPRECATED. -LIBSHIBOKEN_API void* callExternalCppConversion(SbkObjectType*, PyObject*); // DEPRECATED. - - /** * Tells if the \p type represents an object of a class with multiple inheritance in C++. * When this occurs, the C++ pointer held by the Python wrapper will need to be cast when @@ -180,9 +172,6 @@ LIBSHIBOKEN_API void setOriginalName(SbkObjectType* self, const char* nam LIBSHIBOKEN_API const char* getOriginalName(SbkObjectType* self); LIBSHIBOKEN_API void setTypeDiscoveryFunctionV2(SbkObjectType* self, TypeDiscoveryFuncV2 func); -LIBSHIBOKEN_API SBK_DEPRECATED(void setTypeDiscoveryFunction(SbkObjectType* self, TypeDiscoveryFunc func)); -LIBSHIBOKEN_API SBK_DEPRECATED(TypeDiscoveryFunc getTypeDiscoveryFunction(SbkObjectType* self)); - LIBSHIBOKEN_API void copyMultimpleheritance(SbkObjectType* self, SbkObjectType* other); LIBSHIBOKEN_API void setMultipleIheritanceFunction(SbkObjectType* self, MultipleInheritanceInitFunction func); LIBSHIBOKEN_API MultipleInheritanceInitFunction getMultipleIheritanceFunction(SbkObjectType* self); @@ -333,11 +322,6 @@ LIBSHIBOKEN_API void releaseOwnership(PyObject* pyObj); LIBSHIBOKEN_API void releaseOwnership(SbkObject* pyObj); /** - * Returns true if the pyObj holds information about their parents. - */ -LIBSHIBOKEN_API bool hasParentInfo(SbkObject* pyObj); - -/** * Get the C++ pointer of type \p desiredType from a Python object. */ LIBSHIBOKEN_API void* cppPointer(SbkObject* pyObj, PyTypeObject* desiredType); @@ -387,12 +371,6 @@ LIBSHIBOKEN_API void setParent(PyObject* parent, PyObject* child); LIBSHIBOKEN_API void removeParent(SbkObject* child, bool giveOwnershipBack = true, bool keepReferenc = false); /** -* \internal This is an internal function called by tp_dealloc, it's exported just for technical reasons. -* \note Do not call this function inside your bindings. -*/ -LIBSHIBOKEN_API void destroyParentInfo(SbkObject* obj, bool removeFromParent = true); - -/** * Mark the object as invalid */ LIBSHIBOKEN_API void invalidate(SbkObject* self); diff --git a/sources/shiboken2/libshiboken/signature.cpp b/sources/shiboken2/libshiboken/signature.cpp index a2cd12a87..2b1447140 100644 --- a/sources/shiboken2/libshiboken/signature.cpp +++ b/sources/shiboken2/libshiboken/signature.cpp @@ -632,6 +632,7 @@ SbkSpecial_Type_Ready(PyObject *module, PyTypeObject *type, return ret; } +#if EXTENSION_ENABLED static int PySide_FinishSignatures(PyObject *module, const char *signatures) { @@ -675,6 +676,7 @@ PySide_FinishSignatures(PyObject *module, const char *signatures) #endif return 0; } +#endif // EXTENSION_ENABLED void FinishSignatureInitialization(PyObject *module, const char *signatures) diff --git a/sources/shiboken2/tests/libsample/objecttype.h b/sources/shiboken2/tests/libsample/objecttype.h index 4d85daeff..752659488 100644 --- a/sources/shiboken2/tests/libsample/objecttype.h +++ b/sources/shiboken2/tests/libsample/objecttype.h @@ -129,7 +129,6 @@ public: void destroyCppParent() { delete m_parent; - m_parent = 0; } //Deprecated test diff --git a/sources/shiboken2/tests/libsample/samplenamespace.h b/sources/shiboken2/tests/libsample/samplenamespace.h index 3ce410941..93cafa29c 100644 --- a/sources/shiboken2/tests/libsample/samplenamespace.h +++ b/sources/shiboken2/tests/libsample/samplenamespace.h @@ -110,6 +110,10 @@ public: NiceValue1, NiceValue2 }; + enum class NiceEnumClass { + NiceClassValue1, NiceClassValue2 + }; + inline int someMethod(SomeInnerClass*) { return 0; } virtual OkThisIsRecursiveEnough* someVirtualMethod(OkThisIsRecursiveEnough* arg) { return arg; } }; diff --git a/sources/shiboken2/tests/samplebinding/typesystem_sample.xml b/sources/shiboken2/tests/samplebinding/typesystem_sample.xml index c44a5408d..ffb5c976f 100644 --- a/sources/shiboken2/tests/samplebinding/typesystem_sample.xml +++ b/sources/shiboken2/tests/samplebinding/typesystem_sample.xml @@ -548,6 +548,7 @@ <value-type name="SomeInnerClass"> <object-type name="OkThisIsRecursiveEnough"> <enum-type name="NiceEnum" /> + <enum-type name="NiceEnumClass" /> </object-type> <enum-type name="ProtectedEnum"/> </value-type> diff --git a/testing/runner.py b/testing/runner.py index f86bdeebf..6c3eef388 100644 --- a/testing/runner.py +++ b/testing/runner.py @@ -163,11 +163,11 @@ class TestRunner(object): print(*args, file=output, **kw) # 'for line in input:' would read into too large chunks + labelled = True while True: line = input.readline() if not line: break - labelled = True if line.startswith('BEGIN_FILE'): labelled = False txt = line.rstrip() @@ -49,6 +49,8 @@ import fnmatch import glob import itertools import popenasync +import glob + # There is no urllib.request in Python2 try: import urllib.request as urllib @@ -531,7 +533,7 @@ def regenerate_qt_resources(src, pyside_rcc_path, pyside_rcc_options): def back_tick(cmd, ret_err=False): - """ Run command `cmd`, return stdout, or stdout, stderr if `ret_err` + """ Run command `cmd`, return stdout, or stdout, stderr, return_code if `ret_err` is True. Roughly equivalent to ``check_output`` in Python 2.7 @@ -540,20 +542,20 @@ def back_tick(cmd, ret_err=False): cmd : str command to execute ret_err : bool, optional - If True, return stderr in addition to stdout. If False, just return + If True, return stderr and return_code in addition to stdout. If False, just return stdout Returns ------- out : str or tuple If `ret_err` is False, return stripped string containing stdout from - `cmd`. If `ret_err` is True, return tuple of (stdout, stderr) where + `cmd`. If `ret_err` is True, return tuple of (stdout, stderr, return_code) where ``stdout`` is the stripped stdout, and ``stderr`` is the stripped - stderr. + stderr, and ``return_code`` is the process exit code. Raises ------ - Raises RuntimeError if command returns non-zero exit code + Raises RuntimeError if command returns non-zero exit code when ret_err isn't set. """ proc = subprocess.Popen(cmd, stdout=subprocess.PIPE, stderr=subprocess.PIPE, shell=True) out, err = proc.communicate() @@ -562,16 +564,16 @@ def back_tick(cmd, ret_err=False): out = out.decode() err = err.decode() retcode = proc.returncode - if retcode is None: + if retcode is None and not ret_err: proc.terminate() raise RuntimeError(cmd + ' process did not terminate') - if retcode != 0: + if retcode != 0 and not ret_err: raise RuntimeError(cmd + ' process returned code %d\n*** %s' % (retcode, err)) out = out.strip() if not ret_err: return out - return out, err.strip() + return out, err.strip(), retcode OSX_OUTNAME_RE = re.compile(r'\(compatibility version [\d.]+, current version ' @@ -756,7 +758,6 @@ def detectClang(): def download_and_extract_7z(fileurl, target): """ Downloads 7z file from fileurl and extract to target """ - print("Downloading fileUrl %s " % fileurl) info = "" try: @@ -771,3 +772,214 @@ def download_and_extract_7z(fileurl, target): subprocess.call(["7z", "x", "-y", localfile, outputDir]) except: raise RuntimeError(' Error extracting ' + localfile) + +def split_and_strip(input): + lines = [s.strip() for s in input.splitlines()] + return lines + +def ldd_get_dependencies(executable_path): + """ Returns a dictionary of dependencies that `executable_path` depends on. + + The keys are library names and the values are the library paths. + + """ + output = ldd(executable_path) + lines = split_and_strip(output) + pattern = re.compile(r"\s*(.*?)\s+=>\s+(.*?)\s+\(.*\)") + dependencies = {} + for line in lines: + match = pattern.search(line) + if match: + dependencies[match.group(1)] = match.group(2) + return dependencies + +def ldd_get_paths_for_dependencies(dependencies_regex, executable_path = None, dependencies = None): + """ Returns file paths to shared library dependencies that match given `dependencies_regex` + against given `executable_path`. + + The function retrieves the list of shared library dependencies using ld.so for the given + `executable_path` in order to search for libraries that match the `dependencies_regex`, and + then returns a list of absolute paths of the matching libraries. + + If no matching library is found in the list of dependencies, an empty list is returned. + """ + + if not dependencies and not executable_path: + return None + + if not dependencies: + dependencies = ldd_get_dependencies(executable_path) + + pattern = re.compile(dependencies_regex) + + paths = [] + for key in dependencies: + match = pattern.search(key) + if match: + paths.append(dependencies[key]) + + return paths + +def ldd(executable_path): + """ Returns ld.so output of shared library dependencies for given `executable_path`. + + This is a partial port of /usr/bin/ldd from bash to Python. The dependency list is retrieved + by setting the LD_TRACE_LOADED_OBJECTS=1 environment variable, and executing the given path + via the dynamic loader ld.so. + + Only works on Linux. The port is required to make this work on systems that might not have ldd. + This is because ldd (on Ubuntu) is shipped in the libc-bin package that, which might have a + minuscule percentage of not being installed. + + Parameters + ---------- + executable_path : str + path to executable or shared library. + + Returns + ------- + output : str + the raw output retrieved from the dynamic linker. + """ + + chosen_rtld = None + # List of ld's considered by ldd on Ubuntu (here's hoping it's the same on all distros). + rtld_list = ["/lib/ld-linux.so.2", "/lib64/ld-linux-x86-64.so.2", "/libx32/ld-linux-x32.so.2"] + + # Choose appropriate runtime dynamic linker. + for rtld in rtld_list: + if os.path.isfile(rtld) and os.access(rtld, os.X_OK): + (_, _, code) = back_tick(rtld, True) + # Code 127 is returned by ld.so when called without any arguments (some kind of sanity + # check I guess). + if code == 127: + (_, _, code) = back_tick("{} --verify {}".format(rtld, executable_path), True) + # Codes 0 and 2 mean given executable_path can be understood by ld.so. + if code in [0, 2]: + chosen_rtld = rtld + break + + if not chosen_rtld: + raise RuntimeError('Could not find appropriate ld.so to query for dependencies.') + + # Query for shared library dependencies. + rtld_env = "LD_TRACE_LOADED_OBJECTS=1" + rtld_cmd = "{} {} {}".format(rtld_env, chosen_rtld, executable_path) + (out, _, return_code) = back_tick(rtld_cmd, True) + if return_code == 0: + return out + else: + raise RuntimeError('ld.so failed to query for dependent shared libraries ' + 'of {} '.format(executable_path)) + +def find_files_using_glob(path, pattern): + """ Returns list of files that matched glob `pattern` in `path`. """ + final_pattern = os.path.join(path, pattern) + maybe_files = glob.glob(final_pattern) + return maybe_files + +def find_qt_core_library_glob(lib_dir): + """ Returns path to the QtCore library found in `lib_dir`. """ + maybe_file = find_files_using_glob(lib_dir, "libQt5Core.so.?") + if len(maybe_file) == 1: + return maybe_file[0] + return None + +# @TODO: Possibly fix ICU library copying on macOS and Windows. This would require +# to implement the equivalent of the custom written ldd for the specified platforms. +# This has less priority because ICU libs are not used in the default Qt configuration build. + +def copy_icu_libs(destination_lib_dir): + """ Copy ICU libraries that QtCore depends on, to given `destination_lib_dir`. """ + qt_core_library_path = find_qt_core_library_glob(destination_lib_dir) + + if not qt_core_library_path or not os.path.exists(qt_core_library_path): + raise RuntimeError('QtCore library does not exist at path: {}. ' + 'Failed to copy ICU libraries.'.format(qt_core_library_path)) + + dependencies = ldd_get_dependencies(qt_core_library_path) + + icu_regex = r"^libicu.+" + icu_compiled_pattern = re.compile(icu_regex) + icu_required = False + for dependency in dependencies: + match = icu_compiled_pattern.search(dependency) + if match: + icu_required = True + break + + if icu_required: + paths = ldd_get_paths_for_dependencies(icu_regex, dependencies=dependencies) + if not paths: + raise RuntimeError('Failed to find the necessary ICU libraries required by QtCore.') + log.info('Copying the detected ICU libraries required by QtCore.') + + if not os.path.exists(destination_lib_dir): + os.makedirs(destination_lib_dir) + + for path in paths: + basename = os.path.basename(path) + destination = os.path.join(destination_lib_dir, basename) + copyfile(path, destination, force_copy_symlink=True) + # Patch the ICU libraries to contain the $ORIGIN rpath value, so that only the local + # package libraries are used. + linuxSetRPaths(destination, '$ORIGIN') + + # Patch the QtCore library to find the copied over ICU libraries (if necessary). + log.info('Checking if QtCore library needs a new rpath to make it work with ICU libs.') + rpaths = linuxGetRPaths(qt_core_library_path) + if not rpaths or not rpathsHasOrigin(rpaths): + log.info('Patching QtCore library to contain $ORIGIN rpath.') + rpaths.insert(0, '$ORIGIN') + new_rpaths_string = ":".join(rpaths) + linuxSetRPaths(qt_core_library_path, new_rpaths_string) + +def linuxSetRPaths(executable_path, rpath_string): + """ Patches the `executable_path` with a new rpath string. """ + + if not hasattr(linuxSetRPaths, "patchelf_path"): + script_dir = os.getcwd() + patchelf_path = os.path.join(script_dir, "patchelf") + setattr(linuxSetRPaths, "patchelf_path", patchelf_path) + + cmd = [linuxSetRPaths.patchelf_path, '--set-rpath', rpath_string, executable_path] + + if run_process(cmd) != 0: + raise RuntimeError("Error patching rpath in {}".format(executable_path)) + +def linuxGetRPaths(executable_path): + """ Returns a list of run path values embedded in the executable or just an empty list. """ + + cmd = "readelf -d {}".format(executable_path) + (out, err, code) = back_tick(cmd, True) + if code != 0: + raise RuntimeError('Running `readelf -d {}` failed with ' + 'error output:\n {}. '.format(executable_path, err)) + lines = split_and_strip(out) + pattern = re.compile(r"^.+?\(RUNPATH\).+?\[(.+?)\]$") + + rpath_line = None + for line in lines: + match = pattern.search(line) + if match: + rpath_line = match.group(1) + break + + rpaths = [] + + if rpath_line: + rpaths = rpath_line.split(':') + + return rpaths + +def rpathsHasOrigin(rpaths): + """ Return True if the specified list of rpaths has an "$ORIGIN" value (aka current dir). """ + if not rpaths: + return False + + pattern = re.compile(r"^\$ORIGIN(/)?$") + for rpath in rpaths: + match = pattern.search(rpath) + if match: + return True + return False diff --git a/wiki b/wiki deleted file mode 160000 -Subproject c3cdf91f6a6f451f442405552cfa9e45f46419d |
