Merge remote branch 'upstream/4.7' into qt-4.8-from-4.7

6 files changed, 20 insertions, 15 deletions

diff --git a/src/gui/inputmethod/qcoefepinputcontext_s60.cpp b/src/gui/inputmethod/qcoefepinputcontext_s60.cpp
index 3407502..9b5e917 100644
--- a/src/gui/inputmethod/qcoefepinputcontext_s60.cpp
+++ b/src/gui/inputmethod/qcoefepinputcontext_s60.cpp
@@ -365,6 +365,11 @@ bool QCoeFepInputContext::symbianFilterEvent(QWidget *keyWidget, const QSymbianE
         }
     }
 
+    if (event->type() == QSymbianEvent::ResourceChangeEvent
+         && event->resourceChangeType() == KEikMessageFadeAllWindows) {
+        reset();
+    }
+
     return false;
 }
 
diff --git a/src/imports/shaders/glfunctions.h b/src/imports/shaders/glfunctions.h
index 03b88d1..8529519 100755
--- a/src/imports/shaders/glfunctions.h
+++ b/src/imports/shaders/glfunctions.h
@@ -45,26 +45,26 @@
 #ifndef QT_OPENGL_ES
 
 #ifndef Q_WS_MAC
-# ifndef QGLF_APIENTRYP
-#   ifdef QGLF_APIENTRY
-#     define QGLF_APIENTRYP QGLF_APIENTRY *
+# ifndef APIENTRYP
+#   ifdef APIENTRY
+#     define APIENTRYP APIENTRY *
 #   else
-#     define QGLF_APIENTRY
-#     define QGLF_APIENTRYP *
+#     define APIENTRY
+#     define APIENTRYP *
 #   endif
 # endif
 #else
-# define QGLF_APIENTRY
-# define QGLF_APIENTRYP *
+# define APIENTRY
+# define APIENTRYP *
 #endif
 
 #define GL_TEXTURE0 0x84C0
 #define GL_CLAMP_TO_EDGE 0x812F
 #define GL_BGRA 0x80E1
 
-typedef void (QGLF_APIENTRYP type_glActiveTexture)(GLenum texture);
-typedef void (QGLF_APIENTRYP type_glGenerateMipmap)(GLenum target);
-typedef void (QGLF_APIENTRYP type_glVertexAttribPointer)(GLuint, GLint, GLenum, GLboolean, GLsizei, const GLvoid *);
+typedef void (APIENTRYP type_glActiveTexture)(GLenum texture);
+typedef void (APIENTRYP type_glGenerateMipmap)(GLenum target);
+typedef void (APIENTRYP type_glVertexAttribPointer)(GLuint, GLint, GLenum, GLboolean, GLsizei, const GLvoid *);
 
 #define glActiveTexture ((type_glActiveTexture)QGLContext::currentContext()->getProcAddress(QLatin1String("glActiveTexture")))
 #define glGenerateMipmap ((type_glGenerateMipmap)QGLContext::currentContext()->getProcAddress(QLatin1String("glGenerateMipmap")))
diff --git a/tests/manual/declarative/qmlshadersplugin/qml/qmlshadersplugintest/TestHorizontalWrap.qml b/tests/manual/declarative/qmlshadersplugin/qml/qmlshadersplugintest/TestHorizontalWrap.qml
index 3b94389..ec372ca 100644
--- a/tests/manual/declarative/qmlshadersplugin/qml/qmlshadersplugintest/TestHorizontalWrap.qml
+++ b/tests/manual/declarative/qmlshadersplugin/qml/qmlshadersplugintest/TestHorizontalWrap.qml
@@ -70,7 +70,7 @@ Rectangle {
         uniform lowp sampler2D source;
         varying highp vec2 qt_TexCoord0;
         void main() {
-            vec2 tex = qt_TexCoord0 * 4.0;
+            highp vec2 tex = qt_TexCoord0 * 4.0;
             gl_FragColor = texture2D(source, tex);
         }
         "
diff --git a/tests/manual/declarative/qmlshadersplugin/qml/qmlshadersplugintest/TestVertexShader.qml b/tests/manual/declarative/qmlshadersplugin/qml/qmlshadersplugintest/TestVertexShader.qml
index a7530dc..4edb065 100644
--- a/tests/manual/declarative/qmlshadersplugin/qml/qmlshadersplugintest/TestVertexShader.qml
+++ b/tests/manual/declarative/qmlshadersplugin/qml/qmlshadersplugintest/TestVertexShader.qml
@@ -67,7 +67,7 @@ Rectangle {
             {
                 qt_TexCoord0 = qt_MultiTexCoord0;
                 gl_Position = qt_ModelViewProjectionMatrix * qt_Vertex;
-            };
+            }
         "
 
         property string dummyVertexShader: "
@@ -79,7 +79,7 @@ Rectangle {
             {
                  qt_TexCoord0 = qt_MultiTexCoord0;
                  gl_Position = qt_Vertex * vec4(0.0, 0.0, 0.0, 0.0001);
-            };
+            }
         "
 
         vertexShader: defaultVertexShader
diff --git a/tests/manual/declarative/qmlshadersplugin/qml/qmlshadersplugintest/TestVerticalWrap.qml b/tests/manual/declarative/qmlshadersplugin/qml/qmlshadersplugintest/TestVerticalWrap.qml
index 726b237..b7d6db4 100644
--- a/tests/manual/declarative/qmlshadersplugin/qml/qmlshadersplugintest/TestVerticalWrap.qml
+++ b/tests/manual/declarative/qmlshadersplugin/qml/qmlshadersplugintest/TestVerticalWrap.qml
@@ -69,7 +69,7 @@ Rectangle {
         uniform lowp sampler2D source;
         varying highp vec2 qt_TexCoord0;
         void main() {
-            vec2 tex = qt_TexCoord0 * 4.0;
+            highp vec2 tex = qt_TexCoord0 * 4.0;
             gl_FragColor = texture2D(source, tex);
         }
         "
diff --git a/tests/manual/declarative/qmlshadersplugin/qml/qmlshadersplugintest/TestWrapRepeat.qml b/tests/manual/declarative/qmlshadersplugin/qml/qmlshadersplugintest/TestWrapRepeat.qml
index 514e150..e09673c 100644
--- a/tests/manual/declarative/qmlshadersplugin/qml/qmlshadersplugintest/TestWrapRepeat.qml
+++ b/tests/manual/declarative/qmlshadersplugin/qml/qmlshadersplugintest/TestWrapRepeat.qml
@@ -69,7 +69,7 @@ Rectangle {
         uniform lowp sampler2D source;
         varying highp vec2 qt_TexCoord0;
         void main() {
-            vec2 tex = qt_TexCoord0 * 4.0;
+            highp vec2 tex = qt_TexCoord0 * 4.0;
             gl_FragColor = texture2D(source, tex);
         }
         "