Merge branch 'qt-master-from-4.7' of scm.dev.nokia.troll.no:qt/qt-integration into master-integration

* 'qt-master-from-4.7' of scm.dev.nokia.troll.no:qt/qt-integration: (100 commits)
  Fix proxy reading from gconf so that it is only done once / session.
  rebuild configure
  fix misleading uppercasing deprecation warning
  Enable Phonon on Symbian by default.
  Disable OpenGL on Symbian only by default instead of always
  VFP type on ARM option in Linux configure script
  Adding -dont-process option to Unix configure script
  Synchronized configure.exe OpenGL options with Unix configure
  build lrelease as part of the "libs" part.
  purge vestiges of imageformat-plugins
  Unify epocroot usage in createpackage and patch_capabilities scripts
  Update visual tests for the recent qmlviewer change
  Do not use openGL on Mac OS X for QML visual tests
  Give qmlviewer a minimum size if root object has no size.
  Add 'Writing New Components' docs, and document the connect() function.
  Mention that image providers should be added before loading QML files
  Update QML visual tests
  Cleaned up sis_targets.prf
  Append qml import path individually for each available drive on Symbian
  Update TextInput when echoMode changes.
  ...

3 files changed, 5 insertions, 2 deletions

diff --git a/src/opengl/qgl.cpp b/src/opengl/qgl.cpp
index dc7a333..8b31849 100644
--- a/src/opengl/qgl.cpp
+++ b/src/opengl/qgl.cpp
@@ -2125,7 +2125,9 @@ void QGLContextPrivate::cleanup()
 void QGLContextPrivate::setVertexAttribArrayEnabled(int arrayIndex, bool enabled)
 {
     Q_ASSERT(arrayIndex < QT_GL_VERTEX_ARRAY_TRACKED_COUNT);
+#ifdef glEnableVertexAttribArray
     Q_ASSERT(glEnableVertexAttribArray);
+#endif
 
     if (vertexAttributeArraysEnabledState[arrayIndex] && !enabled)
         glDisableVertexAttribArray(arrayIndex);
@@ -2138,7 +2140,9 @@ void QGLContextPrivate::setVertexAttribArrayEnabled(int arrayIndex, bool enabled
 
 void QGLContextPrivate::syncGlState()
 {
+#ifdef glEnableVertexAttribArray
     Q_ASSERT(glEnableVertexAttribArray);
+#endif
     for (int i = 0; i < QT_GL_VERTEX_ARRAY_TRACKED_COUNT; ++i) {
         if (vertexAttributeArraysEnabledState[i])
             glEnableVertexAttribArray(i);
diff --git a/src/opengl/qgl_x11egl.cpp b/src/opengl/qgl_x11egl.cpp
index 21b1ab6..b323d29 100644
--- a/src/opengl/qgl_x11egl.cpp
+++ b/src/opengl/qgl_x11egl.cpp
@@ -345,7 +345,7 @@ void QGLWidgetPrivate::recreateEglSurface()
     // old surface before re-creating a new one. Note: This should not be the case as the
     // surface should be deleted before the old window id.
     if (glcx->d_func()->eglSurface != EGL_NO_SURFACE && (currentId != eglSurfaceWindowId)) {
-        qWarning("EGL surface for deleted window %lx was not destroyed", eglSurfaceWindowId);
+        qWarning("EGL surface for deleted window %lx was not destroyed", uint(eglSurfaceWindowId));
         glcx->d_func()->destroyEglSurfaceForDevice();
     }
 
diff --git a/src/opengl/qglpixelbuffer_egl.cpp b/src/opengl/qglpixelbuffer_egl.cpp
index 0b94f5a..2d9f6f1 100644
--- a/src/opengl/qglpixelbuffer_egl.cpp
+++ b/src/opengl/qglpixelbuffer_egl.cpp
@@ -74,7 +74,6 @@ bool QGLPixelBufferPrivate::init(const QSize &size, const QGLFormat &f, QGLWidge
         // Use the same configuration as the widget we are sharing with.
         ctx->setConfig(shareContext->config());
 #if QGL_RENDER_TEXTURE
-        EGLint value = EGL_FALSE;
         if (ctx->configAttrib(EGL_BIND_TO_TEXTURE_RGBA) == EGL_TRUE)
             textureFormat = EGL_TEXTURE_RGBA;
         else if (ctx->configAttrib(EGL_BIND_TO_TEXTURE_RGB) == EGL_TRUE)