path: root/src/gui/image
diff options
authorSamuel Rødal <>2011-08-22 10:49:28 +0200
committerSamuel Rødal <>2011-08-29 10:25:24 +0200
commit6e28e8441b698c3397c2c78125c877f2e9867cb1 (patch)
tree1e3ad0e43cb775854835817cd04bdc8b5e047e15 /src/gui/image
parentaaa4a26f82f99fa8724841eba91bad029306e0ce (diff)
Copy core GL functionality to QtGui with QGL -> QOpenGL naming.
Change-Id: Ibc989afa4a30dd184d41d1a1cd89f97196e48855 Reviewed-on: Reviewed-by: Gunnar Sletta <>
Diffstat (limited to 'src/gui/image')
3 files changed, 3 insertions, 3 deletions
diff --git a/src/gui/image/qpixmap.h b/src/gui/image/qpixmap.h
index 402708b48c..330370e25b 100644
--- a/src/gui/image/qpixmap.h
+++ b/src/gui/image/qpixmap.h
@@ -182,7 +182,7 @@ private:
friend class QBitmap;
friend class QPaintDevice;
friend class QPainter;
- friend class QGLWidget;
+ friend class QOpenGLWidget;
friend class QWidgetPrivate;
friend class QRasterBuffer;
#if !defined(QT_NO_DATASTREAM)
diff --git a/src/gui/image/qplatformpixmap.cpp b/src/gui/image/qplatformpixmap.cpp
index 7fb1bd6530..a214f397ed 100644
--- a/src/gui/image/qplatformpixmap.cpp
+++ b/src/gui/image/qplatformpixmap.cpp
@@ -73,7 +73,7 @@ QPlatformPixmap::QPlatformPixmap(PixelType pixelType, int objectId)
// Sometimes the pixmap cleanup hooks will be called from derrived classes, which will
- // then set is_cached to false. For example, on X11 QtOpenGL needs to delete the GLXPixmap
+ // then set is_cached to false. For example, on X11 QtGui needs to delete the GLXPixmap
// or EGL Pixmap Surface for a given pixmap _before_ the native X11 pixmap is deleted,
// otherwise some drivers will leak the GL surface. In this case, QX11PlatformPixmap will
// call the cleanup hooks itself before deleting the native pixmap and set is_cached to
diff --git a/src/gui/image/qplatformpixmap_qpa.h b/src/gui/image/qplatformpixmap_qpa.h
index 5f5b903962..d528f4138f 100644
--- a/src/gui/image/qplatformpixmap_qpa.h
+++ b/src/gui/image/qplatformpixmap_qpa.h
@@ -136,7 +136,7 @@ protected:
friend class QPixmap;
friend class QImagePixmapCleanupHooks; // Needs to set is_cached
- friend class QGLTextureCache; //Needs to check the reference count
+ friend class QOpenGLTextureCache; //Needs to check the reference count
friend class QExplicitlySharedDataPointer<QPlatformPixmap>;
QAtomicInt ref;