Skip to content

Commit 52d74fe

Browse files
committed
On Ubuntu 22.04 this enum value does not exist (yet)
1 parent d643ad1 commit 52d74fe

File tree

2 files changed

+6
-2
lines changed

2 files changed

+6
-2
lines changed

generated_cpp_515/com_trolltech_qt_multimedia/com_trolltech_qt_multimedia0.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -389,7 +389,7 @@ class PythonQtWrapper_QAbstractVideoBuffer : public QObject
389389
public:
390390
Q_ENUMS(HandleType MapMode )
391391
enum HandleType{
392-
NoHandle = QAbstractVideoBuffer::NoHandle, GLTextureHandle = QAbstractVideoBuffer::GLTextureHandle, XvShmImageHandle = QAbstractVideoBuffer::XvShmImageHandle, CoreImageHandle = QAbstractVideoBuffer::CoreImageHandle, QPixmapHandle = QAbstractVideoBuffer::QPixmapHandle, EGLImageHandle = QAbstractVideoBuffer::EGLImageHandle, GLTextureRectangleHandle = QAbstractVideoBuffer::GLTextureRectangleHandle, UserHandle = QAbstractVideoBuffer::UserHandle};
392+
NoHandle = QAbstractVideoBuffer::NoHandle, GLTextureHandle = QAbstractVideoBuffer::GLTextureHandle, XvShmImageHandle = QAbstractVideoBuffer::XvShmImageHandle, CoreImageHandle = QAbstractVideoBuffer::CoreImageHandle, QPixmapHandle = QAbstractVideoBuffer::QPixmapHandle, EGLImageHandle = QAbstractVideoBuffer::EGLImageHandle, UserHandle = QAbstractVideoBuffer::UserHandle};
393393
enum MapMode{
394394
NotMapped = QAbstractVideoBuffer::NotMapped, ReadOnly = QAbstractVideoBuffer::ReadOnly, WriteOnly = QAbstractVideoBuffer::WriteOnly, ReadWrite = QAbstractVideoBuffer::ReadWrite};
395395
public slots:

generator/typesystem_multimedia.xml

+5-1
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,11 @@
1919
</group>
2020
<enum-type name="QSoundEffect::Status"/>
2121
<enum-type name="QSoundEffect::Loop"/>
22-
<enum-type name="QAbstractVideoBuffer::HandleType"/>
22+
<enum-type name="QAbstractVideoBuffer::HandleType">
23+
<!-- GLTextureRectangleHandle did not exist until Qt 5.15.8 (introduced for macOS it seems);
24+
Ubuntu 22.04 only has Qt 5.15.3 by default. In Qt 6 QAbstractVideoBuffer is private anyway. -->
25+
<reject-enum-value name="GLTextureRectangleHandle"/>
26+
</enum-type>
2327
<enum-type name="QAbstractVideoBuffer::MapMode"/>
2428
<enum-type name="QCameraImageCapture::Error"/>
2529
<enum-type name="QCameraImageCapture::DriveMode"/>

0 commit comments

Comments
 (0)