diff options
| author | Andreas Aardal Hanssen <andreas.aardal.hanssen@nokia.com> | 2009-09-15 13:29:48 (GMT) |
|---|---|---|
| committer | Andreas Aardal Hanssen <andreas.aardal.hanssen@nokia.com> | 2009-09-15 13:29:48 (GMT) |
| commit | 9d96ff055390cea8996b68dc4aef39512fbd9c96 (patch) | |
| tree | 525c1afc933bba0f3f00bbcbfc560d10db439179 /src/opengl/qpaintengine_opengl.cpp | |
| parent | b13365187b58ecc2d259589ab523a7d0da84dc83 (diff) | |
| parent | f42f5c457b3368adb4c92e521dc56969f138bdd3 (diff) | |
| download | Qt-9d96ff055390cea8996b68dc4aef39512fbd9c96.zip Qt-9d96ff055390cea8996b68dc4aef39512fbd9c96.tar.gz Qt-9d96ff055390cea8996b68dc4aef39512fbd9c96.tar.bz2 | |
Merge commit 'qt-mainline/4.6' into kinetic-declarativeui
Diffstat (limited to 'src/opengl/qpaintengine_opengl.cpp')
| -rw-r--r-- | src/opengl/qpaintengine_opengl.cpp | 14 |
1 files changed, 0 insertions, 14 deletions
diff --git a/src/opengl/qpaintengine_opengl.cpp b/src/opengl/qpaintengine_opengl.cpp index ff00f29..bd3883a 100644 --- a/src/opengl/qpaintengine_opengl.cpp +++ b/src/opengl/qpaintengine_opengl.cpp @@ -5625,20 +5625,6 @@ void QOpenGLPaintEnginePrivate::ensureDrawableTexture() #endif } -QPixmapFilter *QOpenGLPaintEngine::createPixmapFilter(int type) const -{ -#if !defined(QT_OPENGL_ES_1) && !defined(QT_OPENGL_ES_1_CL) - if (QGLContext::currentContext()) - return QGLContext::currentContext()->d_func()->createPixmapFilter(type); - else - return 0; -#else - Q_UNUSED(type); - return 0; -#endif -} - - QT_END_NAMESPACE #include "qpaintengine_opengl.moc" |