From 1f1b37e613a930cc1ab871f5d11bf9742920c7f9 Mon Sep 17 00:00:00 2001
From: Tom Cooksey <thomas.cooksey@nokia.com>
Date: Wed, 30 Dec 2009 09:21:34 +0100
Subject: Track which vertex attrib arrays are enabled in QGLContextPrivate

The GL2 engine (and probably Qt/3D) needs to track which vertex
attribute arrays are currently enabled and which are disabled. As
this is per-context state, the logical place to track this is in the
context and not in the paint engine.

This patch also makes the GL2 engine's shader manager enable/disable
the appropriate attribute arrays for a given shader program when it
is used.

Reviewed-By: Kim
---
 .../gl2paintengineex/qglengineshadermanager.cpp    | 29 +++++++++++++++++++-
 .../gl2paintengineex/qglengineshadermanager_p.h    |  3 +++
 .../gl2paintengineex/qpaintengineex_opengl2.cpp    | 11 +++++---
 src/opengl/qgl.cpp                                 | 31 ++++++++++++++++++++++
 src/opengl/qgl.h                                   |  1 +
 src/opengl/qgl_p.h                                 |  9 +++++++
 6 files changed, 79 insertions(+), 5 deletions(-)

diff --git a/src/opengl/gl2paintengineex/qglengineshadermanager.cpp b/src/opengl/gl2paintengineex/qglengineshadermanager.cpp
index d28d5f3..da33eb3 100644
--- a/src/opengl/gl2paintengineex/qglengineshadermanager.cpp
+++ b/src/opengl/gl2paintengineex/qglengineshadermanager.cpp
@@ -505,7 +505,27 @@ QGLShaderProgram* QGLEngineShaderManager::currentProgram()
     if (currentShaderProg)
         return currentShaderProg->program;
     else
-        return simpleProgram();
+        return sharedShaders->simpleProgram();
+}
+
+void QGLEngineShaderManager::useSimpleProgram()
+{
+    sharedShaders->simpleProgram()->bind();
+    QGLContextPrivate* ctx_d = ctx->d_func();
+    ctx_d->setVertexAttribArrayEnabled(QT_VERTEX_COORDS_ATTR, true);
+    ctx_d->setVertexAttribArrayEnabled(QT_TEXTURE_COORDS_ATTR, false);
+    ctx_d->setVertexAttribArrayEnabled(QT_OPACITY_ATTR, false);
+    shaderProgNeedsChanging = true;
+}
+
+void QGLEngineShaderManager::useBlitProgram()
+{
+    sharedShaders->blitProgram()->bind();
+    QGLContextPrivate* ctx_d = ctx->d_func();
+    ctx_d->setVertexAttribArrayEnabled(QT_VERTEX_COORDS_ATTR, true);
+    ctx_d->setVertexAttribArrayEnabled(QT_TEXTURE_COORDS_ATTR, true);
+    ctx_d->setVertexAttribArrayEnabled(QT_OPACITY_ATTR, false);
+    shaderProgNeedsChanging = true;
 }
 
 QGLShaderProgram* QGLEngineShaderManager::simpleProgram()
@@ -716,6 +736,13 @@ bool QGLEngineShaderManager::useCorrectShaderProg()
             customSrcStage->setUniforms(currentShaderProg->program);
     }
 
+    // Make sure all the vertex attribute arrays the program uses are enabled (and the ones it
+    // doesn't use are disabled)
+    QGLContextPrivate* ctx_d = ctx->d_func();
+    ctx_d->setVertexAttribArrayEnabled(QT_VERTEX_COORDS_ATTR, true);
+    ctx_d->setVertexAttribArrayEnabled(QT_TEXTURE_COORDS_ATTR, currentShaderProg->useTextureCoords);
+    ctx_d->setVertexAttribArrayEnabled(QT_OPACITY_ATTR, currentShaderProg->useOpacityAttribute);
+
     shaderProgNeedsChanging = false;
     return true;
 }
diff --git a/src/opengl/gl2paintengineex/qglengineshadermanager_p.h b/src/opengl/gl2paintengineex/qglengineshadermanager_p.h
index 1ec4cdc..a132e1b 100644
--- a/src/opengl/gl2paintengineex/qglengineshadermanager_p.h
+++ b/src/opengl/gl2paintengineex/qglengineshadermanager_p.h
@@ -468,6 +468,9 @@ public:
     void setDirty(); // someone has manually changed the current shader program
     bool useCorrectShaderProg(); // returns true if the shader program needed to be changed
 
+    void useSimpleProgram();
+    void useBlitProgram();
+
     QGLShaderProgram* currentProgram(); // Returns pointer to the shader the manager has chosen
     QGLShaderProgram* simpleProgram(); // Used to draw into e.g. stencil buffers
     QGLShaderProgram* blitProgram(); // Used to blit a texture into the framebuffer
diff --git a/src/opengl/gl2paintengineex/qpaintengineex_opengl2.cpp b/src/opengl/gl2paintengineex/qpaintengineex_opengl2.cpp
index d3a9547..0574c52 100644
--- a/src/opengl/gl2paintengineex/qpaintengineex_opengl2.cpp
+++ b/src/opengl/gl2paintengineex/qpaintengineex_opengl2.cpp
@@ -248,9 +248,8 @@ void QGLTextureGlyphCache::resizeTextureData(int width, int height)
     glVertexAttribPointer(QT_VERTEX_COORDS_ATTR, 2, GL_FLOAT, GL_FALSE, 0, vertexCoordinateArray);
     glVertexAttribPointer(QT_TEXTURE_COORDS_ATTR, 2, GL_FLOAT, GL_FALSE, 0, textureCoordinateArray);
 
-    pex->shaderManager->blitProgram()->bind();
+    pex->shaderManager->useBlitProgram();
     pex->shaderManager->blitProgram()->setUniformValue("imageTexture", QT_IMAGE_TEXTURE_UNIT);
-    pex->shaderManager->setDirty();
 
     glDrawArrays(GL_TRIANGLE_FAN, 0, 4);
 
@@ -413,8 +412,7 @@ void QGL2PaintEngineExPrivate::setBrush(const QBrush& brush)
 
 void QGL2PaintEngineExPrivate::useSimpleShader()
 {
-    shaderManager->simpleProgram()->bind();
-    shaderManager->setDirty();
+    shaderManager->useSimpleProgram();
 
     if (matrixDirty)
         updateMatrix();
@@ -745,6 +743,10 @@ void QGL2PaintEngineEx::beginNativePainting()
     QGLContext *ctx = d->ctx;
     glUseProgram(0);
 
+    // Disable all the vertex attribute arrays:
+    for (int i = 0; i < QT_GL_VERTEX_ARRAY_TRACKED_COUNT; ++i)
+        glDisableVertexAttribArray(i);
+
 #ifndef QT_OPENGL_ES_2
     // be nice to people who mix OpenGL 1.x code with QPainter commands
     // by setting modelview and projection matrices to mirror the GL 1
@@ -1935,6 +1937,7 @@ void QGL2PaintEngineEx::ensureActive()
         glViewport(0, 0, d->width, d->height);
         d->needsSync = false;
         d->shaderManager->setDirty();
+        d->ctx->d_func()->syncGlState();
         setState(state());
     }
 }
diff --git a/src/opengl/qgl.cpp b/src/opengl/qgl.cpp
index 466e851..5bb62f7 100644
--- a/src/opengl/qgl.cpp
+++ b/src/opengl/qgl.cpp
@@ -1484,6 +1484,8 @@ void QGLContextPrivate::init(QPaintDevice *dev, const QGLFormat &format)
     current_fbo = 0;
     default_fbo = 0;
     active_engine = 0;
+    for (int i = 0; i < QT_GL_VERTEX_ARRAY_TRACKED_COUNT; ++i)
+        vertexAttributeArraysEnabledState[i] = false;
 }
 
 QGLContext* QGLContext::currentCtx = 0;
@@ -1874,6 +1876,35 @@ void QGLContextPrivate::cleanup()
 {
 }
 
+#define ctx q_ptr
+void QGLContextPrivate::setVertexAttribArrayEnabled(int arrayIndex, bool enabled)
+{
+    Q_ASSERT(arrayIndex < QT_GL_VERTEX_ARRAY_TRACKED_COUNT);
+    Q_ASSERT(glEnableVertexAttribArray);
+
+    if (vertexAttributeArraysEnabledState[arrayIndex] && !enabled)
+        glDisableVertexAttribArray(arrayIndex);
+
+    if (!vertexAttributeArraysEnabledState[arrayIndex] && enabled)
+        glEnableVertexAttribArray(arrayIndex);
+
+    vertexAttributeArraysEnabledState[arrayIndex] = enabled;
+}
+
+void QGLContextPrivate::syncGlState()
+{
+    Q_ASSERT(glEnableVertexAttribArray);
+    for (int i = 0; i < QT_GL_VERTEX_ARRAY_TRACKED_COUNT; ++i) {
+        if (vertexAttributeArraysEnabledState[i])
+            glEnableVertexAttribArray(i);
+        else
+            glDisableVertexAttribArray(i);
+    }
+
+}
+#undef ctx
+
+
 /*!
     \overload
 
diff --git a/src/opengl/qgl.h b/src/opengl/qgl.h
index 2076c46..b6cd128 100644
--- a/src/opengl/qgl.h
+++ b/src/opengl/qgl.h
@@ -393,6 +393,7 @@ private:
     friend class QOpenGLPaintEnginePrivate;
     friend class QGL2PaintEngineEx;
     friend class QGL2PaintEngineExPrivate;
+    friend class QGLEngineShaderManager;
     friend class QGLWindowSurface;
     friend class QGLPixmapData;
     friend class QGLPixmapFilterBase;
diff --git a/src/opengl/qgl_p.h b/src/opengl/qgl_p.h
index 99c0f33..834ff96 100644
--- a/src/opengl/qgl_p.h
+++ b/src/opengl/qgl_p.h
@@ -257,6 +257,10 @@ private:
 
 class QGLTexture;
 
+// This probably needs to grow to GL_MAX_VERTEX_ATTRIBS, but 3 is ok for now as that's
+// all the GL2 engine uses:
+#define QT_GL_VERTEX_ARRAY_TRACKED_COUNT 3
+
 class QGLContextPrivate
 {
     Q_DECLARE_PUBLIC(QGLContext)
@@ -276,6 +280,9 @@ public:
 
     void cleanup();
 
+    void setVertexAttribArrayEnabled(int arrayIndex, bool enabled = true);
+    void syncGlState(); // Makes sure the GL context's state is what we think it is
+
 #if defined(Q_WS_WIN)
     HGLRC rc;
     HDC dc;
@@ -332,6 +339,8 @@ public:
     GLuint default_fbo;
     QPaintEngine *active_engine;
 
+    bool vertexAttributeArraysEnabledState[QT_GL_VERTEX_ARRAY_TRACKED_COUNT];
+
     static inline QGLContextGroup *contextGroup(const QGLContext *ctx) { return ctx->d_ptr->group; }
 
 #ifdef Q_WS_WIN
-- 
cgit v0.12


From 16b41824dceb1cecfe54089d88af787af134af8a Mon Sep 17 00:00:00 2001
From: Tom Cooksey <thomas.cooksey@nokia.com>
Date: Wed, 30 Dec 2009 09:48:35 +0100
Subject: Remove superfluous enable/disable vertex arrtib arrays

Now that the shader manager takes care of enabling/disabling the
vertex attribute arrays for us, the GL2 paint engine doesn't have
to do it. This reduces GL state changes within the paint engine
and provides significant performance improvements. For a given test
case (25,000 3x3px solid rects), the improvement is 67% on desktop
(nVidia) and 9% on embedded (SGX).

Reviewed-By: Kim
---
 .../gl2paintengineex/qpaintengineex_opengl2.cpp    | 34 ----------------------
 1 file changed, 34 deletions(-)

diff --git a/src/opengl/gl2paintengineex/qpaintengineex_opengl2.cpp b/src/opengl/gl2paintengineex/qpaintengineex_opengl2.cpp
index 0574c52..90b7214 100644
--- a/src/opengl/gl2paintengineex/qpaintengineex_opengl2.cpp
+++ b/src/opengl/gl2paintengineex/qpaintengineex_opengl2.cpp
@@ -242,9 +242,6 @@ void QGLTextureGlyphCache::resizeTextureData(int width, int height)
     float vertexCoordinateArray[] = { -1, -1, 1, -1, 1, 1, -1, 1 };
     float textureCoordinateArray[] = { 0, 0, 1, 0, 1, 1, 0, 1 };
 
-    glEnableVertexAttribArray(QT_VERTEX_COORDS_ATTR);
-    glEnableVertexAttribArray(QT_TEXTURE_COORDS_ATTR);
-
     glVertexAttribPointer(QT_VERTEX_COORDS_ATTR, 2, GL_FLOAT, GL_FALSE, 0, vertexCoordinateArray);
     glVertexAttribPointer(QT_TEXTURE_COORDS_ATTR, 2, GL_FLOAT, GL_FALSE, 0, textureCoordinateArray);
 
@@ -253,9 +250,6 @@ void QGLTextureGlyphCache::resizeTextureData(int width, int height)
 
     glDrawArrays(GL_TRIANGLE_FAN, 0, 4);
 
-    glDisableVertexAttribArray(QT_VERTEX_COORDS_ATTR);
-    glDisableVertexAttribArray(QT_TEXTURE_COORDS_ATTR);
-
     glBindTexture(GL_TEXTURE_2D, m_texture);
 
 #ifdef QT_OPENGL_ES_2
@@ -806,34 +800,20 @@ void QGL2PaintEngineExPrivate::transferMode(EngineMode newMode)
         return;
 
     if (mode == TextDrawingMode || mode == ImageDrawingMode || mode == ImageArrayDrawingMode) {
-        glDisableVertexAttribArray(QT_TEXTURE_COORDS_ATTR);
-        glDisableVertexAttribArray(QT_VERTEX_COORDS_ATTR);
-        glDisableVertexAttribArray(QT_OPACITY_ATTR);
-
         lastTextureUsed = GLuint(-1);
     }
 
     if (newMode == TextDrawingMode) {
-        glEnableVertexAttribArray(QT_VERTEX_COORDS_ATTR);
-        glEnableVertexAttribArray(QT_TEXTURE_COORDS_ATTR);
-
         glVertexAttribPointer(QT_VERTEX_COORDS_ATTR, 2, GL_FLOAT, GL_FALSE, 0, vertexCoordinateArray.data());
         glVertexAttribPointer(QT_TEXTURE_COORDS_ATTR, 2, GL_FLOAT, GL_FALSE, 0, textureCoordinateArray.data());
     }
 
     if (newMode == ImageDrawingMode) {
-        glEnableVertexAttribArray(QT_VERTEX_COORDS_ATTR);
-        glEnableVertexAttribArray(QT_TEXTURE_COORDS_ATTR);
-
         glVertexAttribPointer(QT_VERTEX_COORDS_ATTR, 2, GL_FLOAT, GL_FALSE, 0, staticVertexCoordinateArray);
         glVertexAttribPointer(QT_TEXTURE_COORDS_ATTR, 2, GL_FLOAT, GL_FALSE, 0, staticTextureCoordinateArray);
     }
 
     if (newMode == ImageArrayDrawingMode) {
-        glEnableVertexAttribArray(QT_VERTEX_COORDS_ATTR);
-        glEnableVertexAttribArray(QT_TEXTURE_COORDS_ATTR);
-        glEnableVertexAttribArray(QT_OPACITY_ATTR);
-
         glVertexAttribPointer(QT_VERTEX_COORDS_ATTR, 2, GL_FLOAT, GL_FALSE, 0, vertexCoordinateArray.data());
         glVertexAttribPointer(QT_TEXTURE_COORDS_ATTR, 2, GL_FLOAT, GL_FALSE, 0, textureCoordinateArray.data());
         glVertexAttribPointer(QT_OPACITY_ATTR, 1, GL_FLOAT, GL_FALSE, 0, opacityArray.data());
@@ -944,7 +924,6 @@ void QGL2PaintEngineExPrivate::fill(const QVectorPath& path)
             }
 
             prepareForDraw(currentBrush.isOpaque());
-            glEnableVertexAttribArray(QT_VERTEX_COORDS_ATTR);
 #ifdef QT_OPENGL_CACHE_AS_VBOS
             glBindBuffer(GL_ARRAY_BUFFER, cache->vbo);
             glVertexAttribPointer(QT_VERTEX_COORDS_ATTR, 2, GL_FLOAT, false, 0, 0);
@@ -1085,10 +1064,8 @@ void QGL2PaintEngineExPrivate::fillStencilWithVertexArray(const float *data,
         glStencilMask(GL_STENCIL_HIGH_BIT);
 #if 0
         glStencilOp(GL_KEEP, GL_KEEP, GL_INVERT); // Simply invert the stencil bit
-        glEnableVertexAttribArray(QT_VERTEX_COORDS_ATTR);
         glVertexAttribPointer(QT_VERTEX_COORDS_ATTR, 2, GL_FLOAT, GL_FALSE, 0, data);
         glDrawArrays(GL_TRIANGLE_STRIP, 0, count);
-        glDisableVertexAttribArray(QT_VERTEX_COORDS_ATTR);
 #else
 
         glStencilOp(GL_KEEP, GL_KEEP, GL_REPLACE);
@@ -1098,10 +1075,8 @@ void QGL2PaintEngineExPrivate::fillStencilWithVertexArray(const float *data,
         } else {
             glStencilFunc(GL_ALWAYS, GL_STENCIL_HIGH_BIT, 0xff);
         }
-        glEnableVertexAttribArray(QT_VERTEX_COORDS_ATTR);
         glVertexAttribPointer(QT_VERTEX_COORDS_ATTR, 2, GL_FLOAT, GL_FALSE, 0, data);
         glDrawArrays(GL_TRIANGLE_STRIP, 0, count);
-        glDisableVertexAttribArray(QT_VERTEX_COORDS_ATTR);
 #endif
     }
 
@@ -1228,12 +1203,8 @@ void QGL2PaintEngineExPrivate::composite(const QGLRect& boundingRect)
         boundingRect.right, boundingRect.top
     };
 
-    glEnableVertexAttribArray(QT_VERTEX_COORDS_ATTR);
     glVertexAttribPointer(QT_VERTEX_COORDS_ATTR, 2, GL_FLOAT, GL_FALSE, 0, rectVerts);
-
     glDrawArrays(GL_TRIANGLE_FAN, 0, 4);
-
-    glDisableVertexAttribArray(QT_VERTEX_COORDS_ATTR);
 }
 
 // Draws the vertex array as a set of <vertexArrayStops.size()> triangle fans.
@@ -1241,7 +1212,6 @@ void QGL2PaintEngineExPrivate::drawVertexArrays(const float *data, int *stops, i
                                                 GLenum primitive)
 {
     // Now setup the pointer to the vertex array:
-    glEnableVertexAttribArray(QT_VERTEX_COORDS_ATTR);
     glVertexAttribPointer(QT_VERTEX_COORDS_ATTR, 2, GL_FLOAT, GL_FALSE, 0, data);
 
     int previousStop = 0;
@@ -1255,7 +1225,6 @@ void QGL2PaintEngineExPrivate::drawVertexArrays(const float *data, int *stops, i
         glDrawArrays(primitive, previousStop, stop - previousStop);
         previousStop = stop;
     }
-    glDisableVertexAttribArray(QT_VERTEX_COORDS_ATTR);
 }
 
 void QGL2PaintEngineExPrivate::prepareDepthRangeForRenderText()
@@ -1364,7 +1333,6 @@ void QGL2PaintEngineExPrivate::stroke(const QVectorPath &path, const QPen &pen)
 
     if (opaque) {
         prepareForDraw(opaque);
-        glEnableVertexAttribArray(QT_VERTEX_COORDS_ATTR);
         glVertexAttribPointer(QT_VERTEX_COORDS_ATTR, 2, GL_FLOAT, false, 0, stroker.vertices());
         glDrawArrays(GL_TRIANGLE_STRIP, 0, stroker.vertexCount() / 2);
 
@@ -1373,8 +1341,6 @@ void QGL2PaintEngineExPrivate::stroke(const QVectorPath &path, const QPen &pen)
 //         d->prepareForDraw(true);
 //         glDrawArrays(GL_LINE_STRIP, 0, d->stroker.vertexCount() / 2);
 
-        glDisableVertexAttribArray(QT_VERTEX_COORDS_ATTR);
-
     } else {
         qreal width = qpen_widthf(pen) / 2;
         if (width == 0)
-- 
cgit v0.12


From 2600fd42117913b427d07e510724b0ea5e355205 Mon Sep 17 00:00:00 2001
From: Yoann Lopes <yoann.lopes@nokia.com>
Date: Wed, 30 Dec 2009 13:44:58 +0100
Subject: Fixes painting artifacts when using CacheBackground in a
 QGraphicsView.

The problem was that when the background cache was invalidated, it was
entirely recreated but only the exposed area of the view was repainted
in it, causing the cache to be partly empty in some cases. Now the
background cache is always fully repainted when it is invalidated.

Task-number: QTBUG-6935
Reviewed-by: ogoffart
---
 src/gui/graphicsview/qgraphicsview.cpp | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/gui/graphicsview/qgraphicsview.cpp b/src/gui/graphicsview/qgraphicsview.cpp
index 3bb40fb..1569078 100644
--- a/src/gui/graphicsview/qgraphicsview.cpp
+++ b/src/gui/graphicsview/qgraphicsview.cpp
@@ -3365,7 +3365,8 @@ void QGraphicsView::paintEvent(QPaintEvent *event)
 #define X11 qt_x11Data
 #endif
                 backgroundPainter.setCompositionMode(QPainter::CompositionMode_Source);
-            drawBackground(&backgroundPainter, exposedSceneRect);
+            QRectF backgroundExposedSceneRect = mapToScene(d->backgroundPixmapExposed.boundingRect()).boundingRect();
+            drawBackground(&backgroundPainter, backgroundExposedSceneRect);
             d->backgroundPixmapExposed = QRegion();
         }
 
-- 
cgit v0.12


From 5394052c422f7087263ad6dc6d6a4448b4c4afba Mon Sep 17 00:00:00 2001
From: Trond Kjernaasen <trond@trolltech.com>
Date: Wed, 30 Dec 2009 14:11:22 +0100
Subject: Fixed QGLWidget::renderText().

Fall back and use the GL 1 engine for the renderText() functions.
Getting it to work with the GL 2 engine is a futile effort.
Making it work with renderPixmap() in the GL 2 engine is not possible
at all, since software contexts in general do not support shader
programs.

Task-number: QTBUG-5002, QTBUG-6931
Reviewed-by: Kim
---
 .../gl2paintengineex/qpaintengineex_opengl2.cpp    | 88 ++--------------------
 .../gl2paintengineex/qpaintengineex_opengl2_p.h    |  9 +--
 src/opengl/qgl.cpp                                 | 25 ++----
 3 files changed, 13 insertions(+), 109 deletions(-)

diff --git a/src/opengl/gl2paintengineex/qpaintengineex_opengl2.cpp b/src/opengl/gl2paintengineex/qpaintengineex_opengl2.cpp
index 90b7214..0f8e945 100644
--- a/src/opengl/gl2paintengineex/qpaintengineex_opengl2.cpp
+++ b/src/opengl/gl2paintengineex/qpaintengineex_opengl2.cpp
@@ -227,11 +227,6 @@ void QGLTextureGlyphCache::resizeTextureData(int width, int height)
 
     pex->transferMode(BrushDrawingMode);
 
-#ifndef QT_OPENGL_ES_2
-    if (pex->inRenderText)
-        glPushAttrib(GL_ENABLE_BIT | GL_VIEWPORT_BIT | GL_SCISSOR_BIT);
-#endif
-
     glDisable(GL_STENCIL_TEST);
     glDisable(GL_DEPTH_TEST);
     glDisable(GL_SCISSOR_TEST);
@@ -276,11 +271,6 @@ void QGLTextureGlyphCache::resizeTextureData(int width, int height)
 
     glViewport(0, 0, pex->width, pex->height);
     pex->updateClipScissorTest();
-
-#ifndef QT_OPENGL_ES_2
-    if (pex->inRenderText)
-        glPopAttrib();
-#endif
 }
 
 void QGLTextureGlyphCache::fillTexture(const Coord &c, glyph_t glyph)
@@ -965,20 +955,11 @@ void QGL2PaintEngineExPrivate::fill(const QVectorPath& path)
             // Pass when high bit is set, replace stencil value with 0
             glStencilFunc(GL_NOTEQUAL, 0, GL_STENCIL_HIGH_BIT);
         }
-
         prepareForDraw(currentBrush.isOpaque());
 
-        if (inRenderText)
-            prepareDepthRangeForRenderText();
-
         // Stencil the brush onto the dest buffer
         composite(vertexCoordinateArray.boundingRect());
-
-        if (inRenderText)
-            restoreDepthRangeForRenderText();
-
         glStencilMask(0);
-
         updateClipScissorTest();
     }
 }
@@ -1017,13 +998,6 @@ void QGL2PaintEngineExPrivate::fillStencilWithVertexArray(const float *data,
     useSimpleShader();
     glEnable(GL_STENCIL_TEST); // For some reason, this has to happen _after_ the simple shader is use()'d
 
-#ifndef QT_OPENGL_ES_2
-    if (inRenderText) {
-        glPushAttrib(GL_ENABLE_BIT);
-        glDisable(GL_DEPTH_TEST);
-    }
-#endif
-
     if (mode == WindingFillMode) {
         Q_ASSERT(stops && !count);
         if (q->state()->clipTestEnabled) {
@@ -1082,12 +1056,6 @@ void QGL2PaintEngineExPrivate::fillStencilWithVertexArray(const float *data,
 
     // Enable color writes & disable stencil writes
     glColorMask(GL_TRUE, GL_TRUE, GL_TRUE, GL_TRUE);
-
-#ifndef QT_OPENGL_ES_2
-    if (inRenderText)
-        glPopAttrib();
-#endif
-
 }
 
 /*
@@ -1227,30 +1195,6 @@ void QGL2PaintEngineExPrivate::drawVertexArrays(const float *data, int *stops, i
     }
 }
 
-void QGL2PaintEngineExPrivate::prepareDepthRangeForRenderText()
-{
-#ifndef QT_OPENGL_ES_2
-    // Get the z translation value from the model view matrix and
-    // transform it using the ortogonal projection with z-near = 0,
-    // and z-far = 1, which is used in QGLWidget::renderText()
-    GLdouble model[4][4];
-    glGetDoublev(GL_MODELVIEW_MATRIX, &model[0][0]);
-    float deviceZ = -2 * model[3][2] - 1;
-
-    glGetFloatv(GL_DEPTH_RANGE, depthRange);
-    float windowZ = depthRange[0] + (deviceZ + 1) * 0.5 * (depthRange[1] - depthRange[0]);
-
-    glDepthRange(windowZ, windowZ);
-#endif
-}
-
-void QGL2PaintEngineExPrivate::restoreDepthRangeForRenderText()
-{
-#ifndef QT_OPENGL_ES_2
-    glDepthRange(depthRange[0], depthRange[1]);
-#endif
-}
-
 /////////////////////////////////// Public Methods //////////////////////////////////////////
 
 QGL2PaintEngineEx::QGL2PaintEngineEx()
@@ -1268,10 +1212,7 @@ void QGL2PaintEngineEx::fill(const QVectorPath &path, const QBrush &brush)
 
     if (qbrush_style(brush) == Qt::NoBrush)
         return;
-
-    if (!d->inRenderText)
-        ensureActive();
-
+    ensureActive();
     d->setBrush(brush);
     d->fill(path);
 }
@@ -1486,8 +1427,7 @@ void QGL2PaintEngineEx::drawTextItem(const QPointF &p, const QTextItem &textItem
 {
     Q_D(QGL2PaintEngineEx);
 
-    if (!d->inRenderText)
-        ensureActive();
+    ensureActive();
     QOpenGL2PaintEngineState *s = state();
 
     const QTextItemInt &ti = static_cast<const QTextItemInt &>(textItem);
@@ -1506,7 +1446,7 @@ void QGL2PaintEngineEx::drawTextItem(const QPointF &p, const QTextItem &textItem
                                             ? QFontEngineGlyphCache::Type(ti.fontEngine->glyphFormat)
                                             : d->glyphCacheType;
 
-    if (d->inRenderText || txtype > QTransform::TxTranslate)
+    if (txtype > QTransform::TxTranslate)
         glyphType = QFontEngineGlyphCache::Raster_A8;
 
     if (glyphType == QFontEngineGlyphCache::Raster_RGBMask
@@ -1548,8 +1488,6 @@ void QGL2PaintEngineExPrivate::drawCachedGlyphs(const QPointF &p, QFontEngineGly
     if (cache->width() == 0 || cache->height() == 0)
         return;
 
-    if (inRenderText)
-        transferMode(BrushDrawingMode);
     transferMode(TextDrawingMode);
 
     int margin = cache->glyphMargin();
@@ -1585,9 +1523,6 @@ void QGL2PaintEngineExPrivate::drawCachedGlyphs(const QPointF &p, QFontEngineGly
     QBrush pensBrush = q->state()->pen.brush();
     setBrush(pensBrush);
 
-    if (inRenderText)
-        prepareDepthRangeForRenderText();
-
     if (glyphType == QFontEngineGlyphCache::Raster_RGBMask) {
 
         // Subpixel antialiasing without gamma correction
@@ -1672,9 +1607,6 @@ void QGL2PaintEngineExPrivate::drawCachedGlyphs(const QPointF &p, QFontEngineGly
 
     shaderManager->currentProgram()->setUniformValue(location(QGLEngineShaderManager::MaskTexture), QT_MASK_TEXTURE_UNIT);
     glDrawArrays(GL_TRIANGLES, 0, 6 * glyphs.size());
-
-    if (inRenderText)
-        restoreDepthRangeForRenderText();
 }
 
 void QGL2PaintEngineEx::drawPixmaps(const QDrawPixmaps::Data *drawingData, int dataCount, const QPixmap &pixmap, QDrawPixmaps::DrawingHints hints)
@@ -1822,11 +1754,9 @@ bool QGL2PaintEngineEx::begin(QPaintDevice *pdev)
 
     d->shaderManager = new QGLEngineShaderManager(d->ctx);
 
-    if (!d->inRenderText) {
-        glDisable(GL_STENCIL_TEST);
-        glDisable(GL_DEPTH_TEST);
-        glDisable(GL_SCISSOR_TEST);
-    }
+    glDisable(GL_STENCIL_TEST);
+    glDisable(GL_DEPTH_TEST);
+    glDisable(GL_SCISSOR_TEST);
 
 #if !defined(QT_OPENGL_ES_2)
     glDisable(GL_MULTISAMPLE);
@@ -2267,12 +2197,6 @@ QPainterState *QGL2PaintEngineEx::createState(QPainterState *orig) const
     return s;
 }
 
-void QGL2PaintEngineEx::setRenderTextActive(bool active)
-{
-    Q_D(QGL2PaintEngineEx);
-    d->inRenderText = active;
-}
-
 QOpenGL2PaintEngineState::QOpenGL2PaintEngineState(QOpenGL2PaintEngineState &other)
     : QPainterState(other)
 {
diff --git a/src/opengl/gl2paintengineex/qpaintengineex_opengl2_p.h b/src/opengl/gl2paintengineex/qpaintengineex_opengl2_p.h
index c94c4f4..9a5c447 100644
--- a/src/opengl/gl2paintengineex/qpaintengineex_opengl2_p.h
+++ b/src/opengl/gl2paintengineex/qpaintengineex_opengl2_p.h
@@ -168,8 +168,7 @@ public:
             ctx(0),
             useSystemClip(true),
             addOffset(false),
-            inverseScale(1),
-            inRenderText(false)
+            inverseScale(1)
     { }
 
     ~QGL2PaintEngineExPrivate();
@@ -215,10 +214,6 @@ public:
         return shaderManager->getUniformLocation(uniform);
     }
 
-
-    void prepareDepthRangeForRenderText();
-    void restoreDepthRangeForRenderText();
-
     void clearClip(uint value);
     void writeClip(const QVectorPath &path, uint value);
     void resetClipIfNeeded();
@@ -228,7 +223,6 @@ public:
     void regenerateClip();
     void systemStateChanged();
 
-
     static QGLEngineShaderManager* shaderManagerForEngine(QGL2PaintEngineEx *engine) { return engine->d_func()->shaderManager; }
     static QGL2PaintEngineExPrivate *getData(QGL2PaintEngineEx *engine) { return engine->d_func(); }
     static void cleanupVectorPath(QPaintEngineEx *engine, void *data);
@@ -273,7 +267,6 @@ public:
     GLuint lastTextureUsed;
 
     bool needsSync;
-    bool inRenderText;
     bool multisamplingAlwaysEnabled;
 
     GLfloat depthRange[2];
diff --git a/src/opengl/qgl.cpp b/src/opengl/qgl.cpp
index 5bb62f7..f5e46de 100644
--- a/src/opengl/qgl.cpp
+++ b/src/opengl/qgl.cpp
@@ -4409,9 +4409,9 @@ void QGLWidget::renderText(int x, int y, const QString &str, const QFont &font,
     int height = d->glcx->device()->height();
     bool auto_swap = autoBufferSwap();
 
+    QPaintEngine::Type oldEngineType = qgl_engine_selector()->preferredPaintEngine();
+    qgl_engine_selector()->setPreferredPaintEngine(QPaintEngine::OpenGL);
     QPaintEngine *engine = paintEngine();
-    if (engine->type() == QPaintEngine::OpenGL2)
-        static_cast<QGL2PaintEngineEx *>(engine)->setRenderTextActive(true);
     QPainter *p;
     bool reuse_painter = false;
     if (engine->isActive()) {
@@ -4431,11 +4431,6 @@ void QGLWidget::renderText(int x, int y, const QString &str, const QFont &font,
         setAutoBufferSwap(false);
         // disable glClear() as a result of QPainter::begin()
         d->disable_clear_on_painter_begin = true;
-        if (engine->type() == QPaintEngine::OpenGL2) {
-            qt_save_gl_state();
-            glMatrixMode(GL_MODELVIEW);
-            glLoadIdentity();
-        }
         p = new QPainter(this);
     }
 
@@ -4459,11 +4454,8 @@ void QGLWidget::renderText(int x, int y, const QString &str, const QFont &font,
         delete p;
         setAutoBufferSwap(auto_swap);
         d->disable_clear_on_painter_begin = false;
-        if (engine->type() == QPaintEngine::OpenGL2)
-            qt_restore_gl_state();
     }
-    if (engine->type() == QPaintEngine::OpenGL2)
-        static_cast<QGL2PaintEngineEx *>(engine)->setRenderTextActive(false);
+    qgl_engine_selector()->setPreferredPaintEngine(oldEngineType);
 #else // QT_OPENGL_ES
     Q_UNUSED(x);
     Q_UNUSED(y);
@@ -4511,9 +4503,9 @@ void QGLWidget::renderText(double x, double y, double z, const QString &str, con
                 &win_x, &win_y, &win_z);
     win_y = height - win_y; // y is inverted
 
+    QPaintEngine::Type oldEngineType = qgl_engine_selector()->preferredPaintEngine();
+    qgl_engine_selector()->setPreferredPaintEngine(QPaintEngine::OpenGL);
     QPaintEngine *engine = paintEngine();
-    if (engine->type() == QPaintEngine::OpenGL2)
-        static_cast<QGL2PaintEngineEx *>(engine)->setRenderTextActive(true);
     QPainter *p;
     bool reuse_painter = false;
     bool use_depth_testing = glIsEnabled(GL_DEPTH_TEST);
@@ -4527,8 +4519,6 @@ void QGLWidget::renderText(double x, double y, double z, const QString &str, con
         setAutoBufferSwap(false);
         // disable glClear() as a result of QPainter::begin()
         d->disable_clear_on_painter_begin = true;
-        if (engine->type() == QPaintEngine::OpenGL2)
-            qt_save_gl_state();
         p = new QPainter(this);
     }
 
@@ -4557,13 +4547,10 @@ void QGLWidget::renderText(double x, double y, double z, const QString &str, con
     } else {
         p->end();
         delete p;
-        if (engine->type() == QPaintEngine::OpenGL2)
-            qt_restore_gl_state();
         setAutoBufferSwap(auto_swap);
         d->disable_clear_on_painter_begin = false;
     }
-    if (engine->type() == QPaintEngine::OpenGL2)
-        static_cast<QGL2PaintEngineEx *>(engine)->setRenderTextActive(false);
+    qgl_engine_selector()->setPreferredPaintEngine(oldEngineType);
 #else // QT_OPENGL_ES
     Q_UNUSED(x);
     Q_UNUSED(y);
-- 
cgit v0.12


From f005fb5b15eb387edb1a0d1da91639ac4cc1e67b Mon Sep 17 00:00:00 2001
From: jianliang79 <jianliang79@gmail.com>
Date: Wed, 30 Dec 2009 13:58:22 +0100
Subject: fix a memory leak in QGLEngineSharedShaders

Merge-request: 412
Reviewed-by: Tom Cooksey <thomas.cooksey@nokia.com>
---
 src/opengl/gl2paintengineex/qglengineshadermanager.cpp | 7 +++++++
 src/opengl/gl2paintengineex/qglengineshadermanager_p.h | 1 +
 2 files changed, 8 insertions(+)

diff --git a/src/opengl/gl2paintengineex/qglengineshadermanager.cpp b/src/opengl/gl2paintengineex/qglengineshadermanager.cpp
index da33eb3..b026e29 100644
--- a/src/opengl/gl2paintengineex/qglengineshadermanager.cpp
+++ b/src/opengl/gl2paintengineex/qglengineshadermanager.cpp
@@ -218,6 +218,13 @@ QGLEngineSharedShaders::QGLEngineSharedShaders(const QGLContext* context)
 
 }
 
+QGLEngineSharedShaders::~QGLEngineSharedShaders()
+{
+    QList<QGLEngineShaderProg*>::iterator itr;
+    for (itr = cachedPrograms.begin(); itr != cachedPrograms.end(); ++itr)
+        delete *itr;
+}
+
 #if defined (QT_DEBUG)
 QByteArray QGLEngineSharedShaders::snippetNameStr(SnippetName name)
 {
diff --git a/src/opengl/gl2paintengineex/qglengineshadermanager_p.h b/src/opengl/gl2paintengineex/qglengineshadermanager_p.h
index a132e1b..a3464d4 100644
--- a/src/opengl/gl2paintengineex/qglengineshadermanager_p.h
+++ b/src/opengl/gl2paintengineex/qglengineshadermanager_p.h
@@ -344,6 +344,7 @@ public:
 */
 
     QGLEngineSharedShaders(const QGLContext *context);
