diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-03-10 15:53:20 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-03-10 15:53:20 (GMT) |
| commit | b80466364fe6c6ca030b884f2d8df94bdfa477b9 (patch) | |
| tree | 3bceaf50ae806138525bd5977e693da6b58cf942 /src/opengl/gl2paintengineex/qglgradientcache.cpp | |
| parent | 1e9552f826c05bf9884fb2893dedca265ead363b (diff) | |
| parent | 9b016ce33e4d63725239945a2fcf19a8d6af14cf (diff) | |
| download | Qt-b80466364fe6c6ca030b884f2d8df94bdfa477b9.zip Qt-b80466364fe6c6ca030b884f2d8df94bdfa477b9.tar.gz Qt-b80466364fe6c6ca030b884f2d8df94bdfa477b9.tar.bz2 | |
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2:
Re-enable tst_QGL::glWidgetRenderPixmap on X11/EGL
Added clipping to the dashed stroke processor in the GL2 engine.
Fixed assert failure when drawing dashes with raster engine.
Update tst_QGL::getSetCheck to check for new (correct) behaviour
Update QGLFormat from EGLConfig properly
Make calls to QGLFormat::set*BufferSize also update flags
Compile fix when Qt3Support is enabled for devices using EGL.
Cocoa: Fix misaligned text between format changes
Added configure check to diasable building QtDeclarative
Fixes Q3ListViewItem grandchildren not sorted if item has one child
Compile with Qt3Support in a ScratchBox environment.
Diffstat (limited to 'src/opengl/gl2paintengineex/qglgradientcache.cpp')
| -rw-r--r-- | src/opengl/gl2paintengineex/qglgradientcache.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/opengl/gl2paintengineex/qglgradientcache.cpp b/src/opengl/gl2paintengineex/qglgradientcache.cpp index 192e01c..a1495dd 100644 --- a/src/opengl/gl2paintengineex/qglgradientcache.cpp +++ b/src/opengl/gl2paintengineex/qglgradientcache.cpp @@ -39,10 +39,10 @@ ** ****************************************************************************/ +#include "qglgradientcache_p.h" #include <private/qdrawhelper_p.h> #include <private/qgl_p.h> -#include "qglgradientcache_p.h" QT_BEGIN_NAMESPACE |