Merge remote-tracking branch 'qt/4.8'

Conflicts:
	doc/src/examples/wheel.qdoc
	src/gui/util/qflickgesture.cpp
	src/gui/util/qflickgesture_p.h
	src/gui/util/qscroller.cpp
	src/gui/util/qscroller.h
	src/gui/util/qscroller_p.h
	src/gui/util/qscrollerproperties.cpp
	src/gui/util/qscrollerproperties.h
	tests/auto/qscroller/tst_qscroller.cpp

4 files changed, 60 insertions, 26 deletions

diff --git a/src/opengl/qgl_symbian.cpp b/src/opengl/qgl_symbian.cpp
index bc65bcd..91904d0 100644
--- a/src/opengl/qgl_symbian.cpp
+++ b/src/opengl/qgl_symbian.cpp
@@ -49,6 +49,9 @@
 #include <private/qpaintengine_opengl_p.h>
 #include <private/qwidget_p.h> // to access QWExtra
 #include <private/qnativeimagehandleprovider_p.h>
+#include <private/qapplication_p.h>
+#include <private/qgraphicssystem_p.h>
+#include <private/qgraphicssystemex_symbian_p.h>
 #include "qgl_egl_p.h"
 #include "qpixmapdata_gl_p.h"
 #include "qgltexturepool_p.h"
@@ -180,6 +183,15 @@ bool QGLContext::chooseContext(const QGLContext* shareContext) // almost same as
         d->ownsEglContext = true;
         d->eglContext->setApi(QEgl::OpenGL);
 
