diff -r 56cd8111b7f7 -r 41300fa6a67c src/opengl/qpixmapdata_gl_p.h
--- a/src/opengl/qpixmapdata_gl_p.h	Tue Jan 26 12:42:25 2010 +0200
+++ b/src/opengl/qpixmapdata_gl_p.h	Tue Feb 02 00:43:10 2010 +0200
@@ -69,7 +69,7 @@
 class QGLFramebufferObjectPool
 {
 public:
-    QGLFramebufferObject *acquire(const QSize &size, const QGLFramebufferObjectFormat &format);
+    QGLFramebufferObject *acquire(const QSize &size, const QGLFramebufferObjectFormat &format, bool strictSize = false);
     void release(QGLFramebufferObject *fbo);
 
 private:
@@ -106,6 +106,10 @@
     // Re-implemented from QPixmapData:
     void resize(int width, int height);
     void fromImage(const QImage &image, Qt::ImageConversionFlags flags);
+    bool fromFile(const QString &filename, const char *format,
+                  Qt::ImageConversionFlags flags);
+    bool fromData(const uchar *buffer, uint len, const char *format,
+                  Qt::ImageConversionFlags flags);
     void copy(const QPixmapData *data, const QRect &rect);
     bool scroll(int dx, int dy, const QRect &rect);
     void fill(const QColor &color);