Update Python bindings

wang-bin · Oct 3, 2022 · d63024f · d63024f
1 parent 2af6a28
commit d63024f
Show file tree

Hide file tree

Showing 6 changed files with 4 additions and 69 deletions.
diff --git a/python/pyproject.toml b/python/pyproject.toml
@@ -30,7 +30,7 @@ libraries = [QTAV_LIB]
 library-dirs = [LIB_DIRS]
 
 [tool.sip.bindings.QtAVWidgets]
-qmake-QT = ["widgets", "opengl"]
+qmake-QT = ["widgets", "opengl", "openglwidgets"]
 include-dirs = [INCLUDE_DIRS]
 libraries = [QTAV_LIB, QTAV_WIDGETS_LIB]
 library-dirs = [LIB_DIRS]
diff --git a/python/sip/QtAV/VideoFormat.sip b/python/sip/QtAV/VideoFormat.sip
@@ -104,7 +104,6 @@ public:
     static QImage::Format imageFormatFromPixelFormat(PixelFormat format);
     static PixelFormat pixelFormatFromFFmpeg(int ff); //AVPixelFormat
     static int pixelFormatToFFmpeg(PixelFormat fmt);
-    static QVector<int> pixelFormatsFFmpeg();
 
     VideoFormat(PixelFormat format = Format_Invalid);
     VideoFormat(int formatFF /Constrained/);

diff --git a/python/sip/QtAVWidgets/GLWidgetRenderer2.sip b/python/sip/QtAVWidgets/GLWidgetRenderer2.sip
diff --git a/python/sip/QtAVWidgets/QtAVWidgetsmod.sip b/python/sip/QtAVWidgets/QtAVWidgetsmod.sip
@@ -3,6 +3,7 @@
 %Import QtGui/QtGuimod.sip
 %Import QtWidgets/QtWidgetsmod.sip
 %Import QtOpenGL/QtOpenGLmod.sip
+%Import QtOpenGLWidgets/QtOpenGLWidgetsmod.sip
 %Import QtAV/QtAVmod.sip
 
 %Timeline {QtAVWidgets_1_11_0 QtAVWidgets_1_12_0}
@@ -35,7 +36,6 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 %Include global.sip
 
 %If (FULL_QTWIDGETS_API)
-%Include GLWidgetRenderer2.sip
 %Include GraphicsItemRenderer.sip
 // NOTE: We don't expose QOpenGLWidget because it is present in Qt >= 5.4.0
 %Include OpenGLWidgetRenderer.sip

diff --git a/src/libQtAV.pro b/src/libQtAV.pro
@@ -3,7 +3,7 @@ MODULE_INCNAME = QtAV # for mac framework. also used in install_sdk.pro
 TARGET = QtAV
 QT += core gui
 #CONFIG *= ltcg
-greaterThan(QT_MAJOR_VERSION, 5): QT += opengl
+greaterThan(QT_MAJOR_VERSION, 5): QT += opengl openglwidgets
 greaterThan(QT_MAJOR_VERSION, 4) {
   contains(QT_CONFIG, opengl) {
       CONFIG *= config_opengl

diff --git a/widgets/QtAVWidgets/OpenGLWidgetRenderer.h b/widgets/QtAVWidgets/OpenGLWidgetRenderer.h
@@ -24,7 +24,7 @@
 
 #include <QtAVWidgets/global.h>
 #if QT_VERSION >= QT_VERSION_CHECK(5, 4, 0)
-#include <QOpenGLWidget>
+#include <QtOpenGLWidgets/QOpenGLWidget>
 #else
 #include <QtAVWidgets/QOpenGLWidget.h>
 #endif //QT_VERSION >= QT_VERSION_CHECK(5, 4, 0)