diff options
| author | Liang Qi <liang.qi@qt.io> | 2020-01-09 20:30:39 +0100 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2020-01-09 20:30:39 +0100 |
| commit | a59c7684897bfbbb7ddcec2f05263fee92ab5056 (patch) | |
| tree | 50793671569f87bdbfc0e9ff36adbf416971d6cf /src/gui/opengl/qopenglpaintengine.cpp | |
| parent | 5507d0f1b04ea6b1d91be9ade30bc31d1830c220 (diff) | |
| parent | 1c75f59588694557caba69c2fc173dd8f1d7f514 (diff) | |
Merge remote-tracking branch 'origin/5.14' into 5.15
Conflicts:
src/corelib/kernel/qobject.cpp
Change-Id: I4780b25665672692b086ee92092e506c814642f2
Diffstat (limited to 'src/gui/opengl/qopenglpaintengine.cpp')
| -rw-r--r-- | src/gui/opengl/qopenglpaintengine.cpp | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/src/gui/opengl/qopenglpaintengine.cpp b/src/gui/opengl/qopenglpaintengine.cpp index a82edbb073..b53c9a3eab 100644 --- a/src/gui/opengl/qopenglpaintengine.cpp +++ b/src/gui/opengl/qopenglpaintengine.cpp @@ -1330,6 +1330,7 @@ void QOpenGL2PaintEngineExPrivate::drawVertexArrays(const float *data, int *stop QOpenGL2PaintEngineEx::QOpenGL2PaintEngineEx() : QPaintEngineEx(*(new QOpenGL2PaintEngineExPrivate(this))) { + gccaps &= ~QPaintEngine::RasterOpModes; } QOpenGL2PaintEngineEx::~QOpenGL2PaintEngineEx() |