diff options
Diffstat (limited to 'sources/pyside2/PySide2/QtOpenGLFunctions')
3 files changed, 50 insertions, 48 deletions
diff --git a/sources/pyside2/PySide2/QtOpenGLFunctions/CMakeLists.txt b/sources/pyside2/PySide2/QtOpenGLFunctions/CMakeLists.txt index 383afb68f..fcda32a18 100644 --- a/sources/pyside2/PySide2/QtOpenGLFunctions/CMakeLists.txt +++ b/sources/pyside2/PySide2/QtOpenGLFunctions/CMakeLists.txt @@ -1,17 +1,15 @@ project(QtOpenGLFunctions) -set(QtOpenGLFunctions_DROPPED_ENTRIES) - get_property(QtOpenGLFunctions_enabled_features TARGET Qt${QT_MAJOR_VERSION}::Gui PROPERTY QT_ENABLED_PUBLIC_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) +get_property(QtGui_enabled_features TARGET Qt${QT_MAJOR_VERSION}::Gui + PROPERTY QT_ENABLED_PUBLIC_FEATURES) + +cmake_policy(SET CMP0057 NEW) +if("opengles2" IN_LIST QtGui_enabled_features) list(APPEND QtOpenGLFunctions_SRC ${QtOpenGLFunctions_GEN_DIR}/qopenglfunctions_es2_wrapper.cpp) message(STATUS "Qt${QT_MAJOR_VERSION}OpenGLFunctions: Dropping Desktop OpenGL classes (GLES2)") @@ -49,19 +47,23 @@ 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} - ${Qt${QT_MAJOR_VERSION}Core_INCLUDE_DIRS} - ${Qt${QT_MAJOR_VERSION}Gui_INCLUDE_DIRS} - ${libpyside_SOURCE_DIR} - ${QtCore_GEN_DIR} - ${QtGui_GEN_DIR} - ) -set(QtOpenGLFunctions_libraries pyside2 - ${Qt${QT_MAJOR_VERSION}Gui_LIBRARIES}) +set(QtOpenGLFunctions_include_dirs ${QtOpenGLFunctions_SOURCE_DIR} + ${QtOpenGLFunctions_BINARY_DIR} + ${pyside2_SOURCE_DIR} + ${Qt${QT_MAJOR_VERSION}Core_INCLUDE_DIRS} + ${Qt${QT_MAJOR_VERSION}Gui_INCLUDE_DIRS} + ${Qt${QT_MAJOR_VERSION}OpenGL_INCLUDE_DIRS} + ${libpyside_SOURCE_DIR} + ${QtCore_GEN_DIR} + ${QtGui_GEN_DIR} + ${QtOpenGL_GEN_DIR} + ) + +set(QtOpenGLFunctions_libraries pyside2 + ${Qt${QT_MAJOR_VERSION}Gui_LIBRARIES} + ${Qt${QT_MAJOR_VERSION}OpenGL_LIBRARIES}) -set(QtOpenGLFunctions_deps QtGui) +set(QtOpenGLFunctions_deps QtGui QtOpenGL) create_pyside_module(NAME QtOpenGLFunctions INCLUDE_DIRS QtOpenGLFunctions_include_dirs diff --git a/sources/pyside2/PySide2/QtOpenGLFunctions/QtOpenGLFunctions_global.post.h.in b/sources/pyside2/PySide2/QtOpenGLFunctions/QtOpenGLFunctions_global.post.h.in index 6c8c77087..c25343e05 100644 --- a/sources/pyside2/PySide2/QtOpenGLFunctions/QtOpenGLFunctions_global.post.h.in +++ b/sources/pyside2/PySide2/QtOpenGLFunctions/QtOpenGLFunctions_global.post.h.in @@ -29,33 +29,33 @@ #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> +# include <QtOpenGL/qopenglfunctions_1_0.h> +# include <QtOpenGL/qopenglfunctions_1_1.h> +# include <QtOpenGL/qopenglfunctions_1_2.h> +# include <QtOpenGL/qopenglfunctions_1_3.h> +# include <QtOpenGL/qopenglfunctions_1_4.h> +# include <QtOpenGL/qopenglfunctions_1_5.h> +# include <QtOpenGL/qopenglfunctions_2_0.h> +# include <QtOpenGL/qopenglfunctions_2_1.h> +# include <QtOpenGL/qopenglfunctions_3_0.h> +# include <QtOpenGL/qopenglfunctions_3_1.h> +# include <QtOpenGL/qopenglfunctions_3_2_compatibility.h> +# include <QtOpenGL/qopenglfunctions_3_2_core.h> +# include <QtOpenGL/qopenglfunctions_3_3_compatibility.h> +# include <QtOpenGL/qopenglfunctions_3_3_core.h> +# include <QtOpenGL/qopenglfunctions_4_0_compatibility.h> +# include <QtOpenGL/qopenglfunctions_4_0_core.h> +# include <QtOpenGL/qopenglfunctions_4_1_compatibility.h> +# include <QtOpenGL/qopenglfunctions_4_1_core.h> +# include <QtOpenGL/qopenglfunctions_4_2_compatibility.h> +# include <QtOpenGL/qopenglfunctions_4_2_core.h> +# include <QtOpenGL/qopenglfunctions_4_3_compatibility.h> +# include <QtOpenGL/qopenglfunctions_4_3_core.h> +# include <QtOpenGL/qopenglfunctions_4_4_compatibility.h> +# include <QtOpenGL/qopenglfunctions_4_4_core.h> +# include <QtOpenGL/qopenglfunctions_4_5_compatibility.h> +# include <QtOpenGL/qopenglfunctions_4_5_core.h> #endif #if QT_CONFIG(opengles2) -# include <QtGui/qopenglfunctions_es2.h> +# include <QtOpenGL/qopenglfunctions_es2.h> #endif diff --git a/sources/pyside2/PySide2/QtOpenGLFunctions/typesystem_openglfunctions.xml b/sources/pyside2/PySide2/QtOpenGLFunctions/typesystem_openglfunctions.xml index 1d5b08edb..6e4bf8009 100644 --- a/sources/pyside2/PySide2/QtOpenGLFunctions/typesystem_openglfunctions.xml +++ b/sources/pyside2/PySide2/QtOpenGLFunctions/typesystem_openglfunctions.xml @@ -2,7 +2,7 @@ <!-- /**************************************************************************** ** -** Copyright (C) 2019 The Qt Company Ltd. +** Copyright (C) 2020 The Qt Company Ltd. ** Contact: https://www.qt.io/licensing/ ** ** This file is part of Qt for Python. @@ -40,7 +40,7 @@ ****************************************************************************/ --> <typesystem package="PySide2.QtOpenGLFunctions"> - <load-typesystem name="QtGui/typesystem_gui.xml" generate="no"/> + <load-typesystem name="QtOpenGL/typesystem_opengl.xml" generate="no"/> <load-typesystem name="templates/openglfunctions_common.xml" generate="no"/> <rejection class="^QOpenGL.*$" argument-type="^(const )?GLboolean ?\*$"/> |