Merge branch 'Plasma/5.2'

This commit is contained in:
Martin Gräßlin 2015-02-11 15:32:28 +01:00
commit 5c4f1dffa3

View file

@ -338,7 +338,7 @@ void GLTexture::update(const QImage &image, const QPoint &offset, const QRect &s
QImage tmpImage;
if (!src.isNull()) {
if (d->s_supportsUnpack) {
if (useUnpack) {
glPixelStorei(GL_UNPACK_ROW_LENGTH, image.width());
glPixelStorei(GL_UNPACK_SKIP_PIXELS, src.x());
glPixelStorei(GL_UNPACK_SKIP_ROWS, src.y());