diff options
| author | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2019-05-06 21:19:07 +0200 |
|---|---|---|
| committer | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2019-05-06 21:19:07 +0200 |
| commit | 91b93e1021ccc06d13e0d66a43bf7f9063faeff3 (patch) | |
| tree | f5270164466b42367d4df63d723b3a4db4d7d0fe /sources/pyside2/PySide2 | |
| parent | edae6185cef9c0ddd7c7c88bfa97c5043ba0d78a (diff) | |
| parent | 06f97eca45ddadf4f04229cf14d5dc0bbd867316 (diff) | |
Merge remote-tracking branch 'origin/5.12' into 5.13
Change-Id: Ia87a2e46bb051f1cccf3b7ba988aeb5eb32c0f0e
Diffstat (limited to 'sources/pyside2/PySide2')
30 files changed, 1687 insertions, 18 deletions
diff --git a/sources/pyside2/PySide2/CMakeLists.txt b/sources/pyside2/PySide2/CMakeLists.txt index 5a371b8a9..d666751ea 100644 --- a/sources/pyside2/PySide2/CMakeLists.txt +++ b/sources/pyside2/PySide2/CMakeLists.txt @@ -43,7 +43,11 @@ file(READ "${CMAKE_CURRENT_BINARY_DIR}/pyside2_global.h" pyside2_global_contents foreach(shortname IN LISTS all_module_shortnames) set(name "Qt5${shortname}") - HAS_QT_MODULE(${name}_FOUND Qt${shortname}) + set(_qt_module_name "${name}") + if ("${shortname}" STREQUAL "OpenGLFunctions") + set(_qt_module_name "Qt5Gui") + endif() + HAS_QT_MODULE(${_qt_module_name}_FOUND Qt${shortname}) # Create a module header consisting of pyside2_global.h and the module # include. Note: The contents of pyside2_global.h must be copied instead of @@ -59,7 +63,7 @@ foreach(shortname IN LISTS all_module_shortnames) endif() set(module_header_content "${module_header_content}\n${pyside2_global_contents}") # AxContainer/AxServer from Active Qt do not have module headers - if(NOT "${shortname}" STREQUAL "AxContainer") + if(NOT "${shortname}" STREQUAL "AxContainer" AND NOT "${shortname}" STREQUAL "OpenGLFunctions") set(module_header_content "${module_header_content}\n#include <Qt${shortname}/Qt${shortname}>") endif() set(post_header "${CMAKE_CURRENT_BINARY_DIR}/Qt${shortname}/Qt${shortname}_global.post.h") @@ -87,6 +91,8 @@ install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/templates/datavisualization_common.xml DESTINATION share/PySide2${pyside_SUFFIX}/typesystems) install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/templates/opengl_common.xml DESTINATION share/PySide2${pyside_SUFFIX}/typesystems) +install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/templates/openglfunctions_common.xml + DESTINATION share/PySide2${pyside_SUFFIX}/typesystems) install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/templates/webkitwidgets_common.xml DESTINATION share/PySide2${pyside_SUFFIX}/typesystems) install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/templates/xml_common.xml diff --git a/sources/pyside2/PySide2/QtGui/typesystem_gui_common.xml b/sources/pyside2/PySide2/QtGui/typesystem_gui_common.xml index cadfc33fa..71001140c 100644 --- a/sources/pyside2/PySide2/QtGui/typesystem_gui_common.xml +++ b/sources/pyside2/PySide2/QtGui/typesystem_gui_common.xml @@ -43,6 +43,7 @@ <load-typesystem name="QtCore/typesystem_core.xml" generate="no"/> <load-typesystem name="templates/core_common.xml" generate="no"/> <load-typesystem name="templates/gui_common.xml" generate="no"/> + <load-typesystem name="templates/openglfunctions_common.xml" generate="no"/> <rejection class="^Q.*$" argument-type="^QPlatform.*$"/> @@ -2906,12 +2907,7 @@ <modify-argument index="2"><array/></modify-argument> </modify-function> <!-- Add explicit signatures for the setUniformValue functions --> - <modify-function signature="setUniformValue(const char*, GLfloat)" remove="all"/> - <modify-function signature="setUniformValue(const char*, GLint)" remove="all"/> - <modify-function signature="setUniformValue(const char*, GLuint)" remove="all"/> - <modify-function signature="setUniformValue(int, GLfloat)" remove="all"/> - <modify-function signature="setUniformValue(int, GLint)" remove="all"/> - <modify-function signature="setUniformValue(int, GLuint)" remove="all"/> + <modify-function signature="^setUniformValue\(const char\*,(float|int|uint)\)$" remove="all"/> <!-- No need for a signature for GLuint, since Qt (internally) calls the same function: glUniform1i --> <add-function signature="setUniformValue1f(const char*, float)" return-type="void"> <inject-code file="../glue/qtgui.cpp" snippet="qopenglshaderprogram_setuniformvalue_float"/> diff --git a/sources/pyside2/PySide2/QtOpenGLFunctions/CMakeLists.txt b/sources/pyside2/PySide2/QtOpenGLFunctions/CMakeLists.txt new file mode 100644 index 000000000..72b3a16ca --- /dev/null +++ b/sources/pyside2/PySide2/QtOpenGLFunctions/CMakeLists.txt @@ -0,0 +1,72 @@ +project(QtOpenGLFunctions) + +set(QtOpenGLFunctions_DROPPED_ENTRIES) + +get_property(QtOpenGLFunctions_enabled_features TARGET Qt5::Gui PROPERTY INTERFACE_QT_ENABLED_FEATURES) + +set(QtOpenGLFunctions_SRC ${QtOpenGLFunctions_GEN_DIR}/qtopenglfunctions_module_wrapper.cpp) + +# cf qtbase/src/gui/opengl/opengl.pri +list(FIND QtOpenGLFunctions_enabled_features "opengles2" _opengles2Index) +# ### fixme: For cmake >= 3.3: if(opengles2 IN_LIST QtOpenGLFunctions_enabled_features) +if(_opengles2Index GREATER -1) + list(APPEND QtOpenGLFunctions_DROPPED_ENTRIES QOpenGLTimeMonitor QOpenGLTimerQuery) + list(APPEND QtOpenGLFunctions_SRC + ${QtOpenGLFunctions_GEN_DIR}/qopenglfunctions_es2_wrapper.cpp) + message(STATUS "Qt5OpenGLFunctions: Dropping Desktop OpenGL classes (GLES2)") +else() + list(APPEND QtOpenGLFunctions_SRC + ${QtOpenGLFunctions_GEN_DIR}/qopenglfunctions_1_0_wrapper.cpp + ${QtOpenGLFunctions_GEN_DIR}/qopenglfunctions_1_1_wrapper.cpp + ${QtOpenGLFunctions_GEN_DIR}/qopenglfunctions_1_2_wrapper.cpp + ${QtOpenGLFunctions_GEN_DIR}/qopenglfunctions_1_3_wrapper.cpp + ${QtOpenGLFunctions_GEN_DIR}/qopenglfunctions_1_4_wrapper.cpp + ${QtOpenGLFunctions_GEN_DIR}/qopenglfunctions_1_5_wrapper.cpp + ${QtOpenGLFunctions_GEN_DIR}/qopenglfunctions_2_0_wrapper.cpp + ${QtOpenGLFunctions_GEN_DIR}/qopenglfunctions_2_1_wrapper.cpp + ${QtOpenGLFunctions_GEN_DIR}/qopenglfunctions_3_0_wrapper.cpp + ${QtOpenGLFunctions_GEN_DIR}/qopenglfunctions_3_1_wrapper.cpp + ${QtOpenGLFunctions_GEN_DIR}/qopenglfunctions_3_2_compatibility_wrapper.cpp + ${QtOpenGLFunctions_GEN_DIR}/qopenglfunctions_3_2_core_wrapper.cpp + ${QtOpenGLFunctions_GEN_DIR}/qopenglfunctions_3_3_compatibility_wrapper.cpp + ${QtOpenGLFunctions_GEN_DIR}/qopenglfunctions_3_3_core_wrapper.cpp + ${QtOpenGLFunctions_GEN_DIR}/qopenglfunctions_4_0_compatibility_wrapper.cpp + ${QtOpenGLFunctions_GEN_DIR}/qopenglfunctions_4_0_core_wrapper.cpp + ${QtOpenGLFunctions_GEN_DIR}/qopenglfunctions_4_1_compatibility_wrapper.cpp + ${QtOpenGLFunctions_GEN_DIR}/qopenglfunctions_4_1_core_wrapper.cpp + ${QtOpenGLFunctions_GEN_DIR}/qopenglfunctions_4_2_compatibility_wrapper.cpp + ${QtOpenGLFunctions_GEN_DIR}/qopenglfunctions_4_2_core_wrapper.cpp + ${QtOpenGLFunctions_GEN_DIR}/qopenglfunctions_4_3_compatibility_wrapper.cpp + ${QtOpenGLFunctions_GEN_DIR}/qopenglfunctions_4_3_core_wrapper.cpp + ${QtOpenGLFunctions_GEN_DIR}/qopenglfunctions_4_4_compatibility_wrapper.cpp + ${QtOpenGLFunctions_GEN_DIR}/qopenglfunctions_4_4_core_wrapper.cpp + ${QtOpenGLFunctions_GEN_DIR}/qopenglfunctions_4_5_compatibility_wrapper.cpp + ${QtOpenGLFunctions_GEN_DIR}/qopenglfunctions_4_5_core_wrapper.cpp) + message(STATUS "Qt5OpenGLFunctions: Adding Desktop OpenGL classes") +endif() + +configure_file("${QtOpenGLFunctions_SOURCE_DIR}/QtOpenGLFunctions_global.post.h.in" + "${QtOpenGLFunctions_BINARY_DIR}/QtOpenGLFunctions_global.post.h" @ONLY) + +set(QtOpenGLFunctions_include_dirs ${QtGOpenGLFunctions_SOURCE_DIR} + ${QtOpenGLFunctions_BINARY_DIR} + ${pyside2_SOURCE_DIR} + ${Qt5Core_INCLUDE_DIRS} + ${Qt5Gui_INCLUDE_DIRS} + ${libpyside_SOURCE_DIR} + ${QtCore_GEN_DIR} + ${QtGui_GEN_DIR} + ) +set(QtOpenGLFunctions_libraries pyside2 + ${Qt5Gui_LIBRARIES}) + +set(QtOpenGLFunctions_deps QtGui) + +create_pyside_module(NAME QtOpenGLFunctions + INCLUDE_DIRS QtOpenGLFunctions_include_dirs + LIBRARIES QtOpenGLFunctions_libraries + DEPS QtOpenGLFunctions_deps + TYPESYSTEM_PATH QtOpenGLFunctions_SOURCE_DIR + SOURCES QtOpenGLFunctions_SRC + TYPESYSTEM_NAME ${QtOpenGLFunctions_BINARY_DIR}/typesystem_openglfunctions.xml + DROPPED_ENTRIES QtOpenGLFunctions_DROPPED_ENTRIES) diff --git a/sources/pyside2/PySide2/QtOpenGLFunctions/QtOpenGLFunctions_global.post.h.in b/sources/pyside2/PySide2/QtOpenGLFunctions/QtOpenGLFunctions_global.post.h.in new file mode 100644 index 000000000..6c8c77087 --- /dev/null +++ b/sources/pyside2/PySide2/QtOpenGLFunctions/QtOpenGLFunctions_global.post.h.in @@ -0,0 +1,61 @@ +/**************************************************************************** +** +** Copyright (C) 2019 The Qt Company Ltd. +** Contact: https://www.qt.io/licensing/ +** +** This file is part of Qt for Python. +** +** $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$ +** +****************************************************************************/ + +#include <QtGui/qtgui-config.h> +// OpenGL functions are not in the QtGui module header +#if QT_CONFIG(opengl) +# include <QtGui/qopenglfunctions_1_0.h> +# include <QtGui/qopenglfunctions_1_1.h> +# include <QtGui/qopenglfunctions_1_2.h> +# include <QtGui/qopenglfunctions_1_3.h> +# include <QtGui/qopenglfunctions_1_4.h> +# include <QtGui/qopenglfunctions_1_5.h> +# include <QtGui/qopenglfunctions_2_0.h> +# include <QtGui/qopenglfunctions_2_1.h> +# include <QtGui/qopenglfunctions_3_0.h> +# include <QtGui/qopenglfunctions_3_1.h> +# include <QtGui/qopenglfunctions_3_2_compatibility.h> +# include <QtGui/qopenglfunctions_3_2_core.h> +# include <QtGui/qopenglfunctions_3_3_compatibility.h> +# include <QtGui/qopenglfunctions_3_3_core.h> +# include <QtGui/qopenglfunctions_4_0_compatibility.h> +# include <QtGui/qopenglfunctions_4_0_core.h> +# include <QtGui/qopenglfunctions_4_1_compatibility.h> +# include <QtGui/qopenglfunctions_4_1_core.h> +# include <QtGui/qopenglfunctions_4_2_compatibility.h> +# include <QtGui/qopenglfunctions_4_2_core.h> +# include <QtGui/qopenglfunctions_4_3_compatibility.h> +# include <QtGui/qopenglfunctions_4_3_core.h> +# include <QtGui/qopenglfunctions_4_4_compatibility.h> +# include <QtGui/qopenglfunctions_4_4_core.h> +# include <QtGui/qopenglfunctions_4_5_compatibility.h> +# include <QtGui/qopenglfunctions_4_5_core.h> +#endif +#if QT_CONFIG(opengles2) +# include <QtGui/qopenglfunctions_es2.h> +#endif diff --git a/sources/pyside2/PySide2/QtOpenGLFunctions/typesystem_openglfunctions.xml b/sources/pyside2/PySide2/QtOpenGLFunctions/typesystem_openglfunctions.xml new file mode 100644 index 000000000..1d5b08edb --- /dev/null +++ b/sources/pyside2/PySide2/QtOpenGLFunctions/typesystem_openglfunctions.xml @@ -0,0 +1,409 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- +/**************************************************************************** +** +** Copyright (C) 2019 The Qt Company Ltd. +** Contact: https://www.qt.io/licensing/ +** +** This file is part of Qt for Python. +** +** $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.QtOpenGLFunctions"> + <load-typesystem name="QtGui/typesystem_gui.xml" generate="no"/> + <load-typesystem name="templates/openglfunctions_common.xml" generate="no"/> + + <rejection class="^QOpenGL.*$" argument-type="^(const )?GLboolean ?\*$"/> + <rejection class="^QOpenGL.*$" argument-type="^GLchar\*$"/> + <rejection class="^QOpenGL.*$" argument-type="^(const )?GLchar ?\*(const)?\*$"/> + <rejection class="^QOpenGL.*$" argument-type="^char\*$"/> + <rejection class="^QOpenGL.*$" argument-type="^(const )?char ?\*\*$"/> + <rejection class="^QOpenGL.*$" argument-type="GLintptr"/> + <rejection class="^QOpenGL.*$" argument-type="GLsizeiptr"/> + <rejection class="^QOpenGL.*$" argument-type="GLsync"/> + <rejection class="^QOpenGL.*$" argument-type="^GLubyte( const)?\*$"/> + <rejection class="^QOpenGL.*$" argument-type="^(const )?QMatrix.x. ?\*$"/> + <rejection class="^QOpenGL.*$" argument-type="qopengl_GLintptr"/> + <rejection class="^QOpenGL.*$" argument-type="qopengl_GLsizeiptr"/> + <rejection class="^QOpenGL.*$" argument-type="QOpenGLTextureHelper*"/> + <rejection class="^QOpenGL.*$" argument-type="^(const )?QVector.D ?\*$"/> + <rejection class="^QOpenGL.*$" argument-type="^(const )?void ?\*\*$"/> + <rejection class="^QOpenGLFunctions.*$" function-name="^glGet(Buffer|VertexAttrib)?Pointer.*$"/> + <rejection class="^QOpenGLFunctions.*$" function-name="^glMultiDrawElements.*$"/> + <!-- Reject any non-const array of the version functions --> + <rejection class="^QOpenGLFunctions_\d_\d.*$" argument-type="^GL\w+ ?\*$"/> + + <object-type name="QOpenGLFunctions_1_0" since="5.1"> + &openglfunctions_modifications1_0; + &openglfunctions_modifications1_0_compat; + </object-type> + <object-type name="QOpenGLFunctions_1_1" since="5.1"> + &openglfunctions_modifications1_0; + &openglfunctions_modifications1_0_compat; + &openglfunctions_modifications1_1; + &openglfunctions_modifications1_1_compat; + </object-type> + <object-type name="QOpenGLFunctions_1_2" since="5.1"> + &openglfunctions_modifications1_0; + &openglfunctions_modifications1_0_compat; + &openglfunctions_modifications1_1; + &openglfunctions_modifications1_1_compat; + &openglfunctions_modifications1_2_compat; + </object-type> + <object-type name="QOpenGLFunctions_1_3" since="5.1"> + &openglfunctions_modifications1_0; + &openglfunctions_modifications1_0_compat; + &openglfunctions_modifications1_1; + &openglfunctions_modifications1_1_compat; + &openglfunctions_modifications1_2_compat; + &openglfunctions_modifications1_3_compat; + </object-type> + <object-type name="QOpenGLFunctions_1_4" since="5.1"> + &openglfunctions_modifications1_0; + &openglfunctions_modifications1_0_compat; + &openglfunctions_modifications1_1; + &openglfunctions_modifications1_1_compat; + &openglfunctions_modifications1_2_compat; + &openglfunctions_modifications1_3_compat; + &openglfunctions_modifications1_4; + &openglfunctions_modifications1_4_compat; + </object-type> + <object-type name="QOpenGLFunctions_1_5" since="5.1"> + &openglfunctions_modifications1_0; + &openglfunctions_modifications1_0_compat; + &openglfunctions_modifications1_1; + &openglfunctions_modifications1_1_compat; + &openglfunctions_modifications1_2_compat; + &openglfunctions_modifications1_3_compat; + &openglfunctions_modifications1_4; + &openglfunctions_modifications1_4_compat; + </object-type> + <object-type name="QOpenGLFunctions_2_0" since="5.1"> + &openglfunctions_modifications1_0; + &openglfunctions_modifications1_0_compat; + &openglfunctions_modifications1_1; + &openglfunctions_modifications1_1_compat; + &openglfunctions_modifications1_2_compat; + &openglfunctions_modifications1_3_compat; + &openglfunctions_modifications1_4; + &openglfunctions_modifications1_4_compat; + &openglfunctions_modifications2_0; + &openglfunctions_modifications2_0_compat; + </object-type> + <object-type name="QOpenGLFunctions_2_1" since="5.1"> + &openglfunctions_modifications1_0; + &openglfunctions_modifications1_0_compat; + &openglfunctions_modifications1_1; + &openglfunctions_modifications1_1_compat; + &openglfunctions_modifications1_2_compat; + &openglfunctions_modifications1_3_compat; + &openglfunctions_modifications1_4; + &openglfunctions_modifications1_4_compat; + &openglfunctions_modifications2_0; + &openglfunctions_modifications2_0_compat; + &openglfunctions_modifications2_1; + </object-type> + <object-type name="QOpenGLFunctions_3_0" since="5.1"> + &openglfunctions_modifications1_0; + &openglfunctions_modifications1_0_compat; + &openglfunctions_modifications1_1; + &openglfunctions_modifications1_1_compat; + &openglfunctions_modifications1_2_compat; + &openglfunctions_modifications1_3_compat; + &openglfunctions_modifications1_4; + &openglfunctions_modifications1_4_compat; + &openglfunctions_modifications2_0; + &openglfunctions_modifications2_0_compat; + &openglfunctions_modifications2_1; + &openglfunctions_modifications3_0; + </object-type> + <object-type name="QOpenGLFunctions_3_1" since="5.1"> + &openglfunctions_modifications1_0; + &openglfunctions_modifications1_1; + &openglfunctions_modifications1_4; + &openglfunctions_modifications2_0; + &openglfunctions_modifications2_1; + &openglfunctions_modifications3_0; + </object-type> + <object-type name="QOpenGLFunctions_3_2_Compatibility" since="5.1"> + &openglfunctions_modifications1_0; + &openglfunctions_modifications1_0_compat; + &openglfunctions_modifications1_1; + &openglfunctions_modifications1_1_compat; + &openglfunctions_modifications1_2_compat; + &openglfunctions_modifications1_3_compat; + &openglfunctions_modifications1_4; + &openglfunctions_modifications1_4_compat; + &openglfunctions_modifications2_0; + &openglfunctions_modifications2_0_compat; + &openglfunctions_modifications2_1; + &openglfunctions_modifications3_0; + </object-type> + <object-type name="QOpenGLFunctions_3_2_Core" since="5.1"> + &openglfunctions_modifications1_0; + &openglfunctions_modifications1_1; + &openglfunctions_modifications1_4; + &openglfunctions_modifications2_0; + &openglfunctions_modifications2_1; + &openglfunctions_modifications3_0; + </object-type> + <object-type name="QOpenGLFunctions_3_3_Compatibility" since="5.1"> + &openglfunctions_modifications1_0; + &openglfunctions_modifications1_0_compat; + &openglfunctions_modifications1_1; + &openglfunctions_modifications1_1_compat; + &openglfunctions_modifications1_2_compat; + &openglfunctions_modifications1_3_compat; + &openglfunctions_modifications1_4; + &openglfunctions_modifications1_4_compat; + &openglfunctions_modifications2_0; + &openglfunctions_modifications2_0_compat; + &openglfunctions_modifications2_1; + &openglfunctions_modifications3_0; + &openglfunctions_modifications3_3; + &openglfunctions_modifications3_3a; + </object-type> + <object-type name="QOpenGLFunctions_3_3_Core" since="5.1"> + &openglfunctions_modifications1_0; + &openglfunctions_modifications1_1; + &openglfunctions_modifications1_4; + &openglfunctions_modifications2_0; + &openglfunctions_modifications2_1; + &openglfunctions_modifications3_0; + &openglfunctions_modifications3_3; + &openglfunctions_modifications3_3a; + </object-type> + <object-type name="QOpenGLFunctions_4_0_Compatibility" since="5.1"> + &openglfunctions_modifications1_0; + &openglfunctions_modifications1_0_compat; + &openglfunctions_modifications1_1; + &openglfunctions_modifications1_1_compat; + &openglfunctions_modifications1_2_compat; + &openglfunctions_modifications1_3_compat; + &openglfunctions_modifications1_4; + &openglfunctions_modifications1_4_compat; + &openglfunctions_modifications2_0; + &openglfunctions_modifications2_0_compat; + &openglfunctions_modifications2_1; + &openglfunctions_modifications3_0; + &openglfunctions_modifications3_3; + &openglfunctions_modifications3_3a; + &openglfunctions_modifications4_0; + </object-type> + <object-type name="QOpenGLFunctions_4_0_Core" since="5.1"> + &openglfunctions_modifications1_0; + &openglfunctions_modifications1_1; + &openglfunctions_modifications1_4; + &openglfunctions_modifications2_0; + &openglfunctions_modifications2_1; + &openglfunctions_modifications3_0; + &openglfunctions_modifications3_3; + &openglfunctions_modifications3_3a; + &openglfunctions_modifications4_0; + </object-type> + <object-type name="QOpenGLFunctions_4_1_Compatibility" since="5.1"> + &openglfunctions_modifications1_0; + &openglfunctions_modifications1_0_compat; + &openglfunctions_modifications1_1; + &openglfunctions_modifications1_1_compat; + &openglfunctions_modifications1_2_compat; + &openglfunctions_modifications1_3_compat; + &openglfunctions_modifications1_4; + &openglfunctions_modifications1_4_compat; + &openglfunctions_modifications2_0; + &openglfunctions_modifications2_0_compat; + &openglfunctions_modifications2_1; + &openglfunctions_modifications3_0; + &openglfunctions_modifications3_3; + &openglfunctions_modifications3_3a; + &openglfunctions_modifications4_1; + &openglfunctions_modifications4_0; + </object-type> + <object-type name="QOpenGLFunctions_4_1_Core" since="5.1"> + &openglfunctions_modifications1_0; + &openglfunctions_modifications1_1; + &openglfunctions_modifications1_4; + &openglfunctions_modifications2_0; + &openglfunctions_modifications2_1; + &openglfunctions_modifications3_0; + &openglfunctions_modifications3_3; + &openglfunctions_modifications3_3a; + &openglfunctions_modifications4_0; + &openglfunctions_modifications4_1; + &openglfunctions_modifications_va; + </object-type> + <object-type name="QOpenGLFunctions_4_2_Compatibility" since="5.1"> + &openglfunctions_modifications1_0; + &openglfunctions_modifications1_0_compat; + &openglfunctions_modifications1_1; + &openglfunctions_modifications1_1_compat; + &openglfunctions_modifications1_2_compat; + &openglfunctions_modifications1_3_compat; + &openglfunctions_modifications1_4; + &openglfunctions_modifications1_4_compat; + &openglfunctions_modifications2_0; + &openglfunctions_modifications2_0_compat; + &openglfunctions_modifications2_1; + &openglfunctions_modifications3_0; + &openglfunctions_modifications3_3; + &openglfunctions_modifications3_3a; + &openglfunctions_modifications4_0; + &openglfunctions_modifications4_1; + </object-type> + <object-type name="QOpenGLFunctions_4_2_Core" since="5.1"> + &openglfunctions_modifications1_0; + &openglfunctions_modifications1_1; + &openglfunctions_modifications1_4; + &openglfunctions_modifications2_0; + &openglfunctions_modifications2_1; + &openglfunctions_modifications3_0; + &openglfunctions_modifications3_3; + &openglfunctions_modifications3_3a; + &openglfunctions_modifications4_0; + &openglfunctions_modifications4_1; + &openglfunctions_modifications_va; + </object-type> + <object-type name="QOpenGLFunctions_4_3_Compatibility" since="5.1"> + &openglfunctions_modifications1_0; + &openglfunctions_modifications1_0_compat; + &openglfunctions_modifications1_1; + &openglfunctions_modifications1_1_compat; + &openglfunctions_modifications1_2_compat; + &openglfunctions_modifications1_3_compat; + &openglfunctions_modifications1_4; + &openglfunctions_modifications1_4_compat; + &openglfunctions_modifications2_0; + &openglfunctions_modifications2_0_compat; + &openglfunctions_modifications2_1; + &openglfunctions_modifications3_0; + &openglfunctions_modifications3_3; + &openglfunctions_modifications3_3a; + &openglfunctions_modifications4_0; + &openglfunctions_modifications4_1; + &openglfunctions_modifications4_3; + </object-type> + <object-type name="QOpenGLFunctions_4_3_Core" since="5.1"> + &openglfunctions_modifications1_0; + &openglfunctions_modifications1_1; + &openglfunctions_modifications1_4; + &openglfunctions_modifications2_0; + &openglfunctions_modifications2_1; + &openglfunctions_modifications3_0; + &openglfunctions_modifications3_3; + &openglfunctions_modifications3_3a; + &openglfunctions_modifications4_0; + &openglfunctions_modifications4_3; + &openglfunctions_modifications4_1; + &openglfunctions_modifications_va; + </object-type> + <object-type name="QOpenGLFunctions_4_4_Compatibility" since="5.5"> + &openglfunctions_modifications1_0; + &openglfunctions_modifications1_0_compat; + &openglfunctions_modifications1_1; + &openglfunctions_modifications1_1_compat; + &openglfunctions_modifications1_2_compat; + &openglfunctions_modifications1_3_compat; + &openglfunctions_modifications1_4; + &openglfunctions_modifications1_4_compat; + &openglfunctions_modifications2_0; + &openglfunctions_modifications2_0_compat; + &openglfunctions_modifications2_1; + &openglfunctions_modifications3_0; + &openglfunctions_modifications3_3; + &openglfunctions_modifications3_3a; + &openglfunctions_modifications4_0; + &openglfunctions_modifications4_1; + &openglfunctions_modifications4_3; + &openglfunctions_modifications4_4; + &openglfunctions_modifications4_4_core; + </object-type> + <object-type name="QOpenGLFunctions_4_4_Core" since="5.5"> + &openglfunctions_modifications1_0; + &openglfunctions_modifications1_1; + &openglfunctions_modifications1_4; + &openglfunctions_modifications2_0; + &openglfunctions_modifications2_1; + &openglfunctions_modifications3_0; + &openglfunctions_modifications3_3; + &openglfunctions_modifications4_0; + &openglfunctions_modifications4_1; + &openglfunctions_modifications_va; + &openglfunctions_modifications4_3; + &openglfunctions_modifications4_4; + &openglfunctions_modifications4_4_core; + </object-type> + <object-type name="QOpenGLFunctions_4_5_Compatibility" since="5.5"> + &openglfunctions_modifications1_0; + &openglfunctions_modifications1_0_compat; + &openglfunctions_modifications1_1; + &openglfunctions_modifications1_1_compat; + &openglfunctions_modifications1_2_compat; + &openglfunctions_modifications1_3_compat; + &openglfunctions_modifications1_4; + &openglfunctions_modifications1_4_compat; + &openglfunctions_modifications2_0; + &openglfunctions_modifications2_0_compat; + &openglfunctions_modifications2_1; + &openglfunctions_modifications3_0; + &openglfunctions_modifications3_3; + &openglfunctions_modifications3_3a; + &openglfunctions_modifications4_0; + &openglfunctions_modifications4_1; + &openglfunctions_modifications4_3; + &openglfunctions_modifications4_4; + &openglfunctions_modifications4_4_core; + &openglfunctions_modifications4_5; + </object-type> + <object-type name="QOpenGLFunctions_4_5_Core" since="5.5"> + &openglfunctions_modifications1_0; + &openglfunctions_modifications1_1; + &openglfunctions_modifications1_4; + &openglfunctions_modifications2_0; + &openglfunctions_modifications2_1; + &openglfunctions_modifications3_0; + &openglfunctions_modifications3_3; + &openglfunctions_modifications4_0; + &openglfunctions_modifications4_1; + &openglfunctions_modifications4_3; + &openglfunctions_modifications4_4; + &openglfunctions_modifications4_4_core; + &openglfunctions_modifications4_5; + &openglfunctions_modifications_va; + </object-type> + <object-type name="QOpenGLFunctions_ES2" since="5.1"> + &openglfunctions_modifications1_0; + &openglfunctions_modifications1_1; + </object-type> + <suppress-warning text="^There's no user provided way.*QOpenGLFunctions_\d_\d.*::glIndex.*$"/> + +</typesystem> diff --git a/sources/pyside2/PySide2/QtOpenGLFunctions/typesystem_openglfunctions_modifications1_0.xml b/sources/pyside2/PySide2/QtOpenGLFunctions/typesystem_openglfunctions_modifications1_0.xml new file mode 100644 index 000000000..5652ad6b6 --- /dev/null +++ b/sources/pyside2/PySide2/QtOpenGLFunctions/typesystem_openglfunctions_modifications1_0.xml @@ -0,0 +1,51 @@ +<!-- +/**************************************************************************** +** +** Copyright (C) 2019 The Qt Company Ltd. +** Contact: https://www.qt.io/licensing/ +** +** This file is part of Qt for Python. +** +** $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$ +** +****************************************************************************/ +--> +<modify-function signature="^glGetStringi?\(.*$"> + <modify-argument index="return"> + <replace-type modified-type="QString"/> + </modify-argument> + <inject-code class="target" position="beginning"> + <insert-template name="glGetString_return_QString"/> + </inject-code> +</modify-function> +<modify-function signature="^glTexParameterI?u?[fi]v\(.*$"> + <modify-argument index="3"><array/></modify-argument> +</modify-function> diff --git a/sources/pyside2/PySide2/QtOpenGLFunctions/typesystem_openglfunctions_modifications1_0_compat.xml b/sources/pyside2/PySide2/QtOpenGLFunctions/typesystem_openglfunctions_modifications1_0_compat.xml new file mode 100644 index 000000000..5793048cd --- /dev/null +++ b/sources/pyside2/PySide2/QtOpenGLFunctions/typesystem_openglfunctions_modifications1_0_compat.xml @@ -0,0 +1,103 @@ +<!-- +/**************************************************************************** +** +** Copyright (C) 2019 The Qt Company Ltd. +** Contact: https://www.qt.io/licensing/ +** +** This file is part of Qt for Python. +** +** $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$ +** +****************************************************************************/ +--> +<modify-function signature="^glBitmap\(.*$" remove="all"/> +<modify-function signature="^glColor[34][a-z]{1,2}v\(.*$"> + <modify-argument index="1"><array/></modify-argument> +</modify-function> +<modify-function signature="glClipPlane(unsigned int,const double *)"> + <modify-argument index="2"><array/></modify-argument> +</modify-function> +<modify-function signature="^glEvalCoord\d[a-z]{1,2}v\(.*$"> + <modify-argument index="1"><array/></modify-argument> +</modify-function> +<modify-function signature="^glFog[fi]v\(.*$"> + <modify-argument index="2"><array/></modify-argument> +</modify-function> +<modify-function signature="^glIndex[a-z]v\(.*$"> + <modify-argument index="1"><array/></modify-argument> +</modify-function> +<modify-function signature="^glLoadMatrix[df]\(.*$"> + <modify-argument index="1"><array/></modify-argument> +</modify-function> +<modify-function signature="^glLight[fi]v\(.*$"> + <modify-argument index="3"><array/></modify-argument> +</modify-function> +<modify-function signature="^glLightModel[fi]v\(.*$"> + <modify-argument index="2"><array/></modify-argument> +</modify-function> +<modify-function signature="^glMap1[df]\(.*$"> + <modify-argument index="6"><array/></modify-argument> +</modify-function> +<modify-function signature="^glMap2[df]\(.*$"> + <modify-argument index="10"><array/></modify-argument> +</modify-function> +<modify-function signature="^glMaterial[fi]v\(.*$"> + <modify-argument index="3"><array/></modify-argument> +</modify-function> +<modify-function signature="^glMultMatrix[df]\(.*$"> + <modify-argument index="1"><array/></modify-argument> +</modify-function> +<modify-function signature="^glNormal3.v\(.*$"> + <modify-argument index="1"><array/></modify-argument> +</modify-function> +<modify-function signature="^glPixelMap[a-z]{1,2}v\(.*$"> + <modify-argument index="3"><array/></modify-argument> +</modify-function> +<modify-function signature="^glPolygonStipple\(.*$" remove="all"/> +<modify-function signature="^glRasterPos\d[a-z]v\(.*$"> + <modify-argument index="1"><array/></modify-argument> +</modify-function> +<modify-function signature="^glRect[dfis]v\(.*$"> + <modify-argument index="1"><array/></modify-argument> + <modify-argument index="2"><array/></modify-argument> +</modify-function> +<modify-function signature="^glTexCoord\d[dfis]v\(.*$"> + <modify-argument index="1"><array/></modify-argument> +</modify-function> +<modify-function signature="^glTexEnv[fi]v\(.*$"> + <modify-argument index="3"><array/></modify-argument> +</modify-function> +<modify-function signature="^glTexGen[dfi]v\(.*$"> + <modify-argument index="3"><array/></modify-argument> +</modify-function> +<modify-function signature="^glVertex\d[dfis]v\(.*$"> + <modify-argument index="1"><array/></modify-argument> +</modify-function> diff --git a/sources/pyside2/PySide2/QtOpenGLFunctions/typesystem_openglfunctions_modifications1_1.xml b/sources/pyside2/PySide2/QtOpenGLFunctions/typesystem_openglfunctions_modifications1_1.xml new file mode 100644 index 000000000..9383fb83f --- /dev/null +++ b/sources/pyside2/PySide2/QtOpenGLFunctions/typesystem_openglfunctions_modifications1_1.xml @@ -0,0 +1,44 @@ +<!-- +/**************************************************************************** +** +** Copyright (C) 2019 The Qt Company Ltd. +** Contact: https://www.qt.io/licensing/ +** +** This file is part of Qt for Python. +** +** $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$ +** +****************************************************************************/ +--> +<!-- Except glGenLists/glDeleteLists --> +<modify-function signature="^glDelete[A-KM-Z].*s\(.*$"> + <modify-argument index="2"><array/></modify-argument> +</modify-function> diff --git a/sources/pyside2/PySide2/QtOpenGLFunctions/typesystem_openglfunctions_modifications1_1_compat.xml b/sources/pyside2/PySide2/QtOpenGLFunctions/typesystem_openglfunctions_modifications1_1_compat.xml new file mode 100644 index 000000000..3f8075b30 --- /dev/null +++ b/sources/pyside2/PySide2/QtOpenGLFunctions/typesystem_openglfunctions_modifications1_1_compat.xml @@ -0,0 +1,44 @@ +<!-- +/**************************************************************************** +** +** Copyright (C) 2019 The Qt Company Ltd. +** Contact: https://www.qt.io/licensing/ +** +** This file is part of Qt for Python. +** +** $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$ +** +****************************************************************************/ +--> +<modify-function signature="^glPrioritizeTextures\(.*$"> + <modify-argument index="2"><array/></modify-argument> + <modify-argument index="3"><array/></modify-argument> +</modify-function> diff --git a/sources/pyside2/PySide2/QtOpenGLFunctions/typesystem_openglfunctions_modifications1_2_compat.xml b/sources/pyside2/PySide2/QtOpenGLFunctions/typesystem_openglfunctions_modifications1_2_compat.xml new file mode 100644 index 000000000..c13b09b5b --- /dev/null +++ b/sources/pyside2/PySide2/QtOpenGLFunctions/typesystem_openglfunctions_modifications1_2_compat.xml @@ -0,0 +1,46 @@ +<!-- +/**************************************************************************** +** +** Copyright (C) 2019 The Qt Company Ltd. +** Contact: https://www.qt.io/licensing/ +** +** This file is part of Qt for Python. +** +** $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$ +** +****************************************************************************/ +--> +<modify-function signature="^glColorTableParameter[fi]v\(.*$"> + <modify-argument index="3"><array/></modify-argument> +</modify-function> +<modify-function signature="^glConvolutionParameter[fi]v\(.*$"> + <modify-argument index="3"><array/></modify-argument> +</modify-function> diff --git a/sources/pyside2/PySide2/QtOpenGLFunctions/typesystem_openglfunctions_modifications1_3_compat.xml b/sources/pyside2/PySide2/QtOpenGLFunctions/typesystem_openglfunctions_modifications1_3_compat.xml new file mode 100644 index 000000000..e35f3b334 --- /dev/null +++ b/sources/pyside2/PySide2/QtOpenGLFunctions/typesystem_openglfunctions_modifications1_3_compat.xml @@ -0,0 +1,46 @@ +<!-- +/**************************************************************************** +** +** Copyright (C) 2019 The Qt Company Ltd. +** Contact: https://www.qt.io/licensing/ +** +** This file is part of Qt for Python. +** +** $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$ +** +****************************************************************************/ +--> +<modify-function signature="^gl(Load|Mult)TransposeMatrix[df]\(.*$"> + <modify-argument index="1"><array/></modify-argument> +</modify-function> +<modify-function signature="^glMultiTexCoord\d[a-z]v\(.*$"> + <modify-argument index="2"><array/></modify-argument> +</modify-function> diff --git a/sources/pyside2/PySide2/QtOpenGLFunctions/typesystem_openglfunctions_modifications1_4.xml b/sources/pyside2/PySide2/QtOpenGLFunctions/typesystem_openglfunctions_modifications1_4.xml new file mode 100644 index 000000000..1102daea8 --- /dev/null +++ b/sources/pyside2/PySide2/QtOpenGLFunctions/typesystem_openglfunctions_modifications1_4.xml @@ -0,0 +1,47 @@ +<!-- +/**************************************************************************** +** +** Copyright (C) 2019 The Qt Company Ltd. +** Contact: https://www.qt.io/licensing/ +** +** This file is part of Qt for Python. +** +** $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$ +** +****************************************************************************/ +--> +<modify-function signature="^glMultiDrawArrays\(.*$"> + <modify-argument index="2"><array/></modify-argument> + <modify-argument index="3"><array/></modify-argument> +</modify-function> +<modify-function signature="^glPointParameter[fi]v\(.*$"> + <modify-argument index="2"><array/></modify-argument> +</modify-function> diff --git a/sources/pyside2/PySide2/QtOpenGLFunctions/typesystem_openglfunctions_modifications1_4_compat.xml b/sources/pyside2/PySide2/QtOpenGLFunctions/typesystem_openglfunctions_modifications1_4_compat.xml new file mode 100644 index 000000000..4cb75d418 --- /dev/null +++ b/sources/pyside2/PySide2/QtOpenGLFunctions/typesystem_openglfunctions_modifications1_4_compat.xml @@ -0,0 +1,49 @@ +<!-- +/**************************************************************************** +** +** Copyright (C) 2019 The Qt Company Ltd. +** Contact: https://www.qt.io/licensing/ +** +** This file is part of Qt for Python. +** +** $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$ +** +****************************************************************************/ +--> +<modify-function signature="^glFogCoord[df]v\(.*$"> + <modify-argument index="1"><array/></modify-argument> +</modify-function> +<modify-function signature="^glSecondaryColor3u?[bdfis]v\(.*$"> + <modify-argument index="1"><array/></modify-argument> +</modify-function> +<modify-function signature="^glWindowPos[23][dfis]v\(.*$"> + <modify-argument index="1"><array/></modify-argument> +</modify-function> diff --git a/sources/pyside2/PySide2/QtOpenGLFunctions/typesystem_openglfunctions_modifications2_0.xml b/sources/pyside2/PySide2/QtOpenGLFunctions/typesystem_openglfunctions_modifications2_0.xml new file mode 100644 index 000000000..28a424e1a --- /dev/null +++ b/sources/pyside2/PySide2/QtOpenGLFunctions/typesystem_openglfunctions_modifications2_0.xml @@ -0,0 +1,49 @@ +<!-- +/**************************************************************************** +** +** Copyright (C) 2019 The Qt Company Ltd. +** Contact: https://www.qt.io/licensing/ +** +** This file is part of Qt for Python. +** +** $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$ +** +****************************************************************************/ +--> +<modify-function signature="^glDrawBuffers\(.*$"> + <modify-argument index="2"><array/></modify-argument> +</modify-function> +<modify-function signature="^glUniformMatrix\d[df]v\(.*$"> + <modify-argument index="4"><array/></modify-argument> +</modify-function> +<modify-function signature="^glUniform\d?.v\(.*$"> + <modify-argument index="3"><array/></modify-argument> +</modify-function> diff --git a/sources/pyside2/PySide2/QtOpenGLFunctions/typesystem_openglfunctions_modifications2_0_compat.xml b/sources/pyside2/PySide2/QtOpenGLFunctions/typesystem_openglfunctions_modifications2_0_compat.xml new file mode 100644 index 000000000..49cbd5c05 --- /dev/null +++ b/sources/pyside2/PySide2/QtOpenGLFunctions/typesystem_openglfunctions_modifications2_0_compat.xml @@ -0,0 +1 @@ +&typesystem_openglfunctions_modifications_va.xml; diff --git a/sources/pyside2/PySide2/QtOpenGLFunctions/typesystem_openglfunctions_modifications2_1.xml b/sources/pyside2/PySide2/QtOpenGLFunctions/typesystem_openglfunctions_modifications2_1.xml new file mode 100644 index 000000000..af515ed8c --- /dev/null +++ b/sources/pyside2/PySide2/QtOpenGLFunctions/typesystem_openglfunctions_modifications2_1.xml @@ -0,0 +1,43 @@ +<!-- +/**************************************************************************** +** +** Copyright (C) 2019 The Qt Company Ltd. +** Contact: https://www.qt.io/licensing/ +** +** This file is part of Qt for Python. +** +** $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$ +** +****************************************************************************/ +--> +<modify-function signature="^glUniformMatrix\dx\d[a-z]v\(.*$"> + <modify-argument index="4"><array/></modify-argument> +</modify-function> diff --git a/sources/pyside2/PySide2/QtOpenGLFunctions/typesystem_openglfunctions_modifications3_0.xml b/sources/pyside2/PySide2/QtOpenGLFunctions/typesystem_openglfunctions_modifications3_0.xml new file mode 100644 index 000000000..8377e440b --- /dev/null +++ b/sources/pyside2/PySide2/QtOpenGLFunctions/typesystem_openglfunctions_modifications3_0.xml @@ -0,0 +1,46 @@ +<!-- +/**************************************************************************** +** +** Copyright (C) 2019 The Qt Company Ltd. +** Contact: https://www.qt.io/licensing/ +** +** This file is part of Qt for Python. +** +** $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$ +** +****************************************************************************/ +--> +<modify-function signature="^glClearBufferu?[fi]v\(.*$"> + <modify-argument index="3"><array/></modify-argument> +</modify-function> +<modify-function signature="^glUniform\duiv\(.*$"> + <modify-argument index="3"><array/></modify-argument> +</modify-function> diff --git a/sources/pyside2/PySide2/QtOpenGLFunctions/typesystem_openglfunctions_modifications3_3.xml b/sources/pyside2/PySide2/QtOpenGLFunctions/typesystem_openglfunctions_modifications3_3.xml new file mode 100644 index 000000000..7f4717170 --- /dev/null +++ b/sources/pyside2/PySide2/QtOpenGLFunctions/typesystem_openglfunctions_modifications3_3.xml @@ -0,0 +1,46 @@ +<!-- +/**************************************************************************** +** +** Copyright (C) 2019 The Qt Company Ltd. +** Contact: https://www.qt.io/licensing/ +** +** This file is part of Qt for Python. +** +** $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$ +** +****************************************************************************/ +--> +<modify-function signature="^glSamplerParameterI?u?[dfi]v\(.*$"> + <modify-argument index="3"><array/></modify-argument> +</modify-function> +<modify-function signature="^glVertexAttribP\duiv\(.*$"> + <modify-argument index="4"><array/></modify-argument> +</modify-function> diff --git a/sources/pyside2/PySide2/QtOpenGLFunctions/typesystem_openglfunctions_modifications3_3a.xml b/sources/pyside2/PySide2/QtOpenGLFunctions/typesystem_openglfunctions_modifications3_3a.xml new file mode 100644 index 000000000..4bf2bc8f5 --- /dev/null +++ b/sources/pyside2/PySide2/QtOpenGLFunctions/typesystem_openglfunctions_modifications3_3a.xml @@ -0,0 +1,57 @@ +<!-- +/**************************************************************************** +** +** Copyright (C) 2019 The Qt Company Ltd. +** Contact: https://www.qt.io/licensing/ +** +** This file is part of Qt for Python. +** +** $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$ +** +****************************************************************************/ + +Present from 3.3..4.5 except 4.4 Core/4.5 Core +--> +<modify-function signature="^glColorP[34]uiv\(.*$"> + <modify-argument index="2"><array/></modify-argument> +</modify-function> +<modify-function signature="^glMultiTexCoordP\duiv\(.*$"> + <modify-argument index="3"><array/></modify-argument> +</modify-function> +<modify-function signature="^gl(Normal|SecondaryColor)P3uiv\(.*$"> + <modify-argument index="2"><array/></modify-argument> +</modify-function> +<modify-function signature="^glTexCoordP\duiv\(.*$"> + <modify-argument index="2"><array/></modify-argument> +</modify-function> +<modify-function signature="^glVertexP\duiv\(.*$"> + <modify-argument index="2"><array/></modify-argument> +</modify-function> diff --git a/sources/pyside2/PySide2/QtOpenGLFunctions/typesystem_openglfunctions_modifications4_0.xml b/sources/pyside2/PySide2/QtOpenGLFunctions/typesystem_openglfunctions_modifications4_0.xml new file mode 100644 index 000000000..cf2e47a5c --- /dev/null +++ b/sources/pyside2/PySide2/QtOpenGLFunctions/typesystem_openglfunctions_modifications4_0.xml @@ -0,0 +1,46 @@ +<!-- +/**************************************************************************** +** +** Copyright (C) 2019 The Qt Company Ltd. +** Contact: https://www.qt.io/licensing/ +** +** This file is part of Qt for Python. +** +** $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$ +** +****************************************************************************/ +--> +<modify-function signature="^glPatchParameterfv\(.*$"> + <modify-argument index="2"><array/></modify-argument> +</modify-function> +<modify-function signature="^glUniformSubroutinesuiv\(.*$"> + <modify-argument index="3"><array/></modify-argument> +</modify-function> diff --git a/sources/pyside2/PySide2/QtOpenGLFunctions/typesystem_openglfunctions_modifications4_1.xml b/sources/pyside2/PySide2/QtOpenGLFunctions/typesystem_openglfunctions_modifications4_1.xml new file mode 100644 index 000000000..bc92ce80d --- /dev/null +++ b/sources/pyside2/PySide2/QtOpenGLFunctions/typesystem_openglfunctions_modifications4_1.xml @@ -0,0 +1,58 @@ +<!-- +/**************************************************************************** +** +** Copyright (C) 2019 The Qt Company Ltd. +** Contact: https://www.qt.io/licensing/ +** +** This file is part of Qt for Python. +** +** $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$ +** +****************************************************************************/ +--> +<modify-function signature="^gl(DepthRange|Scissor|Viewport)Arrayv\(.*$"> + <modify-argument index="3"><array/></modify-argument> +</modify-function> +<modify-function signature="^glProgramUniform\du?[dfi]v\(.*$"> + <modify-argument index="4"><array/></modify-argument> +</modify-function> +<modify-function signature="^glProgramUniformMatrix\d[df]v\(.*$"> + <modify-argument index="5"><array/></modify-argument> +</modify-function> +<modify-function signature="^glProgramUniformMatrix\dx\d[df]v\(.*$"> + <modify-argument index="5"><array/></modify-argument> +</modify-function> +<modify-function signature="^gl(Scissor|Viewport)Indexedf?v\(.*$"> + <modify-argument index="2"><array/></modify-argument> +</modify-function> +<modify-function signature="glShaderBinary(int,const unsigned int*,unsigned int,const void *,int)"> + <modify-argument index="2"><array/></modify-argument> +</modify-function> diff --git a/sources/pyside2/PySide2/QtOpenGLFunctions/typesystem_openglfunctions_modifications4_3.xml b/sources/pyside2/PySide2/QtOpenGLFunctions/typesystem_openglfunctions_modifications4_3.xml new file mode 100644 index 000000000..b3c2b618d --- /dev/null +++ b/sources/pyside2/PySide2/QtOpenGLFunctions/typesystem_openglfunctions_modifications4_3.xml @@ -0,0 +1,43 @@ +<!-- +/**************************************************************************** +** +** Copyright (C) 2019 The Qt Company Ltd. +** Contact: https://www.qt.io/licensing/ +** +** This file is part of Qt for Python. +** +** $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$ +** +****************************************************************************/ +--> +<modify-function signature="^glInvalidate(Sub)?Framebuffer\(.*$"> + <modify-argument index="3"><array/></modify-argument> +</modify-function> diff --git a/sources/pyside2/PySide2/QtOpenGLFunctions/typesystem_openglfunctions_modifications4_4.xml b/sources/pyside2/PySide2/QtOpenGLFunctions/typesystem_openglfunctions_modifications4_4.xml new file mode 100644 index 000000000..ef6949a8e --- /dev/null +++ b/sources/pyside2/PySide2/QtOpenGLFunctions/typesystem_openglfunctions_modifications4_4.xml @@ -0,0 +1,46 @@ +<!-- +/**************************************************************************** +** +** Copyright (C) 2019 The Qt Company Ltd. +** Contact: https://www.qt.io/licensing/ +** +** This file is part of Qt for Python. +** +** $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$ +** +****************************************************************************/ +--> +<modify-function signature="^glBindBuffersBase\(.*$"> + <modify-argument index="4"><array/></modify-argument> +</modify-function> +<modify-function signature="^glBind(ImageTextures|Samplers|Textures)\(.*$"> + <modify-argument index="3"><array/></modify-argument> +</modify-function> diff --git a/sources/pyside2/PySide2/QtOpenGLFunctions/typesystem_openglfunctions_modifications4_4_core.xml b/sources/pyside2/PySide2/QtOpenGLFunctions/typesystem_openglfunctions_modifications4_4_core.xml new file mode 100644 index 000000000..c747997aa --- /dev/null +++ b/sources/pyside2/PySide2/QtOpenGLFunctions/typesystem_openglfunctions_modifications4_4_core.xml @@ -0,0 +1,43 @@ +<!-- +/**************************************************************************** +** +** Copyright (C) 2019 The Qt Company Ltd. +** Contact: https://www.qt.io/licensing/ +** +** This file is part of Qt for Python. +** +** $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$ +** +****************************************************************************/ +--> +<modify-function signature="^glDebugMessageControl\(.*$"> + <modify-argument index="5"><array/></modify-argument> +</modify-function> diff --git a/sources/pyside2/PySide2/QtOpenGLFunctions/typesystem_openglfunctions_modifications4_5.xml b/sources/pyside2/PySide2/QtOpenGLFunctions/typesystem_openglfunctions_modifications4_5.xml new file mode 100644 index 000000000..0a83531e6 --- /dev/null +++ b/sources/pyside2/PySide2/QtOpenGLFunctions/typesystem_openglfunctions_modifications4_5.xml @@ -0,0 +1,52 @@ +<!-- +/**************************************************************************** +** +** Copyright (C) 2019 The Qt Company Ltd. +** Contact: https://www.qt.io/licensing/ +** +** This file is part of Qt for Python. +** +** $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$ +** +****************************************************************************/ +--> +<modify-function signature="^glClearNamedFramebufferu?[fi]v\(.*$"> + <modify-argument index="4"><array/></modify-argument> +</modify-function> +<modify-function signature="^glInvalidateNamedFramebuffer(Sub)?Data\(.*$"> + <modify-argument index="3"><array/></modify-argument> +</modify-function> +<modify-function signature="^glNamedFramebufferDrawBuffers\(.*$"> + <modify-argument index="3"><array/></modify-argument> +</modify-function> +<modify-function signature="^glTextureParameterI?u?[fi]v\(.*$"> + <modify-argument index="3"><array/></modify-argument> +</modify-function> diff --git a/sources/pyside2/PySide2/QtOpenGLFunctions/typesystem_openglfunctions_modifications4_5_core.xml b/sources/pyside2/PySide2/QtOpenGLFunctions/typesystem_openglfunctions_modifications4_5_core.xml new file mode 100644 index 000000000..5cd5161f8 --- /dev/null +++ b/sources/pyside2/PySide2/QtOpenGLFunctions/typesystem_openglfunctions_modifications4_5_core.xml @@ -0,0 +1,41 @@ +<!-- +/**************************************************************************** +** +** Copyright (C) 2019 The Qt Company Ltd. +** Contact: https://www.qt.io/licensing/ +** +** This file is part of Qt for Python. +** +** $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$ +** +****************************************************************************/ + Remove me! +--> diff --git a/sources/pyside2/PySide2/QtOpenGLFunctions/typesystem_openglfunctions_modifications_va.xml b/sources/pyside2/PySide2/QtOpenGLFunctions/typesystem_openglfunctions_modifications_va.xml new file mode 100644 index 000000000..ae4d49ab1 --- /dev/null +++ b/sources/pyside2/PySide2/QtOpenGLFunctions/typesystem_openglfunctions_modifications_va.xml @@ -0,0 +1,43 @@ +<!-- +/**************************************************************************** +** +** Copyright (C) 2019 The Qt Company Ltd. +** Contact: https://www.qt.io/licensing/ +** +** This file is part of Qt for Python. +** +** $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$ +** +****************************************************************************/ +--> +<modify-function signature="^glVertexAttrib[IL]?\dN?u?[bdfis]v\(.*$"> + <modify-argument index="2"><array/></modify-argument> +</modify-function> diff --git a/sources/pyside2/PySide2/support/generate_pyi.py b/sources/pyside2/PySide2/support/generate_pyi.py index f286e34f1..377a53331 100644 --- a/sources/pyside2/PySide2/support/generate_pyi.py +++ b/sources/pyside2/PySide2/support/generate_pyi.py @@ -53,6 +53,7 @@ import re import subprocess import argparse import glob +import math from contextlib import contextmanager from textwrap import dedent import traceback @@ -183,6 +184,33 @@ def find_imports(text): return [imp for imp in PySide2.__all__ if imp + "." in text] +_cache = {} + +def check_if_skipable(outfilepath): + # A file can be skipped if it exists, and if it's file time is not + # older than this script or any of its dependencies. + def _do_find_newest_module(): + newest = 0 + for obj in sys.modules.values(): + if getattr(obj, "__file__", None) and os.path.isfile(obj.__file__): + sourcepath = os.path.splitext(obj.__file__)[0] + ".py" + if os.path.exists(sourcepath): + newest = max(os.path.getmtime(sourcepath), newest) + return newest + + def find_newest_module(): + cache_name = "newest_module" + if cache_name not in _cache: + _cache[cache_name] = _do_find_newest_module() + return _cache[cache_name] + + if os.path.exists(outfilepath): + stamp = os.path.getmtime(outfilepath) + if stamp >= find_newest_module(): + return True + return False + + def generate_pyi(import_name, outpath, options): """ Generates a .pyi file. @@ -198,7 +226,7 @@ def generate_pyi(import_name, outpath, options): pid = os.getpid() plainname = import_name.split(".")[-1] outfilepath = os.path.join(outpath, plainname + ".pyi") - if options.skip and os.path.exists(outfilepath): + if options.skip and check_if_skipable(outfilepath): logger.debug("{pid}:Skipped existing: {op}" .format(op=os.path.basename(outfilepath), **locals())) return -1 @@ -291,7 +319,17 @@ def generate_all_pyi(outpath, options): valid = check = 0 if not outpath: outpath = os.path.dirname(PySide2.__file__) - lockdir = os.path.join(outpath, "generate_pyi.lockfile") + lockdir = os.path.join(outpath, "generate_pyi.lockdir") + + pyi_var = "GENERATE_PYI_RECURSE {}".format(math.pi) # should not be set by anybody + if not os.environ.get(pyi_var, ""): + # To catch a possible crash, we run as a subprocess: + os.environ[pyi_var] = "yes" + ret = subprocess.call([sys.executable] + sys.argv) + if ret and os.path.exists(lockdir): + os.rmdir(lockdir) + sys.exit(ret) + # We are the subprocess. Do the real work. with single_process(lockdir) as locked: if locked: if is_ci: @@ -343,3 +381,4 @@ if __name__ == "__main__": else: parser_run.print_help() sys.exit(1) +# eof diff --git a/sources/pyside2/PySide2/templates/gui_common.xml b/sources/pyside2/PySide2/templates/gui_common.xml index 363422c8f..f3e772a8c 100644 --- a/sources/pyside2/PySide2/templates/gui_common.xml +++ b/sources/pyside2/PySide2/templates/gui_common.xml @@ -251,14 +251,6 @@ } </template> - <template name="glGetString_return_QString"> - %BEGIN_ALLOW_THREADS - const GLubyte *us = %CPPSELF.%FUNCTION_NAME(%ARGUMENT_NAMES); - const QString s = QString::fromLocal8Bit(reinterpret_cast<const char *>(us)); - %END_ALLOW_THREADS - %PYARG_0 = %CONVERTTOPYTHON[QString](s); - </template> - <template name="fix_args,QRectF*"> QRectF rect_; %BEGIN_ALLOW_THREADS diff --git a/sources/pyside2/PySide2/templates/openglfunctions_common.xml b/sources/pyside2/PySide2/templates/openglfunctions_common.xml new file mode 100644 index 000000000..e01094004 --- /dev/null +++ b/sources/pyside2/PySide2/templates/openglfunctions_common.xml @@ -0,0 +1,50 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- +/**************************************************************************** +** +** Copyright (C) 2019 The Qt Company Ltd. +** Contact: https://www.qt.io/licensing/ +** +** This file is part of Qt for Python. +** +** $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> + <template name="glGetString_return_QString"> + %BEGIN_ALLOW_THREADS + const GLubyte *us = %CPPSELF.%FUNCTION_NAME(%ARGUMENT_NAMES); + const QString s = QString::fromLocal8Bit(reinterpret_cast<const char *>(us)); + %END_ALLOW_THREADS + %PYARG_0 = %CONVERTTOPYTHON[QString](s); + </template> +</typesystem> |