diff options
| author | Thiago Macieira <thiago.macieira@nokia.com> | 2011-03-24 16:18:52 (GMT) |
|---|---|---|
| committer | Thiago Macieira <thiago.macieira@nokia.com> | 2011-03-24 16:18:52 (GMT) |
| commit | f09b8e7b134c8dfe7e50d64662e943273d721d9a (patch) | |
| tree | 19b13cbe46a5c676327c3b4098e527f465469523 /src/opengl/gl2paintengineex | |
| parent | 295fbcba490712fe6e6f61926836920366134b55 (diff) | |
| parent | 660f881f04a0880c83a0b43b4f4d0e89da082d92 (diff) | |
| download | Qt-f09b8e7b134c8dfe7e50d64662e943273d721d9a.zip Qt-f09b8e7b134c8dfe7e50d64662e943273d721d9a.tar.gz Qt-f09b8e7b134c8dfe7e50d64662e943273d721d9a.tar.bz2 | |
Merge remote-tracking branch 'origin/4.7' into qt-master-from-4.7
Conflicts:
src/opengl/qwindowsurface_gl.cpp
Diffstat (limited to 'src/opengl/gl2paintengineex')
| -rw-r--r-- | src/opengl/gl2paintengineex/qpaintengineex_opengl2.cpp | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/src/opengl/gl2paintengineex/qpaintengineex_opengl2.cpp b/src/opengl/gl2paintengineex/qpaintengineex_opengl2.cpp index a134078..ad77d7f 100644 --- a/src/opengl/gl2paintengineex/qpaintengineex_opengl2.cpp +++ b/src/opengl/gl2paintengineex/qpaintengineex_opengl2.cpp @@ -90,10 +90,6 @@ QT_BEGIN_NAMESPACE -#if defined(Q_OS_SYMBIAN) -#define QT_GL_NO_SCISSOR_TEST -#endif - #if defined(Q_WS_WIN) extern Q_GUI_EXPORT bool qt_cleartype_enabled; #endif |