diff options
| author | Liang Qi <liang.qi@theqtcompany.com> | 2016-02-12 10:53:43 +0100 |
|---|---|---|
| committer | Liang Qi <liang.qi@theqtcompany.com> | 2016-02-12 10:53:43 +0100 |
| commit | 20a51e87fd15b8a6c1503b905399f7befe31114b (patch) | |
| tree | 5a8667150568ed798d63eb165372c198549498c2 /src/quick/items/context2d/qquickcontext2dtexture.cpp | |
| parent | 6c152bf27f94f01b2942b02e370df4fa01e0d40f (diff) | |
| parent | 084dbb06d7b00c4a67edb6ce58956150036c35f2 (diff) | |
Merge remote-tracking branch 'origin/5.6' into dev
Conflicts:
.qmake.conf
Change-Id: I356ec83cf687bd2833f9a7c5e820d56b1efa8979
Diffstat (limited to 'src/quick/items/context2d/qquickcontext2dtexture.cpp')
| -rw-r--r-- | src/quick/items/context2d/qquickcontext2dtexture.cpp | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/src/quick/items/context2d/qquickcontext2dtexture.cpp b/src/quick/items/context2d/qquickcontext2dtexture.cpp index 12bd95101f..f3513f447a 100644 --- a/src/quick/items/context2d/qquickcontext2dtexture.cpp +++ b/src/quick/items/context2d/qquickcontext2dtexture.cpp @@ -605,6 +605,11 @@ QPaintDevice* QQuickContext2DFBOTexture::beginPainting() void QQuickContext2DFBOTexture::endPainting() { QQuickContext2DTexture::endPainting(); + + // There may not be an FBO due to zero width or height. + if (!m_fbo) + return; + if (m_multisampledFbo) QOpenGLFramebufferObject::blitFramebuffer(m_fbo, m_multisampledFbo); |