+    ~QGLEngineSharedShaders();
 
     QGLShaderProgram *simpleProgram() { return simpleShaderProg; }
     QGLShaderProgram *blitProgram() { return blitShaderProg; }
-- 
cgit v0.12


From f953b7c40c28a5728125ba72b091d8b384e8858a Mon Sep 17 00:00:00 2001
From: Tom Cooksey <thomas.cooksey@nokia.com>
Date: Wed, 30 Dec 2009 14:32:58 +0100
Subject: Also delete blitShader & simpleShader in ~QGLEngineSharedShaders

Reviewed-By: Trustme
---
 src/opengl/gl2paintengineex/qglengineshadermanager.cpp | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/src/opengl/gl2paintengineex/qglengineshadermanager.cpp b/src/opengl/gl2paintengineex/qglengineshadermanager.cpp
index b026e29..326ea1f 100644
--- a/src/opengl/gl2paintengineex/qglengineshadermanager.cpp
+++ b/src/opengl/gl2paintengineex/qglengineshadermanager.cpp
@@ -223,6 +223,16 @@ QGLEngineSharedShaders::~QGLEngineSharedShaders()
     QList<QGLEngineShaderProg*>::iterator itr;
     for (itr = cachedPrograms.begin(); itr != cachedPrograms.end(); ++itr)
         delete *itr;
+
+    if (blitShaderProg) {
+        delete blitShaderProg;
+        blitShaderProg = 0;
+    }
+
+    if (simpleShaderProg) {
+        delete simpleShaderProg;
+        simpleShaderProg = 0;
+    }
 }
 
 #if defined (QT_DEBUG)
-- 
cgit v0.12


From 51c4571caf5d5ffb2545106df47d7c399b3e228b Mon Sep 17 00:00:00 2001
From: Pierre Rossi <pierre.rossi@nokia.com>
Date: Wed, 30 Dec 2009 14:38:59 +0100
Subject: Fix background brush for character format when writing to ODF
 document.

Task-number: QTBUG-7047
Reviewed-by: Benjamin Poulain
---
 src/gui/text/qtextodfwriter.cpp                  | 9 ++++++++-
 tests/auto/qtextodfwriter/tst_qtextodfwriter.cpp | 4 ++++
 2 files changed, 12 insertions(+), 1 deletion(-)

diff --git a/src/gui/text/qtextodfwriter.cpp b/src/gui/text/qtextodfwriter.cpp
index 1bd4dd6..5822d92 100644
--- a/src/gui/text/qtextodfwriter.cpp
+++ b/src/gui/text/qtextodfwriter.cpp
@@ -484,6 +484,10 @@ void QTextOdfWriter::writeBlockFormat(QXmlStreamWriter &writer, QTextBlockFormat
         if (format.pageBreakPolicy() & QTextFormat::PageBreak_AlwaysAfter)
             writer.writeAttribute(foNS, QString::fromLatin1("break-after"), QString::fromLatin1("page"));
     }
+    if (format.hasProperty(QTextFormat::BackgroundBrush)) {
+        QBrush brush = format.background();
+        writer.writeAttribute(foNS, QString::fromLatin1("background-color"), brush.color().name());
+    }
     if (format.hasProperty(QTextFormat::BlockNonBreakableLines))
         writer.writeAttribute(foNS, QString::fromLatin1("keep-together"),
                 format.nonBreakableLines() ? QString::fromLatin1("true") : QString::fromLatin1("false"));
@@ -610,9 +614,12 @@ void QTextOdfWriter::writeCharacterFormat(QXmlStreamWriter &writer, QTextCharFor
     }
     if (format.hasProperty(QTextFormat::ForegroundBrush)) {
         QBrush brush = format.foreground();
-        // TODO
         writer.writeAttribute(foNS, QString::fromLatin1("color"), brush.color().name());
     }
+    if (format.hasProperty(QTextFormat::BackgroundBrush)) {
+        QBrush brush = format.background();
+        writer.writeAttribute(foNS, QString::fromLatin1("background-color"), brush.color().name());
+    }
 
     writer.writeEndElement(); // style
 }
diff --git a/tests/auto/qtextodfwriter/tst_qtextodfwriter.cpp b/tests/auto/qtextodfwriter/tst_qtextodfwriter.cpp
index cfcbcfb..a61de99 100644
--- a/tests/auto/qtextodfwriter/tst_qtextodfwriter.cpp
+++ b/tests/auto/qtextodfwriter/tst_qtextodfwriter.cpp
@@ -175,6 +175,10 @@ void tst_QTextOdfWriter::testWriteStyle1_data()
         "<style:style style:name=\"c4\" style:family=\"text\"><style:text-properties fo:font-style=\"italic\" fo:font-family=\"Sans\"/></style:style>";
     QTest::newRow("bold+italic") << text1 << 25 <<
         "<style:style style:name=\"c4\" style:family=\"text\"><style:text-properties fo:font-style=\"italic\" fo:font-weight=\"bold\" fo:font-family=\"Sans\"/></style:style>";
+    QString colorText = "<span style=\"color: #00FF00; background-color: #FF0000;\"> Color Text </span>";
+    QTest::newRow("green/red") << colorText  << 3 <<
+        "<style:style style:name=\"c4\" style:family=\"text\"><style:text-properties fo:font-family=\"Sans\" fo:color=\"#00ff00\" fo:background-color=\"#ff0000\"/></style:style>";
+
 }
 
 void tst_QTextOdfWriter::testWriteStyle1()
-- 
cgit v0.12


From cd63a4c50ecfca56bb7685fc40b084f830156c02 Mon Sep 17 00:00:00 2001
From: Michael Fairman <mfairman@teslamotors.com>
Date: Wed, 30 Dec 2009 15:05:59 +0100
Subject: Fix configure's error message to report correct OpenGL qmake vars

e.g. QMAKE_INCDIR_OPENGL_ES2

Merge-request: 2279
Reviewed-by: Tom Cooksey <thomas.cooksey@nokia.com>
---
 configure | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/configure b/configure
index 22e6bd4..cf9f06a 100755
--- a/configure
+++ b/configure
@@ -5107,7 +5107,7 @@ if [ "$PLATFORM_X11" = "yes" ]; then
         if [ $? != "0" ]; then
 	    echo "The OpenGL ES 1.x Common Lite Profile functionality test failed!"
             echo " You might need to modify the include and library search paths by editing"
-            echo " QMAKE_INCDIR_OPENGL, QMAKE_LIBDIR_OPENGL and QMAKE_LIBS_OPENGL in"
+            echo " QMAKE_INCDIR_OPENGL_ES1CL, QMAKE_LIBDIR_OPENGL_ES1CL and QMAKE_LIBS_OPENGL_ES1CL in"
             echo " ${XQMAKESPEC}."
             exit 1
         fi
@@ -5117,7 +5117,7 @@ if [ "$PLATFORM_X11" = "yes" ]; then
         if [ $? != "0" ]; then
 	    echo "The OpenGL ES 1.x functionality test failed!"
             echo " You might need to modify the include and library search paths by editing"
-            echo " QMAKE_INCDIR_OPENGL, QMAKE_LIBDIR_OPENGL and QMAKE_LIBS_OPENGL in"
+            echo " QMAKE_INCDIR_OPENGL_ES1, QMAKE_LIBDIR_OPENGL_ES1 and QMAKE_LIBS_OPENGL_ES1 in"
             echo " ${XQMAKESPEC}."
             exit 1
         fi
@@ -5127,7 +5127,7 @@ if [ "$PLATFORM_X11" = "yes" ]; then
         if [ $? != "0" ]; then
 	    echo "The OpenGL ES 2.0 functionality test failed!"
             echo " You might need to modify the include and library search paths by editing"
-            echo " QMAKE_INCDIR_OPENGL, QMAKE_LIBDIR_OPENGL and QMAKE_LIBS_OPENGL in"
+            echo " QMAKE_INCDIR_OPENGL_ES2, QMAKE_LIBDIR_OPENGL_ES2 and QMAKE_LIBS_OPENGL_ES2 in"
             echo " ${XQMAKESPEC}."
             exit 1
         fi
-- 
cgit v0.12


From fbccab463a8bd77d66adb9f96a67037f73f0019d Mon Sep 17 00:00:00 2001
From: Rhys Weatherley <rhys.weatherley@nokia.com>
Date: Mon, 4 Jan 2010 11:15:52 +1000
Subject: Reset the OpenVG scissor after a native painting call-out

Task-number: QTBUG-7051
Reviewed-by: Daniel Pope
---
 src/openvg/qpaintengine_vg.cpp | 13 +++++++++++--
 1 file changed, 11 insertions(+), 2 deletions(-)

diff --git a/src/openvg/qpaintengine_vg.cpp b/src/openvg/qpaintengine_vg.cpp
index 04fee08..c6ff627 100644
--- a/src/openvg/qpaintengine_vg.cpp
+++ b/src/openvg/qpaintengine_vg.cpp
@@ -200,6 +200,7 @@ public:
 
     QRegion scissorRegion;  // Currently active scissor region.
     bool scissorActive;     // True if scissor region is active.
+    bool scissorDirty;      // True if scissor is dirty after native painting.
 
     QPaintEngine::DirtyFlags dirty;
 
@@ -357,6 +358,7 @@ void QVGPaintEnginePrivate::init()
     rawVG = false;
 
     scissorActive = false;
+    scissorDirty = false;
 
     dirty = 0;
 
@@ -2083,6 +2085,7 @@ void QVGPaintEngine::updateScissor()
             // so there is no point doing any scissoring.
             vgSeti(VG_SCISSORING, VG_FALSE);
             d->scissorActive = false;
+            d->scissorDirty = false;
             return;
         }
     } else
@@ -2100,6 +2103,7 @@ void QVGPaintEngine::updateScissor()
                 // so there is no point doing any scissoring.
                 vgSeti(VG_SCISSORING, VG_FALSE);
                 d->scissorActive = false;
+                d->scissorDirty = false;
                 return;
             }
         } else
@@ -2109,11 +2113,12 @@ void QVGPaintEngine::updateScissor()
         if (region.isEmpty()) {
             vgSeti(VG_SCISSORING, VG_FALSE);
             d->scissorActive = false;
+            d->scissorDirty = false;
             return;
         }
     }
 
-    if (d->scissorActive && region == d->scissorRegion)
+    if (d->scissorActive && region == d->scissorRegion && !d->scissorDirty)
         return;
 
     QVector<QRect> rects = region.rects();
@@ -2131,6 +2136,7 @@ void QVGPaintEngine::updateScissor()
 
     vgSetiv(VG_SCISSOR_RECTS, count * 4, params.data());
     vgSeti(VG_SCISSORING, VG_TRUE);
+    d->scissorDirty = false;
     d->scissorActive = true;
     d->scissorRegion = region;
 }
@@ -3333,6 +3339,7 @@ void QVGPaintEngine::endNativePainting()
     d->brushType = (VGPaintType)0;
     d->clearColor = QColor();
     d->fillPaint = d->brushPaint;
+    d->scissorDirty = true;
     restoreState(QPaintEngine::AllDirty);
     d->dirty = dirty;
     d->rawVG = false;
@@ -3666,15 +3673,17 @@ void QVGCompositionHelper::setScissor(const QRegion& region)
 
     vgSetiv(VG_SCISSOR_RECTS, count * 4, params.data());
     vgSeti(VG_SCISSORING, VG_TRUE);
+    d->scissorDirty = false;
     d->scissorActive = true;
     d->scissorRegion = region;
 }
 
 void QVGCompositionHelper::clearScissor()
 {
-    if (d->scissorActive) {
+    if (d->scissorActive || d->scissorDirty) {
         vgSeti(VG_SCISSORING, VG_FALSE);
         d->scissorActive = false;
+        d->scissorDirty = false;
     }
 }
 
-- 
cgit v0.12


From b0e7ef2aa62a123b51920b8f0a08af07a9cd9d09 Mon Sep 17 00:00:00 2001
From: Rhys Weatherley <rhys.weatherley@nokia.com>
Date: Mon, 4 Jan 2010 11:32:37 +1000
Subject: Avoid deep QImage copies in the OpenVG paint engine

Task-number: QTBUG-7015
Reviewed-by: Daniel Pope
---
 src/openvg/qpaintengine_vg.cpp | 19 +++++++++++--------
 src/openvg/qpixmapdata_vg.cpp  |  2 +-
 2 files changed, 12 insertions(+), 9 deletions(-)

diff --git a/src/openvg/qpaintengine_vg.cpp b/src/openvg/qpaintengine_vg.cpp
index c6ff627..117c910 100644
--- a/src/openvg/qpaintengine_vg.cpp
+++ b/src/openvg/qpaintengine_vg.cpp
@@ -986,6 +986,9 @@ static QImage colorizeBitmap(const QImage &image, const QColor &color)
     return dest;
 }
 
+// defined in qpixmapdata_vg.cpp.
+const uchar *qt_vg_imageBits(const QImage& image);
+
 static VGImage toVGImage
     (const QImage & image, Qt::ImageConversionFlags flags = Qt::AutoColor)
 {
@@ -1019,7 +1022,7 @@ static VGImage toVGImage
         break;
     }
 
-    const uchar *pixels = img.bits();
+    const uchar *pixels = qt_vg_imageBits(img);
 
     VGImage vgImg = QVGImagePool::instance()->createPermanentImage
         (format, img.width(), img.height(), VG_IMAGE_QUALITY_FASTER);
@@ -1063,7 +1066,7 @@ static VGImage toVGImageSubRect
         break;
     }
 
-    const uchar *pixels = img.bits() + bpp * sr.x() +
+    const uchar *pixels = qt_vg_imageBits(img) + bpp * sr.x() +
                           img.bytesPerLine() * sr.y();
 
     VGImage vgImg = QVGImagePool::instance()->createPermanentImage
@@ -1085,7 +1088,7 @@ static VGImage toVGImageWithOpacity(const QImage & image, qreal opacity)
     painter.drawImage(0, 0, image);
     painter.end();
 
-    const uchar *pixels = img.bits();
+    const uchar *pixels = qt_vg_imageBits(img);
 
     VGImage vgImg = QVGImagePool::instance()->createPermanentImage
         (VG_sARGB_8888_PRE, img.width(), img.height(), VG_IMAGE_QUALITY_FASTER);
@@ -1107,7 +1110,7 @@ static VGImage toVGImageWithOpacitySubRect
     painter.drawImage(QPoint(0, 0), image, sr);
     painter.end();
 
-    const uchar *pixels = img.bits();
+    const uchar *pixels = qt_vg_imageBits(img);
 
     VGImage vgImg = QVGImagePool::instance()->createPermanentImage
         (VG_sARGB_8888_PRE, img.width(), img.height(), VG_IMAGE_QUALITY_FASTER);
@@ -3172,15 +3175,15 @@ void QVGFontGlyphCache::cacheGlyphs
         if (!scaledImage.isNull()) {  // Not a space character
             if (scaledImage.format() == QImage::Format_Indexed8) {
                 vgImage = vgCreateImage(VG_A_8, scaledImage.width(), scaledImage.height(), VG_IMAGE_QUALITY_FASTER);
-                vgImageSubData(vgImage, scaledImage.bits(), scaledImage.bytesPerLine(), VG_A_8, 0, 0, scaledImage.width(), scaledImage.height());
+                vgImageSubData(vgImage, qt_vg_imageBits(scaledImage), scaledImage.bytesPerLine(), VG_A_8, 0, 0, scaledImage.width(), scaledImage.height());
             } else if (scaledImage.format() == QImage::Format_Mono) {
                 QImage img = scaledImage.convertToFormat(QImage::Format_Indexed8);
                 vgImage = vgCreateImage(VG_A_8, img.width(), img.height(), VG_IMAGE_QUALITY_FASTER);
-                vgImageSubData(vgImage, img.bits(), img.bytesPerLine(), VG_A_8, 0, 0, img.width(), img.height());
+                vgImageSubData(vgImage, qt_vg_imageBits(img), img.bytesPerLine(), VG_A_8, 0, 0, img.width(), img.height());
             } else {
                 QImage img = scaledImage.convertToFormat(QImage::Format_ARGB32_Premultiplied);
                 vgImage = vgCreateImage(VG_sARGB_8888_PRE, img.width(), img.height(), VG_IMAGE_QUALITY_FASTER);
-                vgImageSubData(vgImage, img.bits(), img.bytesPerLine(), VG_sARGB_8888_PRE, 0, 0, img.width(), img.height());
+                vgImageSubData(vgImage, qt_vg_imageBits(img), img.bytesPerLine(), VG_sARGB_8888_PRE, 0, 0, img.width(), img.height());
             }
         }
         origin[0] = -metrics.x.toReal() + 0.5f;
