diff options
| author | David Boddie <david.boddie@nokia.com> | 2011-05-06 15:08:45 (GMT) |
|---|---|---|
| committer | David Boddie <david.boddie@nokia.com> | 2011-05-06 15:08:45 (GMT) |
| commit | 6bc6003cb2a2bb770d4e060653f18c05d8f4296b (patch) | |
| tree | 44cddd871e6cac48345a04bb900addf9626b5e8b /src/opengl/qgl_x11.cpp | |
| parent | bb4e1cefdf4d8302d89914e54e6ff7e2fc9481e8 (diff) | |
| download | Qt-6bc6003cb2a2bb770d4e060653f18c05d8f4296b.zip Qt-6bc6003cb2a2bb770d4e060653f18c05d8f4296b.tar.gz Qt-6bc6003cb2a2bb770d4e060653f18c05d8f4296b.tar.bz2 | |
Squashed merge of the master-temp branch.
Conflicts:
doc/src/examples/maemovibration.qdoc
Diffstat (limited to 'src/opengl/qgl_x11.cpp')
| -rw-r--r-- | src/opengl/qgl_x11.cpp | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/src/opengl/qgl_x11.cpp b/src/opengl/qgl_x11.cpp index 9b52003..9e170ad 100644 --- a/src/opengl/qgl_x11.cpp +++ b/src/opengl/qgl_x11.cpp @@ -1407,10 +1407,6 @@ bool QGLWidgetPrivate::renderCxPm(QPixmap* pm) return true; } -/*! \internal - Free up any allocated colormaps. This fn is only called for - top-level widgets. -*/ void QGLWidgetPrivate::cleanupColormaps() { if (!cmap.handle()) { |