Changeset 846 for trunk/src/opengl/qpixmapdata_gl_p.h

Timestamp:

May 5, 2011, 5:36:53 AM (14 years ago)

Author:

Dmitry A. Kuminov

Message:

trunk: Merged in qt 4.7.2 sources from branches/vendor/nokia/qt.

Location:

trunk

Files:

• . (modified) (1 prop)
• src/opengl/qpixmapdata_gl_p.h (modified) (4 diffs)

trunk/src/opengl/qpixmapdata_gl_p.h

@@ -1 +1 @@
 /****************************************************************************
 **
-** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
@@ -97 +97 @@
 
 
-class QGLPixmapData : public QPixmapData
+class Q_OPENGL_EXPORT QGLPixmapData : public QPixmapData
 {
 public:
@@ -146 +146 @@
     QSize size() const { return QSize(w, h); }
 
-    static bool useFramebufferObjects();
+    bool useFramebufferObjects() const;
 
     QImage fillImage(const QColor &color) const;
@@ -169 +169 @@
 
     friend class QGLPixmapGLPaintDevice;
+    friend class QMeeGoPixmapData;
+    friend class QMeeGoLivePixmapData;
 };