Skip to content

Commit 6a61e9b

Browse files
wangdaye078wangdaye078
committed
opengl compatible Qt5 and Qt6
1 parent 8e5581b commit 6a61e9b

File tree

3 files changed

+209
-115
lines changed

3 files changed

+209
-115
lines changed

‎extensions/PythonQt_QtAll/PythonQt_QtAll.pro‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -11,10 +11,7 @@ isEmpty( PYTHONQTALL_CONFIG ) {
1111
qtHaveModule(svg):CONFIG += PythonQtSvg
1212
qtHaveModule(sql):CONFIG += PythonQtSql
1313
qtHaveModule(network):CONFIG += PythonQtNetwork
14-
lessThan(QT_MAJOR_VERSION, 6) {
15-
# module is empty in Qt6
16-
qtHaveModule(opengl):CONFIG += PythonQtOpengl
17-
}
14+
qtHaveModule(opengl):CONFIG += PythonQtOpengl
1815
qtHaveModule(xml):CONFIG += PythonQtXml
1916
qtHaveModule(xmlpatterns):CONFIG += PythonQtXmlpatterns
2017
qtHaveModule(multimedia):CONFIG += PythonQtMultimedia
@@ -115,6 +112,9 @@ PythonQtNetwork {
115112
PythonQtOpengl {
116113
DEFINES += PYTHONQT_WITH_OPENGL
117114
QT += opengl
115+
equals(QT_MAJOR_VERSION, 6){
116+
QT += openglwidgets
117+
}
118118
PythonQtCore: Xinclude (com_trolltech_qt_opengl)
119119
QT += xml
120120
}

‎generator/typesystem_gui.xml‎

Lines changed: 84 additions & 84 deletions
Original file line numberDiff line numberDiff line change
@@ -39,42 +39,42 @@
3939
<rejection class="QAccessibleTextUpdateEvent"/>
4040
<rejection class="QAccessibleValueChangeEvent"/>
4141
<rejection class="QAccessibleWidget"/>
42-
<rejection class="QOpenGLDebugLogger"/>
43-
<rejection class="QOpenGLDebugMessage"/>
44-
<rejection class="QOpenGLExtraFunctions"/>
45-
<rejection class="QOpenGLExtraFunctionsPrivate"/>
46-
<rejection class="QOpenGLFunctionsPrivate"/>
47-
<rejection class="QOpenGLFunctions_1_0_CoreBackend"/>
48-
<rejection class="QOpenGLFunctions_1_0_DeprecatedBackend"/>
49-
<rejection class="QOpenGLFunctions_1_1_CoreBackend"/>
50-
<rejection class="QOpenGLFunctions_1_1_DeprecatedBackend"/>
51-
<rejection class="QOpenGLFunctions_1_2_CoreBackend"/>
52-
<rejection class="QOpenGLFunctions_1_2_DeprecatedBackend"/>
53-
<rejection class="QOpenGLFunctions_1_3_CoreBackend"/>
54-
<rejection class="QOpenGLFunctions_1_3_DeprecatedBackend"/>
55-
<rejection class="QOpenGLFunctions_1_4_CoreBackend"/>
56-
<rejection class="QOpenGLFunctions_1_4_DeprecatedBackend"/>
57-
<rejection class="QOpenGLFunctions_1_5_CoreBackend"/>
58-
<rejection class="QOpenGLFunctions_2_0_CoreBackend"/>
59-
<rejection class="QOpenGLFunctions_2_0_DeprecatedBackend"/>
60-
<rejection class="QOpenGLFunctions_2_1_CoreBackend"/>
61-
<rejection class="QOpenGLFunctions_3_0_CoreBackend"/>
62-
<rejection class="QOpenGLFunctions_3_0_DeprecatedBackend"/>
63-
<rejection class="QOpenGLFunctions_3_1_CoreBackend"/>
64-
<rejection class="QOpenGLFunctions_3_2_CoreBackend"/>
65-
<rejection class="QOpenGLFunctions_3_3_CoreBackend"/>
66-
<rejection class="QOpenGLFunctions_3_3_DeprecatedBackend"/>
67-
<rejection class="QOpenGLFunctions_4_0_CoreBackend"/>
68-
<rejection class="QOpenGLFunctions_4_1_CoreBackend"/>
69-
<rejection class="QOpenGLFunctions_4_2_CoreBackend"/>
70-
<rejection class="QOpenGLFunctions_4_3_CoreBackend"/>
71-
<rejection class="QOpenGLFunctions_4_4_CoreBackend"/>
72-
<rejection class="QOpenGLFunctions_4_5_CoreBackend"/>
73-
<rejection class="QOpenGLFunctions_4_5_DeprecatedBackend"/>
74-
<rejection class="QOpenGLPixelTransferOptions"/>
75-
<rejection class="QOpenGLVersionFunctionsBackend"/>
76-
<rejection class="QOpenGLVersionStatus"/>
77-
<rejection class="QOpenGLVertexArrayObject::Binder"/>
42+
<rejection class="QOpenGLDebugLogger" before-version="6" />
43+
<rejection class="QOpenGLDebugMessage" before-version="6" />
44+
<rejection class="QOpenGLExtraFunctions" before-version="6" />
45+
<rejection class="QOpenGLExtraFunctionsPrivate" before-version="6" />
46+
<rejection class="QOpenGLFunctionsPrivate" before-version="6" />
47+
<rejection class="QOpenGLFunctions_1_0_CoreBackend" before-version="6" />
48+
<rejection class="QOpenGLFunctions_1_0_DeprecatedBackend" before-version="6" />
49+
<rejection class="QOpenGLFunctions_1_1_CoreBackend" before-version="6" />
50+
<rejection class="QOpenGLFunctions_1_1_DeprecatedBackend" before-version="6" />
51+
<rejection class="QOpenGLFunctions_1_2_CoreBackend" before-version="6" />
52+
<rejection class="QOpenGLFunctions_1_2_DeprecatedBackend" before-version="6" />
53+
<rejection class="QOpenGLFunctions_1_3_CoreBackend" before-version="6" />
54+
<rejection class="QOpenGLFunctions_1_3_DeprecatedBackend" before-version="6" />
55+
<rejection class="QOpenGLFunctions_1_4_CoreBackend" before-version="6" />
56+
<rejection class="QOpenGLFunctions_1_4_DeprecatedBackend" before-version="6" />
57+
<rejection class="QOpenGLFunctions_1_5_CoreBackend" before-version="6" />
58+
<rejection class="QOpenGLFunctions_2_0_CoreBackend" before-version="6" />
59+
<rejection class="QOpenGLFunctions_2_0_DeprecatedBackend" before-version="6" />
60+
<rejection class="QOpenGLFunctions_2_1_CoreBackend" before-version="6" />
61+
<rejection class="QOpenGLFunctions_3_0_CoreBackend" before-version="6" />
62+
<rejection class="QOpenGLFunctions_3_0_DeprecatedBackend" before-version="6" />
63+
<rejection class="QOpenGLFunctions_3_1_CoreBackend" before-version="6" />
64+
<rejection class="QOpenGLFunctions_3_2_CoreBackend" before-version="6" />
65+
<rejection class="QOpenGLFunctions_3_3_CoreBackend" before-version="6" />
66+
<rejection class="QOpenGLFunctions_3_3_DeprecatedBackend" before-version="6" />
67+
<rejection class="QOpenGLFunctions_4_0_CoreBackend" before-version="6" />
68+
<rejection class="QOpenGLFunctions_4_1_CoreBackend" before-version="6" />
69+
<rejection class="QOpenGLFunctions_4_2_CoreBackend" before-version="6" />
70+
<rejection class="QOpenGLFunctions_4_3_CoreBackend" before-version="6" />
71+
<rejection class="QOpenGLFunctions_4_4_CoreBackend" before-version="6" />
72+
<rejection class="QOpenGLFunctions_4_5_CoreBackend" before-version="6" />
73+
<rejection class="QOpenGLFunctions_4_5_DeprecatedBackend" before-version="6" />
74+
<rejection class="QOpenGLPixelTransferOptions" before-version="6" />
75+
<rejection class="QOpenGLVersionFunctionsBackend" before-version="6" />
76+
<rejection class="QOpenGLVersionStatus" before-version="6" />
77+
<rejection class="QOpenGLVertexArrayObject::Binder" before-version="6" />
7878
<rejection class="QSizePolicy::Bits"/>
7979

8080
<rejection class="QGenericMatrix"/>
@@ -498,8 +498,8 @@
498498
<enum-type name="QImageIOPlugin::Capability" flags="QImageIOPlugin::Capabilities"/>
499499
<enum-type name="QStackedLayout::StackingMode"/>
500500

501-
<enum-type name="QOpenGLWidget::UpdateBehavior"/>
502-
<enum-type name="QOpenGLWindow::UpdateBehavior"/>
501+
<enum-type name="QOpenGLWidget::UpdateBehavior" before-version="6" />
502+
<enum-type name="QOpenGLWindow::UpdateBehavior" before-version="6" />
503503
<enum-type name="QPixelFormat::AlphaPosition"/>
504504
<enum-type name="QPixelFormat::AlphaPremultiplied"/>
505505
<enum-type name="QPixelFormat::AlphaUsage"/>
@@ -3073,30 +3073,30 @@ PyObject* constScanLine(QImage* image, int line) {
30733073
<object-type name="QInputMethod"/>
30743074
<object-type name="QNativeGestureEvent" polymorphic-id-expression="%1-&gt;type() == QEvent::NativeGesture"/>
30753075
<object-type name="QOffscreenSurface"/>
3076-
<object-type name="QOpenGLBuffer"/>
3077-
<enum-type name="QOpenGLBuffer::RangeAccessFlag"/>
3078-
<enum-type name="QOpenGLTexture::ComparisonFunction"/>
3079-
<enum-type name="QOpenGLTexture::ComparisonMode"/>
3080-
<object-type name="QOpenGLContext"/>
3081-
<object-type name="QOpenGLContextGroup"/>
3082-
<object-type name="QOpenGLFramebufferObject"/>
3083-
<object-type name="QOpenGLFramebufferObjectFormat"/>
3084-
<object-type name="QOpenGLFunctions"/>
3085-
<object-type name="QOpenGLShader"/>
3086-
<object-type name="QOpenGLShaderProgram">
3076+
<object-type name="QOpenGLBuffer" before-version="6" />
3077+
<enum-type name="QOpenGLBuffer::RangeAccessFlag" before-version="6" />
3078+
<enum-type name="QOpenGLTexture::ComparisonFunction" before-version="6" />
3079+
<enum-type name="QOpenGLTexture::ComparisonMode" before-version="6" />
3080+
<object-type name="QOpenGLContext" before-version="6" />
3081+
<object-type name="QOpenGLContextGroup" before-version="6" />
3082+
<object-type name="QOpenGLFramebufferObject" before-version="6" />
3083+
<object-type name="QOpenGLFramebufferObjectFormat" before-version="6" />
3084+
<object-type name="QOpenGLFunctions" before-version="6" />
3085+
<object-type name="QOpenGLShader" before-version="6" />
3086+
<object-type name="QOpenGLShaderProgram" before-version="6">
30873087
<modify-function signature="setUniformValue(const char*,Array)">
30883088
<remove/>
30893089
</modify-function>
30903090
<modify-function signature="setUniformValue(int,Array)">
30913091
<remove/>
30923092
</modify-function>
30933093
</object-type>
3094-
<object-type name="QOpenGLTexture"/>
3095-
<object-type name="QOpenGLTimeMonitor"/>
3096-
<object-type name="QOpenGLTimerQuery"/>
3097-
<object-type name="QOpenGLVersionProfile"/>
3098-
<object-type name="QOpenGLVersionFunctionsFactory" since-version="6"/>
3099-
<object-type name="QOpenGLVertexArrayObject"/>
3094+
<object-type name="QOpenGLTexture" before-version="6" />
3095+
<object-type name="QOpenGLTimeMonitor" before-version="6" />
3096+
<object-type name="QOpenGLTimerQuery" before-version="6" />
3097+
<object-type name="QOpenGLVersionProfile" before-version="6" />
3098+
<object-type name="QOpenGLVersionFunctionsFactory" since-version="6" before-version="6" />
3099+
<object-type name="QOpenGLVertexArrayObject" before-version="6" />
31003100
<object-type name="QPageLayout"/>
31013101
<object-type name="QPageSize"/>
31023102
<object-type name="QPdfWriter"/>
@@ -3121,15 +3121,15 @@ PyObject* constScanLine(QImage* image, int line) {
31213121
<interface-type name="QSurface"/>
31223122
<object-type name="QSurfaceFormat"/>
31233123
<value-type name="QPainter::PixmapFragment"/>
3124-
<object-type name="QOpenGLPaintDevice">
3124+
<object-type name="QOpenGLPaintDevice" before-version="6">
31253125
<modify-function signature="QOpenGLPaintDevice(const QOpenGLPaintDevice&amp;)" remove="all"/>
31263126
<modify-function signature="operator=(const QOpenGLPaintDevice&amp;)" remove="all"/>
31273127
</object-type>
31283128
<value-type name="QPagedPaintDevice::Margins"/>
31293129

31303130
<object-type name="QKeySequenceEdit"/>
3131-
<object-type name="QOpenGLWindow"/>
3132-
<object-type name="QOpenGLWidget"/>
3131+
<object-type name="QOpenGLWindow" before-version="6" />
3132+
<object-type name="QOpenGLWidget" before-version="6" />
31333133
<object-type name="QPaintDeviceWindow"/>
31343134
<object-type name="QRasterWindow"/>
31353135
<object-type name="QPixelFormat"/>
@@ -3155,34 +3155,34 @@ PyObject* constScanLine(QImage* image, int line) {
31553155
<enum-type name="QPageSize::PageSizeId"/>
31563156
<enum-type name="QRawFont::AntialiasingType"/>
31573157
<enum-type name="QRawFont::LayoutFlag" flags="QRawFont::LayoutFlags"/>
3158-
<enum-type name="QOpenGLContext::OpenGLModuleType"/>
3159-
<enum-type name="QOpenGLTexture::MipMapGeneration"/>
3160-
<enum-type name="QOpenGLTexture::TextureFormat"/>
3161-
<enum-type name="QOpenGLTexture::CubeMapFace"/>
3162-
<enum-type name="QOpenGLTexture::CoordinateDirection"/>
3163-
<enum-type name="QOpenGLTexture::TextureFormatClass"/>
3164-
<enum-type name="QOpenGLTexture::DepthStencilMode"/>
3165-
<enum-type name="QOpenGLTexture::SwizzleValue"/>
3166-
<enum-type name="QOpenGLTexture::Filter"/>
3167-
<enum-type name="QOpenGLTexture::PixelFormat"/>
3168-
<enum-type name="QOpenGLTexture::WrapMode"/>
3169-
<enum-type name="QOpenGLTexture::TextureUnitReset"/>
3170-
<enum-type name="QOpenGLTexture::BindingTarget"/>
3171-
<enum-type name="QOpenGLTexture::SwizzleComponent"/>
3172-
<enum-type name="QOpenGLTexture::Feature" flags="QOpenGLTexture::Features"/>
3173-
<enum-type name="QOpenGLTexture::Target"/>
3174-
<enum-type name="QOpenGLTexture::PixelType"/>
3175-
<enum-type name="QOpenGLBuffer::UsagePattern"/>
3176-
<enum-type name="QOpenGLBuffer::Type"/>
3177-
<enum-type name="QOpenGLBuffer::Access"/>
3158+
<enum-type name="QOpenGLContext::OpenGLModuleType" before-version="6" />
3159+
<enum-type name="QOpenGLTexture::MipMapGeneration" before-version="6" />
3160+
<enum-type name="QOpenGLTexture::TextureFormat" before-version="6" />
3161+
<enum-type name="QOpenGLTexture::CubeMapFace" before-version="6" />
3162+
<enum-type name="QOpenGLTexture::CoordinateDirection" before-version="6" />
3163+
<enum-type name="QOpenGLTexture::TextureFormatClass" before-version="6" />
3164+
<enum-type name="QOpenGLTexture::DepthStencilMode" before-version="6" />
3165+
<enum-type name="QOpenGLTexture::SwizzleValue" before-version="6" />
3166+
<enum-type name="QOpenGLTexture::Filter" before-version="6" />
3167+
<enum-type name="QOpenGLTexture::PixelFormat" before-version="6" />
3168+
<enum-type name="QOpenGLTexture::WrapMode" before-version="6" />
3169+
<enum-type name="QOpenGLTexture::TextureUnitReset" before-version="6" />
3170+
<enum-type name="QOpenGLTexture::BindingTarget" before-version="6" />
3171+
<enum-type name="QOpenGLTexture::SwizzleComponent" before-version="6" />
3172+
<enum-type name="QOpenGLTexture::Feature" flags="QOpenGLTexture::Features" before-version="6" />
3173+
<enum-type name="QOpenGLTexture::Target" before-version="6" />
3174+
<enum-type name="QOpenGLTexture::PixelType" before-version="6" />
3175+
<enum-type name="QOpenGLBuffer::UsagePattern" before-version="6" />
3176+
<enum-type name="QOpenGLBuffer::Type" before-version="6" />
3177+
<enum-type name="QOpenGLBuffer::Access" before-version="6" />
31783178
<enum-type name="QPageLayout::Unit"/>
31793179
<enum-type name="QPageLayout::Mode"/>
31803180
<enum-type name="QPageLayout::Orientation"/>
3181-
<enum-type name="QOpenGLFramebufferObject::Attachment"/>
3182-
<enum-type name="QOpenGLShader::ShaderTypeBit" flags="QOpenGLShader::ShaderType"/>
3181+
<enum-type name="QOpenGLFramebufferObject::Attachment" before-version="6" />
3182+
<enum-type name="QOpenGLShader::ShaderTypeBit" flags="QOpenGLShader::ShaderType" before-version="6" />
31833183
<enum-type name="QWindow::Visibility"/>
31843184
<enum-type name="QWindow::AncestorMode"/>
3185-
<enum-type name="QOpenGLFunctions::OpenGLFeature" flags="QOpenGLFunctions::OpenGLFeatures"/>
3185+
<enum-type name="QOpenGLFunctions::OpenGLFeature" flags="QOpenGLFunctions::OpenGLFeatures" before-version="6" />
31863186
<enum-type name="QScrollEvent::ScrollState"/>
31873187
<enum-type name="QTouchDevice::DeviceType"/>
31883188
<enum-type name="QTouchDevice::CapabilityFlag" flags="QTouchDevice::Capabilities"/>
@@ -3193,11 +3193,11 @@ PyObject* constScanLine(QImage* image, int line) {
31933193
<enum-type name="QSurfaceFormat::OpenGLContextProfile"/>
31943194
<enum-type name="QSurfaceFormat::ColorSpace"/>
31953195

3196-
<enum-type name="QOpenGLFramebufferObject::FramebufferRestorePolicy"/>
3196+
<enum-type name="QOpenGLFramebufferObject::FramebufferRestorePolicy" before-version="6" />
31973197
<enum-type name="QPagedPaintDevice::PdfVersion"/>
31983198

3199-
<object-type name="QOpenGLTextureBlitter"/>
3200-
<enum-type name="QOpenGLTextureBlitter::Origin"/>
3199+
<object-type name="QOpenGLTextureBlitter" before-version="6" />
3200+
<enum-type name="QOpenGLTextureBlitter::Origin" before-version="6" />
32013201

32023202
<object-type name="QConcatenateTablesProxyModel" since-version="5.13"/>
32033203
<object-type name="QTransposeProxyModel" since-version="5.13"/>

0 commit comments

Comments
 (0)