Merge branch 'KDE/4.7'

2011-07-02 15:32:56 +02:00 · 2011-07-02 15:32:56 +02:00 · 3259ff612a
parent 78b8dada3b 42aac88f1b
commit 3259ff612a
1 changed files with 1 additions and 1 deletions
--- a/scene_opengl_egl.cpp
+++ b/scene_opengl_egl.cpp
@ -228,7 +228,6 @@ void SceneOpenGL::Texture::findTarget()
 bool SceneOpenGL::Texture::load(const Pixmap& pix, const QSize& size,
                                int depth, QRegion region)
 {
-    Q_UNUSED(size)
    Q_UNUSED(depth)
    Q_UNUSED(region)

@ -259,6 +258,7 @@ bool SceneOpenGL::Texture::load(const Pixmap& pix, const QSize& size,
        unbind();
        checkGLError("load texture");
        setYInverted(true);
+        mSize = size;
    }
    return true;
 }