Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integration

* '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2:
  Fall back to Qt for loading images with DICAPS_COLORKEY.
  Implement QWidget::metric PdmNumColors for QWS
  Adding ::scroll capabilities to live pixmaps.
  Major refactoring: creating a new QPixmapData subclass for live textures.

1 files changed, 0 insertions, 28 deletions

diff --git a/src/plugins/graphicssystems/meego/qmeegopixmapdata.cpp b/src/plugins/graphicssystems/meego/qmeegopixmapdata.cpp
index 08c2656..0899f2d 100644
--- a/src/plugins/graphicssystems/meego/qmeegopixmapdata.cpp
+++ b/src/plugins/graphicssystems/meego/qmeegopixmapdata.cpp
@@ -106,34 +106,6 @@ void QMeeGoPixmapData::fromImage(const QImage &image,
     }
 }
 
-void QMeeGoPixmapData::fromEGLImage(Qt::HANDLE handle)
-{
-    QGLShareContextScope ctx(qt_gl_share_widget()->context());
-    QMeeGoExtensions::ensureInitialized();
- 
-    bool textureIsBound = false;
-    GLuint newTextureId;
-    GLint newWidth, newHeight;
-
-    glGenTextures(1, &newTextureId);
-    glBindTexture(GL_TEXTURE_2D, newTextureId);
-   
-    glEGLImageTargetTexture2DOES(GL_TEXTURE_2D, (EGLImageKHR) handle);
-    GLint err = glGetError();
-    if (err == GL_NO_ERROR)
-        textureIsBound = true;
-        
-    QMeeGoExtensions::eglQueryImageNOK(QEgl::display(), (EGLImageKHR) handle, EGL_WIDTH, &newWidth);
-    QMeeGoExtensions::eglQueryImageNOK(QEgl::display(), (EGLImageKHR) handle, EGL_HEIGHT, &newHeight);
-          
-    if (textureIsBound) {
-        fromTexture(newTextureId, newWidth, newHeight, true); 
-    } else {
-        qWarning("Failed to create a texture from an egl image!");
-        glDeleteTextures(1, &newTextureId);
-    }
-}
-
 void QMeeGoPixmapData::fromEGLSharedImage(Qt::HANDLE handle, const QImage &si)
 {
     if (si.isNull())