Skip to content

Add QImage null check when QOpenGLTexture converts

Andreas Sturmlechner requested to merge asturmlechner/qtbase:asturmlechner/QTBUG-68884 into kde/5.15

...the image to RGBA8888. Just mirror the first null check that is done for the user-provided QImage. The same should be done for the result of convertToFormat().

Pick-to: 6.5 6.5 6.2 5.15 Fixes: QTBUG-68884 Change-Id: I77091d7a2bc6e32d2aa292dc7650c1af091fcec1 Reviewed-by: Andy Nichols andy.nichols@qt.io (cherry picked from commit a561d52a)

Merge request reports