@@ -3647,7 +3650,7 @@ void QVGCompositionHelper::drawCursorPixmap
         if (vgImage == VG_INVALID_HANDLE)
             return;
         vgImageSubData
-            (vgImage, img.bits() + img.bytesPerLine() * (img.height() - 1),
+            (vgImage, qt_vg_imageBits(img) + img.bytesPerLine() * (img.height() - 1),
              -(img.bytesPerLine()), VG_sARGB_8888_PRE, 0, 0,
              img.width(), img.height());
 
diff --git a/src/openvg/qpixmapdata_vg.cpp b/src/openvg/qpixmapdata_vg.cpp
index 358ec4d..7de2212 100644
--- a/src/openvg/qpixmapdata_vg.cpp
+++ b/src/openvg/qpixmapdata_vg.cpp
@@ -232,7 +232,7 @@ QPaintEngine* QVGPixmapData::paintEngine() const
 // This function works around QImage::bits() making a deep copy if the
 // QImage is not const.  We force it to be const and then get the bits.
 // XXX: Should add a QImage::constBits() in the future to replace this.
-static inline const uchar *qt_vg_imageBits(const QImage& image)
+const uchar *qt_vg_imageBits(const QImage& image)
 {
     return image.bits();
 }
-- 
cgit v0.12


From eb94abb952114e826e02ba4562d9048e77f46644 Mon Sep 17 00:00:00 2001
From: Anders Bakken <anders.bakken@nokia.com>
Date: Wed, 30 Dec 2009 16:16:59 -0800
Subject: Set serial number in QX11PixmapData::transformed

QX11PixmapData::transformed initializes a new QX11PixmapData object but
doesn't set its serial number.

Reviewed-by: Donald Carr <donald.carr@nokia.com>
---
 src/gui/image/qpixmap_x11.cpp | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/gui/image/qpixmap_x11.cpp b/src/gui/image/qpixmap_x11.cpp
index 7008fbd..f3947ff 100644
--- a/src/gui/image/qpixmap_x11.cpp
+++ b/src/gui/image/qpixmap_x11.cpp
@@ -1932,6 +1932,8 @@ QPixmap QX11PixmapData::transformed(const QTransform &transform,
         x11Data->hd = (Qt::HANDLE)XCreatePixmap(X11->display,
                                                 RootWindow(X11->display, xinfo.screen()),
                                                 w, h, d);
+        x11Data->setSerialNumber(++qt_pixmap_serial);
+
 #ifndef QT_NO_XRENDER
         if (X11->use_xrender) {
             XRenderPictFormat *format = x11Data->d == 32
-- 
cgit v0.12


From d1846e00155a1555baf9927a66e7f5de9fc08940 Mon Sep 17 00:00:00 2001
From: Tom Cooksey <thomas.cooksey@nokia.com>
Date: Sat, 2 Jan 2010 17:05:45 +0100
Subject: New lance test for checking aliased vs antialiased rendering

This test renders various primitives with anti-aliasing both on and
off. It then repeats the render at several non-integer offsets.

Note: The reference image was generated with the raster engine,
which seems to have off-by-one errors on fills when rendering
aliased (It seems to ceil the coords rather than round them).

Reviewed-By: Trustme
---
 tests/arthur/data/qps/aliasing.qps     | 156 +++++++++++++++++++++++++++++++++
 tests/arthur/data/qps/aliasing_qps.png | Bin 0 -> 30531 bytes
 2 files changed, 156 insertions(+)
 create mode 100644 tests/arthur/data/qps/aliasing.qps
 create mode 100644 tests/arthur/data/qps/aliasing_qps.png

diff --git a/tests/arthur/data/qps/aliasing.qps b/tests/arthur/data/qps/aliasing.qps
new file mode 100644
index 0000000..59878f9
--- /dev/null
+++ b/tests/arthur/data/qps/aliasing.qps
@@ -0,0 +1,156 @@
+
+path_moveTo convexPath 25 0
+path_lineTo convexPath 50 50
+path_lineTo convexPath 25 25
+path_lineTo convexPath 0  50
+path_closeSubpath convexPath
+
+pixmap_load border.png pixmap
+
+setRenderHint LineAntialiasing false
+translate 10 10
+
+begin_block drawing
+    setPen black 1
+    setBrush 7f7fff
+    drawPath convexPath
+
+    setFont "monospace" 8
+    setPen black
+    drawText 0 68 "QwErTy@"
+
+
+    setPen black 1
+    setBrush 7f7fff
+    drawRect 0 80 10 5
+
+    setPen black 1
+    setBrush noBrush
+    drawRect 20 80 10 5
+
+    setPen noPen
+    setBrush 7f7fff
+    drawRect 40 80 10 5
+
+
+    setPen black 2
+    setBrush 7f7fff
+    drawRect 0 90 10 5
+
+    setPen black 2
+    setBrush noBrush
+    drawRect 20 90 10 5
+
+    setPen noPen
+    setBrush 7f7fff
+    drawRect 40 90 10 5
+
+
+    setPen black 3
+    setBrush 7f7fff
+    drawRect 0 100 10 5
+
+    setPen black 3
+    setBrush noBrush
+    drawRect 20 100 10 5
+
+    setPen noPen
+    setBrush 7f7fff
+    drawRect 40 100 10 5
+
+
+    setPen black 1
+    setBrush noBrush
+    drawLine 10 110 20 120
+    drawLine 30 120 40 110
+
+    setPen black 2
+    setBrush noBrush
+    drawLine 10 120 20 130
+    drawLine 30 130 40 120
+
+    setPen black 3
+    setBrush noBrush
+    drawLine 10 130 20 140
+    drawLine 30 140 40 130
+
+    drawPixmap pixmap 0 150
+
+    setRenderHint SmoothPixmapTransform false
+    drawPixmap pixmap 20 150 15 15   0 0 10 10
+
+end_block
+
+translate 0 180
+setRenderHint LineAntialiasing true
+repeat_block drawing
+drawText 15 185 "0.0"
+
+resetMatrix
+translate 70.2 10.2
+setRenderHint LineAntialiasing false
+repeat_block drawing
+translate 0 180
+setRenderHint LineAntialiasing true
+repeat_block drawing
+translate -0.2 -0.2
+drawText 15 185 "0.2"
+
+
+resetMatrix
+translate 130.4 10.4
+setRenderHint LineAntialiasing false
+repeat_block drawing
+translate 0 180
+setRenderHint LineAntialiasing true
+repeat_block drawing
+translate -0.4 -0.4
+drawText 15 185 "0.4"
+
+
+resetMatrix
+translate 190.5 10.5
+setRenderHint LineAntialiasing false
+repeat_block drawing
+translate 0 180
+setRenderHint LineAntialiasing true
+repeat_block drawing
+translate -0.5 -0.5
+drawText 15 185 "0.5"
+
+
+resetMatrix
+translate 250.6 10.6
+setRenderHint LineAntialiasing false
+repeat_block drawing
+translate 0 180
+setRenderHint LineAntialiasing true
+repeat_block drawing
+translate -0.6 -0.6
+drawText 15 185 "0.6"
+
+
+resetMatrix
+translate 310.8 10.8
+setRenderHint LineAntialiasing false
+repeat_block drawing
+translate 0 180
+setRenderHint LineAntialiasing true
+repeat_block drawing
+translate -0.8 -0.8
+drawText 15 185 "0.8"
+
+
+resetMatrix
+translate 371 11
+setRenderHint LineAntialiasing false
+repeat_block drawing
+translate 0 180
+setRenderHint LineAntialiasing true
+repeat_block drawing
+drawText 15 185 "1.0"
+
+
+resetMatrix
+drawText 430 95 "Aliased"
+drawText 430 275 "Anti-Aliased"
\ No newline at end of file
diff --git a/tests/arthur/data/qps/aliasing_qps.png b/tests/arthur/data/qps/aliasing_qps.png
new file mode 100644
index 0000000..183129b
Binary files /dev/null and b/tests/arthur/data/qps/aliasing_qps.png differ
-- 
cgit v0.12


From e3e0a7acd42101a9abeb1dab53d4e03940bcebaa Mon Sep 17 00:00:00 2001
From: Anders Bakken <anders.bakken@nokia.com>
Date: Wed, 30 Dec 2009 16:24:45 -0800
Subject: Set serial number in QDFBPixmapData::transformed

QDirectFBPixmapData::transformed initializes a new QDirectFBPixmapData object
but doesn't set its serial number.

Reviewed-by: Donald Carr <donald.carr@nokia.com>
---
 src/plugins/gfxdrivers/directfb/qdirectfbpixmap.cpp | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/plugins/gfxdrivers/directfb/qdirectfbpixmap.cpp b/src/plugins/gfxdrivers/directfb/qdirectfbpixmap.cpp
index b15888b..e78966c 100644
--- a/src/plugins/gfxdrivers/directfb/qdirectfbpixmap.cpp
+++ b/src/plugins/gfxdrivers/directfb/qdirectfbpixmap.cpp
@@ -470,6 +470,7 @@ QPixmap QDirectFBPixmapData::transformed(const QTransform &transform,
         return QPixmap();
 
     QDirectFBPixmapData *data = new QDirectFBPixmapData(screen, QPixmapData::PixmapType);
+    data->setSerialNumber(++global_ser_no);
     DFBSurfaceBlittingFlags flags = DSBLIT_NOFX;
     data->alpha = alpha;
     if (alpha) {
-- 
cgit v0.12


From cdebdfc7964df6b19f8bd520335a8645c1a125e6 Mon Sep 17 00:00:00 2001
From: Anders Bakken <anders.bakken@nokia.com>
Date: Sun, 3 Jan 2010 12:56:16 -0800
Subject: Make stretchblit an opt-out option in DirectFB

Certain boards are not support StretchBlit very well. This patch enables
them to define QT_NO_DIRECTFB_STRETCHBLIT to fall back to the raster
engine for stretchblits.

Reviewed-by: Donald Carr <donald.carr@nokia.com>
---
 src/gui/embedded/directfb.pri                      |  1 +
 .../gfxdrivers/directfb/qdirectfbpaintengine.cpp   | 36 +++++++++++++++-------
 src/plugins/gfxdrivers/directfb/qdirectfbscreen.h  |  3 ++
 3 files changed, 29 insertions(+), 11 deletions(-)

diff --git a/src/gui/embedded/directfb.pri b/src/gui/embedded/directfb.pri
index 84253b5..bd1d947 100644
--- a/src/gui/embedded/directfb.pri
+++ b/src/gui/embedded/directfb.pri
@@ -14,6 +14,7 @@
 #DEFINES += QT_NO_DIRECTFB_KEYBOARD
 #DEFINES += QT_DIRECTFB_TIMING
 #DEFINES += QT_NO_DIRECTFB_OPAQUE_DETECTION
+#DEFINES += QT_NO_DIRECTFB_STRETCHBLIT
 #DIRECTFB_DRAWINGOPERATIONS=DRAW_RECTS|DRAW_LINES|DRAW_IMAGE|DRAW_PIXMAP|DRAW_TILED_PIXMAP|STROKE_PATH|DRAW_PATH|DRAW_POINTS|DRAW_ELLIPSE|DRAW_POLYGON|DRAW_TEXT|FILL_PATH|FILL_RECT|DRAW_COLORSPANS|DRAW_ROUNDED_RECT
 #DEFINES += \"QT_DIRECTFB_WARN_ON_RASTERFALLBACKS=$$DIRECTFB_DRAWINGOPERATIONS\"
 #DEFINES += \"QT_DIRECTFB_DISABLE_RASTERFALLBACKS=$$DIRECTFB_DRAWINGOPERATIONS\"
diff --git a/src/plugins/gfxdrivers/directfb/qdirectfbpaintengine.cpp b/src/plugins/gfxdrivers/directfb/qdirectfbpaintengine.cpp
index c86af73..47b8786 100644
--- a/src/plugins/gfxdrivers/directfb/qdirectfbpaintengine.cpp
+++ b/src/plugins/gfxdrivers/directfb/qdirectfbpaintengine.cpp
@@ -103,6 +103,8 @@ public:
     void drawTiledPixmap(const QRectF &dest, const QPixmap &pixmap, const QPointF &pos);
     void blit(const QRectF &dest, IDirectFBSurface *surface, const QRectF &src);
 
+    inline bool supportsStretchBlit() const;
+
     inline void updateClip();
     virtual void systemStateChanged();
 
@@ -526,11 +528,12 @@ void QDirectFBPaintEngine::drawImage(const QRectF &r, const QImage &image,
 #if !defined QT_NO_DIRECTFB_PREALLOCATED || defined QT_DIRECTFB_IMAGECACHE
     if (!(d->compositionModeStatus & QDirectFBPaintEnginePrivate::PorterDuff_SupportedBlits)
         || (d->transformationType & QDirectFBPaintEnginePrivate::Matrix_BlitsUnsupported)
-        || d->clipType == QDirectFBPaintEnginePrivate::ComplexClip
+        || (d->clipType == QDirectFBPaintEnginePrivate::ComplexClip)
+        || (!d->supportsStretchBlit() && state()->matrix.mapRect(r).size() != sr.size())
 #ifndef QT_DIRECTFB_IMAGECACHE
-        || QDirectFBScreen::getSurfacePixelFormat(image.format()) == DSPF_UNKNOWN
+        || (QDirectFBScreen::getSurfacePixelFormat(image.format()) == DSPF_UNKNOWN)
 #elif defined QT_NO_DIRECTFB_PREALLOCATED
-        || QDirectFBPaintEnginePrivate::cacheCost(image) > imageCache.maxCost()
+        || (QDirectFBPaintEnginePrivate::cacheCost(image) > imageCache.maxCost())
 #endif
         )
 #endif
@@ -573,10 +576,9 @@ void QDirectFBPaintEngine::drawPixmap(const QRectF &r, const QPixmap &pixmap,
         Q_ASSERT(data->classId() == QPixmapData::DirectFBClass);
         QDirectFBPixmapData *dfbData = static_cast<QDirectFBPixmapData*>(data);
         if (!(d->compositionModeStatus & QDirectFBPaintEnginePrivate::PorterDuff_SupportedBlits)
-               || (d->transformationType & QDirectFBPaintEnginePrivate::Matrix_BlitsUnsupported)
-               || d->clipType == QDirectFBPaintEnginePrivate::ComplexClip
-               || (state()->renderHints & QPainter::SmoothPixmapTransform
-                   && state()->matrix.mapRect(r).size() != sr.size())) {
+            || (d->transformationType & QDirectFBPaintEnginePrivate::Matrix_BlitsUnsupported)
+            || (d->clipType == QDirectFBPaintEnginePrivate::ComplexClip)
+            || (!d->supportsStretchBlit() && state()->matrix.mapRect(r).size() != sr.size())) {
             RASTERFALLBACK(DRAW_PIXMAP, r, pixmap.size(), sr);
             const QImage *img = dfbData->buffer();
             d->lock();
@@ -606,8 +608,8 @@ void QDirectFBPaintEngine::drawTiledPixmap(const QRectF &r,
         QRasterPaintEngine::drawTiledPixmap(r, pixmap, offset);
     } else if (!(d->compositionModeStatus & QDirectFBPaintEnginePrivate::PorterDuff_SupportedBlits)
                || (d->transformationType & QDirectFBPaintEnginePrivate::Matrix_BlitsUnsupported)
-               || d->clipType == QDirectFBPaintEnginePrivate::ComplexClip
-               || (state()->renderHints & QPainter::SmoothPixmapTransform && state()->matrix.isScaling())) {
+               || (d->clipType == QDirectFBPaintEnginePrivate::ComplexClip)
+               || (!d->supportsStretchBlit() && state()->matrix.isScaling())) {
         RASTERFALLBACK(DRAW_TILED_PIXMAP, r, pixmap.size(), offset);
         QPixmapData *pixmapData = pixmap.pixmapData();
         Q_ASSERT(pixmapData->classId() == QPixmapData::DirectFBClass);
@@ -732,7 +734,7 @@ void QDirectFBPaintEngine::fillRect(const QRectF &rect, const QBrush &brush)
         case Qt::TexturePattern: {
             if (!(d->compositionModeStatus & QDirectFBPaintEnginePrivate::PorterDuff_SupportedBlits)
                 || (d->transformationType & QDirectFBPaintEnginePrivate::Matrix_BlitsUnsupported)
-                || (state()->renderHints & QPainter::SmoothPixmapTransform && state()->matrix.isScaling())) {
+                || (!d->supportsStretchBlit() && state()->matrix.isScaling())) {
                 break;
             }
 
@@ -757,7 +759,7 @@ void QDirectFBPaintEngine::fillRect(const QRectF &rect, const QColor &color)
         return;
     Q_D(QDirectFBPaintEngine);
     if ((d->transformationType & QDirectFBPaintEnginePrivate::Matrix_RectsUnsupported)
-        || d->clipType == QDirectFBPaintEnginePrivate::ComplexClip
+        || (d->clipType == QDirectFBPaintEnginePrivate::ComplexClip)
         || !d->testCompositionMode(0, 0, &color)) {
         RASTERFALLBACK(FILL_RECT, rect, color, VOID_ARG());
         d->lock();
@@ -1049,6 +1051,7 @@ void QDirectFBPaintEnginePrivate::blit(const QRectF &dest, IDirectFBSurface *s,
     if (dr.size() == sr.size()) {
         result = surface->Blit(surface, s, &sRect, dr.x(), dr.y());
     } else {
+        Q_ASSERT(supportsStretchBlit());
         const DFBRectangle dRect = { dr.x(), dr.y(), dr.width(), dr.height() };
         result = surface->StretchBlit(surface, s, &sRect, &dRect);
     }
@@ -1096,6 +1099,7 @@ void QDirectFBPaintEnginePrivate::drawTiledPixmap(const QRectF &dest, const QPix
     const QSize pixmapSize = dfbData->size();
     IDirectFBSurface *sourceSurface = dfbData->directFBSurface();
     if (transform.isScaling()) {
+        Q_ASSERT(supportsStretchBlit());
         Q_ASSERT(qMin(transform.m11(), transform.m22()) >= 0);
         offset.rx() *= transform.m11();
         offset.ry() *= transform.m22();
@@ -1184,6 +1188,16 @@ void QDirectFBPaintEnginePrivate::updateClip()
     }
 }
 
+bool QDirectFBPaintEnginePrivate::supportsStretchBlit() const
+{
+#ifdef QT_DIRECTFB_STRETCHBLIT
+    return !(q->state()->renderHints & QPainter::SmoothPixmapTransform);
+#else
+    return false;
+#endif
+}
+
+
 void QDirectFBPaintEnginePrivate::systemStateChanged()
 {
     QRasterPaintEnginePrivate::systemStateChanged();
diff --git a/src/plugins/gfxdrivers/directfb/qdirectfbscreen.h b/src/plugins/gfxdrivers/directfb/qdirectfbscreen.h
index 6330582..61d9cf1 100644
--- a/src/plugins/gfxdrivers/directfb/qdirectfbscreen.h
+++ b/src/plugins/gfxdrivers/directfb/qdirectfbscreen.h
@@ -69,6 +69,9 @@ QT_MODULE(Gui)
 #if !defined QT_NO_DIRECTFB_IMAGEPROVIDER && !defined QT_DIRECTFB_IMAGEPROVIDER
 #define QT_DIRECTFB_IMAGEPROVIDER
 #endif
+#if !defined QT_NO_DIRECTFB_STRETCHBLIT && !defined QT_DIRECTFB_STRETCHBLIT
+#define QT_DIRECTFB_STRETCHBLIT
+#endif
 #if !defined QT_DIRECTFB_IMAGEPROVIDER_KEEPALIVE && !defined QT_NO_DIRECTFB_IMAGEPROVIDER_KEEPALIVE
 #define QT_NO_DIRECTFB_IMAGEPROVIDER_KEEPALIVE
 #endif
-- 
cgit v0.12


From 1a1f781e7f6be2e62be91b082ee798b8854ad920 Mon Sep 17 00:00:00 2001
From: Gunnar Sletta <gunnar@trolltech.com>
Date: Mon, 14 Dec 2009 14:31:24 +0100
Subject: fixed typo in qpainter docs

---
 src/gui/painting/qpainter.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/gui/painting/qpainter.cpp b/src/gui/painting/qpainter.cpp
index 8ed126f..fd67f96 100644
--- a/src/gui/painting/qpainter.cpp
+++ b/src/gui/painting/qpainter.cpp
@@ -1329,7 +1329,7 @@ void QPainterPrivate::updateState(QPainterState *newState)
     of composition modes, brushes, clipping, transformation, etc, is
     close to an impossible task because of the number of
     permutations. As a compromise we have selected a subset of the
-    QPainter API and backends, were performance is guaranteed to be as
+    QPainter API and backends, where performance is guaranteed to be as
     good as we can sensibly get it for the given combination of
     hardware and software.
 
-- 
cgit v0.12


From 1e7922262c29ba29a70226cf8894645f46df3ca2 Mon Sep 17 00:00:00 2001
From: Tom Cooksey <thomas.cooksey@nokia.com>
Date: Sun, 3 Jan 2010 15:35:53 +0100
Subject: Introduce new "snapToPixelGrid" flag to GL2 engine for drawText

When we're rendering text, the glyphs need to be aligned to the
pixel grid otherwise we get strange artifacts. Normally text is
drawn at integer coordinates, however it is still possible to
have a transform which translates by a non-integer offset. This
patch adds a flag to the engine which can be used to snap any
translate to the pixel grid.

Task-number: QTBUG-7094
Reviewed-By: Kim
---
 .../gl2paintengineex/qpaintengineex_opengl2.cpp    | 47 +++++++++++++++++++---
 .../gl2paintengineex/qpaintengineex_opengl2_p.h    |  2 +
 2 files changed, 44 insertions(+), 5 deletions(-)

diff --git a/src/opengl/gl2paintengineex/qpaintengineex_opengl2.cpp b/src/opengl/gl2paintengineex/qpaintengineex_opengl2.cpp
index 0f8e945..a41d439 100644
--- a/src/opengl/gl2paintengineex/qpaintengineex_opengl2.cpp
+++ b/src/opengl/gl2paintengineex/qpaintengineex_opengl2.cpp
@@ -589,19 +589,28 @@ void QGL2PaintEngineExPrivate::updateMatrix()
 
     const GLfloat wfactor = 2.0f / width;
     const GLfloat hfactor = -2.0f / height;
+    GLfloat dx = transform.dx();
+    GLfloat dy = transform.dy();
+
+    // Non-integer translates can have strange effects for some rendering operations such as
+    // anti-aliased text rendering. In such cases, we snap the translate to the pixel grid.
+    if (snapToPixelGrid && transform.type() == QTransform::TxTranslate) {
+        // 0.50 needs to rounded down to 0.0 for consistency with raster engine:
+        dx = ceilf(dx - 0.5f);
+        dy = ceilf(dy - 0.5f);
+    }
 
     if (addOffset) {
-        pmvMatrix[2][0] = (wfactor * (transform.dx() + 0.49f)) - transform.m33();
-        pmvMatrix[2][1] = (hfactor * (transform.dy() + 0.49f)) + transform.m33();
-    } else {
-        pmvMatrix[2][0] = (wfactor * transform.dx()) - transform.m33();
-        pmvMatrix[2][1] = (hfactor * transform.dy()) + transform.m33();
+        dx += 0.49f;
+        dy += 0.49f;
     }
 
     pmvMatrix[0][0] = (wfactor * transform.m11())  - transform.m13();
     pmvMatrix[1][0] = (wfactor * transform.m21())  - transform.m23();
+    pmvMatrix[2][0] = (wfactor * dx) - transform.m33();
     pmvMatrix[0][1] = (hfactor * transform.m12())  + transform.m13();
     pmvMatrix[1][1] = (hfactor * transform.m22())  + transform.m23();
+    pmvMatrix[2][1] = (hfactor * dy) + transform.m33();
     pmvMatrix[0][2] = transform.m13();
     pmvMatrix[1][2] = transform.m23();
     pmvMatrix[2][2] = transform.m33();
@@ -699,6 +708,11 @@ void QGL2PaintEngineExPrivate::drawTexture(const QGLRect& dest, const QGLRect& s
         matrixDirty = true;
     }
 
+    if (snapToPixelGrid) {
+        snapToPixelGrid = false;
+        matrixDirty = true;
+    }
+
     if (prepareForDraw(opaque))
         shaderManager->currentProgram()->setUniformValue(location(QGLEngineShaderManager::ImageTexture), QT_IMAGE_TEXTURE_UNIT);
 
@@ -856,6 +870,11 @@ void QGL2PaintEngineExPrivate::fill(const QVectorPath& path)
         matrixDirty = true;
     }
 
+    if (snapToPixelGrid) {
+        snapToPixelGrid = false;
+        matrixDirty = true;
+    }
+
     // Might need to call updateMatrix to re-calculate inverseScale
     if (matrixDirty)
         updateMatrix();
@@ -1249,6 +1268,11 @@ void QGL2PaintEngineExPrivate::stroke(const QVectorPath &path, const QPen &pen)
         matrixDirty = true;
     }
 
+    if (snapToPixelGrid) {
+        snapToPixelGrid = false;
+        matrixDirty = true;
+    }
+
     const Qt::PenStyle penStyle = qpen_style(pen);
     const QBrush &penBrush = qpen_brush(pen);
     const bool opaque = penBrush.isOpaque() && s->opacity > 0.99;
@@ -1519,6 +1543,10 @@ void QGL2PaintEngineExPrivate::drawCachedGlyphs(const QPointF &p, QFontEngineGly
         addOffset = false;
         matrixDirty = true;
     }
+    if (!snapToPixelGrid) {
+        snapToPixelGrid = true;
+        matrixDirty = true;
+    }
 
     QBrush pensBrush = q->state()->pen.brush();
     setBrush(pensBrush);
@@ -1637,6 +1665,11 @@ void QGL2PaintEngineExPrivate::drawPixmaps(const QDrawPixmaps::Data *drawingData
         matrixDirty = true;
     }
 
+    if (snapToPixelGrid) {
+        snapToPixelGrid = false;
+        matrixDirty = true;
+    }
+
     bool allOpaque = true;
 
     for (int i = 0; i < dataCount; ++i) {
@@ -1918,6 +1951,10 @@ void QGL2PaintEngineExPrivate::writeClip(const QVectorPath &path, uint value)
         addOffset = false;
         matrixDirty = true;
     }
+    if (snapToPixelGrid) {
+        snapToPixelGrid = false;
+        matrixDirty = true;
+    }
 
     if (matrixDirty)
         updateMatrix();
diff --git a/src/opengl/gl2paintengineex/qpaintengineex_opengl2_p.h b/src/opengl/gl2paintengineex/qpaintengineex_opengl2_p.h
index 9a5c447..7d5cb52 100644
--- a/src/opengl/gl2paintengineex/qpaintengineex_opengl2_p.h
+++ b/src/opengl/gl2paintengineex/qpaintengineex_opengl2_p.h
@@ -167,6 +167,7 @@ public:
             width(0), height(0),
             ctx(0),
             useSystemClip(true),
+            snapToPixelGrid(false),
             addOffset(false),
             inverseScale(1)
     { }
@@ -260,6 +261,7 @@ public:
     GLfloat staticVertexCoordinateArray[8];
     GLfloat staticTextureCoordinateArray[8];
 
+    bool snapToPixelGrid;
     bool addOffset; // When enabled, adds a 0.49,0.49 offset to matrix in updateMatrix
     GLfloat pmvMatrix[3][3];
     GLfloat inverseScale;
-- 
cgit v0.12


From 4cfb341b0cc38f32fb6fba134bfeb96197337867 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Samuel=20R=C3=B8dal?= <sroedal@trolltech.com>
Date: Mon, 21 Dec 2009 14:22:27 +0100
Subject: Slight performance improvement in comp_func_SourceOver.

We should check for the fully opaque and fully transparent special
cases, like we do in the dedicated image blend functions.

Reveiewed-by: Gunnar Sletta
---
 src/gui/painting/qdrawhelper.cpp | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/gui/painting/qdrawhelper.cpp b/src/gui/painting/qdrawhelper.cpp
index 84cf5cc..9bb4486 100644
--- a/src/gui/painting/qdrawhelper.cpp
+++ b/src/gui/painting/qdrawhelper.cpp
@@ -1364,7 +1364,10 @@ static void QT_FASTCALL comp_func_SourceOver(uint *dest, const uint *src, int le
         for (int i = 0; i < length; ++i) {
             PRELOAD_COND2(dest, src)
             uint s = src[i];
-            dest[i] = s + BYTE_MUL(dest[i], qAlpha(~s));
+            if (s >= 0xff000000)
+                dest[i] = s;
+            else if (s != 0)
+                dest[i] = s + BYTE_MUL(dest[i], qAlpha(~s));
         }
     } else {
         for (int i = 0; i < length; ++i) {
-- 
cgit v0.12


From 5c2d319ce56fa7914afe52ae13f1a24c03608629 Mon Sep 17 00:00:00 2001
From: Alexis Menard <alexis.menard@nokia.com>
Date: Mon, 4 Jan 2010 17:25:38 +0100
Subject: Make the ShowDirsOnly option work in QFileDialog.

This option was simply not implemented at all so it didn't work.

Task-number:QTBUG-6558
Reviewed-by:ogoffart
---
 src/gui/dialogs/qfiledialog.cpp              |  3 ++
 tests/auto/qfiledialog2/tst_qfiledialog2.cpp | 68 ++++++++++++++++++++++++++++
 2 files changed, 71 insertions(+)

diff --git a/src/gui/dialogs/qfiledialog.cpp b/src/gui/dialogs/qfiledialog.cpp
index 45a410f..d952c34 100644
--- a/src/gui/dialogs/qfiledialog.cpp
+++ b/src/gui/dialogs/qfiledialog.cpp
@@ -669,6 +669,9 @@ void QFileDialog::setOptions(Options options)
     }
     if (changed & HideNameFilterDetails)
         setNameFilters(d->nameFilters);
+
+    if (changed & ShowDirsOnly)
+        setFilter((options & ShowDirsOnly) ? filter() & ~QDir::Files : filter() | QDir::Files);
 }
 
 QFileDialog::Options QFileDialog::options() const
diff --git a/tests/auto/qfiledialog2/tst_qfiledialog2.cpp b/tests/auto/qfiledialog2/tst_qfiledialog2.cpp
index 83ddd39..83380a5 100644
--- a/tests/auto/qfiledialog2/tst_qfiledialog2.cpp
+++ b/tests/auto/qfiledialog2/tst_qfiledialog2.cpp
@@ -130,6 +130,7 @@ private slots:
     void task259105_filtersCornerCases();
 
     void QTBUG4419_lineEditSelectAll();
+    void QTBUG6558_showDirsOnly();
 
 private:
     QByteArray userSettings;
@@ -1040,5 +1041,72 @@ void tst_QFiledialog::QTBUG4419_lineEditSelectAll()
     QCOMPARE(tempPath + QChar('/') + lineEdit->selectedText(), t->fileName());
 }
 
+void tst_QFiledialog::QTBUG6558_showDirsOnly()
+{
+    const QString tempPath = QDir::tempPath();
+    QDir dirTemp(tempPath);
+    const QString tempName = QLatin1String("showDirsOnly.") + QString::number(qrand());
+    dirTemp.mkdir(tempName);
+    dirTemp.cd(tempName);
+    QTRY_VERIFY(dirTemp.exists());
+
+    const QString dirPath = dirTemp.absolutePath();
+    QDir dir(dirPath);
+
+    //We create two dirs
+    dir.mkdir("a");
+    dir.mkdir("b");
+
+    //Create a file
+    QFile tempFile(dirPath + "/plop.txt");
+    tempFile.open(QIODevice::WriteOnly | QIODevice::Text);
+    QTextStream out(&tempFile);
+    out << "The magic number is: " << 49 << "\n";
+    tempFile.close();
+
+    QNonNativeFileDialog fd(0, "TestFileDialog");
+
+    fd.setDirectory(dir.absolutePath());
+    fd.setViewMode(QFileDialog::List);
+    fd.setAcceptMode(QFileDialog::AcceptSave);
+    fd.setOption(QFileDialog::ShowDirsOnly, true);
+    fd.show();
+
+    QApplication::setActiveWindow(&fd);
+    QTest::qWaitForWindowShown(&fd);
+    QTRY_COMPARE(fd.isVisible(), true);
+    QTRY_COMPARE(QApplication::activeWindow(), static_cast<QWidget*>(&fd));
+
+    QFileSystemModel *model = qFindChild<QFileSystemModel*>(&fd, "qt_filesystem_model");
+    QTRY_COMPARE(model->rowCount(model->index(dir.absolutePath())), 2);
+
+    fd.setOption(QFileDialog::ShowDirsOnly, false);
+    QTRY_COMPARE(model->rowCount(model->index(dir.absolutePath())), 3);
+
+    fd.setOption(QFileDialog::ShowDirsOnly, true);
+    QTRY_COMPARE(model->rowCount(model->index(dir.absolutePath())), 2);
+
+    fd.setFileMode(QFileDialog::DirectoryOnly);
+    QTRY_COMPARE(model->rowCount(model->index(dir.absolutePath())), 2);
+    QTRY_COMPARE(bool(fd.options() & QFileDialog::ShowDirsOnly), true);
+
+    fd.setFileMode(QFileDialog::AnyFile);
+    QTRY_COMPARE(model->rowCount(model->index(dir.absolutePath())), 3);
+    QTRY_COMPARE(bool(fd.options() & QFileDialog::ShowDirsOnly), false);
+
+    fd.setDirectory(QDir::homePath());
+
+    //We remove the dirs
+    dir.rmdir("a");
+    dir.rmdir("b");
+
+    //we delete the file
+    tempFile.remove();
+
+    dirTemp.cdUp();
+    dirTemp.rmdir(tempName);
+    QTRY_VERIFY(!dir.exists());
+}
+
 QTEST_MAIN(tst_QFiledialog)
 #include "tst_qfiledialog2.moc"
-- 
cgit v0.12


From f019f3cf807e3c804bba3ef5598ea69adbb39e8b Mon Sep 17 00:00:00 2001
From: Rhys Weatherley <rhys.weatherley@nokia.com>
Date: Tue, 5 Jan 2010 07:50:44 +1000
Subject: BitsPerSample should default to 1 in TIFF files.

Task-number: QTBUG-6870
Reviewed-by: Lorn Potter
---
 src/plugins/imageformats/tiff/qtiffhandler.cpp | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/src/plugins/imageformats/tiff/qtiffhandler.cpp b/src/plugins/imageformats/tiff/qtiffhandler.cpp
index 9538745..7ac9722 100644
--- a/src/plugins/imageformats/tiff/qtiffhandler.cpp
+++ b/src/plugins/imageformats/tiff/qtiffhandler.cpp
@@ -192,11 +192,10 @@ bool QTiffHandler::read(QImage *image)
         return false;
     }
 
+    // BitsPerSample defaults to 1 according to the TIFF spec.
     uint16 bitPerSample;
-    if (!TIFFGetField(tiff, TIFFTAG_BITSPERSAMPLE, &bitPerSample)) {
-        TIFFClose(tiff);
-        return false;
-    }
+    if (!TIFFGetField(tiff, TIFFTAG_BITSPERSAMPLE, &bitPerSample))
+        bitPerSample = 1;
 
     bool grayscale = photometric == PHOTOMETRIC_MINISBLACK || photometric == PHOTOMETRIC_MINISWHITE;
     if (grayscale && bitPerSample == 1) {
-- 
cgit v0.12


From 619392c059326c11c24c1092ab62dd091114a0ab Mon Sep 17 00:00:00 2001
From: Rhys Weatherley <rhys.weatherley@nokia.com>
Date: Mon, 4 Jan 2010 14:08:37 +1000
Subject: Remove QGLShareRegister and transfer its functionality to
 QGLContextGroup

Task-number: QT-2600
Reviewed-by: Samuel
---
 .../gl2paintengineex/qpaintengineex_opengl2.cpp    | 15 ++++++----
 src/opengl/qgl.cpp                                 | 28 +++++++++---------
 src/opengl/qgl.h                                   |  2 +-
 src/opengl/qgl_egl.cpp                             |  2 +-
 src/opengl/qgl_mac.mm                              |  2 +-
 src/opengl/qgl_p.h                                 | 25 ++++++----------
 src/opengl/qgl_win.cpp                             |  2 +-
 src/opengl/qgl_x11.cpp                             |  2 +-
 src/opengl/qglpixelbuffer.cpp                      |  2 +-
 tests/auto/qgl/tst_qgl.cpp                         | 33 +---------------------
 10 files changed, 40 insertions(+), 73 deletions(-)

diff --git a/src/opengl/gl2paintengineex/qpaintengineex_opengl2.cpp b/src/opengl/gl2paintengineex/qpaintengineex_opengl2.cpp
index a41d439..7655971 100644
--- a/src/opengl/gl2paintengineex/qpaintengineex_opengl2.cpp
+++ b/src/opengl/gl2paintengineex/qpaintengineex_opengl2.cpp
@@ -124,17 +124,20 @@ public:
 public Q_SLOTS:
     void contextDestroyed(const QGLContext *context) {
         if (context == ctx) {
-            QList<const QGLContext *> shares = qgl_share_reg()->shares(ctx);
-            if (shares.isEmpty()) {
-                glDeleteFramebuffers(1, &m_fbo);
-                if (m_width || m_height)
-                    glDeleteTextures(1, &m_texture);
+            const QGLContext *nextCtx = qt_gl_transfer_context(ctx);
+            if (!nextCtx) {
+                // the context may not be current, so we cannot directly
+                // destroy the fbo and texture here, but since the context
+                // is about to be destroyed, the GL server will do the
+                // clean up for us anyway
+                m_fbo = 0;
+                m_texture = 0;
                 ctx = 0;
             } else {
                 // since the context holding the texture is shared, and
                 // about to be destroyed, we have to transfer ownership
                 // of the texture to one of the share contexts
-                ctx = const_cast<QGLContext *>((ctx == shares.at(0)) ? shares.at(1) : shares.at(0));
+                ctx = const_cast<QGLContext *>(nextCtx);
             }
         }
     }
diff --git a/src/opengl/qgl.cpp b/src/opengl/qgl.cpp
index f5e46de..c3e4a2e 100644
--- a/src/opengl/qgl.cpp
+++ b/src/opengl/qgl.cpp
@@ -1436,6 +1436,18 @@ void QGLContextGroup::removeGuard(QGLSharedResourceGuard *guard)
         m_guards = guard->m_next;
 }
 
+const QGLContext *qt_gl_transfer_context(const QGLContext *ctx)
+{
+    if (!ctx)
+        return 0;
+    QList<const QGLContext *> shares
+        (QGLContextPrivate::contextGroup(ctx)->shares());
+    if (shares.size() >= 2)
+        return (ctx == shares.at(0)) ? shares.at(1) : shares.at(0);
+    else
+        return 0;
+}
+
 QGLContextPrivate::~QGLContextPrivate()
 {
     if (!group->m_refs.deref()) {
@@ -1731,12 +1743,6 @@ struct DDSFormat {
 #define GL_GENERATE_MIPMAP_HINT_SGIS  0x8192
 #endif
 
-Q_GLOBAL_STATIC(QGLShareRegister, _qgl_share_reg)
-Q_OPENGL_EXPORT QGLShareRegister* qgl_share_reg()
-{
-    return _qgl_share_reg();
-}
-
 /*!
     \class QGLContext
     \brief The QGLContext class encapsulates an OpenGL rendering context.
@@ -2985,7 +2991,7 @@ bool QGLContext::create(const QGLContext* shareContext)
         wd->usesDoubleBufferedGLContext = d->glFormat.doubleBuffer();
     }
     if (d->sharing)  // ok, we managed to share
-        qgl_share_reg()->addShare(this, shareContext);
+        QGLContextGroup::addShare(this, shareContext);
     return d->valid;
 }
 
@@ -4971,7 +4977,7 @@ Q_OPENGL_EXPORT const QString qt_gl_library_name()
 }
 #endif
 
-void QGLShareRegister::addShare(const QGLContext *context, const QGLContext *share) {
+void QGLContextGroup::addShare(const QGLContext *context, const QGLContext *share) {
     Q_ASSERT(context && share);
     if (context->d_ptr->group == share->d_ptr->group)
         return;
@@ -4992,11 +4998,7 @@ void QGLShareRegister::addShare(const QGLContext *context, const QGLContext *sha
     group->m_shares.append(context);
 }
 
-QList<const QGLContext *> QGLShareRegister::shares(const QGLContext *context) {
-    return context->d_ptr->group->m_shares;
-}
-
-void QGLShareRegister::removeShare(const QGLContext *context) {
+void QGLContextGroup::removeShare(const QGLContext *context) {
     // Remove the context from the group.
     QGLContextGroup *group = context->d_ptr->group;
     if (group->m_shares.isEmpty())
diff --git a/src/opengl/qgl.h b/src/opengl/qgl.h
index b6cd128..932ea7e 100644
--- a/src/opengl/qgl.h
+++ b/src/opengl/qgl.h
@@ -398,7 +398,7 @@ private:
     friend class QGLPixmapData;
     friend class QGLPixmapFilterBase;
     friend class QGLTextureGlyphCache;
-    friend class QGLShareRegister;
+    friend class QGLContextGroup;
     friend class QGLSharedResourceGuard;
     friend class QGLPixmapBlurFilter;
     friend QGLFormat::OpenGLVersionFlags QGLFormat::openGLVersionFlags();
diff --git a/src/opengl/qgl_egl.cpp b/src/opengl/qgl_egl.cpp
index 839e8eb..084db32 100644
--- a/src/opengl/qgl_egl.cpp
+++ b/src/opengl/qgl_egl.cpp
@@ -152,7 +152,7 @@ void QGLContext::reset()
     d->valid = false;
     d->transpColor = QColor();
     d->initDone = false;
-    qgl_share_reg()->removeShare(this);
+    QGLContextGroup::removeShare(this);
 }
 
 void QGLContext::makeCurrent()
diff --git a/src/opengl/qgl_mac.mm b/src/opengl/qgl_mac.mm
index 4dd822d..8ecc48b 100644
--- a/src/opengl/qgl_mac.mm
+++ b/src/opengl/qgl_mac.mm
@@ -476,7 +476,7 @@ void QGLContext::reset()
     d->valid = false;
     d->transpColor = QColor();
     d->initDone = false;
-    qgl_share_reg()->removeShare(this);
+    QGLContextGroup::removeShare(this);
 }
 
 void QGLContext::makeCurrent()
diff --git a/src/opengl/qgl_p.h b/src/opengl/qgl_p.h
index 834ff96..fcfe791 100644
--- a/src/opengl/qgl_p.h
+++ b/src/opengl/qgl_p.h
@@ -222,9 +222,8 @@ class QGLSharedResourceGuard;
 typedef QHash<QString, GLuint> QGLDDSCache;
 
 // QGLContextPrivate has the responsibility of creating context groups.
-// QGLContextPrivate and QGLShareRegister will both maintain the reference counter and destroy
+// QGLContextPrivate maintains the reference counter and destroys
 // context groups when needed.
-// QGLShareRegister has the responsibility of keeping the context pointer up to date.
 class QGLContextGroup
 {
 public:
@@ -233,9 +232,13 @@ public:
     QGLExtensionFuncs &extensionFuncs() {return m_extensionFuncs;}
     const QGLContext *context() const {return m_context;}
     bool isSharing() const { return m_shares.size() >= 2; }
+    QList<const QGLContext *> shares() const { return m_shares; }
 
     void addGuard(QGLSharedResourceGuard *guard);
     void removeGuard(QGLSharedResourceGuard *guard);
+
+    static void addShare(const QGLContext *context, const QGLContext *share);
+    static void removeShare(const QGLContext *context);
 private:
     QGLContextGroup(const QGLContext *context) : m_context(context), m_guards(0), m_refs(1) { }
 
@@ -249,12 +252,15 @@ private:
 
     void cleanupResources(const QGLContext *ctx);
 
-    friend class QGLShareRegister;
     friend class QGLContext;
     friend class QGLContextPrivate;
     friend class QGLContextResource;
 };
 
+// Get the context that resources for "ctx" will transfer to once
+// "ctx" is destroyed.  Returns null if nothing is sharing with ctx.
+Q_OPENGL_EXPORT const QGLContext *qt_gl_transfer_context(const QGLContext *);
+
 class QGLTexture;
 
 // This probably needs to grow to GL_MAX_VERTEX_ATTRIBS, but 3 is ok for now as that's
@@ -404,19 +410,6 @@ public:
 Q_DECLARE_OPERATORS_FOR_FLAGS(QGLExtensions::Extensions)
 
 
-class Q_OPENGL_EXPORT QGLShareRegister
-{
-public:
-    QGLShareRegister() {}
-    ~QGLShareRegister() {}
-
-    void addShare(const QGLContext *context, const QGLContext *share);
-    QList<const QGLContext *> shares(const QGLContext *context);
-    void removeShare(const QGLContext *context);
-};
-
-extern Q_OPENGL_EXPORT QGLShareRegister* qgl_share_reg();
-
 // Temporarily make a context current if not already current or
 // shared with the current contex.  The previous context is made
 // current when the object goes out of scope.
diff --git a/src/opengl/qgl_win.cpp b/src/opengl/qgl_win.cpp
index 5b5820a..f80025d 100644
--- a/src/opengl/qgl_win.cpp
+++ b/src/opengl/qgl_win.cpp
@@ -1145,7 +1145,7 @@ void QGLContext::reset()
     delete d->cmap;
     d->cmap = 0;
     d->initDone = false;
-    qgl_share_reg()->removeShare(this);
+    QGLContextGroup::removeShare(this);
 }
 
 //
diff --git a/src/opengl/qgl_x11.cpp b/src/opengl/qgl_x11.cpp
index 9c3fc79..8173bec 100644
--- a/src/opengl/qgl_x11.cpp
+++ b/src/opengl/qgl_x11.cpp
@@ -825,7 +825,7 @@ void QGLContext::reset()
     d->valid = false;
     d->transpColor = QColor();
     d->initDone = false;
-    qgl_share_reg()->removeShare(this);
+    QGLContextGroup::removeShare(this);
 }
 
 
diff --git a/src/opengl/qglpixelbuffer.cpp b/src/opengl/qglpixelbuffer.cpp
index 7c97ebb..fab6efc 100644
--- a/src/opengl/qglpixelbuffer.cpp
+++ b/src/opengl/qglpixelbuffer.cpp
@@ -127,7 +127,7 @@ void QGLPixelBufferPrivate::common_init(const QSize &size, const QGLFormat &form
         qctx = new QGLContext(format);
         qctx->d_func()->sharing = (shareWidget != 0);
         if (shareWidget != 0 && shareWidget->d_func()->glcx) {
-            qgl_share_reg()->addShare(qctx, shareWidget->d_func()->glcx);
+            QGLContextGroup::addShare(qctx, shareWidget->d_func()->glcx);
             shareWidget->d_func()->glcx->d_func()->sharing = true;
         }
 
diff --git a/tests/auto/qgl/tst_qgl.cpp b/tests/auto/qgl/tst_qgl.cpp
index 532e550..a61eb8d 100644
--- a/tests/auto/qgl/tst_qgl.cpp
+++ b/tests/auto/qgl/tst_qgl.cpp
@@ -1824,17 +1824,12 @@ Q_GLOBAL_STATIC_WITH_ARGS(QGLContextResource, qt_shared_test, (qt_shared_test_fr
 void tst_QGL::shareRegister()
 {
 #ifdef QT_BUILD_INTERNAL
-    QGLShareRegister *shareReg = qgl_share_reg();
-    QVERIFY(shareReg != 0);
-
     // Create a context.
     QGLWidget *glw1 = new QGLWidget();
     glw1->makeCurrent();
 
     // Nothing should be sharing with glw1's context yet.
-    QList<const QGLContext *> list;
-    list = shareReg->shares(glw1->context());
-    QCOMPARE(list.size(), 0);
+    QVERIFY(!glw1->isSharing());
 
     // Create a guard for the first context.
     QGLSharedResourceGuard guard(glw1->context());
@@ -1867,16 +1862,6 @@ void tst_QGL::shareRegister()
     QVERIFY(guard.context() == glw1->context());
     QVERIFY(guard.id() == 3);
 
-    // Now there are two items in the share lists.
-    list = shareReg->shares(glw1->context());
-    QCOMPARE(list.size(), 2);
-    QVERIFY(list.contains(glw1->context()));
-    QVERIFY(list.contains(glw2->context()));
-    list = shareReg->shares(glw2->context());
-    QCOMPARE(list.size(), 2);
-    QVERIFY(list.contains(glw1->context()));
-    QVERIFY(list.contains(glw2->context()));
-
     // Check the sharing relationships.
     QVERIFY(QGLContext::areSharing(glw1->context(), glw1->context()));
     QVERIFY(QGLContext::areSharing(glw2->context(), glw2->context()));
@@ -1902,18 +1887,6 @@ void tst_QGL::shareRegister()
     QVERIFY(qt_shared_test()->value(glw2->context()) == res1);
     QVERIFY(qt_shared_test()->value(glw3->context()) == res3);
 
-    // First two should still be sharing, but third is in its own list.
-    list = shareReg->shares(glw1->context());
-    QCOMPARE(list.size(), 2);
-    QVERIFY(list.contains(glw1->context()));
-    QVERIFY(list.contains(glw2->context()));
-    list = shareReg->shares(glw2->context());
-    QCOMPARE(list.size(), 2);
-    QVERIFY(list.contains(glw1->context()));
-    QVERIFY(list.contains(glw2->context()));
-    list = shareReg->shares(glw3->context());
-    QCOMPARE(list.size(), 0);
-
     // Check the sharing relationships again.
     QVERIFY(QGLContext::areSharing(glw1->context(), glw1->context()));
     QVERIFY(QGLContext::areSharing(glw2->context(), glw2->context()));
@@ -1951,10 +1924,6 @@ void tst_QGL::shareRegister()
     QVERIFY(guard3.context() == glw3->context());
     QVERIFY(guard3.id() == 5);
 
-    // Re-check the share list for the second context (should be empty now).
-    list = shareReg->shares(glw2->context());
-    QCOMPARE(list.size(), 0);
-
     // Clean up and check that the resources are properly deleted.
     delete glw2;
     QCOMPARE(tst_QGLResource::deletions, 1);
-- 
cgit v0.12


From 4520a644f3bb82c650db8280a812fcd67ad815bf Mon Sep 17 00:00:00 2001
From: Bill King <bill.king@nokia.com>
Date: Tue, 5 Jan 2010 11:47:40 +1000
Subject: (ODBC) Handle drivers that return SQL_NO_DATA for exec success.

Most drivers return SQL_SUCCESS when executing a delete statement for
example, but FreeTDS returns SQL_NO_DATA, which is technically correct,
but doesn't follow the practice of other drivers.

Task-number: QTBUG-4896
Reviewed-by: Justin McPherson
---
 src/sql/drivers/odbc/qsql_odbc.cpp | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/src/sql/drivers/odbc/qsql_odbc.cpp b/src/sql/drivers/odbc/qsql_odbc.cpp
index fdf0c2c..55f0696 100644
--- a/src/sql/drivers/odbc/qsql_odbc.cpp
+++ b/src/sql/drivers/odbc/qsql_odbc.cpp
@@ -888,12 +888,17 @@ bool QODBCResult::reset (const QString& query)
                        (SQLCHAR*) query8.constData(),
                        (SQLINTEGER) query8.length());
 #endif
-    if (r != SQL_SUCCESS && r != SQL_SUCCESS_WITH_INFO) {
+    if (r != SQL_SUCCESS && r != SQL_SUCCESS_WITH_INFO && r!= SQL_NO_DATA) {
         setLastError(qMakeError(QCoreApplication::translate("QODBCResult",
                      "Unable to execute statement"), QSqlError::StatementError, d));
         return false;
     }
 
+    if(r == SQL_NO_DATA) {
+        setSelect(false);
+        return true;
+    }
+
     SQLINTEGER isScrollable, bufferLength;
     r = SQLGetStmtAttr(d->hStmt, SQL_ATTR_CURSOR_SCROLLABLE, &isScrollable, SQL_IS_INTEGER, &bufferLength);
     if(r == SQL_SUCCESS || r == SQL_SUCCESS_WITH_INFO)
-- 
cgit v0.12


From d307ecedc046e2f4a5dd51d67da21309781c4964 Mon Sep 17 00:00:00 2001
From: Bill King <bill.king@nokia.com>
Date: Tue, 5 Jan 2010 13:42:10 +1000
Subject: (mysql) Add test to the system so it's there for use later.

The test passes/doesn't fail, but is a useful test nonetheless, so
adding it to the testsystem anyway.

Task-number: QTBUG-6852
---
 tests/auto/qsqlquery/tst_qsqlquery.cpp | 38 ++++++++++++++++++++++++++++++++++
 1 file changed, 38 insertions(+)

diff --git a/tests/auto/qsqlquery/tst_qsqlquery.cpp b/tests/auto/qsqlquery/tst_qsqlquery.cpp
index 2a55c32..5b6da30 100644
--- a/tests/auto/qsqlquery/tst_qsqlquery.cpp
+++ b/tests/auto/qsqlquery/tst_qsqlquery.cpp
@@ -203,6 +203,8 @@ private slots:
     void QTBUG_6421();
     void QTBUG_6618_data() { generic_data("QODBC"); }
     void QTBUG_6618();
+    void QTBUG_6852_data() { generic_data("QMYSQL"); }
+    void QTBUG_6852();
 
 private:
     // returns all database connections
@@ -2985,5 +2987,41 @@ void tst_QSqlQuery::QTBUG_6618()
     QVERIFY(q.lastError().text().contains(errorString));
 }
 
+void tst_QSqlQuery::QTBUG_6852()
+{
+    QFETCH( QString, dbName );
+    QSqlDatabase db = QSqlDatabase::database( dbName );
+    CHECK_DATABASE( db );
+    if ( tst_Databases::getMySqlVersion( db ).section( QChar('.'), 0, 0 ).toInt()<5 )
+        QSKIP( "Test requires MySQL >= 5.0", SkipSingle );
+
+    QSqlQuery q(db);
+    QString tableName(qTableName(QLatin1String("bug6421"))), procName(qTableName(QLatin1String("bug6421_proc")));
+
+    QVERIFY_SQL(q, exec("DROP PROCEDURE IF EXISTS "+procName));
+    tst_Databases::safeDropTable(db, tableName);
+    QVERIFY_SQL(q, exec("CREATE TABLE "+tableName+"(\n"
+                        "MainKey INT NOT NULL,\n"
+                        "OtherTextCol VARCHAR(45) NOT NULL,\n"
+                        "PRIMARY KEY(`MainKey`))"));
+    QVERIFY_SQL(q, exec("INSERT INTO "+tableName+" VALUES(0, \"Disabled\")"));
+    QVERIFY_SQL(q, exec("INSERT INTO "+tableName+" VALUES(5, \"Error Only\")"));
+    QVERIFY_SQL(q, exec("INSERT INTO "+tableName+" VALUES(10, \"Enabled\")"));
+    QVERIFY_SQL(q, exec("INSERT INTO "+tableName+" VALUES(15, \"Always\")"));
+    QVERIFY_SQL(q, exec("CREATE PROCEDURE "+procName+"()\n"
+                        "READS SQL DATA\n"
+                        "BEGIN\n"
+                        "  SET @st = 'SELECT MainKey, OtherTextCol from "+tableName+"';\n"
+                        "  PREPARE stmt from @st;\n"
+                        "  EXECUTE stmt;\n"
+                        "END;"));
+
+    QVERIFY_SQL(q, exec("CALL "+procName+"()"));
+    QVERIFY_SQL(q, next());
+    QCOMPARE(q.value(0).toInt(), 0);
+    QCOMPARE(q.value(1).toString(), QLatin1String("Disabled"));
+}
+
+
 QTEST_MAIN( tst_QSqlQuery )
 #include "tst_qsqlquery.moc"
-- 
cgit v0.12


From 6893e329aa640b3baf156dbcedfc8706f6f9a450 Mon Sep 17 00:00:00 2001
From: Tom Cooksey <thomas.cooksey@nokia.com>
Date: Mon, 4 Jan 2010 15:48:31 +0100
Subject: Move QGLTextureGlyphCache into it's own file

Reviewed-By: Samuel
---
 .../gl2paintengineex/qpaintengineex_opengl2.cpp    | 239 +--------------------
 .../gl2paintengineex/qpaintengineex_opengl2_p.h    |   6 +
 .../gl2paintengineex/qtextureglyphcache_gl.cpp     | 216 +++++++++++++++++++
 .../gl2paintengineex/qtextureglyphcache_gl_p.h     | 123 +++++++++++
 src/opengl/opengl.pro                              |   6 +-
 5 files changed, 350 insertions(+), 240 deletions(-)
 create mode 100644 src/opengl/gl2paintengineex/qtextureglyphcache_gl.cpp
 create mode 100644 src/opengl/gl2paintengineex/qtextureglyphcache_gl_p.h

diff --git a/src/opengl/gl2paintengineex/qpaintengineex_opengl2.cpp b/src/opengl/gl2paintengineex/qpaintengineex_opengl2.cpp
index 7655971..b3b5fe1 100644
--- a/src/opengl/gl2paintengineex/qpaintengineex_opengl2.cpp
+++ b/src/opengl/gl2paintengineex/qpaintengineex_opengl2.cpp
@@ -75,15 +75,14 @@
 #include <QPaintEngine>
 #include <private/qpainter_p.h>
 #include <private/qfontengine_p.h>
-#include <private/qtextureglyphcache_p.h>
 #include <private/qpixmapdata_gl_p.h>
 #include <private/qdatabuffer_p.h>
 
 #include "qglgradientcache_p.h"
 #include "qglengineshadermanager_p.h"
 #include "qgl2pexvertexarray_p.h"
-
 #include "qtriangulatingstroker_p.h"
+#include "qtextureglyphcache_gl_p.h"
 
 #include <QDebug>
 
@@ -91,240 +90,6 @@ QT_BEGIN_NAMESPACE
 
 //#define QT_GL_NO_SCISSOR_TEST
 
-static const GLuint GL_STENCIL_HIGH_BIT         = 0x80;
-static const GLuint QT_BRUSH_TEXTURE_UNIT       = 0;
-static const GLuint QT_IMAGE_TEXTURE_UNIT       = 0; //Can be the same as brush texture unit
-static const GLuint QT_MASK_TEXTURE_UNIT        = 1;
-static const GLuint QT_BACKGROUND_TEXTURE_UNIT  = 2;
-
-#ifdef Q_WS_WIN
-extern Q_GUI_EXPORT bool qt_cleartype_enabled;
-#endif
-
-class QGLTextureGlyphCache : public QObject, public QTextureGlyphCache
-{
-    Q_OBJECT
-public:
-    QGLTextureGlyphCache(QGLContext *context, QFontEngineGlyphCache::Type type, const QTransform &matrix);
-    ~QGLTextureGlyphCache();
-
-    virtual void createTextureData(int width, int height);
-    virtual void resizeTextureData(int width, int height);
-    virtual void fillTexture(const Coord &c, glyph_t glyph);
-    virtual int glyphMargin() const;
-
-    inline GLuint texture() const { return m_texture; }
-
-    inline int width() const { return m_width; }
-    inline int height() const { return m_height; }
-
-    inline void setPaintEnginePrivate(QGL2PaintEngineExPrivate *p) { pex = p; }
-
-
-public Q_SLOTS:
-    void contextDestroyed(const QGLContext *context) {
-        if (context == ctx) {
-            const QGLContext *nextCtx = qt_gl_transfer_context(ctx);
-            if (!nextCtx) {
-                // the context may not be current, so we cannot directly
-                // destroy the fbo and texture here, but since the context
-                // is about to be destroyed, the GL server will do the
-                // clean up for us anyway
-                m_fbo = 0;
-                m_texture = 0;
-                ctx = 0;
-            } else {
-                // since the context holding the texture is shared, and
-                // about to be destroyed, we have to transfer ownership
-                // of the texture to one of the share contexts
-                ctx = const_cast<QGLContext *>(nextCtx);
-            }
-        }
-    }
-
-private:
-    QGLContext *ctx;
-
-    QGL2PaintEngineExPrivate *pex;
-
-    GLuint m_texture;
-    GLuint m_fbo;
-
-    int m_width;
-    int m_height;
-
-    QGLShaderProgram *m_program;
-};
-
-QGLTextureGlyphCache::QGLTextureGlyphCache(QGLContext *context, QFontEngineGlyphCache::Type type, const QTransform &matrix)
-    : QTextureGlyphCache(type, matrix)
-    , ctx(context)
-    , m_width(0)
-    , m_height(0)
-{
-    glGenFramebuffers(1, &m_fbo);
-    connect(QGLSignalProxy::instance(), SIGNAL(aboutToDestroyContext(const QGLContext*)),
-            SLOT(contextDestroyed(const QGLContext*)));
-}
-
-QGLTextureGlyphCache::~QGLTextureGlyphCache()
-{
-    if (ctx) {
-        QGLShareContextScope scope(ctx);
-        glDeleteFramebuffers(1, &m_fbo);
-
-        if (m_width || m_height)
-            glDeleteTextures(1, &m_texture);
-    }
-}
-
-void QGLTextureGlyphCache::createTextureData(int width, int height)
-{
-    glGenTextures(1, &m_texture);
-    glBindTexture(GL_TEXTURE_2D, m_texture);
-
-    m_width = width;
-    m_height = height;
-
-    QVarLengthArray<uchar> data(width * height);
-    for (int i = 0; i < data.size(); ++i)
-        data[i] = 0;
-
-    if (m_type == QFontEngineGlyphCache::Raster_RGBMask)
-        glTexImage2D(GL_TEXTURE_2D, 0, GL_RGB, width, height, 0, GL_ALPHA, GL_UNSIGNED_BYTE, &data[0]);
-    else
-        glTexImage2D(GL_TEXTURE_2D, 0, GL_ALPHA, width, height, 0, GL_ALPHA, GL_UNSIGNED_BYTE, &data[0]);
-
-    glTexParameterf(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
-    glTexParameterf(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_NEAREST);
-}
-
-void QGLTextureGlyphCache::resizeTextureData(int width, int height)
-{
-    // ### the QTextureGlyphCache API needs to be reworked to allow
-    // ### resizeTextureData to fail
-
-    int oldWidth = m_width;
-    int oldHeight = m_height;
-
-    GLuint oldTexture = m_texture;
-    createTextureData(width, height);
-
-    glBindFramebuffer(GL_FRAMEBUFFER_EXT, m_fbo);
-
-    GLuint tmp_texture;
-    glGenTextures(1, &tmp_texture);
-    glBindTexture(GL_TEXTURE_2D, tmp_texture);
-    glTexImage2D(GL_TEXTURE_2D, 0, GL_RGBA, oldWidth, oldHeight, 0,
-                 GL_RGBA, GL_UNSIGNED_BYTE, NULL);
-    glTexParameterf(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_NEAREST);
-    glTexParameterf(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
-    glTexParameterf(GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_CLAMP_TO_EDGE);
-    glTexParameterf(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE);
-    glBindTexture(GL_TEXTURE_2D, 0);
-    glFramebufferTexture2D(GL_FRAMEBUFFER_EXT, GL_COLOR_ATTACHMENT0_EXT,
-                           GL_TEXTURE_2D, tmp_texture, 0);
-
-    glActiveTexture(GL_TEXTURE0 + QT_IMAGE_TEXTURE_UNIT);
-    glBindTexture(GL_TEXTURE_2D, oldTexture);
-
-    pex->transferMode(BrushDrawingMode);
-
-    glDisable(GL_STENCIL_TEST);
-    glDisable(GL_DEPTH_TEST);
-    glDisable(GL_SCISSOR_TEST);
-    glDisable(GL_BLEND);
-
-    glViewport(0, 0, oldWidth, oldHeight);
-
-    float vertexCoordinateArray[] = { -1, -1, 1, -1, 1, 1, -1, 1 };
-    float textureCoordinateArray[] = { 0, 0, 1, 0, 1, 1, 0, 1 };
-
-    glVertexAttribPointer(QT_VERTEX_COORDS_ATTR, 2, GL_FLOAT, GL_FALSE, 0, vertexCoordinateArray);
-    glVertexAttribPointer(QT_TEXTURE_COORDS_ATTR, 2, GL_FLOAT, GL_FALSE, 0, textureCoordinateArray);
-
-    pex->shaderManager->useBlitProgram();
-    pex->shaderManager->blitProgram()->setUniformValue("imageTexture", QT_IMAGE_TEXTURE_UNIT);
-
-    glDrawArrays(GL_TRIANGLE_FAN, 0, 4);
-
-    glBindTexture(GL_TEXTURE_2D, m_texture);
-
-#ifdef QT_OPENGL_ES_2
-    QDataBuffer<uchar> buffer(4*oldWidth*oldHeight);
-    buffer.resize(4*oldWidth*oldHeight);
-    glReadPixels(0, 0, oldWidth, oldHeight, GL_RGBA, GL_UNSIGNED_BYTE, buffer.data());
-
-    // do an in-place conversion from GL_RGBA to GL_ALPHA
-    for (int i=0; i<oldWidth*oldHeight; ++i)
-        buffer.data()[i] = buffer.at(4*i + 3);
-
-    glTexSubImage2D(GL_TEXTURE_2D, 0, 0, 0, oldWidth, oldHeight,
-                    GL_ALPHA, GL_UNSIGNED_BYTE, buffer.data());
-#else
-    glCopyTexSubImage2D(GL_TEXTURE_2D, 0, 0, 0, 0, 0, oldWidth, oldHeight);
-#endif
-
-    glFramebufferRenderbuffer(GL_FRAMEBUFFER_EXT, GL_COLOR_ATTACHMENT0_EXT,
-                              GL_RENDERBUFFER_EXT, 0);
-    glDeleteTextures(1, &tmp_texture);
-    glDeleteTextures(1, &oldTexture);
-
-    glBindFramebuffer(GL_FRAMEBUFFER_EXT, ctx->d_ptr->current_fbo);
-
-    glViewport(0, 0, pex->width, pex->height);
-    pex->updateClipScissorTest();
-}
-
-void QGLTextureGlyphCache::fillTexture(const Coord &c, glyph_t glyph)
-{
-    QImage mask = textureMapForGlyph(glyph);
-    const int maskWidth = mask.width();
-    const int maskHeight = mask.height();
-
-    if (mask.format() == QImage::Format_Mono) {
-        mask = mask.convertToFormat(QImage::Format_Indexed8);
-        for (int y = 0; y < maskHeight; ++y) {
-            uchar *src = (uchar *) mask.scanLine(y);
-            for (int x = 0; x < maskWidth; ++x)
-                src[x] = -src[x]; // convert 0 and 1 into 0 and 255
-        }
-     }
-
-
-    glBindTexture(GL_TEXTURE_2D, m_texture);
-    if (mask.format() == QImage::Format_RGB32) {
-        glTexSubImage2D(GL_TEXTURE_2D, 0, c.x, c.y, maskWidth, maskHeight, GL_BGRA, GL_UNSIGNED_BYTE, mask.bits());
-    } else {
-#ifdef QT_OPENGL_ES2
-        glTexSubImage2D(GL_TEXTURE_2D, 0, c.x, c.y, maskWidth, maskHeight, GL_ALPHA, GL_UNSIGNED_BYTE, mask.bits());
-#else
-        // glTexSubImage2D() might cause some garbage to appear in the texture if the mask width is
-        // not a multiple of four bytes. The bug appeared on a computer with 32-bit Windows Vista
-        // and nVidia GeForce 8500GT. GL_UNPACK_ALIGNMENT is set to four bytes, 'mask' has a
-        // multiple of four bytes per line, and most of the glyph shows up correctly in the
-        // texture, which makes me think that this is a driver bug.
-        // One workaround is to make sure the mask width is a multiple of four bytes, for instance
-        // by converting it to a format with four bytes per pixel. Another is to copy one line at a
-        // time.
-
-        for (int i = 0; i < maskHeight; ++i)
-            glTexSubImage2D(GL_TEXTURE_2D, 0, c.x, c.y + i, maskWidth, 1, GL_ALPHA, GL_UNSIGNED_BYTE, mask.scanLine(i));
-#endif
-    }
-}
-
-int QGLTextureGlyphCache::glyphMargin() const
-{
-#if defined(Q_WS_MAC)
-    return 2;
-#elif defined (Q_WS_X11)
-    return 0;
-#else
-    return m_type == QFontEngineGlyphCache::Raster_RGBMask ? 2 : 0;
-#endif
-}
-
 extern QImage qt_imageForBrush(int brushStyle, bool invert);
 
 ////////////////////////////////// Private Methods //////////////////////////////////////////
@@ -2261,5 +2026,3 @@ QOpenGL2PaintEngineState::~QOpenGL2PaintEngineState()
 }
 
 QT_END_NAMESPACE
-
-#include "qpaintengineex_opengl2.moc"
diff --git a/src/opengl/gl2paintengineex/qpaintengineex_opengl2_p.h b/src/opengl/gl2paintengineex/qpaintengineex_opengl2_p.h
index 7d5cb52..eaae187 100644
--- a/src/opengl/gl2paintengineex/qpaintengineex_opengl2_p.h
+++ b/src/opengl/gl2paintengineex/qpaintengineex_opengl2_p.h
@@ -73,6 +73,12 @@ enum EngineMode {
 
 QT_BEGIN_NAMESPACE
 
+#define GL_STENCIL_HIGH_BIT         GLuint(0x80)
+#define QT_BRUSH_TEXTURE_UNIT       GLuint(0)
+#define QT_IMAGE_TEXTURE_UNIT       GLuint(0) //Can be the same as brush texture unit
+#define QT_MASK_TEXTURE_UNIT        GLuint(1)
+#define QT_BACKGROUND_TEXTURE_UNIT  GLuint(2)
+
 class QGL2PaintEngineExPrivate;
 
 
diff --git a/src/opengl/gl2paintengineex/qtextureglyphcache_gl.cpp b/src/opengl/gl2paintengineex/qtextureglyphcache_gl.cpp
new file mode 100644
index 0000000..047876f
--- /dev/null
+++ b/src/opengl/gl2paintengineex/qtextureglyphcache_gl.cpp
@@ -0,0 +1,216 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
+**
+** This file is part of the QtOpenGL module of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** No Commercial Usage
+** This file contains pre-release code and may not be distributed.
+** You may use this file in accordance with the terms and conditions
+** contained in the Technology Preview License Agreement accompanying
+** this package.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain additional
+** rights.  These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+** If you have questions regarding the use of this file, please contact
+** Nokia at qt-info@nokia.com.
+**
+**
+**
+**
+**
+**
+**
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include "qtextureglyphcache_gl_p.h"
+#include "qpaintengineex_opengl2_p.h"
+
+#ifdef Q_WS_WIN
+extern Q_GUI_EXPORT bool qt_cleartype_enabled;
+#endif
+
+QGLTextureGlyphCache::QGLTextureGlyphCache(QGLContext *context, QFontEngineGlyphCache::Type type, const QTransform &matrix)
+    : QTextureGlyphCache(type, matrix)
+    , ctx(context)
+    , m_width(0)
+    , m_height(0)
+{
+    glGenFramebuffers(1, &m_fbo);
+    connect(QGLSignalProxy::instance(), SIGNAL(aboutToDestroyContext(const QGLContext*)),
+            SLOT(contextDestroyed(const QGLContext*)));
+}
+
+QGLTextureGlyphCache::~QGLTextureGlyphCache()
+{
+    if (ctx) {
+        QGLShareContextScope scope(ctx);
+        glDeleteFramebuffers(1, &m_fbo);
+
+        if (m_width || m_height)
+            glDeleteTextures(1, &m_texture);
+    }
+}
+
+void QGLTextureGlyphCache::createTextureData(int width, int height)
+{
+    glGenTextures(1, &m_texture);
+    glBindTexture(GL_TEXTURE_2D, m_texture);
+
+    m_width = width;
+    m_height = height;
+
+    QVarLengthArray<uchar> data(width * height);
+    for (int i = 0; i < data.size(); ++i)
+        data[i] = 0;
+
+    if (m_type == QFontEngineGlyphCache::Raster_RGBMask)
+        glTexImage2D(GL_TEXTURE_2D, 0, GL_RGB, width, height, 0, GL_ALPHA, GL_UNSIGNED_BYTE, &data[0]);
+    else
+        glTexImage2D(GL_TEXTURE_2D, 0, GL_ALPHA, width, height, 0, GL_ALPHA, GL_UNSIGNED_BYTE, &data[0]);
+
+    glTexParameterf(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
+    glTexParameterf(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_NEAREST);
+}
+
+void QGLTextureGlyphCache::resizeTextureData(int width, int height)
+{
+    // ### the QTextureGlyphCache API needs to be reworked to allow
+    // ### resizeTextureData to fail
+
+    int oldWidth = m_width;
+    int oldHeight = m_height;
+
+    GLuint oldTexture = m_texture;
+    createTextureData(width, height);
+
+    glBindFramebuffer(GL_FRAMEBUFFER_EXT, m_fbo);
+
+    GLuint tmp_texture;
+    glGenTextures(1, &tmp_texture);
+    glBindTexture(GL_TEXTURE_2D, tmp_texture);
+    glTexImage2D(GL_TEXTURE_2D, 0, GL_RGBA, oldWidth, oldHeight, 0,
+                 GL_RGBA, GL_UNSIGNED_BYTE, NULL);
+    glTexParameterf(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_NEAREST);
+    glTexParameterf(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
+    glTexParameterf(GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_CLAMP_TO_EDGE);
+    glTexParameterf(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE);
+    glBindTexture(GL_TEXTURE_2D, 0);
+    glFramebufferTexture2D(GL_FRAMEBUFFER_EXT, GL_COLOR_ATTACHMENT0_EXT,
+                           GL_TEXTURE_2D, tmp_texture, 0);
+
+    glActiveTexture(GL_TEXTURE0 + QT_IMAGE_TEXTURE_UNIT);
+    glBindTexture(GL_TEXTURE_2D, oldTexture);
+
+    pex->transferMode(BrushDrawingMode);
+
+    glDisable(GL_STENCIL_TEST);
+    glDisable(GL_DEPTH_TEST);
+    glDisable(GL_SCISSOR_TEST);
+    glDisable(GL_BLEND);
+
+    glViewport(0, 0, oldWidth, oldHeight);
+
+    float vertexCoordinateArray[] = { -1, -1, 1, -1, 1, 1, -1, 1 };
+    float textureCoordinateArray[] = { 0, 0, 1, 0, 1, 1, 0, 1 };
+
+    glVertexAttribPointer(QT_VERTEX_COORDS_ATTR, 2, GL_FLOAT, GL_FALSE, 0, vertexCoordinateArray);
+    glVertexAttribPointer(QT_TEXTURE_COORDS_ATTR, 2, GL_FLOAT, GL_FALSE, 0, textureCoordinateArray);
+
+    pex->shaderManager->useBlitProgram();
+    pex->shaderManager->blitProgram()->setUniformValue("imageTexture", QT_IMAGE_TEXTURE_UNIT);
+
+    glDrawArrays(GL_TRIANGLE_FAN, 0, 4);
+
+    glBindTexture(GL_TEXTURE_2D, m_texture);
+
+#ifdef QT_OPENGL_ES_2
+    QDataBuffer<uchar> buffer(4*oldWidth*oldHeight);
+    buffer.resize(4*oldWidth*oldHeight);
+    glReadPixels(0, 0, oldWidth, oldHeight, GL_RGBA, GL_UNSIGNED_BYTE, buffer.data());
+
+    // do an in-place conversion from GL_RGBA to GL_ALPHA
+    for (int i=0; i<oldWidth*oldHeight; ++i)
+        buffer.data()[i] = buffer.at(4*i + 3);
+
+    glTexSubImage2D(GL_TEXTURE_2D, 0, 0, 0, oldWidth, oldHeight,
+                    GL_ALPHA, GL_UNSIGNED_BYTE, buffer.data());
+#else
+    glCopyTexSubImage2D(GL_TEXTURE_2D, 0, 0, 0, 0, 0, oldWidth, oldHeight);
+#endif
+
+    glFramebufferRenderbuffer(GL_FRAMEBUFFER_EXT, GL_COLOR_ATTACHMENT0_EXT,
+                              GL_RENDERBUFFER_EXT, 0);
+    glDeleteTextures(1, &tmp_texture);
+    glDeleteTextures(1, &oldTexture);
+
+    glBindFramebuffer(GL_FRAMEBUFFER_EXT, ctx->d_ptr->current_fbo);
+
+    glViewport(0, 0, pex->width, pex->height);
+    pex->updateClipScissorTest();
+}
+
+void QGLTextureGlyphCache::fillTexture(const Coord &c, glyph_t glyph)
+{
+    QImage mask = textureMapForGlyph(glyph);
+    const int maskWidth = mask.width();
+    const int maskHeight = mask.height();
+
+    if (mask.format() == QImage::Format_Mono) {
+        mask = mask.convertToFormat(QImage::Format_Indexed8);
+        for (int y = 0; y < maskHeight; ++y) {
+            uchar *src = (uchar *) mask.scanLine(y);
+            for (int x = 0; x < maskWidth; ++x)
+                src[x] = -src[x]; // convert 0 and 1 into 0 and 255
+        }
+     }
+
+
+    glBindTexture(GL_TEXTURE_2D, m_texture);
+    if (mask.format() == QImage::Format_RGB32) {
+        glTexSubImage2D(GL_TEXTURE_2D, 0, c.x, c.y, maskWidth, maskHeight, GL_BGRA, GL_UNSIGNED_BYTE, mask.bits());
+    } else {
+#ifdef QT_OPENGL_ES2
+        glTexSubImage2D(GL_TEXTURE_2D, 0, c.x, c.y, maskWidth, maskHeight, GL_ALPHA, GL_UNSIGNED_BYTE, mask.bits());
+#else
+        // glTexSubImage2D() might cause some garbage to appear in the texture if the mask width is
+        // not a multiple of four bytes. The bug appeared on a computer with 32-bit Windows Vista
+        // and nVidia GeForce 8500GT. GL_UNPACK_ALIGNMENT is set to four bytes, 'mask' has a
+        // multiple of four bytes per line, and most of the glyph shows up correctly in the
+        // texture, which makes me think that this is a driver bug.
+        // One workaround is to make sure the mask width is a multiple of four bytes, for instance
+        // by converting it to a format with four bytes per pixel. Another is to copy one line at a
+        // time.
+
+        for (int i = 0; i < maskHeight; ++i)
+            glTexSubImage2D(GL_TEXTURE_2D, 0, c.x, c.y + i, maskWidth, 1, GL_ALPHA, GL_UNSIGNED_BYTE, mask.scanLine(i));
+#endif
+    }
+}
+
+int QGLTextureGlyphCache::glyphMargin() const
+{
+#if defined(Q_WS_MAC)
+    return 2;
+#elif defined (Q_WS_X11)
+    return 0;
+#else
+    return m_type == QFontEngineGlyphCache::Raster_RGBMask ? 2 : 0;
+#endif
+}
diff --git a/src/opengl/gl2paintengineex/qtextureglyphcache_gl_p.h b/src/opengl/gl2paintengineex/qtextureglyphcache_gl_p.h
new file mode 100644
index 0000000..393893c
--- /dev/null
+++ b/src/opengl/gl2paintengineex/qtextureglyphcache_gl_p.h
@@ -0,0 +1,123 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
+**
+** This file is part of the QtOpenGL module of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** No Commercial Usage
+** This file contains pre-release code and may not be distributed.
+** You may use this file in accordance with the terms and conditions
+** contained in the Technology Preview License Agreement accompanying
+** this package.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain additional
+** rights.  These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+** If you have questions regarding the use of this file, please contact
+** Nokia at qt-info@nokia.com.
+**
+**
+**
+**
+**
+**
+**
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#ifndef QTEXTUREGLYPHCACHE_GL_P_H
+#define QTEXTUREGLYPHCACHE_GL_P_H
+
+//
+//  W A R N I N G
+//  -------------
+//
+// This file is not part of the Qt API.  It exists for the convenience
+// of the QLibrary class.  This header file may change from
+// version to version without notice, or even be removed.
+//
+// We mean it.
+//
+
+#include <private/qtextureglyphcache_p.h>
+#include <private/qgl_p.h>
+#include <qglshaderprogram.h>
+
+
+QT_BEGIN_NAMESPACE
+
+class QGL2PaintEngineExPrivate;
+
+class QGLTextureGlyphCache : public QObject, public QTextureGlyphCache
+{
+    Q_OBJECT
+public:
+    QGLTextureGlyphCache(QGLContext *context, QFontEngineGlyphCache::Type type, const QTransform &matrix);
+    ~QGLTextureGlyphCache();
+
+    virtual void createTextureData(int width, int height);
+    virtual void resizeTextureData(int width, int height);
+    virtual void fillTexture(const Coord &c, glyph_t glyph);
+    virtual int glyphMargin() const;
+
+    inline GLuint texture() const { return m_texture; }
+
+    inline int width() const { return m_width; }
+    inline int height() const { return m_height; }
+
+    inline void setPaintEnginePrivate(QGL2PaintEngineExPrivate *p) { pex = p; }
+
+
+public Q_SLOTS:
+    void contextDestroyed(const QGLContext *context) {
+        if (context == ctx) {
+            const QGLContext *nextCtx = qt_gl_transfer_context(ctx);
+            if (!nextCtx) {
+                // the context may not be current, so we cannot directly
+                // destroy the fbo and texture here, but since the context
+                // is about to be destroyed, the GL server will do the
+                // clean up for us anyway
+                m_fbo = 0;
+                m_texture = 0;
+                ctx = 0;
+            } else {
+                // since the context holding the texture is shared, and
+                // about to be destroyed, we have to transfer ownership
+                // of the texture to one of the share contexts
+                ctx = const_cast<QGLContext *>(nextCtx);
+            }
+        }
+    }
+
+private:
+    QGLContext *ctx;
+
+    QGL2PaintEngineExPrivate *pex;
+
+    GLuint m_texture;
+    GLuint m_fbo;
+
+    int m_width;
+    int m_height;
+
+    QGLShaderProgram *m_program;
+};
+
+QT_END_NAMESPACE
+
+#endif
+
diff --git a/src/opengl/opengl.pro b/src/opengl/opengl.pro
index b2474ed..6076891 100644
--- a/src/opengl/opengl.pro
+++ b/src/opengl/opengl.pro
@@ -54,7 +54,8 @@ SOURCES	+= qgl.cpp \
                 gl2paintengineex/qpaintengineex_opengl2_p.h \
                 gl2paintengineex/qglengineshadersource_p.h \
                 gl2paintengineex/qglcustomshaderstage_p.h \
-                gl2paintengineex/qtriangulatingstroker_p.h
+                gl2paintengineex/qtriangulatingstroker_p.h \
+                gl2paintengineex/qtextureglyphcache_gl_p.h
 
     SOURCES +=  qglshaderprogram.cpp \
                 qglpixmapfilter.cpp \
@@ -67,7 +68,8 @@ SOURCES	+= qgl.cpp \
                 gl2paintengineex/qgl2pexvertexarray.cpp \
                 gl2paintengineex/qpaintengineex_opengl2.cpp \
                 gl2paintengineex/qglcustomshaderstage.cpp \
-                gl2paintengineex/qtriangulatingstroker.cpp
+                gl2paintengineex/qtriangulatingstroker.cpp \
+                gl2paintengineex/qtextureglyphcache_gl.cpp
 
 }
 
-- 
cgit v0.12


From 617773f717e590b7945ccf0635e2ff64303135cc Mon Sep 17 00:00:00 2001
From: Gunnar Sletta <gunnar@trolltech.com>
Date: Tue, 5 Jan 2010 08:56:04 +0100
Subject: fix compilation in GL2 paint engine for Windows

---
 src/opengl/gl2paintengineex/qpaintengineex_opengl2.cpp | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/opengl/gl2paintengineex/qpaintengineex_opengl2.cpp b/src/opengl/gl2paintengineex/qpaintengineex_opengl2.cpp
index b3b5fe1..bd067f9 100644
--- a/src/opengl/gl2paintengineex/qpaintengineex_opengl2.cpp
+++ b/src/opengl/gl2paintengineex/qpaintengineex_opengl2.cpp
@@ -1567,6 +1567,7 @@ bool QGL2PaintEngineEx::begin(QPaintDevice *pdev)
 
 #if !defined(QT_OPENGL_ES_2)
 #if defined(Q_WS_WIN)
+    extern Q_GUI_EXPORT bool qt_cleartype_enabled;
     if (qt_cleartype_enabled)
 #endif
         d->glyphCacheType = QFontEngineGlyphCache::Raster_RGBMask;
-- 
cgit v0.12


From d14ac9914753220e54f3b5cd94d122325d499776 Mon Sep 17 00:00:00 2001
From: Olivier Goffart <ogoffart@trolltech.com>
Date: Tue, 5 Jan 2010 11:05:30 +0100
Subject: Implement QScript::QObjectDelegate::getOwnPropertyDescriptor

This is needed for the fix for QTBUG-5749 that follow

Reviewed-by: Kent Hansen
Task-number: QTBUG-5749
---
 src/script/bridge/qscriptobject.cpp  |  17 +++++
 src/script/bridge/qscriptobject_p.h  |   4 +
 src/script/bridge/qscriptqobject.cpp | 140 ++++++++++++++++++++++++++++++++++-
 src/script/bridge/qscriptqobject_p.h |   4 +
 4 files changed, 164 insertions(+), 1 deletion(-)

diff --git a/src/script/bridge/qscriptobject.cpp b/src/script/bridge/qscriptobject.cpp
index 2d71c43..6942eb6 100644
--- a/src/script/bridge/qscriptobject.cpp
+++ b/src/script/bridge/qscriptobject.cpp
@@ -61,6 +61,15 @@ bool QScriptObject::getOwnPropertySlot(JSC::ExecState* exec,
     return d->delegate->getOwnPropertySlot(this, exec, propertyName, slot);
 }
 
+bool QScriptObject::getOwnPropertyDescriptor(JSC::ExecState* exec,
+                                             const JSC::Identifier& propertyName,
+                                             JSC::PropertyDescriptor& descriptor)
+{
+    if (!d || !d->delegate)
+        return JSC::JSObject::getOwnPropertyDescriptor(exec, propertyName, descriptor);
+    return d->delegate->getOwnPropertyDescriptor(this, exec, propertyName, descriptor);
+}
+
 void QScriptObject::put(JSC::ExecState* exec, const JSC::Identifier& propertyName,
                         JSC::JSValue value, JSC::PutPropertySlot& slot)
 {
@@ -164,6 +173,14 @@ bool QScriptObjectDelegate::getOwnPropertySlot(QScriptObject* object, JSC::ExecS
     return object->JSC::JSObject::getOwnPropertySlot(exec, propertyName, slot);
 }
 
+bool QScriptObjectDelegate::getOwnPropertyDescriptor(QScriptObject* object, JSC::ExecState* exec,
+                                               const JSC::Identifier& propertyName,
+                                               JSC::PropertyDescriptor& descriptor)
+{
+    return object->JSC::JSObject::getOwnPropertyDescriptor(exec, propertyName, descriptor);
+}
+
+
 void QScriptObjectDelegate::put(QScriptObject* object, JSC::ExecState* exec,
                                 const JSC::Identifier& propertyName,
                                 JSC::JSValue value, JSC::PutPropertySlot& slot)
diff --git a/src/script/bridge/qscriptobject_p.h b/src/script/bridge/qscriptobject_p.h
index a4faa06..f4b7140 100644
--- a/src/script/bridge/qscriptobject_p.h
+++ b/src/script/bridge/qscriptobject_p.h
@@ -63,6 +63,7 @@ public:
     virtual bool getOwnPropertySlot(JSC::ExecState*,
                                     const JSC::Identifier& propertyName,
                                     JSC::PropertySlot&);
+    virtual bool getOwnPropertyDescriptor(JSC::ExecState*, const JSC::Identifier&, JSC::PropertyDescriptor&);
     virtual void put(JSC::ExecState* exec, const JSC::Identifier& propertyName,
                      JSC::JSValue, JSC::PutPropertySlot&);
     virtual bool deleteProperty(JSC::ExecState*,
@@ -121,6 +122,9 @@ public:
     virtual bool getOwnPropertySlot(QScriptObject*, JSC::ExecState*,
                                     const JSC::Identifier& propertyName,
                                     JSC::PropertySlot&);
+    virtual bool getOwnPropertyDescriptor(QScriptObject*, JSC::ExecState*,
+                                    const JSC::Identifier& propertyName,
+                                    JSC::PropertyDescriptor&);
     virtual void put(QScriptObject*, JSC::ExecState* exec, const JSC::Identifier& propertyName,
                      JSC::JSValue, JSC::PutPropertySlot&);
     virtual bool deleteProperty(QScriptObject*, JSC::ExecState*,
diff --git a/src/script/bridge/qscriptqobject.cpp b/src/script/bridge/qscriptqobject.cpp
index 63ba9ec..b51cb68 100644
--- a/src/script/bridge/qscriptqobject.cpp
+++ b/src/script/bridge/qscriptqobject.cpp
@@ -1173,6 +1173,7 @@ bool QObjectDelegate::getOwnPropertySlot(QScriptObject *object, JSC::ExecState *
                                          const JSC::Identifier &propertyName,
                                          JSC::PropertySlot &slot)
 {
+    //Note: this has to be kept in sync with getOwnPropertyDescriptor
 #ifndef QT_NO_PROPERTIES
     QByteArray name = QString(propertyName.ustring()).toLatin1();
     QObject *qobject = data->value;
@@ -1285,6 +1286,142 @@ bool QObjectDelegate::getOwnPropertySlot(QScriptObject *object, JSC::ExecState *
 #endif //QT_NO_PROPERTIES
 }
 
+
+bool QObjectDelegate::getOwnPropertyDescriptor(QScriptObject *object, JSC::ExecState *exec,
+                                         const JSC::Identifier &propertyName,
+                                         JSC::PropertyDescriptor &descriptor)
+{
+    //Note: this has to be kept in sync with getOwnPropertySlot abd getPropertyAttributes
+#ifndef QT_NO_PROPERTIES
+    QByteArray name = QString(propertyName.ustring()).toLatin1();
+    QObject *qobject = data->value;
+    if (!qobject) {
+        QString message = QString::fromLatin1("cannot access member `%0' of deleted QObject")
+                          .arg(QString::fromLatin1(name));
+        descriptor.setValue(JSC::throwError(exec, JSC::GeneralError, message));
+        return true;
+    }
+
+    const QScriptEngine::QObjectWrapOptions &opt = data->options;
+
+    const QMetaObject *meta = qobject->metaObject();
+    {
+        QHash<QByteArray, JSC::JSValue>::const_iterator it = data->cachedMembers.constFind(name);
+        if (it != data->cachedMembers.constEnd()) {
+            int index;
+            if (GeneratePropertyFunctions && ((index = meta->indexOfProperty(name)) != -1)) {
+                QMetaProperty prop = meta->property(index);
+                descriptor.setAccessorDescriptor(it.value(), it.value(), flagsForMetaProperty(prop));
+                if (!prop.isWritable())
+                    descriptor.setWritable(false);
+            } else {
+                unsigned attributes = QObjectMemberAttribute;
+                if (opt & QScriptEngine::SkipMethodsInEnumeration)
+                    attributes |= JSC::DontEnum;
+                descriptor.setDescriptor(it.value(), attributes);
+            }
+            return true;
+        }
+    }
+
+    QScriptEnginePrivate *eng = scriptEngineFromExec(exec);
+    int index = -1;
+    if (name.contains('(')) {
+        QByteArray normalized = QMetaObject::normalizedSignature(name);
+        if (-1 != (index = meta->indexOfMethod(normalized))) {
+            QMetaMethod method = meta->method(index);
+            if (hasMethodAccess(method, index, opt)) {
+                if (!(opt & QScriptEngine::ExcludeSuperClassMethods)
+                    || (index >= meta->methodOffset())) {
+                    QtFunction *fun = new (exec)QtFunction(
+                        object, index, /*maybeOverloaded=*/false,
+                        &exec->globalData(), eng->originalGlobalObject()->functionStructure(),
+                        propertyName);
+                    data->cachedMembers.insert(name, fun);
+                    unsigned attributes = QObjectMemberAttribute;
+                    if (opt & QScriptEngine::SkipMethodsInEnumeration)
+                        attributes |= JSC::DontEnum;
+                    descriptor.setDescriptor(fun, attributes);
+                    return true;
+                }
+            }
+        }
+    }
+
+    index = meta->indexOfProperty(name);
+    if (index != -1) {
+        QMetaProperty prop = meta->property(index);
+        if (prop.isScriptable()) {
+            if (!(opt & QScriptEngine::ExcludeSuperClassProperties)
+                || (index >= meta->propertyOffset())) {
+                unsigned attributes = flagsForMetaProperty(prop);
+                if (GeneratePropertyFunctions) {
+                    QtPropertyFunction *fun = new (exec)QtPropertyFunction(
+                        meta, index, &exec->globalData(),
+                        eng->originalGlobalObject()->functionStructure(),
+                        propertyName);
+                    data->cachedMembers.insert(name, fun);
+                    descriptor.setAccessorDescriptor(fun, fun, attributes);
+                    if (attributes & JSC::ReadOnly)
+                        descriptor.setWritable(false);
+                } else {
+                    JSC::JSValue val;
+                    if (!prop.isValid())
+                        val = JSC::jsUndefined();
+                    else
+                        val = eng->jscValueFromVariant(prop.read(qobject));
+                    descriptor.setDescriptor(val, attributes);
+                }
+                return true;
+            }
+        }
+    }
+
+    index = qobject->dynamicPropertyNames().indexOf(name);
+    if (index != -1) {
+        JSC::JSValue val = eng->jscValueFromVariant(qobject->property(name));
+        descriptor.setDescriptor(val, QObjectMemberAttribute);
+        return true;
+    }
+
+    const int offset = (opt & QScriptEngine::ExcludeSuperClassMethods)
+                       ? meta->methodOffset() : 0;
+    for (index = meta->methodCount() - 1; index >= offset; --index) {
+        QMetaMethod method = meta->method(index);
+        if (hasMethodAccess(method, index, opt)
+            && (methodName(method) == name)) {
+            QtFunction *fun = new (exec)QtFunction(
+                object, index, /*maybeOverloaded=*/true,
+                &exec->globalData(), eng->originalGlobalObject()->functionStructure(),
+                propertyName);
+            unsigned attributes = QObjectMemberAttribute;
+            if (opt & QScriptEngine::SkipMethodsInEnumeration)
+                attributes |= JSC::DontEnum;
+            descriptor.setDescriptor(fun, attributes);
+            data->cachedMembers.insert(name, fun);
+            return true;
+        }
+    }
+
+    if (!(opt & QScriptEngine::ExcludeChildObjects)) {
+        QList<QObject*> children = qobject->children();
+        for (index = 0; index < children.count(); ++index) {
+            QObject *child = children.at(index);
+            if (child->objectName() == QString(propertyName.ustring())) {
+                QScriptEngine::QObjectWrapOptions opt = QScriptEngine::PreferExistingWrapperObject;
+                QScriptValue tmp = QScriptEnginePrivate::get(eng)->newQObject(child, QScriptEngine::QtOwnership, opt);
+                descriptor.setDescriptor(eng->scriptValueToJSCValue(tmp), JSC::ReadOnly | JSC::DontDelete | JSC::DontEnum);
+                return true;
+            }
+        }
+    }
+
+    return QScriptObjectDelegate::getOwnPropertyDescriptor(object, exec, propertyName, descriptor);
+#else //QT_NO_PROPERTIES
+    return false;
+#endif //QT_NO_PROPERTIES
+}
+
 void QObjectDelegate::put(QScriptObject *object, JSC::ExecState* exec,
                           const JSC::Identifier& propertyName,
                           JSC::JSValue value, JSC::PutPropertySlot &slot)
@@ -1437,7 +1574,7 @@ bool QObjectDelegate::getPropertyAttributes(const QScriptObject *object,
                                             unsigned &attributes) const
 {
 #ifndef QT_NO_PROPERTIES
-    // ### try to avoid duplicating logic from getOwnPropertySlot()
+    //Note: this has to be kept in sync with getOwnPropertyDescriptor and getOwnPropertySlot
     QByteArray name = ((QString)propertyName.ustring()).toLatin1();
     QObject *qobject = data->value;
     if (!qobject)
@@ -1688,6 +1825,7 @@ QObjectPrototype::QObjectPrototype(JSC::ExecState* exec, WTF::PassRefPtr<JSC::St
     putDirectFunction(exec, new (exec) JSC::PrototypeFunction(exec, prototypeFunctionStructure, /*length=*/0, exec->propertyNames().toString, qobjectProtoFuncToString), JSC::DontEnum);
     putDirectFunction(exec, new (exec) JSC::PrototypeFunction(exec, prototypeFunctionStructure, /*length=*/1, JSC::Identifier(exec, "findChild"), qobjectProtoFuncFindChild), JSC::DontEnum);
     putDirectFunction(exec, new (exec) JSC::PrototypeFunction(exec, prototypeFunctionStructure, /*length=*/1, JSC::Identifier(exec, "findChildren"), qobjectProtoFuncFindChildren), JSC::DontEnum);
+    this->structure()->setHasGetterSetterProperties(true);
 }
 
 const JSC::ClassInfo QMetaObjectWrapperObject::info = { "QMetaObject", 0, 0, 0 };
diff --git a/src/script/bridge/qscriptqobject_p.h b/src/script/bridge/qscriptqobject_p.h
index 41900b5..0e7748d 100644
--- a/src/script/bridge/qscriptqobject_p.h
+++ b/src/script/bridge/qscriptqobject_p.h
@@ -78,6 +78,10 @@ public:
     virtual bool getOwnPropertySlot(QScriptObject*, JSC::ExecState*,
                                     const JSC::Identifier& propertyName,
                                     JSC::PropertySlot&);
+    virtual bool getOwnPropertyDescriptor(QScriptObject*, JSC::ExecState*,
+                                    const JSC::Identifier& propertyName,
+                                    JSC::PropertyDescriptor&);
+
     virtual void put(QScriptObject*, JSC::ExecState* exec,
                      const JSC::Identifier& propertyName,
                      JSC::JSValue, JSC::PutPropertySlot&);
-- 
cgit v0.12


From e715a7f4cfad454b9c966fa2938cbe9a92ce49fb Mon Sep 17 00:00:00 2001
From: Olivier Goffart <ogoffart@trolltech.com>
Date: Tue, 5 Jan 2010 11:09:33 +0100
Subject: QScript: Lookup the native setter from the prototype

Usefull if we have 'native' properties with setter in a prototype
This happen if you use a QObject wrapper as a prototype.

Use getPropertyDescriptor that look up the prototype in order to
know if we have a setter.

Note that we cannot relly on PropertDescriptor::isAccessorDescriptor
as the Getter or Setter attributes are not necesserly updated correctly
when updating properties. (See the workaround QScriptValuePrivate::propertyFlags,
and tst_QScriptValue::getSetProperty with object7)

Task-number: QTBUG-5749  (also need the previous patch)
Reviewed-by: Kent Hansen
---
 .../javascriptcore/JavaScriptCore/runtime/JSObject.cpp         | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/src/3rdparty/javascriptcore/JavaScriptCore/runtime/JSObject.cpp b/src/3rdparty/javascriptcore/JavaScriptCore/runtime/JSObject.cpp
index d7f5344..01f74ac 100644
--- a/src/3rdparty/javascriptcore/JavaScriptCore/runtime/JSObject.cpp
+++ b/src/3rdparty/javascriptcore/JavaScriptCore/runtime/JSObject.cpp
@@ -115,9 +115,17 @@ void JSObject::put(ExecState* exec, const Identifier& propertyName, JSValue valu
         return;
 
     for (JSObject* obj = this; ; obj = asObject(prototype)) {
+#ifdef QT_BUILD_SCRIPT_LIB
+        PropertyDescriptor descriptor;
+        if (obj->getPropertyDescriptor(exec, propertyName, descriptor)) {
+            JSObject* setterFunc;
+            if ((descriptor.isAccessorDescriptor() && ((setterFunc = asObject(descriptor.setter())), true))
+                || (descriptor.value().isGetterSetter() && ((setterFunc = asGetterSetter(descriptor.value())->setter()), true))) {
+#else
         if (JSValue gs = obj->getDirect(propertyName)) {
             if (gs.isGetterSetter()) {
-                JSObject* setterFunc = asGetterSetter(gs)->setter();        
+                JSObject* setterFunc = asGetterSetter(gs)->setter();
+#endif
                 if (!setterFunc) {
                     throwSetterError(exec);
                     return;
-- 
cgit v0.12


From 3f8eaba6caaf5b97f4834e6ff206b779479becdc Mon Sep 17 00:00:00 2001
From: Alexis Menard <alexis.menard@nokia.com>
Date: Tue, 5 Jan 2010 11:39:28 +0100
Subject: Fix auto-test failure on Windows

Reviewed-by: Olivier
---
 tests/auto/qfiledialog2/tst_qfiledialog2.cpp | 1 -
 1 file changed, 1 deletion(-)

diff --git a/tests/auto/qfiledialog2/tst_qfiledialog2.cpp b/tests/auto/qfiledialog2/tst_qfiledialog2.cpp
index 83380a5..9757fa0 100644
--- a/tests/auto/qfiledialog2/tst_qfiledialog2.cpp
+++ b/tests/auto/qfiledialog2/tst_qfiledialog2.cpp
@@ -1105,7 +1105,6 @@ void tst_QFiledialog::QTBUG6558_showDirsOnly()
 
     dirTemp.cdUp();
     dirTemp.rmdir(tempName);
-    QTRY_VERIFY(!dir.exists());
 }
 
 QTEST_MAIN(tst_QFiledialog)
-- 
cgit v0.12


From ea55f9b52479fd2cdb6d6deb740df5f495145cd1 Mon Sep 17 00:00:00 2001
From: Olivier Goffart <ogoffart@trolltech.com>
Date: Tue, 5 Jan 2010 12:32:29 +0100
Subject: Fix test: The bug is now fixed

---
 tests/auto/qscriptable/tst_qscriptable.cpp | 1 -
 1 file changed, 1 deletion(-)

diff --git a/tests/auto/qscriptable/tst_qscriptable.cpp b/tests/auto/qscriptable/tst_qscriptable.cpp
index c0945d8..7ed0a8a 100644
--- a/tests/auto/qscriptable/tst_qscriptable.cpp
+++ b/tests/auto/qscriptable/tst_qscriptable.cpp
@@ -332,7 +332,6 @@ void tst_QScriptable::thisObject()
     {
         QVERIFY(!m_scriptable.oofThisObject().isValid());
         m_engine.evaluate("o.oof = 123");
-        QEXPECT_FAIL("", "QTBUG-5749: Setter doesn't get called when it's in the prototype", Continue);
         QVERIFY(m_scriptable.oofThisObject().strictlyEquals(m_engine.evaluate("o")));
     }
     {
-- 
cgit v0.12


From 3c6d15423693bbb370cd47dadfbfe7194dafc668 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Trond=20Kjern=C3=A5sen?= <trond@trolltech.com>
Date: Tue, 5 Jan 2010 12:29:27 +0100
Subject: Removed temporary QGLWidget created during QGLWidget/X11
 initialization.

..and replace it with a much lighter, internal QGLTempContext.

Reviewed-by: Samuel
---
 src/opengl/qgl_x11.cpp | 69 ++++++++++++++++++++++++++++++++++++++++++++++++--
 1 file changed, 67 insertions(+), 2 deletions(-)

diff --git a/src/opengl/qgl_x11.cpp b/src/opengl/qgl_x11.cpp
index 8173bec..9fca28c 100644
--- a/src/opengl/qgl_x11.cpp
+++ b/src/opengl/qgl_x11.cpp
@@ -1132,6 +1132,72 @@ void *QGLContext::getProcAddress(const QString &proc) const
     return glXGetProcAddressARB(reinterpret_cast<const GLubyte *>(proc.toLatin1().data()));
 }
 
+//
+// This class is used to create a temporary, minimal GL context, which is used
+// to retrive GL version and extension info. It's significantly faster to
+// construct than a QGLWidget, and it doesn't have the recursive creation
+// problem that QGLWidget would have. E.g. creating a temporary QGLWidget to
+// retrieve GL info as part of the QGLWidget initialization.
+//
+class QGLTempContext
+{
+public:
+    QGLTempContext(int screen = 0) :
+            initialized(false),
+            old_drawable(0),
+            old_context(0)
+    {
+        int attribs[] = {GLX_RGBA, XNone};
+        XVisualInfo *vi = glXChooseVisual(X11->display, screen, attribs);
+        if (!vi) {
+            qWarning("QGLTempContext: No GL capable X visuals available.");
+            return;
+        }
+
+        int useGL;
+        glXGetConfig(X11->display, vi, GLX_USE_GL, &useGL);
+        if (!useGL) {
+            XFree(vi);
+            return;
+        }
+
+        old_drawable = glXGetCurrentDrawable();
+        old_context = glXGetCurrentContext();
+
+        XSetWindowAttributes a;
+        a.colormap = qt_gl_choose_cmap(X11->display, vi);
+        drawable = XCreateWindow(X11->display, RootWindow(X11->display, screen),
+                                 0, 0, 1, 1, 0,
+                                 vi->depth, InputOutput, vi->visual,
+                                 CWColormap, &a);
+        context = glXCreateContext(X11->display, vi, 0, True);
+        if (context && glXMakeCurrent(X11->display, drawable, context)) {
+            initialized = true;
+        } else {
+            qWarning("QGLTempContext: Unable to create GL context.");
+            XDestroyWindow(X11->display, drawable);
+        }
+        XFree(vi);
+    }
+
+    ~QGLTempContext() {
+        if (initialized) {
+            glXMakeCurrent(X11->display, 0, 0);
+            glXDestroyContext(X11->display, context);
+            XDestroyWindow(X11->display, drawable);
+        }
+        if (old_drawable && old_context)
+            glXMakeCurrent(X11->display, old_drawable, old_context);
+    }
+
+private:
+    bool initialized;
+    Window drawable;
+    GLXContext context;
+    GLXDrawable old_drawable;
+    GLXContext old_context;
+};
+
 /*****************************************************************************
   QGLOverlayWidget (Internal overlay class for X11)
  *****************************************************************************/
@@ -1574,8 +1640,7 @@ void QGLExtensions::init()
         return;
     init_done = true;
 
-    QGLWidget dmy;
-    dmy.makeCurrent();
+    QGLTempContext context;
     init_extensions();
 
     // nvidia 9x.xx unix drivers contain a bug which requires us to call glFinish before releasing an fbo
-- 
cgit v0.12


From bb3428531e31ac30a6b04ecc7e3192909108e6a7 Mon Sep 17 00:00:00 2001
From: Olivier Goffart <ogoffart@trolltech.com>
Date: Tue, 5 Jan 2010 14:25:47 +0100
Subject: Compile with QT_NO_DOCKWIDGET

Task-number: QTBUG-7133
---
 src/gui/widgets/qmainwindow.h | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/gui/widgets/qmainwindow.h b/src/gui/widgets/qmainwindow.h
index 8ee0507..316bbb8 100644
--- a/src/gui/widgets/qmainwindow.h
+++ b/src/gui/widgets/qmainwindow.h
@@ -102,8 +102,10 @@ public:
     Qt::ToolButtonStyle toolButtonStyle() const;
     void setToolButtonStyle(Qt::ToolButtonStyle toolButtonStyle);
 
+#ifndef QT_NO_DOCKWIDGET
     bool isAnimated() const;
     bool isDockNestingEnabled() const;
+#endif
 
 #ifndef QT_NO_TABBAR
     bool documentMode() const;
-- 
cgit v0.12


From b8f7adab5a146bea04d598299c04570fe95caedc Mon Sep 17 00:00:00 2001
From: Thomas Zander <t.zander@nokia.com>
Date: Tue, 5 Jan 2010 13:24:44 +0100
Subject: Make unit test more robust

Make sure that on systems that have a default font of "Sans Serif" (or
another not really existing font name) the unit test doesn't fail.

Reviewed-By: Simon Hausmann
Reviewed-By: Olivier
---
 tests/auto/qfontcombobox/tst_qfontcombobox.cpp | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/tests/auto/qfontcombobox/tst_qfontcombobox.cpp b/tests/auto/qfontcombobox/tst_qfontcombobox.cpp
index 657be06..73dfe076 100644
--- a/tests/auto/qfontcombobox/tst_qfontcombobox.cpp
+++ b/tests/auto/qfontcombobox/tst_qfontcombobox.cpp
@@ -123,9 +123,11 @@ void tst_QFontComboBox::currentFont_data()
     QTest::addColumn<QFont>("currentFont");
     // Normalize the names
     QFont defaultFont;
+    QFontInfo fi(defaultFont);
+    defaultFont = QFont(fi.family()); // make sure we have a real font name and not something like 'Sans Serif'.
     QTest::newRow("default") << defaultFont;
     defaultFont.setPointSize(defaultFont.pointSize() + 10);
-    QTest::newRow("default") << defaultFont;
+    QTest::newRow("default2") << defaultFont;
     QFontDatabase db;
     QStringList list = db.families();
     for (int i = 0; i < list.count(); ++i) {
-- 
cgit v0.12


From 43a9da5339b38ca2b4e507efe2d4fa72df6b2ff3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jan-Arve=20S=C3=A6ther?= <jan-arve.saether@nokia.com>
Date: Tue, 5 Jan 2010 14:17:05 +0100
Subject: Fixed a bug with distribution of spans.

If a span required more size than the rows/columns it spanned, the
size of the span was not distributed to the rows it spanned. The
result was that the size hints of the layout was not correct,
causing the layout to be potentially smaller than the spanning item.

Task: QT-2261
Reviewed-by: Alexis
---
 src/gui/graphicsview/qgridlayoutengine.cpp         |   4 +-
 .../tst_qgraphicsgridlayout.cpp                    | 382 ++++++++++++---------
 2 files changed, 224 insertions(+), 162 deletions(-)

diff --git a/src/gui/graphicsview/qgridlayoutengine.cpp b/src/gui/graphicsview/qgridlayoutengine.cpp
index 9497a2f..1fece7a 100644
--- a/src/gui/graphicsview/qgridlayoutengine.cpp
+++ b/src/gui/graphicsview/qgridlayoutengine.cpp
@@ -182,9 +182,9 @@ void QGridLayoutRowData::distributeMultiCells()
         QVarLengthArray<qreal> newSizes(span);
 
         for (int j = 0; j < NSizes; ++j) {
-            qreal extra = compare(totalBox, box, j);
+            qreal extra = compare(box, totalBox, j);
             if (extra > 0.0) {
-                calculateGeometries(start, end, totalBox.q_sizes(j), dummy.data(), newSizes.data(),
+                calculateGeometries(start, end, box.q_sizes(j), dummy.data(), newSizes.data(),
                                     0, totalBox);
 
                 for (int k = 0; k < span; ++k)
diff --git a/tests/auto/qgraphicsgridlayout/tst_qgraphicsgridlayout.cpp b/tests/auto/qgraphicsgridlayout/tst_qgraphicsgridlayout.cpp
index cd1eedd..3d95f92 100644
--- a/tests/auto/qgraphicsgridlayout/tst_qgraphicsgridlayout.cpp
+++ b/tests/auto/qgraphicsgridlayout/tst_qgraphicsgridlayout.cpp
@@ -108,6 +108,157 @@ private slots:
     void task236367_maxSizeHint();
 };
 
+class RectWidget : public QGraphicsWidget
+{
+public:
+    RectWidget(QGraphicsItem *parent = 0) : QGraphicsWidget(parent){}
+
+    void paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget)
+    {
+        Q_UNUSED(option);
+        Q_UNUSED(widget);
+        painter->drawRoundRect(rect());
+        painter->drawLine(rect().topLeft(), rect().bottomRight());
+        painter->drawLine(rect().bottomLeft(), rect().topRight());
+    }
+
+    QSizeF sizeHint(Qt::SizeHint which, const QSizeF &constraint = QSizeF()) const
+    {
+        if (m_sizeHints[which].isValid()) {
+            return m_sizeHints[which];
+        }
+        return QGraphicsWidget::sizeHint(which, constraint);
+    }
+
+    void setSizeHint(Qt::SizeHint which, const QSizeF &size) {
+        m_sizeHints[which] = size;
+        updateGeometry();
+    }
+
+    QSizeF m_sizeHints[Qt::NSizeHints];
+};
+
+struct ItemDesc
+{
+    ItemDesc(int row, int col)
+    : m_pos(qMakePair(row, col)),
+      m_rowSpan(1),
+      m_colSpan(1),
+      m_sizePolicy(QSizePolicy(QSizePolicy::Preferred, QSizePolicy::Preferred)),
+      m_align(0)
+    {
+    }
+
+    ItemDesc &rowSpan(int span) {
+        m_rowSpan = span;
+        return (*this);
+    }
+
+    ItemDesc &colSpan(int span) {
+        m_colSpan = span;
+        return (*this);
+    }
+
+    ItemDesc &sizePolicy(const QSizePolicy &sp) {
+        m_sizePolicy = sp;
+        return (*this);
+    }
+
+    ItemDesc &sizePolicy(QSizePolicy::Policy horAndVer) {
+        m_sizePolicy = QSizePolicy(horAndVer, horAndVer);
+        return (*this);
+    }
+
+    ItemDesc &sizePolicyH(QSizePolicy::Policy hor) {
+        m_sizePolicy.setHorizontalPolicy(hor);
+        return (*this);
+    }
+
+    ItemDesc &sizePolicyV(QSizePolicy::Policy ver) {
+        m_sizePolicy.setVerticalPolicy(ver);
+        return (*this);
+    }
+
+    ItemDesc &sizePolicy(QSizePolicy::Policy hor, QSizePolicy::Policy ver) {
+        m_sizePolicy = QSizePolicy(hor, ver);
+        return (*this);
+    }
+
+    ItemDesc &sizeHint(Qt::SizeHint which, const QSizeF &sh) {
+        m_sizeHints[which] = sh;
+        return (*this);
+    }
+
+    ItemDesc &preferredSizeHint(const QSizeF &sh) {
+        m_sizeHints[Qt::PreferredSize] = sh;
+        return (*this);
+    }
+
+    ItemDesc &minSize(const QSizeF &sz) {
+        m_sizes[Qt::MinimumSize] = sz;
+        return (*this);
+    }
+    ItemDesc &preferredSize(const QSizeF &sz) {
+        m_sizes[Qt::PreferredSize] = sz;
+        return (*this);
+    }
+    ItemDesc &maxSize(const QSizeF &sz) {
+        m_sizes[Qt::MaximumSize] = sz;
+        return (*this);
+    }
+
+    ItemDesc &alignment(Qt::Alignment alignment) {
+        m_align = alignment;
+        return (*this);
+    }
+
+    void apply(QGraphicsGridLayout *layout, QGraphicsWidget *item) {
+        item->setSizePolicy(m_sizePolicy);
+        for (int i = 0; i < Qt::NSizeHints; ++i) {
+            if (!m_sizes[i].isValid())
+                continue;
+            switch ((Qt::SizeHint)i) {
+            case Qt::MinimumSize:
+                item->setMinimumSize(m_sizes[i]);
+                break;
+            case Qt::PreferredSize:
+                item->setPreferredSize(m_sizes[i]);
+                break;
+            case Qt::MaximumSize:
+                item->setMaximumSize(m_sizes[i]);
+                break;
+            default:
+                qWarning("not implemented");
+                break;
+            }
+        }
+        layout->addItem(item, m_pos.first, m_pos.second, m_rowSpan, m_colSpan);
+        layout->setAlignment(item, m_align);
+    }
+
+    void apply(QGraphicsGridLayout *layout, RectWidget *item) {
+        for (int i = 0; i < Qt::NSizeHints; ++i)
+            item->setSizeHint((Qt::SizeHint)i, m_sizeHints[i]);
+        apply(layout, static_cast<QGraphicsWidget*>(item));
+    }
+
+//private:
+    QPair<int,int> m_pos; // row,col
+    int m_rowSpan;
+    int m_colSpan;
+    QSizePolicy m_sizePolicy;
+    QSizeF m_sizeHints[Qt::NSizeHints];
+    QSizeF m_sizes[Qt::NSizeHints];
+    Qt::Alignment m_align;
+};
+
+typedef QList<ItemDesc> ItemList;
+Q_DECLARE_METATYPE(ItemList);
+
+typedef QList<QSizeF> SizeList;
+Q_DECLARE_METATYPE(SizeList);
+
+
 // This will be called before the first test function is executed.
 // It is only called once.
 void tst_QGraphicsGridLayout::initTestCase()
@@ -190,36 +341,6 @@ void tst_QGraphicsGridLayout::qgraphicsgridlayout()
     layout.verticalSpacing();
 }
 
-class RectWidget : public QGraphicsWidget
-{
-public:
-    RectWidget(QGraphicsItem *parent = 0) : QGraphicsWidget(parent){}
-
-    void paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget)
-    {
-        Q_UNUSED(option);
-        Q_UNUSED(widget);
-        painter->drawRoundRect(rect());
-        painter->drawLine(rect().topLeft(), rect().bottomRight());
-        painter->drawLine(rect().bottomLeft(), rect().topRight());
-    }
-
-    QSizeF sizeHint(Qt::SizeHint which, const QSizeF &constraint = QSizeF()) const
-    {
-        if (m_sizeHints[which].isValid()) {
-            return m_sizeHints[which];
-        }
-        return QGraphicsWidget::sizeHint(which, constraint);
-    }
-
-    void setSizeHint(Qt::SizeHint which, const QSizeF &size) {
-        m_sizeHints[which] = size;
-        updateGeometry();
-    }
-
-    QSizeF m_sizeHints[Qt::NSizeHints];
-};
-
 static void populateLayout(QGraphicsGridLayout *gridLayout, int width, int height)
 {
     for (int y = 0; y < height; ++y) {
@@ -1144,7 +1265,7 @@ void tst_QGraphicsGridLayout::setColumnSpacing()
 }
 
 void tst_QGraphicsGridLayout::setGeometry_data()
-{
+{    
     QTest::addColumn<QRectF>("rect");
     QTest::newRow("null") << QRectF();
     QTest::newRow("normal") << QRectF(0,0, 50, 50);
@@ -1233,28 +1354,84 @@ void tst_QGraphicsGridLayout::setSpacing()
 
 void tst_QGraphicsGridLayout::sizeHint_data()
 {
+    QTest::addColumn<ItemList>("itemDescriptions");
+    QTest::addColumn<QSizeF>("expectedMinimumSizeHint");
+    QTest::addColumn<QSizeF>("expectedPreferredSizeHint");
+    QTest::addColumn<QSizeF>("expectedMaximumSizeHint");
+
+    QTest::newRow("rowSpan_larger_than_rows") << (ItemList()
+                                    << ItemDesc(0,0)
+                                        .minSize(QSizeF(50,300))
+                                        .maxSize(QSizeF(50,300))
+                                        .rowSpan(2)
+                                    << ItemDesc(0,1)
+                                        .minSize(QSizeF(50,0))
+                                        .preferredSize(QSizeF(50,50))
+                                        .maxSize(QSize(50, 1000))
+                                    << ItemDesc(1,1)
+                                        .minSize(QSizeF(50,0))
+                                        .preferredSize(QSizeF(50,50))
+                                        .maxSize(QSize(50, 1000))
+                                )
+                            << QSizeF(100, 300)
+                            << QSizeF(100, 300)
+                            << QSizeF(100, 2000);
+
+    QTest::newRow("rowSpan_smaller_than_rows") << (ItemList()
+                                    << ItemDesc(0,0)
+                                        .minSize(QSizeF(50, 0))
+                                        .preferredSize(QSizeF(50, 50))
+                                        .maxSize(QSizeF(50, 300))
+                                        .rowSpan(2)
+                                    << ItemDesc(0,1)
+                                        .minSize(QSizeF(50, 50))
+                                        .preferredSize(QSizeF(50, 50))
+                                        .maxSize(QSize(50, 50))
+                                    << ItemDesc(1,1)
+                                        .minSize(QSizeF(50, 50))
+                                        .preferredSize(QSizeF(50, 50))
+                                        .maxSize(QSize(50, 50))
+                                )
+                            << QSizeF(100, 100)
+                            << QSizeF(100, 100)
+                            << QSizeF(100, 100);
 
-    /*
-    QTest::addColumn<Qt::SizeHint>("which");
-    QTest::addColumn<QSizeF>("constraint");
-    QTest::addColumn<QSizeF>("sizeHint");
-    QTest::newRow("null") << 0;
-    */
 }
 
 // public QSizeF sizeHint(Qt::SizeHint which, QSizeF const& constraint = QSizeF()) const
 void tst_QGraphicsGridLayout::sizeHint()
 {
-    /*
-    QFETCH(Qt::SizeHint, which);
-    QFETCH(QSizeF, constraint);
-    QFETCH(QSizeF, sizeHint);
+    QFETCH(ItemList, itemDescriptions);
+    QFETCH(QSizeF, expectedMinimumSizeHint);
+    QFETCH(QSizeF, expectedPreferredSizeHint);
+    QFETCH(QSizeF, expectedMaximumSizeHint);
 
-    QGraphicsGridLayout layout;
+    QGraphicsScene scene;
+    QGraphicsView view(&scene);
+    QGraphicsWidget *widget = new QGraphicsWidget(0, Qt::Window);
+    QGraphicsGridLayout *layout = new QGraphicsGridLayout;
+    scene.addItem(widget);
+    widget->setLayout(layout);
+    layout->setContentsMargins(0, 0, 0, 0);
+    layout->setSpacing(0.0);
+    widget->setContentsMargins(0, 0, 0, 0);
+
+    int i;
+    for (i = 0; i < itemDescriptions.count(); ++i) {
+        ItemDesc desc = itemDescriptions.at(i);
+        RectWidget *item = new RectWidget(widget);
+        desc.apply(layout, item);
+    }
+
+    QApplication::sendPostedEvents(0, 0);
+
+    widget->show();
+    view.show();
+    view.resize(400,300);
+    QCOMPARE(layout->sizeHint(Qt::MinimumSize), expectedMinimumSizeHint);
+    QCOMPARE(layout->sizeHint(Qt::PreferredSize), expectedPreferredSizeHint);
+    QCOMPARE(layout->sizeHint(Qt::MaximumSize), expectedMaximumSizeHint);
 
-    layout.sizeHint();
-    */
-    QSKIP("Test unimplemented", SkipSingle);
 }
 
 void tst_QGraphicsGridLayout::verticalSpacing_data()
@@ -1373,121 +1550,6 @@ void tst_QGraphicsGridLayout::removeLayout()
     QCOMPARE(pushButton->geometry(), r2);
 }
 
-struct ItemDesc
-{
-    ItemDesc(int row, int col)
-    : m_pos(qMakePair(row, col)),
-      m_rowSpan(1),
-      m_colSpan(1),
-      m_sizePolicy(QSizePolicy(QSizePolicy::Preferred, QSizePolicy::Preferred)),
-      m_align(0)
-    {
-    }
-
-    ItemDesc &rowSpan(int span) {
-        m_rowSpan = span;
-        return (*this);
-    }
-
-    ItemDesc &colSpan(int span) {
-        m_colSpan = span;
-        return (*this);
-    }
-
-    ItemDesc &sizePolicy(const QSizePolicy &sp) {
-        m_sizePolicy = sp;
-        return (*this);
-    }
-
-    ItemDesc &sizePolicy(QSizePolicy::Policy horAndVer) {
-        m_sizePolicy = QSizePolicy(horAndVer, horAndVer);
-        return (*this);
-    }
-
-    ItemDesc &sizePolicyH(QSizePolicy::Policy hor) {
-        m_sizePolicy.setHorizontalPolicy(hor);
-        return (*this);
-    }
-
-    ItemDesc &sizePolicyV(QSizePolicy::Policy ver) {
-        m_sizePolicy.setVerticalPolicy(ver);
-        return (*this);
-    }
-
-    ItemDesc &sizePolicy(QSizePolicy::Policy hor, QSizePolicy::Policy ver) {
-        m_sizePolicy = QSizePolicy(hor, ver);
-        return (*this);
-    }
-
-    ItemDesc &sizeHint(Qt::SizeHint which, const QSizeF &sh) {
-        m_sizeHints[which] = sh;
-        return (*this);
-    }
-
-    ItemDesc &preferredSizeHint(const QSizeF &sh) {
-        m_sizeHints[Qt::PreferredSize] = sh;
-        return (*this);
-    }
-
-    ItemDesc &minSize(const QSizeF &sz) {
-        m_sizes[Qt::MinimumSize] = sz;
-        return (*this);
-    }
-    ItemDesc &preferredSize(const QSizeF &sz) {
-        m_sizes[Qt::PreferredSize] = sz;
-        return (*this);
-    }
-    ItemDesc &maxSize(const QSizeF &sz) {
-        m_sizes[Qt::MaximumSize] = sz;
-        return (*this);
-    }
-
-    ItemDesc &alignment(Qt::Alignment alignment) {
-        m_align = alignment;
-        return (*this);
-    }
-
-    void apply(QGraphicsGridLayout *layout, RectWidget *item) {
-        item->setSizePolicy(m_sizePolicy);
-        for (int i = 0; i < Qt::NSizeHints; ++i) {
-            item->setSizeHint((Qt::SizeHint)i, m_sizeHints[i]);
-            if (!m_sizes[i].isValid())
-                continue;
-            switch ((Qt::SizeHint)i) {
-            case Qt::MinimumSize:
-                item->setMinimumSize(m_sizes[i]);
-                break;
-            case Qt::PreferredSize:
-                item->setPreferredSize(m_sizes[i]);
-                break;
-            case Qt::MaximumSize:
-                item->setMaximumSize(m_sizes[i]);
-                break;
-            default:
-                qWarning("not implemented");
-                break;
-            }
-        }
-        layout->addItem(item, m_pos.first, m_pos.second, m_rowSpan, m_colSpan);
-        layout->setAlignment(item, m_align);
-    }
-
-//private:
-    QPair<int,int> m_pos; // row,col
-    int m_rowSpan;
-    int m_colSpan;
-    QSizePolicy m_sizePolicy;
-    QSizeF m_sizeHints[Qt::NSizeHints];
-    QSizeF m_sizes[Qt::NSizeHints];
-    Qt::Alignment m_align;
-};
-
-typedef QList<ItemDesc> ItemList;
-Q_DECLARE_METATYPE(ItemList);
-
-typedef QList<QSizeF> SizeList;
-Q_DECLARE_METATYPE(SizeList);
-
 void tst_QGraphicsGridLayout::defaultStretchFactors_data()
 {
     QTest::addColumn<ItemList>("itemDescriptions");
-- 
cgit v0.12


From 884c729545c49e3f21559c8eb397508ab9fe6e6b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jan-Arve=20S=C3=A6ther?= <jan-arve.saether@nokia.com>
Date: Tue, 5 Jan 2010 15:06:58 +0100
Subject: Fix typo in autotest testcase name.

---
 tests/auto/qpauseanimation/tst_qpauseanimation.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/tests/auto/qpauseanimation/tst_qpauseanimation.cpp b/tests/auto/qpauseanimation/tst_qpauseanimation.cpp
index 4d0a7a7..a421228 100644
--- a/tests/auto/qpauseanimation/tst_qpauseanimation.cpp
+++ b/tests/auto/qpauseanimation/tst_qpauseanimation.cpp
@@ -99,7 +99,7 @@ private slots:
     void changeDirectionWhileRunning();
     void noTimerUpdates_data();
     void noTimerUpdates();
-    void mulitplePauseAnimations();
+    void multiplePauseAnimations();
     void pauseAndPropertyAnimations();
     void pauseResume();
     void sequentialPauseGroup();
@@ -169,7 +169,7 @@ void tst_QPauseAnimation::noTimerUpdates()
     QCOMPARE(animation.m_updateCurrentTimeCount, 1 + loopCount);
 }
 
-void tst_QPauseAnimation::mulitplePauseAnimations()
+void tst_QPauseAnimation::multiplePauseAnimations()
 {
     EnableConsistentTiming enabled;
 
-- 
cgit v0.12


From b167c8b31c6da7b3eb5083396c447c679f1a591a Mon Sep 17 00:00:00 2001
From: Alexis Menard <alexis.menard@nokia.com>
Date: Tue, 5 Jan 2010 16:43:24 +0100
Subject: Display broken symlinks in the filesystem model.

A broken symlink has a -1 size so we need to special case that.

Task-number:QTBUG-7119
Reviewed-by:olivier
---
 src/gui/dialogs/qfilesystemmodel.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/gui/dialogs/qfilesystemmodel.cpp b/src/gui/dialogs/qfilesystemmodel.cpp
index 8e78503..21cb737 100644
--- a/src/gui/dialogs/qfilesystemmodel.cpp
+++ b/src/gui/dialogs/qfilesystemmodel.cpp
@@ -1779,7 +1779,7 @@ void QFileSystemModelPrivate::_q_fileSystemChanged(const QString &path, const QL
             node->fileName = fileName;
         }
 
-        if (info.size() == -1) {
+        if (info.size() == -1 && !info.isSymLink()) {
             removeNode(parentNode, fileName);
             continue;
         }
-- 
cgit v0.12


From 3062035b9b38457196869b93650929f95cbd709f Mon Sep 17 00:00:00 2001
From: Olivier Goffart <ogoffart@trolltech.com>
Date: Thu, 15 Oct 2009 10:05:12 +0200
Subject: Document the QGraphicsView::IndirectPainting flag

And that the QGraphics{View,Scene}::drawItems function are now obsolete.

Reviewed-by: Alexis
---
 src/gui/graphicsview/qgraphicsscene.cpp | 4 ++++
 src/gui/graphicsview/qgraphicsview.cpp  | 8 +++++++-
 2 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/src/gui/graphicsview/qgraphicsscene.cpp b/src/gui/graphicsview/qgraphicsscene.cpp
index 182a3f5..bc9d87a 100644
--- a/src/gui/graphicsview/qgraphicsscene.cpp
+++ b/src/gui/graphicsview/qgraphicsscene.cpp
@@ -5089,6 +5089,10 @@ void QGraphicsScenePrivate::processDirtyItemsRecursive(QGraphicsItem *item, bool
 
     \snippet doc/src/snippets/graphicssceneadditemsnippet.cpp 0
 
+    \obsolete Since Qt 4.6, this function is not called anymore unless
+    the QGraphicsView::IndirectPainting flag is given as an Optimization
+    flag.
+
     \sa drawBackground(), drawForeground()
 */
 void QGraphicsScene::drawItems(QPainter *painter,
diff --git a/src/gui/graphicsview/qgraphicsview.cpp b/src/gui/graphicsview/qgraphicsview.cpp
index 1569078..c8f2c7c 100644
--- a/src/gui/graphicsview/qgraphicsview.cpp
+++ b/src/gui/graphicsview/qgraphicsview.cpp
@@ -217,7 +217,9 @@ static const int QGRAPHICSVIEW_PREALLOC_STYLE_OPTIONS = 503; // largest prime <
     common side effect is that items that do draw with antialiasing can leave
     painting traces behind on the scene as they are moved.
 
-    \omitvalue IndirectPainting
+    \value IndirectPainting Since Qt 4.6, restore the old painting algorithm
+    that calls QGraphicsView::drawItems() and QGraphicsScene::drawItems().
+    To be used only for compatibility with old code.
 */
 
 /*!
@@ -3616,6 +3618,10 @@ void QGraphicsView::drawForeground(QPainter *painter, const QRectF &rect)
 
     The default implementation calls the scene's drawItems() function.
 
+    \obsolete Since Qt 4.6, this function is not called anymore unless
+    the QGraphicsView::IndirectPainting flag is given as an Optimization
+    flag.
+
     \sa drawForeground(), drawBackground(), QGraphicsScene::drawItems()
 */
 void QGraphicsView::drawItems(QPainter *painter, int numItems,
-- 
cgit v0.12


From 86e656cccf7555fc4d2f52c79a8f2031cf8d320c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Trond=20Kjern=C3=A5sen?= <trond@trolltech.com>
Date: Wed, 6 Jan 2010 10:58:35 +0100
Subject: Improved initial startup time for a QGLWidget ontop of EGL/X11.

Exchanged the temporary QGLWidget with a lightweight internal class.
Measured on a device it can be upto 20 ms faster to construct.

Reviewed-by: Tom Cooksey
---
 src/opengl/qgl_x11egl.cpp | 116 ++++++++++++++++++++++++++++++++++++++++++++--
 1 file changed, 111 insertions(+), 5 deletions(-)

diff --git a/src/opengl/qgl_x11egl.cpp b/src/opengl/qgl_x11egl.cpp
index 19026b3..271f4de 100644
--- a/src/opengl/qgl_x11egl.cpp
+++ b/src/opengl/qgl_x11egl.cpp
@@ -52,6 +52,116 @@
 
 QT_BEGIN_NAMESPACE
 
+
+bool qt_egl_setup_x11_visual(XVisualInfo &vi, EGLDisplay display, EGLConfig config,
+                             const QX11Info &x11Info, bool useArgbVisual);
+//
+// QGLTempContext is a lass for creating a temporary GL context (which is
+// needed during QGLWidget initialization to retrieve GL extension info).
+// Faster to construct than a full QGLWidget.
+//
+class QGLTempContext
+{
+public:
+    QGLTempContext(int screen = 0) :
+        initialized(false),
+        window(0),
+        context(0),
+        surface(0)
+        {
+            display = eglGetDisplay(EGLNativeDisplayType(X11->display));
+
+            if (!eglInitialize(display, NULL, NULL)) {
+                qWarning("QGLTempContext: Unable to initialize EGL display.");
+                return;
+            }
+
+            EGLConfig config;
+            int numConfigs = 0;
+            EGLint attribs[] = {
+                EGL_SURFACE_TYPE, EGL_WINDOW_BIT,
+#ifdef QT_OPENGL_ES_2
+                EGL_RENDERABLE_TYPE, EGL_OPENGL_ES2_BIT,
+#endif
+                EGL_NONE
+            };
+
+            eglChooseConfig(display, attribs, &config, 1, &numConfigs);
+            if (!numConfigs) {
+                qWarning("QGLTempContext: No EGL configurations available.");
+                return;
+            }
+
+            XVisualInfo visualInfo;
+            XVisualInfo *vi;
+            int numVisuals;
+            EGLint id = 0;
+
+            eglGetConfigAttrib(display, config, EGL_NATIVE_VISUAL_ID, &id);
+            if (id == 0) {
+                // EGL_NATIVE_VISUAL_ID is optional and might not be supported
+                // on some implementations - we'll have to do it the hard way
+                QX11Info xinfo;
+                qt_egl_setup_x11_visual(visualInfo, display, config, xinfo, false);
+            } else {
+                visualInfo.visualid = id;
+            }
+            vi = XGetVisualInfo(X11->display, VisualIDMask, &visualInfo, &numVisuals);
+            if (!vi || numVisuals < 1) {
+                qWarning("QGLTempContext: Unable to get X11 visual info id.");
+                return;
+            }
+
+            window = XCreateWindow(X11->display, RootWindow(X11->display, screen),
+                                   0, 0, 1, 1, 0,
+                                   vi->depth, InputOutput, vi->visual,
+                                   0, 0);
+
+            surface = eglCreateWindowSurface(display, config, (EGLNativeWindowType) window, NULL);
+
+            if (surface == EGL_NO_SURFACE) {
+                qWarning("QGLTempContext: Error creating EGL surface.");
+                XFree(vi);
+                XDestroyWindow(X11->display, window);
+                return;
+            }
+
+            EGLint contextAttribs[] = {
+#ifdef QT_OPENGL_ES_2
+                EGL_CONTEXT_CLIENT_VERSION, 2,
+#endif
+                EGL_NONE
+            };
+            context = eglCreateContext(display, config, 0, contextAttribs);
+            if (context != EGL_NO_CONTEXT
+                && eglMakeCurrent(display, surface, surface, context))
+            {
+                initialized = true;
+            } else {
+                qWarning("QGLTempContext: Error creating EGL context.");
+                eglDestroySurface(display, surface);
+                XDestroyWindow(X11->display, window);
+            }
+            XFree(vi);
+        }
+
+    ~QGLTempContext() {
+        if (initialized) {
+            eglMakeCurrent(display, EGL_NO_SURFACE, EGL_NO_SURFACE, EGL_NO_CONTEXT);
+            eglDestroyContext(display, context);
+            eglDestroySurface(display, surface);
+            XDestroyWindow(X11->display, window);
+        }
+    }
+
+private:
+    bool initialized;
+    Window window;
+    EGLContext context;
+    EGLSurface surface;
+    EGLDisplay display;
+};
+
 bool QGLFormat::hasOpenGLOverlays()
 {
     return false;
@@ -446,12 +556,8 @@ void QGLExtensions::init()
     init_done = true;
 
     // We need a context current to initialize the extensions.
-    QGLWidget tmpWidget;
-    tmpWidget.makeCurrent();
-
+    QGLTempContext context;
     init_extensions();
-
-    tmpWidget.doneCurrent();
 }
 
 // Re-creates the EGL surface if the window ID has changed or if force is true
-- 
cgit v0.12


From 59a2ed52a780afea84c118054fb7de2440a5d17f Mon Sep 17 00:00:00 2001
From: Thomas Zander <t.zander@nokia.com>
Date: Wed, 6 Jan 2010 12:50:58 +0100
Subject: Don't write out fo:word-spacing if its the default value.

the property fo:word-spacing is still not in an official ODF spec so
a strict schema check will fail in any doc that uses it.  Lets make sure
we limit the writing of that property to only those usecases where the
property was really set by the user.

Task-number: QTBUG-5725
---
 src/gui/text/qtextodfwriter.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/gui/text/qtextodfwriter.cpp b/src/gui/text/qtextodfwriter.cpp
index 5822d92..dcc2e7d 100644
--- a/src/gui/text/qtextodfwriter.cpp
+++ b/src/gui/text/qtextodfwriter.cpp
@@ -556,8 +556,8 @@ void QTextOdfWriter::writeCharacterFormat(QXmlStreamWriter &writer, QTextCharFor
     }
     if (format.hasProperty(QTextFormat::FontLetterSpacing))
         writer.writeAttribute(foNS, QString::fromLatin1("letter-spacing"), pixelToPoint(format.fontLetterSpacing()));
-    if (format.hasProperty(QTextFormat::FontWordSpacing))
-        writer.writeAttribute(foNS, QString::fromLatin1("word-spacing"), pixelToPoint(format.fontWordSpacing()));
+    if (format.hasProperty(QTextFormat::FontWordSpacing) && format.fontWordSpacing() != 0)
+            writer.writeAttribute(foNS, QString::fromLatin1("word-spacing"), pixelToPoint(format.fontWordSpacing()));
     if (format.hasProperty(QTextFormat::FontUnderline))
         writer.writeAttribute(styleNS, QString::fromLatin1("text-underline-type"),
                 format.fontUnderline() ? QString::fromLatin1("single") : QString::fromLatin1("none"));
-- 
cgit v0.12


From 0de487a10f3a54c46f30042b96c321f982e01a90 Mon Sep 17 00:00:00 2001
From: Alexis Menard <alexis.menard@nokia.com>
Date: Wed, 6 Jan 2010 14:31:34 +0100
Subject: Fix default filter selection when using HideNameFilterDetails option.

When you have HideNameFilterDetails on, comparing the default filter
given in parameter for selectNameFilter has to be done with the striped
version of the filter, i.e. without the details.

Task-number:QTBUG-4842
Reviewed-by:gabriel
Reviewed-by:olivier
---
 src/gui/dialogs/qfiledialog.cpp              | 43 ++++++++++++++++++----------
 tests/auto/qfiledialog/tst_qfiledialog.cpp   |  1 +
 tests/auto/qfiledialog2/tst_qfiledialog2.cpp | 41 ++++++++++++++++++++++++++
 3 files changed, 70 insertions(+), 15 deletions(-)

diff --git a/src/gui/dialogs/qfiledialog.cpp b/src/gui/dialogs/qfiledialog.cpp
index d952c34..3c388de 100644
--- a/src/gui/dialogs/qfiledialog.cpp
+++ b/src/gui/dialogs/qfiledialog.cpp
@@ -998,6 +998,24 @@ bool QFileDialog::isNameFilterDetailsVisible() const
 }
 
 
+/*
+    Strip the filters by removing the details, e.g. (*.*).
+*/
+QStringList qt_strip_filters(const QStringList &filters)
+{
+    QStringList strippedFilters;
+    QRegExp r(QString::fromLatin1(qt_file_dialog_filter_reg_exp));
+    for (int i = 0; i < filters.count(); ++i) {
+        QString filterName;
+        int index = r.indexIn(filters[i]);
+        if (index >= 0)
+            filterName = r.cap(1);
+        strippedFilters.append(filterName.simplified());
+    }
+    return strippedFilters;
+}
+
+
 /*!
     \since 4.4
 
@@ -1024,20 +1042,11 @@ void QFileDialog::setNameFilters(const QStringList &filters)
     if (cleanedFilters.isEmpty())
         return;
 
-    if (testOption(HideNameFilterDetails)) {
-        QStringList strippedFilters;
-        QRegExp r(QString::fromLatin1(qt_file_dialog_filter_reg_exp));
-        for (int i = 0; i < cleanedFilters.count(); ++i) {
-            QString filterName;
-            int index = r.indexIn(cleanedFilters[i]);
-            if (index >= 0)
-                filterName = r.cap(1);
-            strippedFilters.append(filterName.simplified());
-        }
-        d->qFileDialogUi->fileTypeCombo->addItems(strippedFilters);
-    } else {
+    if (testOption(HideNameFilterDetails))
+        d->qFileDialogUi->fileTypeCombo->addItems(qt_strip_filters(cleanedFilters));
+    else
         d->qFileDialogUi->fileTypeCombo->addItems(cleanedFilters);
-    }
+
     d->_q_useNameFilter(0);
 }
 
@@ -1088,8 +1097,12 @@ void QFileDialog::selectNameFilter(const QString &filter)
         d->selectNameFilter_sys(filter);
         return;
     }
-
-    int i = d->qFileDialogUi->fileTypeCombo->findText(filter);
+    int i;
+    if (testOption(HideNameFilterDetails)) {
+        i = d->qFileDialogUi->fileTypeCombo->findText(qt_strip_filters(qt_make_filter_list(filter)).first());
+    } else {
+        i = d->qFileDialogUi->fileTypeCombo->findText(filter);
+    }
     if (i >= 0) {
         d->qFileDialogUi->fileTypeCombo->setCurrentIndex(i);
         d->_q_useNameFilter(d->qFileDialogUi->fileTypeCombo->currentIndex());
diff --git a/tests/auto/qfiledialog/tst_qfiledialog.cpp b/tests/auto/qfiledialog/tst_qfiledialog.cpp
index 2f9410b..220e1d1 100644
--- a/tests/auto/qfiledialog/tst_qfiledialog.cpp
+++ b/tests/auto/qfiledialog/tst_qfiledialog.cpp
@@ -949,6 +949,7 @@ void tst_QFiledialog::selectFiles()
     QLineEdit *lineEdit = qFindChild<QLineEdit*>(dialog, "fileNameEdit");
     QVERIFY(lineEdit);
     QCOMPARE(lineEdit->text(),QLatin1String("blah"));
+    delete dialog;
 }
 
 void tst_QFiledialog::viewMode()
diff --git a/tests/auto/qfiledialog2/tst_qfiledialog2.cpp b/tests/auto/qfiledialog2/tst_qfiledialog2.cpp
index 9757fa0..c3f88c4 100644
--- a/tests/auto/qfiledialog2/tst_qfiledialog2.cpp
+++ b/tests/auto/qfiledialog2/tst_qfiledialog2.cpp
@@ -131,6 +131,7 @@ private slots:
 
     void QTBUG4419_lineEditSelectAll();
     void QTBUG6558_showDirsOnly();
+    void QTBUG4842_selectFilterWithHideNameFilterDetails();
 
 private:
     QByteArray userSettings;
@@ -1107,5 +1108,45 @@ void tst_QFiledialog::QTBUG6558_showDirsOnly()
     dirTemp.rmdir(tempName);
 }
 
+void tst_QFiledialog::QTBUG4842_selectFilterWithHideNameFilterDetails()
+{
+    QStringList filtersStr;
+    filtersStr << "Images (*.png *.xpm *.jpg)" << "Text files (*.txt)" << "XML files (*.xml)";
+    QString chosenFilterString("Text files (*.txt)");
+
+    QNonNativeFileDialog fd(0, "TestFileDialog");
+    fd.setAcceptMode(QFileDialog::AcceptSave);
+    fd.setOption(QFileDialog::HideNameFilterDetails, true);
+    fd.setNameFilters(filtersStr);
+    fd.selectNameFilter(chosenFilterString);
+    fd.show();
+
+    QApplication::setActiveWindow(&fd);
+    QTest::qWaitForWindowShown(&fd);
+    QTRY_COMPARE(fd.isVisible(), true);
+    QTRY_COMPARE(QApplication::activeWindow(), static_cast<QWidget*>(&fd));
+
+    QComboBox *filters = qFindChild<QComboBox*>(&fd, "fileTypeCombo");
+    //We compare the current combobox text with the stripped version
+    QCOMPARE(filters->currentText(), QString("Text files"));
+
+    QNonNativeFileDialog fd2(0, "TestFileDialog");
+    fd2.setAcceptMode(QFileDialog::AcceptSave);
+    fd2.setOption(QFileDialog::HideNameFilterDetails, false);
+    fd2.setNameFilters(filtersStr);
+    fd2.selectNameFilter(chosenFilterString);
+    fd2.show();
+
+    QApplication::setActiveWindow(&fd2);
+    QTest::qWaitForWindowShown(&fd2);
+    QTRY_COMPARE(fd2.isVisible(), true);
+    QTRY_COMPARE(QApplication::activeWindow(), static_cast<QWidget*>(&fd2));
+
+    QComboBox *filters2 = qFindChild<QComboBox*>(&fd2, "fileTypeCombo");
+    //We compare the current combobox text with the non stripped version
+    QCOMPARE(filters2->currentText(), chosenFilterString);
+
+}
+
 QTEST_MAIN(tst_QFiledialog)
 #include "tst_qfiledialog2.moc"
-- 
cgit v0.12


From b1327abb777ff3ee7ae32690442ca1250f536054 Mon Sep 17 00:00:00 2001
From: Tom Cooksey <thomas.cooksey@nokia.com>
Date: Wed, 6 Jan 2010 14:55:31 +0100
Subject: Revert "Add GLfloat[2][2] & GLfloat[3][3] uniform setters to
 QGLShaderProgram"

We don't add new public methods in patch releases.

This reverts commit 2b4d3391fd922dfc5ac28815bbd5f36c4041b658.

This patch also fixes the paint engine to use glUniformMatrix3fv
directly now it has been removed from 4.6. It is a 3 line change.

Reviewed-By: Samuel
---
 .../gl2paintengineex/qpaintengineex_opengl2.cpp    |  5 +-
 src/opengl/qglshaderprogram.cpp                    | 67 ----------------------
 src/opengl/qglshaderprogram.h                      |  4 --
 3 files changed, 3 insertions(+), 73 deletions(-)

diff --git a/src/opengl/gl2paintengineex/qpaintengineex_opengl2.cpp b/src/opengl/gl2paintengineex/qpaintengineex_opengl2.cpp
index bd067f9..5901601 100644
--- a/src/opengl/gl2paintengineex/qpaintengineex_opengl2.cpp
+++ b/src/opengl/gl2paintengineex/qpaintengineex_opengl2.cpp
@@ -170,7 +170,8 @@ void QGL2PaintEngineExPrivate::useSimpleShader()
         updateMatrix();
 
     if (simpleShaderMatrixUniformDirty) {
-        shaderManager->simpleProgram()->setUniformValue("pmvMatrix", pmvMatrix);
+        const GLuint location = shaderManager->simpleProgram()->uniformLocation("pmvMatrix");
+        glUniformMatrix3fv(location, 1, GL_FALSE, (GLfloat*)pmvMatrix);
         simpleShaderMatrixUniformDirty = false;
     }
 }
@@ -936,7 +937,7 @@ bool QGL2PaintEngineExPrivate::prepareForDraw(bool srcPixelsAreOpaque)
         updateBrushUniforms();
 
     if (shaderMatrixUniformDirty) {
-        shaderManager->currentProgram()->setUniformValue(location(QGLEngineShaderManager::PmvMatrix), pmvMatrix);
+        glUniformMatrix3fv(location(QGLEngineShaderManager::PmvMatrix), 1, GL_FALSE, (GLfloat*)pmvMatrix);
         shaderMatrixUniformDirty = false;
     }
 
diff --git a/src/opengl/qglshaderprogram.cpp b/src/opengl/qglshaderprogram.cpp
index f9737a56..b4191dc 100644
--- a/src/opengl/qglshaderprogram.cpp
+++ b/src/opengl/qglshaderprogram.cpp
@@ -2275,42 +2275,6 @@ void QGLShaderProgram::setUniformValue(const char *name, const QMatrix4x4& value
     \overload
 
     Sets the uniform variable at \a location in the current context
-    to a 2x2 matrix \a value.  The matrix elements must be specified
-    in column-major order.
-
-    \sa setAttributeValue()
-    \since 4.6.2
-*/
-void QGLShaderProgram::setUniformValue(int location, const GLfloat value[2][2])
-{
-    Q_D(QGLShaderProgram);
-    Q_UNUSED(d);
-    if (location != -1)
-        glUniformMatrix2fv(location, 1, GL_FALSE, value[0]);
-}
-
-/*!
-    \overload
-
-    Sets the uniform variable at \a location in the current context
-    to a 3x3 matrix \a value.  The matrix elements must be specified
-    in column-major order.
-
-    \sa setAttributeValue()
-    \since 4.6.2
-*/
-void QGLShaderProgram::setUniformValue(int location, const GLfloat value[3][3])
-{
-    Q_D(QGLShaderProgram);
-    Q_UNUSED(d);
-    if (location != -1)
-        glUniformMatrix3fv(location, 1, GL_FALSE, value[0]);
-}
-
-/*!
-    \overload
-
-    Sets the uniform variable at \a location in the current context
     to a 4x4 matrix \a value.  The matrix elements must be specified
     in column-major order.
 
@@ -2324,37 +2288,6 @@ void QGLShaderProgram::setUniformValue(int location, const GLfloat value[4][4])
         glUniformMatrix4fv(location, 1, GL_FALSE, value[0]);
 }
 
-
-/*!
-    \overload
-
-    Sets the uniform variable called \a name in the current context
-    to a 2x2 matrix \a value.  The matrix elements must be specified
-    in column-major order.
-
-    \sa setAttributeValue()
-    \since 4.6.2
-*/
-void QGLShaderProgram::setUniformValue(const char *name, const GLfloat value[2][2])
-{
-    setUniformValue(uniformLocation(name), value);
-}
-
-/*!
-    \overload
-
-    Sets the uniform variable called \a name in the current context
-    to a 3x3 matrix \a value.  The matrix elements must be specified
-    in column-major order.
-
-    \sa setAttributeValue()
-    \since 4.6.2
-*/
-void QGLShaderProgram::setUniformValue(const char *name, const GLfloat value[3][3])
-{
-    setUniformValue(uniformLocation(name), value);
-}
-
 /*!
     \overload
 
diff --git a/src/opengl/qglshaderprogram.h b/src/opengl/qglshaderprogram.h
index 4eb80dd..deeaee2 100644
--- a/src/opengl/qglshaderprogram.h
+++ b/src/opengl/qglshaderprogram.h
@@ -216,8 +216,6 @@ public:
     void setUniformValue(int location, const QMatrix4x2& value);
     void setUniformValue(int location, const QMatrix4x3& value);
     void setUniformValue(int location, const QMatrix4x4& value);
-    void setUniformValue(int location, const GLfloat value[2][2]);
-    void setUniformValue(int location, const GLfloat value[3][3]);
     void setUniformValue(int location, const GLfloat value[4][4]);
     void setUniformValue(int location, const QTransform& value);
 
@@ -244,8 +242,6 @@ public:
     void setUniformValue(const char *name, const QMatrix4x2& value);
     void setUniformValue(const char *name, const QMatrix4x3& value);
     void setUniformValue(const char *name, const QMatrix4x4& value);
-    void setUniformValue(const char *name, const GLfloat value[2][2]);
-    void setUniformValue(const char *name, const GLfloat value[3][3]);
     void setUniformValue(const char *name, const GLfloat value[4][4]);
     void setUniformValue(const char *name, const QTransform& value);
 
-- 
cgit v0.12


From a6eb1a3ef2c897f1ebca01a7d7bd1a073799e737 Mon Sep 17 00:00:00 2001
From: Alexis Menard <alexis.menard@nokia.com>
Date: Wed, 6 Jan 2010 15:57:30 +0100
Subject: Use QFile:rename when moving items in QFileystemModel.

We got for free the recursive move if the directory that we move has
subdirectories. Unfortunately copying a directory to an another is
not easy in Qt so the copy still doesn't work if the directory contains
directories.

Task-number:QTBUG-5855
Reviewed-by:ogoffart
---
 src/gui/dialogs/qfilesystemmodel.cpp | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/src/gui/dialogs/qfilesystemmodel.cpp b/src/gui/dialogs/qfilesystemmodel.cpp
index 21cb737..6ec80a9 100644
--- a/src/gui/dialogs/qfilesystemmodel.cpp
+++ b/src/gui/dialogs/qfilesystemmodel.cpp
@@ -1223,8 +1223,7 @@ bool QFileSystemModel::dropMimeData(const QMimeData *data, Qt::DropAction action
     case Qt::MoveAction:
         for (; it != urls.constEnd(); ++it) {
             QString path = (*it).toLocalFile();
-            success = QFile::copy(path, to + QFileInfo(path).fileName())
-                      && QFile::remove(path) && success;
+            success = QFile::rename(path, to + QFileInfo(path).fileName()) && success;
         }
         break;
     default:
-- 
cgit v0.12


From 092f2014cf81d9f58670ede7d381022dd6903cbb Mon Sep 17 00:00:00 2001
From: Olivier Goffart <ogoffart@trolltech.com>
Date: Wed, 6 Jan 2010 15:09:21 +0100
Subject: Revert "QStyleSheetStyle: Fixed some text croped when having padding
 with native border."

This reverts commit 6e90192b599cee9b903177a0978198326f667613.

his change the behaviour a little bit. It is better to wait for Qt 4.7

Reviewed-by: jbache
---
 src/gui/styles/qstylesheetstyle.cpp           |  2 +-
 tests/auto/uiloader/baseline/css_qtbug6855.ui | 57 ---------------------------
 2 files changed, 1 insertion(+), 58 deletions(-)
 delete mode 100644 tests/auto/uiloader/baseline/css_qtbug6855.ui

diff --git a/src/gui/styles/qstylesheetstyle.cpp b/src/gui/styles/qstylesheetstyle.cpp
index aff3ac0..8b40931 100644
--- a/src/gui/styles/qstylesheetstyle.cpp
+++ b/src/gui/styles/qstylesheetstyle.cpp
@@ -1065,7 +1065,7 @@ QRect QRenderRule::boxRect(const QRect& cr, int flags) const
             r.adjust(-p[LeftEdge], -p[TopEdge], p[RightEdge], p[BottomEdge]);
         }
     }
-    if (hasBorder() && (flags & Border)) {
+    if (!hasNativeBorder() && (flags & Border)) {
         const int *b = border()->borders;
         r.adjust(-b[LeftEdge], -b[TopEdge], b[RightEdge], b[BottomEdge]);
     }
diff --git a/tests/auto/uiloader/baseline/css_qtbug6855.ui b/tests/auto/uiloader/baseline/css_qtbug6855.ui
deleted file mode 100644
index 0727f6b..0000000
--- a/tests/auto/uiloader/baseline/css_qtbug6855.ui
+++ /dev/null
@@ -1,57 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<ui version="4.0">
- <class>Form</class>
- <widget class="QWidget" name="Form">
-  <property name="geometry">
-   <rect>
-    <x>0</x>
-    <y>0</y>
-    <width>212</width>
-    <height>108</height>
-   </rect>
-  </property>
-  <property name="windowTitle">
-   <string>Form</string>
-  </property>
-  <property name="styleSheet">
-   <string notr="true">QPushButton { padding: 20px; }</string>
-  </property>
-  <layout class="QGridLayout" name="gridLayout">
-   <item row="0" column="0">
-    <widget class="QPushButton" name="pushButton">
-     <property name="text">
-      <string>Text not cropped</string>
-     </property>
-    </widget>
-   </item>
-   <item row="0" column="1">
-    <spacer name="horizontalSpacer">
-     <property name="orientation">
-      <enum>Qt::Horizontal</enum>
-     </property>
-     <property name="sizeHint" stdset="0">
-      <size>
-       <width>258</width>
-       <height>20</height>
-      </size>
-     </property>
-    </spacer>
-   </item>
-   <item row="1" column="0">
-    <spacer name="verticalSpacer">
-     <property name="orientation">
-      <enum>Qt::Vertical</enum>
-     </property>
-     <property name="sizeHint" stdset="0">
-      <size>
-       <width>20</width>
-       <height>218</height>
-      </size>
-     </property>
-    </spacer>
-   </item>
-  </layout>
- </widget>
- <resources/>
- <connections/>
-</ui>
-- 
cgit v0.12


From 94759a0ed565b21c8dbfb4b12bfe6064f156b410 Mon Sep 17 00:00:00 2001
From: Gabriel de Dietrich <gabriel.dietrich-de@nokia.com>
Date: Wed, 6 Jan 2010 15:36:21 +0100
Subject: QBoxLayout::setGeometry would not respect the widget min/max width

When calling heightforWidth after a geometry change, the width actually used
could be outside the widget's width bounds. The height could then be smaller
than needed to fit the widget's contents resulting in a clipped widget being
drawn. Auto-test included.

Reviewed-by: Olivier
Task-number: QTBUG-7103
---
 src/gui/kernel/qboxlayout.cpp            |  6 ++++--
 tests/auto/qboxlayout/tst_qboxlayout.cpp | 27 +++++++++++++++++++++++++++
 2 files changed, 31 insertions(+), 2 deletions(-)

diff --git a/src/gui/kernel/qboxlayout.cpp b/src/gui/kernel/qboxlayout.cpp
index d965933..fd16861 100644
--- a/src/gui/kernel/qboxlayout.cpp
+++ b/src/gui/kernel/qboxlayout.cpp
@@ -830,9 +830,11 @@ void QBoxLayout::setGeometry(const QRect &r)
         if (d->hasHfw && !horz(d->dir)) {
             for (int i = 0; i < n; i++) {
                 QBoxLayoutItem *box = d->list.at(i);
-                if (box->item->hasHeightForWidth())
+                if (box->item->hasHeightForWidth()) {
+                    int width = qBound(box->item->minimumSize().width(), s.width(), box->item->maximumSize().width());
                     a[i].sizeHint = a[i].minimumSize =
-                                    box->item->heightForWidth(s.width());
+                                    box->item->heightForWidth(width);
+                }
             }
         }
 
diff --git a/tests/auto/qboxlayout/tst_qboxlayout.cpp b/tests/auto/qboxlayout/tst_qboxlayout.cpp
index 8887288..48235e8 100644
--- a/tests/auto/qboxlayout/tst_qboxlayout.cpp
+++ b/tests/auto/qboxlayout/tst_qboxlayout.cpp
@@ -66,6 +66,8 @@ private slots:
     void sizeConstraints();
     void setGeometry();
     void setStyleShouldChangeSpacing();
+
+    void taskQTBUG_7103_minMaxWidthNotRespected();
 };
 
 class CustomLayoutStyle : public QWindowsStyle
@@ -246,6 +248,31 @@ void tst_QBoxLayout::setStyleShouldChangeSpacing()
     delete style2;
 }
 
+void tst_QBoxLayout::taskQTBUG_7103_minMaxWidthNotRespected()
+{
+    QLabel *label = new QLabel("Qt uses standard C++, but makes extensive use of the C pre-processor to enrich the language. Qt can also be used in several other programming languages via language bindings. It runs on all major platforms, and has extensive internationalization support. Non-GUI features include SQL database access, XML parsing, thread management, network support and a unified cross-platform API for file handling.");
+    label->setWordWrap(true);
+    label->setFixedWidth(200);
+
+    QVBoxLayout *layout = new QVBoxLayout;
+    layout->addWidget(label);
+    layout->addSpacerItem(new QSpacerItem(1, 1, QSizePolicy::Fixed, QSizePolicy::Expanding));
+
+    QWidget widget;
+    widget.setLayout(layout);
+    widget.show();
+    QTest::qWaitForWindowShown(&widget);
+
+    int height = label->height();
+
+    QRect g = widget.geometry();
+    g.setWidth(600);
+    widget.setGeometry(g);
+
+    QTest::qWait(50);
+
+    QCOMPARE(label->height(), height);
+}
 
 QTEST_MAIN(tst_QBoxLayout)
 #include "tst_qboxlayout.moc"
-- 
cgit v0.12