Merge branch '4.7-upstream' into 4.7-doc

9 files changed, 30 insertions, 26 deletions

diff --git a/dist/changes-4.6.4 b/dist/changes-4.6.4
index 389aa3a..3949b9a 100644
--- a/dist/changes-4.6.4
+++ b/dist/changes-4.6.4
@@ -66,8 +66,6 @@ QtOpenGL
  - QGLShaderProgram
     * [QTBUG-12478] Don't resolve GLSL extensions if no shaders.
     * [QTBUG-12591] setUniformValue(QSize) was setting (w,w) not (w,h).
-    * [QTBUG-12862] Don't #define highp/mediump/lowp if the desktop OpenGL
-      implementation has the GL_ARB_ES2_compatibility extension.
     * [QTBUG-12554] Wrong OpenGLVersionFlags on OpenGL 4.0 systems.
 
 QtScript
@@ -109,7 +107,7 @@ Third party components
 Qt for Unix (X11 and Mac OS X)
 ------------------------------
 
- - 
+ -
 
 Qt for Linux/X11
 ----------------
diff --git a/src/gui/painting/qwindowsurface_s60.cpp b/src/gui/painting/qwindowsurface_s60.cpp
index 8bac1f5..ea19fcd 100644
--- a/src/gui/painting/qwindowsurface_s60.cpp
+++ b/src/gui/painting/qwindowsurface_s60.cpp
@@ -101,9 +101,11 @@ QS60WindowSurface::~QS60WindowSurface()
             // Issue empty redraw to clear the UI surface
 
             QWidget *w = window();
-            RWindow *const window = static_cast<RWindow *>(w->winId()->DrawableWindow());
-            window->BeginRedraw();
-            window->EndRedraw();
+            if (w->testAttribute(Qt::WA_WState_Created)) {
+                RWindow *const window = static_cast<RWindow *>(w->winId()->DrawableWindow());
+                window->BeginRedraw();
+                window->EndRedraw();
+            }
         }
     }
 #endif
diff --git a/src/opengl/qgl.cpp b/src/opengl/qgl.cpp
index 9e74e04..7f25887 100644
--- a/src/opengl/qgl.cpp
+++ b/src/opengl/qgl.cpp
@@ -5264,8 +5264,6 @@ QGLExtensions::Extensions QGLExtensions::currentContextExtensions()
         glExtensions |= FragmentShader;
     if (extensions.match("GL_ARB_shader_objects"))
         glExtensions |= FragmentShader;
-    if (extensions.match("GL_ARB_ES2_compatibility"))
-        glExtensions |= ES2Compatibility;
     if (extensions.match("GL_ARB_texture_mirrored_repeat"))
         glExtensions |= MirroredRepeat;
     if (extensions.match("GL_EXT_framebuffer_object"))
@@ -5286,7 +5284,6 @@ QGLExtensions::Extensions QGLExtensions::currentContextExtensions()
     glExtensions |= FramebufferObject;
     glExtensions |= GenerateMipmap;
     glExtensions |= FragmentShader;
-    glExtensions |= ES2Compatibility;
 #endif
 #if defined(QT_OPENGL_ES_1)
     if (extensions.match("GL_OES_framebuffer_object"))
diff --git a/src/opengl/qgl_p.h b/src/opengl/qgl_p.h
index 623eeaf..387c8f7 100644
--- a/src/opengl/qgl_p.h
+++ b/src/opengl/qgl_p.h
@@ -284,8 +284,7 @@ public:
         DDSTextureCompression   = 0x00008000,
         ETC1TextureCompression  = 0x00010000,
         PVRTCTextureCompression = 0x00020000,
-        FragmentShader          = 0x00040000,
-        ES2Compatibility        = 0x00080000
+        FragmentShader          = 0x00040000
     };
     Q_DECLARE_FLAGS(Extensions, Extension)
 
diff --git a/src/opengl/qglshaderprogram.cpp b/src/opengl/qglshaderprogram.cpp
index bc1c009..74382b0 100644
--- a/src/opengl/qglshaderprogram.cpp
+++ b/src/opengl/qglshaderprogram.cpp
@@ -97,10 +97,6 @@ QT_BEGIN_NAMESPACE
     to just features that are present in GLSL/ES, and avoid
     standard variable names that only work on the desktop.
 
-    If the \c{GL_ARB_ES2_compatibility} extension is present,
-    then the above prefix is not added because the desktop OpenGL
-    implementation supports precision qualifiers.
-
     \section1 Simple shader example
 
     \snippet doc/src/snippets/code/src_opengl_qglshaderprogram.cpp 1
@@ -398,10 +394,8 @@ bool QGLShader::compileSourceCode(const char *source)
             srclen.append(GLint(headerLen));
         }
 #ifdef QGL_DEFINE_QUALIFIERS
