Skip to content

Commit d63024f

Browse files
committed
Update Python bindings
1 parent 2af6a28 commit d63024f

File tree

6 files changed

+4
-69
lines changed

6 files changed

+4
-69
lines changed

python/pyproject.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ libraries = [QTAV_LIB]
3030
library-dirs = [LIB_DIRS]
3131

3232
[tool.sip.bindings.QtAVWidgets]
33-
qmake-QT = ["widgets", "opengl"]
33+
qmake-QT = ["widgets", "opengl", "openglwidgets"]
3434
include-dirs = [INCLUDE_DIRS]
3535
libraries = [QTAV_LIB, QTAV_WIDGETS_LIB]
3636
library-dirs = [LIB_DIRS]

python/sip/QtAV/VideoFormat.sip

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -104,7 +104,6 @@ public:
104104
static QImage::Format imageFormatFromPixelFormat(PixelFormat format);
105105
static PixelFormat pixelFormatFromFFmpeg(int ff); //AVPixelFormat
106106
static int pixelFormatToFFmpeg(PixelFormat fmt);
107-
static QVector<int> pixelFormatsFFmpeg();
108107

109108
VideoFormat(PixelFormat format = Format_Invalid);
110109
VideoFormat(int formatFF /Constrained/);

python/sip/QtAVWidgets/GLWidgetRenderer2.sip

Lines changed: 0 additions & 64 deletions
This file was deleted.

python/sip/QtAVWidgets/QtAVWidgetsmod.sip

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
%Import QtGui/QtGuimod.sip
44
%Import QtWidgets/QtWidgetsmod.sip
55
%Import QtOpenGL/QtOpenGLmod.sip
6+
%Import QtOpenGLWidgets/QtOpenGLWidgetsmod.sip
67
%Import QtAV/QtAVmod.sip
78

89
%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
3536
%Include global.sip
3637

3738
%If (FULL_QTWIDGETS_API)
38-
%Include GLWidgetRenderer2.sip
3939
%Include GraphicsItemRenderer.sip
4040
// NOTE: We don't expose QOpenGLWidget because it is present in Qt >= 5.4.0
4141
%Include OpenGLWidgetRenderer.sip

src/libQtAV.pro

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ MODULE_INCNAME = QtAV # for mac framework. also used in install_sdk.pro
33
TARGET = QtAV
44
QT += core gui
55
#CONFIG *= ltcg
6-
greaterThan(QT_MAJOR_VERSION, 5): QT += opengl
6+
greaterThan(QT_MAJOR_VERSION, 5): QT += opengl openglwidgets
77
greaterThan(QT_MAJOR_VERSION, 4) {
88
contains(QT_CONFIG, opengl) {
99
CONFIG *= config_opengl

widgets/QtAVWidgets/OpenGLWidgetRenderer.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424

2525
#include <QtAVWidgets/global.h>
2626
#if QT_VERSION >= QT_VERSION_CHECK(5, 4, 0)
27-
#include <QOpenGLWidget>
27+
#include <QtOpenGLWidgets/QOpenGLWidget>
2828
#else
2929
#include <QtAVWidgets/QOpenGLWidget.h>
3030
#endif //QT_VERSION >= QT_VERSION_CHECK(5, 4, 0)

0 commit comments

Comments
 (0)