[neon/forks/pyqt5/Neon/release-lts] /: New upstream version 5.15.2+dfsg
Dmitry Shachnev
null at kde.org
Wed May 26 11:29:29 BST 2021
Git commit b23d50b6dfeb87e69af2ee85afd980f4c5451500 by Dmitry Shachnev.
Committed on 27/11/2020 at 15:45.
Pushed by jriddell into branch 'Neon/release-lts'.
New upstream version 5.15.2+dfsg
M +88 -0 ChangeLog
M +4 -0 NEWS
M +1 -2 PKG-INFO
M +1 -1 configure.py
M +2 -0 designer/pluginloader.cpp
M +7 -2 project.py
M +2 -2 pyproject.toml
M +2 -0 qmlscene/pluginloader.cpp
M +28 -1 qpy/QtCore/qpycore_pyqtboundsignal.cpp
M +1 -1 qpy/QtCore/qpycore_pyqtsignal.cpp
M +1 -1 qpy/QtCore/qpycore_pyqtslot.cpp
M +2 -2 sip/QtCore/qglobal.sip
M +10 -0 sip/QtCore/qobject.sip
M +4 -0 sip/QtMultimedia/qabstractvideosurface.sip
M +4 -0 sip/QtMultimedia/qcustomaudiorolecontrol.sip
M +1 -1 sip/QtNetwork/qocspresponse.sip
M +4 -0 sip/QtQuick/qquickframebufferobject.sip
M +2 -0 sip/QtQuick/qquickrendercontrol.sip
M +10 -0 sip/QtQuick/qquickwindow.sip
M +1 -1 sip/QtQuick/qsgabstractrenderer.sip
M +2 -0 sip/QtQuick/qsgengine.sip
M +2 -2 sip/QtQuick/qsggeometry.sip
M +18 -0 sip/QtQuick/qsgmaterial.sip
M +1 -1 sip/QtWidgets/qactiongroup.sip
M +1 -1 sip/QtWidgets/qlayout.sip
M +2 -2 sip/_QOpenGLFunctions_2_0/qopenglfunctions_2_0.sip
M +2 -2 sip/_QOpenGLFunctions_2_1/qopenglfunctions_2_1.sip
M +2 -2 sip/_QOpenGLFunctions_4_1_Core/qopenglfunctions_4_1_core.sip
M +2 -2 sip/_QOpenGLFunctions_ES2/qopenglfunctions_es2.sip
https://invent.kde.org/neon/forks/pyqt5/commit/b23d50b6dfeb87e69af2ee85afd980f4c5451500
diff --git a/ChangeLog b/ChangeLog
index 6c78c632..49c052c2 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,93 @@
+2020-11-23 Phil Thompson <phil at riverbankcomputing.com>
+
+ * NEWS:
+ Released as v5.12.2.
+ [ddf234c8c683] [5.15.2] <5.15-maint>
+
+ * NEWS:
+ Updated the NEWS file.
+ [a4088498ec1a] <5.15-maint>
+
+2020-11-13 Phil Thompson <phil at riverbankcomputing.com>
+
+ * qpy/QtCore/qpycore_pyqtsignal.cpp, qpy/QtCore/qpycore_pyqtslot.cpp:
+ Eliminated a couple of Python deprecation warnings.
+ [a868cf5559cb] <5.15-maint>
+
+2020-10-30 Phil Thompson <phil at riverbankcomputing.com>
+
+ * PyQt5.msp:
+ Fixed some typos in the OpenGL bindings.
+ [d824696aef6b] <5.15-maint>
+
+2020-10-28 Phil Thompson <phil at riverbankcomputing.com>
+
+ * PyQt5.msp:
+ Updated to project v15.
+ [6cc6247a25e1] <5.15-maint>
+
+2020-10-04 Phil Thompson <phil at riverbankcomputing.com>
+
+ * designer/pluginloader.cpp, qmlscene/pluginloader.cpp:
+ Eliminate deprecation warnings from Python v3.9.
+ [ba17824001af] <5.15-maint>
+
+ * PyQt5.msp:
+ Ensure that QtQuick will build without OpenGL.
+ [9625e73814d4] <5.15-maint>
+
+2020-09-28 Phil Thompson <phil at riverbankcomputing.com>
+
+ * PyQt5.msp:
+ Added a missing /TransferBack/ annotation to QLayout.removeWidget().
+ [230f954c1920] <5.15-maint>
+
+2020-09-27 Phil Thompson <phil at riverbankcomputing.com>
+
+ * qpy/QtCore/qpycore_pyqtboundsignal.cpp:
+ Fixed hashable signals for unsupported versions of Python.
+ [32f6a9018722] <5.15-maint>
+
+2020-09-24 Phil Thompson <phil at riverbankcomputing.com>
+
+ * PyQt5.msp:
+ Fixed QActionGroup.ExclusionPolicy.None and
+ QOcspRevocationReason.None.
+ [cdcf3488537b] <5.15-maint>
+
+2020-09-18 Phil Thompson <phil at riverbankcomputing.com>
+
+ * lib/project.py:
+ Check the version of Qt is supported.
+ [50527038fe31] <5.15-maint>
+
+2020-09-17 Phil Thompson <phil at riverbankcomputing.com>
+
+ * lib/project.py, lib/pyproject.toml:
+ Require PyQt-builder v1.6 as we no longer specify the sip module and
+ ABI.
+ [0f86b0b9bb21] <5.15-maint>
+
+ * PyQt5.msp:
+ Added the QT_MAC_WANTS_LAYER workaround for lost paint events.
+ [183a91751895] <5.15-maint>
+
+ * PyQt5.msp, lib/SubclassCode/QtMultimedia.versions:
+ Fixed building against Qt v5.10 and earlier.
+ [29e2ebf17db3] <5.15-maint>
+
+2020-09-14 Phil Thompson <phil at riverbankcomputing.com>
+
+ * NEWS, qpy/QtCore/qpycore_pyqtboundsignal.cpp:
+ Bound signals are now hashable.
+ [4318b62d0575] <5.15-maint>
+
2020-09-11 Phil Thompson <phil at riverbankcomputing.com>
+ * .hgtags:
+ Added tag 5.15.1 for changeset f99d8e2299f1
+ [2e783d474267] <5.15-maint>
+
* NEWS:
Released as v5.15.1.
[f99d8e2299f1] [5.15.1] <5.15-maint>
diff --git a/NEWS b/NEWS
index a4fe9c28..ebad0e2e 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,7 @@
+v5.15.2 23rd November 2020
+ - Bound signals are now hashable.
+ - The QT_MAC_WANTS_LAYER environment variable is automatically set on macOS.
+
v5.15.1 12th September 2020
- Added the QtTextToSpeech module.
- None is now interpreted as a null QJsonValue.
diff --git a/PKG-INFO b/PKG-INFO
index 4d0dc10f..10573e2a 100644
--- a/PKG-INFO
+++ b/PKG-INFO
@@ -1,13 +1,12 @@
Metadata-Version: 2.1
Name: PyQt5
-Version: 5.15.1
+Version: 5.15.2
Requires-Python: >=3.5
Summary: Python bindings for the Qt cross platform application toolkit
Home-Page: https://www.riverbankcomputing.com/software/pyqt/
Author: Riverbank Computing Limited
Author-Email: info at riverbankcomputing.com
License: GPL v3
-Requires-Dist: PyQt5-sip (>=12.8, <13)
PyQt5 - Comprehensive Python Bindings for Qt v5
===============================================
diff --git a/configure.py b/configure.py
index bc267a79..daa0f946 100644
--- a/configure.py
+++ b/configure.py
@@ -28,7 +28,7 @@ import sys
# Initialise the constants.
-PYQT_VERSION_STR = "5.15.1"
+PYQT_VERSION_STR = "5.15.2"
SIP_MIN_VERSION = '4.19.23'
diff --git a/designer/pluginloader.cpp b/designer/pluginloader.cpp
index d4fb17a6..681a4ef9 100644
--- a/designer/pluginloader.cpp
+++ b/designer/pluginloader.cpp
@@ -130,7 +130,9 @@ PyCustomWidgets::PyCustomWidgets(QObject *parent) : QObject(parent),
#ifdef WITH_THREAD
// Make sure we don't have the GIL.
+#if PY_VERSION_HEX < 0x03070000
PyEval_InitThreads();
+#endif
PyEval_SaveThread();
#endif
}
diff --git a/project.py b/project.py
index e67aa377..f343a6d1 100644
--- a/project.py
+++ b/project.py
@@ -33,8 +33,7 @@ class PyQt(PyQtProject):
def __init__(self):
""" Initialise the project. """
- super().__init__(sip_module='PyQt5.sip', abi_version='12.8',
- dunder_init=True, tag_prefix='Qt',
+ super().__init__(dunder_init=True, tag_prefix='Qt',
console_scripts=[
'pylupdate5 = PyQt5.pylupdate_main:main',
'pyrcc5 = PyQt5.pyrcc_main:main',
@@ -156,6 +155,12 @@ del find_qt
if tool not in Option.BUILD_TOOLS:
return
+ # Check we support the version of Qt.
+ if self.builder.qt_version >> 16 != 5:
+ raise UserException(
+ "Qt v5 is required, not v{0}".format(
+ self.builder.qt_version_str))
+
# Automatically confirm the license if there might not be a command
# line option to do so.
if tool == 'pep517':
diff --git a/pyproject.toml b/pyproject.toml
index 49d36505..7813595d 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -1,12 +1,12 @@
# Specify the build system requirements.
[build-system]
-requires = ["sip >=5.3, <7", "PyQt-builder >=1.1.0, <2"]
+requires = ["sip >=5.3, <7", "PyQt-builder >=1.6, <2"]
build-backend = "sipbuild.api"
# Specify the PEP 566 metadata for the project.
[tool.sip.metadata]
name = "PyQt5"
-version = "5.15.1"
+version = "5.15.2"
summary = "Python bindings for the Qt cross platform application toolkit"
home-page = "https://www.riverbankcomputing.com/software/pyqt/"
author = "Riverbank Computing Limited"
diff --git a/qmlscene/pluginloader.cpp b/qmlscene/pluginloader.cpp
index 635d31e1..d450fb50 100644
--- a/qmlscene/pluginloader.cpp
+++ b/qmlscene/pluginloader.cpp
@@ -54,7 +54,9 @@ PyQt5QmlPlugin::PyQt5QmlPlugin(QObject *parent) : QQmlExtensionPlugin(parent),
#ifdef WITH_THREAD
// Make sure we don't have the GIL.
+#if PY_VERSION_HEX < 0x03070000
PyEval_InitThreads();
+#endif
PyEval_SaveThread();
#endif
}
diff --git a/qpy/QtCore/qpycore_pyqtboundsignal.cpp b/qpy/QtCore/qpycore_pyqtboundsignal.cpp
index 31fb8193..b6d4e03f 100644
--- a/qpy/QtCore/qpycore_pyqtboundsignal.cpp
+++ b/qpy/QtCore/qpycore_pyqtboundsignal.cpp
@@ -42,6 +42,10 @@
#define CHAR_CAST(s) (const_cast<char *>(s))
#endif
+#if PY_VERSION_HEX < 0x03020000
+typedef long Py_hash_t;
+#endif
+
// The type object.
PyTypeObject *qpycore_pyqtBoundSignal_TypeObject;
@@ -52,6 +56,7 @@ extern "C" {
static PyObject *pyqtBoundSignal_call(PyObject *self, PyObject *args,
PyObject *kw);
static void pyqtBoundSignal_dealloc(PyObject *self);
+static Py_hash_t pyqtBoundSignal_hash(PyObject *self);
static PyObject *pyqtBoundSignal_repr(PyObject *self);
static PyObject *pyqtBoundSignal_richcompare(PyObject *self, PyObject *other,
int op);
@@ -139,6 +144,7 @@ static PyType_Slot qpycore_pyqtBoundSignal_Slots[] = {
{Py_tp_dealloc, (void *)pyqtBoundSignal_dealloc},
{Py_tp_repr, (void *)pyqtBoundSignal_repr},
{Py_tp_richcompare, (void *)pyqtBoundSignal_richcompare},
+ {Py_tp_hash, (void *)pyqtBoundSignal_hash},
{Py_tp_call, (void *)pyqtBoundSignal_call},
{Py_mp_subscript, (void *)pyqtBoundSignal_mp_subscript},
{Py_tp_methods, pyqtBoundSignal_methods},
@@ -179,7 +185,7 @@ static PyTypeObject qpycore_pyqtBoundSignal_Type = {
0, /* tp_as_number */
0, /* tp_as_sequence */
&pyqtBoundSignal_as_mapping, /* tp_as_mapping */
- 0, /* tp_hash */
+ pyqtBoundSignal_hash, /* tp_hash */
pyqtBoundSignal_call, /* tp_call */
0, /* tp_str */
0, /* tp_getattro */
@@ -315,6 +321,27 @@ static PyObject *pyqtBoundSignal_richcompare(PyObject *self, PyObject *other,
}
+// The type hash slot.
+static Py_hash_t pyqtBoundSignal_hash(PyObject *self)
+{
+ qpycore_pyqtBoundSignal *bs = (qpycore_pyqtBoundSignal *)self;
+
+ Py_hash_t signal_hash = PyObject_Hash((PyObject *)(bs->unbound_signal));
+ if (signal_hash == -1)
+ return -1;
+
+ Py_hash_t object_hash = PyObject_Hash((PyObject *)(bs->bound_pyobject));
+ if (object_hash == -1)
+ return -1;
+
+ Py_hash_t hash = signal_hash ^ object_hash;
+ if (hash == -1)
+ hash = -2;
+
+ return hash;
+}
+
+
// The type call slot.
static PyObject *pyqtBoundSignal_call(PyObject *self, PyObject *args,
PyObject *kw)
diff --git a/qpy/QtCore/qpycore_pyqtsignal.cpp b/qpy/QtCore/qpycore_pyqtsignal.cpp
index eb1ff98b..c119899d 100644
--- a/qpy/QtCore/qpycore_pyqtsignal.cpp
+++ b/qpy/QtCore/qpycore_pyqtsignal.cpp
@@ -859,7 +859,7 @@ PyObject *qpycore_call_signal_overload(qpycore_pyqtSignal *ps, PyObject *bound,
if (!func)
return 0;
- PyObject *result = PyCFunction_Call(func, args, kw);
+ PyObject *result = PyObject_Call(func, args, kw);
Py_DECREF(func);
diff --git a/qpy/QtCore/qpycore_pyqtslot.cpp b/qpy/QtCore/qpycore_pyqtslot.cpp
index 299158de..9c8b11c2 100644
--- a/qpy/QtCore/qpycore_pyqtslot.cpp
+++ b/qpy/QtCore/qpycore_pyqtslot.cpp
@@ -244,7 +244,7 @@ PyObject *PyQtSlot::call(PyObject *callable, PyObject *args) const
{
PyObject *nsa, *xtype, *xvalue, *xtb, *res;
- if ((res = PyEval_CallObject(callable, sa)) != NULL)
+ if ((res = PyObject_Call(callable, sa, NULL)) != NULL)
{
// Remove any previous exception.
diff --git a/sip/QtCore/qglobal.sip b/sip/QtCore/qglobal.sip
index 3dfb4e65..e51e3e2a 100644
--- a/sip/QtCore/qglobal.sip
+++ b/sip/QtCore/qglobal.sip
@@ -29,8 +29,8 @@ int PYQT_VERSION;
const char *PYQT_VERSION_STR;
%ModuleCode
-static int PYQT_VERSION = 0x050f01;
-static const char *PYQT_VERSION_STR = "5.15.1";
+static int PYQT_VERSION = 0x050f02;
+static const char *PYQT_VERSION_STR = "5.15.2";
%End
const int QT_VERSION;
const char *QT_VERSION_STR;
diff --git a/sip/QtCore/qobject.sip b/sip/QtCore/qobject.sip
index f655fce5..e9a74126 100644
--- a/sip/QtCore/qobject.sip
+++ b/sip/QtCore/qobject.sip
@@ -753,6 +753,16 @@ private:
#define sipQtFindSipslot 0
%End
+%PreInitialisationCode
+#if defined(Q_OS_DARWIN)
+ // This works around a problem (possibly a clash between Qt and Python)
+ // began with Qt v5.11 that causes missed paint events. Only set the
+ // variable if it hasn't already been given a value.
+ if (qgetenv("QT_MAC_WANTS_LAYER").isNull())
+ qputenv("QT_MAC_WANTS_LAYER", "1");
+#endif
+%End
+
%InitialisationCode
qpycore_init();
%End
diff --git a/sip/QtMultimedia/qabstractvideosurface.sip b/sip/QtMultimedia/qabstractvideosurface.sip
index b1f0a508..9075e36b 100644
--- a/sip/QtMultimedia/qabstractvideosurface.sip
+++ b/sip/QtMultimedia/qabstractvideosurface.sip
@@ -81,7 +81,11 @@ class QAbstractVideoSurface : QObject
{sipName_QCameraViewfinderSettingsControl, &sipType_QCameraViewfinderSettingsControl, -1, 39},
{sipName_QCameraViewfinderSettingsControl2, &sipType_QCameraViewfinderSettingsControl2, -1, 40},
{sipName_QCameraZoomControl, &sipType_QCameraZoomControl, -1, 41},
+ #if QT_VERSION >= 0x050b00
{sipName_QCustomAudioRoleControl, &sipType_QCustomAudioRoleControl, -1, 42},
+ #else
+ {0, 0, -1, 42},
+ #endif
{sipName_QImageEncoderControl, &sipType_QImageEncoderControl, -1, 43},
{sipName_QMediaAudioProbeControl, &sipType_QMediaAudioProbeControl, -1, 44},
{sipName_QMediaAvailabilityControl, &sipType_QMediaAvailabilityControl, -1, 45},
diff --git a/sip/QtMultimedia/qcustomaudiorolecontrol.sip b/sip/QtMultimedia/qcustomaudiorolecontrol.sip
index 762de926..4eb1fceb 100644
--- a/sip/QtMultimedia/qcustomaudiorolecontrol.sip
+++ b/sip/QtMultimedia/qcustomaudiorolecontrol.sip
@@ -20,6 +20,8 @@
// WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
+%If (Qt_5_11_0 -)
+
class QCustomAudioRoleControl : QMediaControl
{
%TypeHeaderCode
@@ -38,3 +40,5 @@ signals:
protected:
explicit QCustomAudioRoleControl(QObject *parent /TransferThis/ = 0);
};
+
+%End
diff --git a/sip/QtNetwork/qocspresponse.sip b/sip/QtNetwork/qocspresponse.sip
index 699359bf..c0c000ca 100644
--- a/sip/QtNetwork/qocspresponse.sip
+++ b/sip/QtNetwork/qocspresponse.sip
@@ -45,7 +45,7 @@ enum class QOcspCertificateStatus
enum class QOcspRevocationReason
{
- None,
+ None /PyName=None_/,
Unspecified,
KeyCompromise,
CACompromise,
diff --git a/sip/QtQuick/qquickframebufferobject.sip b/sip/QtQuick/qquickframebufferobject.sip
index 593cdf12..eb5f0611 100644
--- a/sip/QtQuick/qquickframebufferobject.sip
+++ b/sip/QtQuick/qquickframebufferobject.sip
@@ -39,9 +39,13 @@ public:
Renderer();
virtual ~Renderer();
virtual void render() = 0;
+%If (PyQt_OpenGL)
virtual QOpenGLFramebufferObject *createFramebufferObject(const QSize &size);
+%End
virtual void synchronize(QQuickFramebufferObject *);
+%If (PyQt_OpenGL)
QOpenGLFramebufferObject *framebufferObject() const;
+%End
void update();
void invalidateFramebufferObject();
};
diff --git a/sip/QtQuick/qquickrendercontrol.sip b/sip/QtQuick/qquickrendercontrol.sip
index 1b7a3641..7f8fe180 100644
--- a/sip/QtQuick/qquickrendercontrol.sip
+++ b/sip/QtQuick/qquickrendercontrol.sip
@@ -36,7 +36,9 @@ public:
QQuickRenderControl(QObject *parent /TransferThis/ = 0);
%End
virtual ~QQuickRenderControl();
+%If (PyQt_OpenGL)
void initialize(QOpenGLContext *gl);
+%End
void invalidate();
void polishItems();
void render();
diff --git a/sip/QtQuick/qquickwindow.sip b/sip/QtQuick/qquickwindow.sip
index 47842b62..0077d533 100644
--- a/sip/QtQuick/qquickwindow.sip
+++ b/sip/QtQuick/qquickwindow.sip
@@ -124,8 +124,12 @@ public:
QQuickItem *mouseGrabberItem() const;
bool sendEvent(QQuickItem *, QEvent *);
QImage grabWindow() /ReleaseGIL/;
+%If (PyQt_OpenGL)
void setRenderTarget(QOpenGLFramebufferObject *fbo);
+%End
+%If (PyQt_OpenGL)
QOpenGLFramebufferObject *renderTarget() const;
+%End
void setRenderTarget(uint fboId, const QSize &size);
uint renderTargetId() const;
QSize renderTargetSize() const;
@@ -146,7 +150,9 @@ public:
bool isPersistentOpenGLContext() const;
void setPersistentSceneGraph(bool persistent);
bool isPersistentSceneGraph() const;
+%If (PyQt_OpenGL)
QOpenGLContext *openglContext() const;
+%End
signals:
void frameSwapped();
@@ -198,8 +204,10 @@ signals:
public:
%If (Qt_5_2_0 -)
+%If (PyQt_OpenGL)
void resetOpenGLState();
%End
+%End
%If (Qt_5_3_0 -)
enum SceneGraphError
@@ -211,8 +219,10 @@ public:
signals:
%If (Qt_5_3_0 -)
+%If (PyQt_OpenGL)
void openglContextCreated(QOpenGLContext *context);
%End
+%End
%If (Qt_5_3_0 -)
void afterSynchronizing();
%End
diff --git a/sip/QtQuick/qsgabstractrenderer.sip b/sip/QtQuick/qsgabstractrenderer.sip
index 113024a8..eb05aab1 100644
--- a/sip/QtQuick/qsgabstractrenderer.sip
+++ b/sip/QtQuick/qsgabstractrenderer.sip
@@ -65,7 +65,7 @@ public:
QColor clearColor() const;
void setClearMode(QSGAbstractRenderer::ClearMode mode);
QSGAbstractRenderer::ClearMode clearMode() const;
- virtual void renderScene(GLuint fboId = 0) = 0;
+ virtual void renderScene(uint fboId = 0) = 0;
signals:
void sceneGraphChanged();
diff --git a/sip/QtQuick/qsgengine.sip b/sip/QtQuick/qsgengine.sip
index 48ff00c9..865eedbf 100644
--- a/sip/QtQuick/qsgengine.sip
+++ b/sip/QtQuick/qsgengine.sip
@@ -47,7 +47,9 @@ public:
QSGEngine(QObject *parent /TransferThis/ = 0);
%End
virtual ~QSGEngine();
+%If (PyQt_OpenGL)
void initialize(QOpenGLContext *context);
+%End
void invalidate();
QSGAbstractRenderer *createRenderer() const;
QSGTexture *createTextureFromImage(const QImage &image, QSGEngine::CreateTextureOptions options = QSGEngine::CreateTextureOption()) const;
diff --git a/sip/QtQuick/qsggeometry.sip b/sip/QtQuick/qsggeometry.sip
index 0f44a52a..fce16e77 100644
--- a/sip/QtQuick/qsggeometry.sip
+++ b/sip/QtQuick/qsggeometry.sip
@@ -284,8 +284,8 @@ enum /NoScope/
QSGGeometry(const QSGGeometry::AttributeSet &attribs /KeepReference/, int vertexCount, int indexCount = 0, int indexType = GL_UNSIGNED_SHORT);
virtual ~QSGGeometry();
- void setDrawingMode(GLenum mode);
- GLenum drawingMode() const;
+ void setDrawingMode(unsigned int mode);
+ unsigned int drawingMode() const;
void allocate(int vertexCount, int indexCount = 0);
int vertexCount() const;
void *vertexData();
diff --git a/sip/QtQuick/qsgmaterial.sip b/sip/QtQuick/qsgmaterial.sip
index f5e021b5..e09a9847 100644
--- a/sip/QtQuick/qsgmaterial.sip
+++ b/sip/QtQuick/qsgmaterial.sip
@@ -56,7 +56,9 @@ public:
QRect viewportRect() const;
QRect deviceRect() const;
float determinant() const;
+%If (PyQt_OpenGL)
QOpenGLContext *context() const;
+%End
%If (Qt_5_1_0 -)
QMatrix4x4 projectionMatrix() const;
%End
@@ -124,29 +126,45 @@ public:
}
%End
+%If (PyQt_OpenGL)
QOpenGLShaderProgram *program();
+%End
protected:
+%If (PyQt_OpenGL)
virtual void compile();
+%End
virtual void initialize();
%If (Qt_5_2_0 -)
+%If (PyQt_OpenGL)
virtual const char *vertexShader() const;
%End
+%End
%If (- Qt_5_2_0)
+%If (PyQt_OpenGL)
virtual const char *vertexShader() const = 0;
%End
+%End
%If (Qt_5_2_0 -)
+%If (PyQt_OpenGL)
virtual const char *fragmentShader() const;
%End
+%End
%If (- Qt_5_2_0)
+%If (PyQt_OpenGL)
virtual const char *fragmentShader() const = 0;
%End
+%End
%If (Qt_5_2_0 -)
+%If (PyQt_OpenGL)
void setShaderSourceFile(QOpenGLShader::ShaderType type, const QString &sourceFile);
%End
+%End
%If (Qt_5_2_0 -)
+%If (PyQt_OpenGL)
void setShaderSourceFiles(QOpenGLShader::ShaderType type, const QStringList &sourceFiles);
%End
+%End
private:
QSGMaterialShader(const QSGMaterialShader &);
diff --git a/sip/QtWidgets/qactiongroup.sip b/sip/QtWidgets/qactiongroup.sip
index 3b33f2b7..cd81052e 100644
--- a/sip/QtWidgets/qactiongroup.sip
+++ b/sip/QtWidgets/qactiongroup.sip
@@ -54,7 +54,7 @@ public:
enum class ExclusionPolicy
{
- None,
+ None /PyName=None_/,
Exclusive,
ExclusiveOptional,
};
diff --git a/sip/QtWidgets/qlayout.sip b/sip/QtWidgets/qlayout.sip
index 2965c1c2..4ebec330 100644
--- a/sip/QtWidgets/qlayout.sip
+++ b/sip/QtWidgets/qlayout.sip
@@ -102,7 +102,7 @@ public:
%End
virtual void addItem(QLayoutItem * /Transfer/) = 0;
- void removeWidget(QWidget *w);
+ void removeWidget(QWidget *w /TransferBack/);
void removeItem(QLayoutItem * /TransferBack/);
virtual Qt::Orientations expandingDirections() const;
virtual QSize minimumSize() const;
diff --git a/sip/_QOpenGLFunctions_2_0/qopenglfunctions_2_0.sip b/sip/_QOpenGLFunctions_2_0/qopenglfunctions_2_0.sip
index d55a237f..6611009d 100644
--- a/sip/_QOpenGLFunctions_2_0/qopenglfunctions_2_0.sip
+++ b/sip/_QOpenGLFunctions_2_0/qopenglfunctions_2_0.sip
@@ -59,7 +59,7 @@ public:
switch (a1)
{
- #if defined(GL_TEXTURE_SWIZZLE_RGBA) || defined(GL_TEXTURE_SWIZZLE_RGBA)
+ #if defined(GL_TEXTURE_SWIZZLE_RGBA) || defined(GL_TEXTURE_BORDER_COLOR)
#if defined(GL_TEXTURE_SWIZZLE_RGBA)
case GL_TEXTURE_SWIZZLE_RGBA:
#endif
@@ -86,7 +86,7 @@ public:
switch (a1)
{
- #if defined(GL_TEXTURE_SWIZZLE_RGBA) || defined(GL_TEXTURE_SWIZZLE_RGBA)
+ #if defined(GL_TEXTURE_SWIZZLE_RGBA) || defined(GL_TEXTURE_BORDER_COLOR)
#if defined(GL_TEXTURE_SWIZZLE_RGBA)
case GL_TEXTURE_SWIZZLE_RGBA:
#endif
diff --git a/sip/_QOpenGLFunctions_2_1/qopenglfunctions_2_1.sip b/sip/_QOpenGLFunctions_2_1/qopenglfunctions_2_1.sip
index c47fd3bc..e6d52e47 100644
--- a/sip/_QOpenGLFunctions_2_1/qopenglfunctions_2_1.sip
+++ b/sip/_QOpenGLFunctions_2_1/qopenglfunctions_2_1.sip
@@ -60,7 +60,7 @@ public:
switch (a1)
{
- #if defined(GL_TEXTURE_SWIZZLE_RGBA) || defined(GL_TEXTURE_SWIZZLE_RGBA)
+ #if defined(GL_TEXTURE_SWIZZLE_RGBA) || defined(GL_TEXTURE_BORDER_COLOR)
#if defined(GL_TEXTURE_SWIZZLE_RGBA)
case GL_TEXTURE_SWIZZLE_RGBA:
#endif
@@ -87,7 +87,7 @@ public:
switch (a1)
{
- #if defined(GL_TEXTURE_SWIZZLE_RGBA) || defined(GL_TEXTURE_SWIZZLE_RGBA)
+ #if defined(GL_TEXTURE_SWIZZLE_RGBA) || defined(GL_TEXTURE_BORDER_COLOR)
#if defined(GL_TEXTURE_SWIZZLE_RGBA)
case GL_TEXTURE_SWIZZLE_RGBA:
#endif
diff --git a/sip/_QOpenGLFunctions_4_1_Core/qopenglfunctions_4_1_core.sip b/sip/_QOpenGLFunctions_4_1_Core/qopenglfunctions_4_1_core.sip
index f51afe22..235d3d99 100644
--- a/sip/_QOpenGLFunctions_4_1_Core/qopenglfunctions_4_1_core.sip
+++ b/sip/_QOpenGLFunctions_4_1_Core/qopenglfunctions_4_1_core.sip
@@ -60,7 +60,7 @@ public:
switch (a1)
{
- #if defined(GL_TEXTURE_SWIZZLE_RGBA) || defined(GL_TEXTURE_SWIZZLE_RGBA)
+ #if defined(GL_TEXTURE_SWIZZLE_RGBA) || defined(GL_TEXTURE_BORDER_COLOR)
#if defined(GL_TEXTURE_SWIZZLE_RGBA)
case GL_TEXTURE_SWIZZLE_RGBA:
#endif
@@ -87,7 +87,7 @@ public:
switch (a1)
{
- #if defined(GL_TEXTURE_SWIZZLE_RGBA) || defined(GL_TEXTURE_SWIZZLE_RGBA)
+ #if defined(GL_TEXTURE_SWIZZLE_RGBA) || defined(GL_TEXTURE_BORDER_COLOR)
#if defined(GL_TEXTURE_SWIZZLE_RGBA)
case GL_TEXTURE_SWIZZLE_RGBA:
#endif
diff --git a/sip/_QOpenGLFunctions_ES2/qopenglfunctions_es2.sip b/sip/_QOpenGLFunctions_ES2/qopenglfunctions_es2.sip
index 0e352851..559d77e6 100644
--- a/sip/_QOpenGLFunctions_ES2/qopenglfunctions_es2.sip
+++ b/sip/_QOpenGLFunctions_ES2/qopenglfunctions_es2.sip
@@ -476,7 +476,7 @@ public:
switch (a1)
{
- #if defined(GL_TEXTURE_SWIZZLE_RGBA) || defined(GL_TEXTURE_SWIZZLE_RGBA)
+ #if defined(GL_TEXTURE_SWIZZLE_RGBA) || defined(GL_TEXTURE_BORDER_COLOR)
#if defined(GL_TEXTURE_SWIZZLE_RGBA)
case GL_TEXTURE_SWIZZLE_RGBA:
#endif
@@ -503,7 +503,7 @@ public:
switch (a1)
{
- #if defined(GL_TEXTURE_SWIZZLE_RGBA) || defined(GL_TEXTURE_SWIZZLE_RGBA)
+ #if defined(GL_TEXTURE_SWIZZLE_RGBA) || defined(GL_TEXTURE_BORDER_COLOR)
#if defined(GL_TEXTURE_SWIZZLE_RGBA)
case GL_TEXTURE_SWIZZLE_RGBA:
#endif
More information about the Neon-commits
mailing list