-        if (!(QGLExtensions::glExtensions() & QGLExtensions::ES2Compatibility)) {
-            src.append(qualifierDefines);
-            srclen.append(GLint(sizeof(qualifierDefines) - 1));
-        }
+        src.append(qualifierDefines);
+        srclen.append(GLint(sizeof(qualifierDefines) - 1));
 #endif
 #ifdef QGL_REDEFINE_HIGHP
         if (d->shaderType == Fragment) {
diff --git a/src/openvg/qpaintengine_vg.cpp b/src/openvg/qpaintengine_vg.cpp
index f6d2435..ce9d11a 100644
--- a/src/openvg/qpaintengine_vg.cpp
+++ b/src/openvg/qpaintengine_vg.cpp
@@ -61,11 +61,6 @@
 
 QT_BEGIN_NAMESPACE
 
-// vgDrawGlyphs() only exists in OpenVG 1.1 and higher.
-#if !defined(OPENVG_VERSION_1_1) && !defined(QVG_NO_DRAW_GLYPHS)
-#define QVG_NO_DRAW_GLYPHS 1
-#endif
-
 // vgRenderToMask() only exists in OpenVG 1.1 and higher.
 // Also, disable masking completely if we are using the scissor to clip.
 #if !defined(OPENVG_VERSION_1_1) && !defined(QVG_NO_RENDER_TO_MASK)
@@ -75,11 +70,11 @@ QT_BEGIN_NAMESPACE
 #define QVG_NO_RENDER_TO_MASK 1
 #endif
 
-#if !defined(QVG_NO_DRAW_GLYPHS)
-
 // use the same rounding as in qrasterizer.cpp (6 bit fixed point)
 static const qreal aliasedCoordinateDelta = 0.5 - 0.015625;
 
+#if !defined(QVG_NO_DRAW_GLYPHS)
+
 Q_DECL_IMPORT extern int qt_defaultDpiX();
 Q_DECL_IMPORT extern int qt_defaultDpiY();
 
diff --git a/src/openvg/qvg_p.h b/src/openvg/qvg_p.h
index 51abbee..94d1eae 100644
--- a/src/openvg/qvg_p.h
+++ b/src/openvg/qvg_p.h
@@ -55,6 +55,11 @@
 // We mean it.
 //
 
+// vgDrawGlyphs() only exists in OpenVG 1.1 and higher.
+#if !defined(OPENVG_VERSION_1_1) && !defined(QVG_NO_DRAW_GLYPHS)
+#define QVG_NO_DRAW_GLYPHS 1
+#endif
+
 #include <QtGui/qimage.h>
 
 #if !defined(QT_NO_EGL)
diff --git a/src/openvg/qvgfontglyphcache_p.h b/src/openvg/qvgfontglyphcache_p.h
index b32a873..8bcdcc7 100644
--- a/src/openvg/qvgfontglyphcache_p.h
+++ b/src/openvg/qvgfontglyphcache_p.h
@@ -56,10 +56,14 @@
 #include <QtCore/qvarlengtharray.h>
 #include <QtGui/private/qfontengine_p.h>
 
+#include <qvg_p.h>
+
 QT_BEGIN_NAMESPACE
 
 class QVGPaintEnginePrivate;
 
+#ifndef QVG_NO_DRAW_GLYPHS
+
 class QVGFontGlyphCache
 {
 public:
@@ -90,6 +94,8 @@ public:
 };
 #endif
 
+#endif
+
 QT_END_NAMESPACE
 
 #endif // QVGFONTGLYPHCACHE_H
diff --git a/src/plugins/graphicssystems/openvg/qgraphicssystem_vg.cpp b/src/plugins/graphicssystems/openvg/qgraphicssystem_vg.cpp
index 2c7c0b7..9674233 100644
--- a/src/plugins/graphicssystems/openvg/qgraphicssystem_vg.cpp
+++ b/src/plugins/graphicssystems/openvg/qgraphicssystem_vg.cpp
@@ -42,6 +42,9 @@
 #include "qgraphicssystem_vg_p.h"
 #include <QtOpenVG/private/qpixmapdata_vg_p.h>
 #include <QtOpenVG/private/qwindowsurface_vg_p.h>
+#if defined(Q_OS_SYMBIAN) && !defined(Q_SYMBIAN_SEMITRANSPARENT_BG_SURFACE)
+#include <QtGui/private/qwidget_p.h>
+#endif
 
 QT_BEGIN_NAMESPACE
 
@@ -64,6 +67,11 @@ QPixmapData *QVGGraphicsSystem::createPixmapData(QPixmapData::PixelType type) co
 
 QWindowSurface *QVGGraphicsSystem::createWindowSurface(QWidget *widget) const
 {
+#if defined(Q_OS_SYMBIAN) && !defined(Q_SYMBIAN_SEMITRANSPARENT_BG_SURFACE)
+    QWidgetPrivate *d = qt_widget_private(widget);
+    if (!d->isOpaque && widget->testAttribute(Qt::WA_TranslucentBackground))
+        return d->createDefaultWindowSurface_sys();
+#endif
     return new QVGWindowSurface(widget);
 }