+        QGraphicsSystemEx *ex = QApplicationPrivate::graphicsSystem()->platformExtension();
+        QSymbianGraphicsSystemEx *symex = static_cast<QSymbianGraphicsSystemEx*>(ex);
+        if (symex && !symex->hasBCM2727()) {
+            // Most likely we have hw support for multisampling
+            // so let's enable it.
+            d->glFormat.setSampleBuffers(1);
+            d->glFormat.setSamples(4);
+        }
+
 	    // If the device is a widget with WA_TranslucentBackground set, make sure the glFormat
         // has the alpha channel option set:
         if (devType == QInternal::Widget) {
@@ -229,20 +241,20 @@ bool QGLContext::chooseContext(const QGLContext* shareContext) // almost same as
 
         d->eglSurface = QEgl::createSurface(device(), d->eglContext->config());
 
-    eglGetError();  // Clear error state first.
+        eglGetError();  // Clear error state first.
 
 #ifdef QGL_NO_PRESERVED_SWAP
-    eglSurfaceAttrib(QEgl::display(), d->eglSurface,
-            EGL_SWAP_BEHAVIOR, EGL_BUFFER_DESTROYED);
+        eglSurfaceAttrib(QEgl::display(), d->eglSurface,
+                EGL_SWAP_BEHAVIOR, EGL_BUFFER_DESTROYED);
 
-    if (eglGetError() != EGL_SUCCESS)
-        qWarning("QGLContext: could not enable destroyed swap behaviour");
+        if (eglGetError() != EGL_SUCCESS)
+            qWarning("QGLContext: could not enable destroyed swap behaviour");
 #else
-    eglSurfaceAttrib(QEgl::display(), d->eglSurface,
-            EGL_SWAP_BEHAVIOR, EGL_BUFFER_PRESERVED);
+        eglSurfaceAttrib(QEgl::display(), d->eglSurface,
+                EGL_SWAP_BEHAVIOR, EGL_BUFFER_PRESERVED);
 
-    if (eglGetError() != EGL_SUCCESS)
-        qWarning("QGLContext: could not enable preserved swap behaviour");
+        if (eglGetError() != EGL_SUCCESS)
+            qWarning("QGLContext: could not enable preserved swap behaviour");
 #endif
 
         setWindowCreated(true);
diff --git a/src/opengl/qglfunctions.cpp b/src/opengl/qglfunctions.cpp
index 2724921..c11c4a8 100644
--- a/src/opengl/qglfunctions.cpp
+++ b/src/opengl/qglfunctions.cpp
@@ -211,19 +211,24 @@ QGLFunctions::QGLFunctions(const QGLContext *context)
 static int qt_gl_resolve_features()
 {
 #if defined(QT_OPENGL_ES_2)
-    return QGLFunctions::Multitexture |
-           QGLFunctions::Shaders |
-           QGLFunctions::Buffers |
-           QGLFunctions::Framebuffers |
-           QGLFunctions::BlendColor |
-           QGLFunctions::BlendEquation |
-           QGLFunctions::BlendEquationSeparate |
-           QGLFunctions::BlendFuncSeparate |
-           QGLFunctions::BlendSubtract |
-           QGLFunctions::CompressedTextures |
-           QGLFunctions::Multisample |
-           QGLFunctions::StencilSeparate |
-           QGLFunctions::NPOTTextures;
+    int features = QGLFunctions::Multitexture |
+                   QGLFunctions::Shaders |
+                   QGLFunctions::Buffers |
+                   QGLFunctions::Framebuffers |
+                   QGLFunctions::BlendColor |
+                   QGLFunctions::BlendEquation |
+                   QGLFunctions::BlendEquationSeparate |
+                   QGLFunctions::BlendFuncSeparate |
+                   QGLFunctions::BlendSubtract |
+                   QGLFunctions::CompressedTextures |
+                   QGLFunctions::Multisample |
+                   QGLFunctions::StencilSeparate;
+    QGLExtensionMatcher extensions;
+    if (extensions.match("GL_OES_texture_npot"))
+        features |= QGLFunctions::NPOTTextures;
+    if (extensions.match("GL_IMG_texture_npot"))
+        features |= QGLFunctions::NPOTTextures;
+    return features;
 #elif defined(QT_OPENGL_ES)
     int features = QGLFunctions::Multitexture |
                    QGLFunctions::Buffers |
@@ -240,6 +245,8 @@ static int qt_gl_resolve_features()
         features |= QGLFunctions::BlendSubtract;
     if (extensions.match("GL_OES_texture_npot"))
         features |= QGLFunctions::NPOTTextures;
+    if (extensions.match("GL_IMG_texture_npot"))
+        features |= QGLFunctions::NPOTTextures;
     return features;
 #else
     int features = 0;
diff --git a/src/opengl/qgraphicssystem_gl.cpp b/src/opengl/qgraphicssystem_gl.cpp
index 01a2864..8530b52 100644
--- a/src/opengl/qgraphicssystem_gl.cpp
+++ b/src/opengl/qgraphicssystem_gl.cpp
@@ -104,11 +104,17 @@ QWindowSurface *QGLGraphicsSystem::createWindowSurface(QWidget *widget) const
 
     return new QGLWindowSurface(widget);
 }
-#ifdef QGL_USE_TEXTURE_POOL
-void QGLGraphicsSystem::releaseCachedResources()
+#ifdef Q_OS_SYMBIAN
+void QGLGraphicsSystem::releaseCachedGpuResources()
 {
     QGLTexturePool::instance()->hibernate();
 }
+
+QGraphicsSystemEx* QGLGraphicsSystem::platformExtension()
+{
+    return this;
+}
 #endif
+
 QT_END_NAMESPACE
 
diff --git a/src/opengl/qgraphicssystem_gl_p.h b/src/opengl/qgraphicssystem_gl_p.h
index 6e8e9a8..c8387e4 100644
--- a/src/opengl/qgraphicssystem_gl_p.h
+++ b/src/opengl/qgraphicssystem_gl_p.h
@@ -55,11 +55,19 @@
 
 #include "private/qgraphicssystem_p.h"
 
+#ifdef Q_OS_SYMBIAN
+#include "private/qgraphicssystemex_symbian_p.h"
+#endif
+
 #include <QMap>
 
 QT_BEGIN_NAMESPACE
 
 class Q_OPENGL_EXPORT QGLGraphicsSystem : public QGraphicsSystem
+#ifdef Q_OS_SYMBIAN
+    , public QSymbianGraphicsSystemEx
+#endif
+
 {
 public:
     QGLGraphicsSystem(bool useX11GL);
@@ -67,8 +75,9 @@ public:
     QPixmapData *createPixmapData(QPixmapData::PixelType type) const;
     QWindowSurface *createWindowSurface(QWidget *widget) const;
 
-#ifdef QGL_USE_TEXTURE_POOL
-    void releaseCachedResources();
+#ifdef Q_OS_SYMBIAN
+    void releaseCachedGpuResources();
+    QGraphicsSystemEx* platformExtension();
 #endif
 private:
     bool m_useX11GL;