summaryrefslogtreecommitdiffstats
path: root/src/opengl/gl2paintengineex/qpaintengineex_opengl2.cpp
diff options
context:
space:
mode:
authorGunnar Sletta <gunnar@trolltech.com>2009-09-16 06:52:46 (GMT)
committerGunnar Sletta <gunnar@trolltech.com>2009-09-16 06:52:46 (GMT)
commit0d08eb833cde5ad7f671208ce0d201d86bdef8e6 (patch)
tree871d0fac51b6b4965bc3545fa44fdbc56ca69d6d /src/opengl/gl2paintengineex/qpaintengineex_opengl2.cpp
parentec6c31b95c8c83d785ae884a5522a82351610461 (diff)
parent10e1d939d6bf08249304cb2c555be2f74c3a0f02 (diff)
downloadQt-0d08eb833cde5ad7f671208ce0d201d86bdef8e6.zip
Qt-0d08eb833cde5ad7f671208ce0d201d86bdef8e6.tar.gz
Qt-0d08eb833cde5ad7f671208ce0d201d86bdef8e6.tar.bz2
Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt into 4.6
Diffstat (limited to 'src/opengl/gl2paintengineex/qpaintengineex_opengl2.cpp')
-rw-r--r--src/opengl/gl2paintengineex/qpaintengineex_opengl2.cpp8
1 files changed, 0 insertions, 8 deletions
diff --git a/src/opengl/gl2paintengineex/qpaintengineex_opengl2.cpp b/src/opengl/gl2paintengineex/qpaintengineex_opengl2.cpp
index 70e7ef3..837d055 100644
--- a/src/opengl/gl2paintengineex/qpaintengineex_opengl2.cpp
+++ b/src/opengl/gl2paintengineex/qpaintengineex_opengl2.cpp
@@ -1767,14 +1767,6 @@ QOpenGL2PaintEngineState::~QOpenGL2PaintEngineState()
{
}
-QPixmapFilter *QGL2PaintEngineEx::createPixmapFilter(int type) const
-{
- const QGLContext *ctx = QGLContext::currentContext();
- if (ctx)
- return ctx->d_func()->createPixmapFilter(type);
- return 0;
-}
-
QT_END_NAMESPACE
#include "qpaintengineex_opengl2.moc"