diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2011-06-22 22:15:40 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2011-06-22 22:15:40 (GMT) |
| commit | 00062150f61f5930a158594583a564d659232216 (patch) | |
| tree | 2d1685fa729bcac9c08fdd43b5c2436d6ad1d342 /src/opengl/opengl.pro | |
| parent | f28990edd2c95f4382d661e4731d06060bb11b39 (diff) | |
| parent | 14f10211e72f2d04fa7f4e0faa430eb94c1f8f83 (diff) | |
| download | Qt-00062150f61f5930a158594583a564d659232216.zip Qt-00062150f61f5930a158594583a564d659232216.tar.gz Qt-00062150f61f5930a158594583a564d659232216.tar.bz2 | |
Merge branch 'qt-4.8-from-4.7' of scm.dev.nokia.troll.no:qt/qt-integration into master-integration
* 'qt-4.8-from-4.7' of scm.dev.nokia.troll.no:qt/qt-integration:
Fix crash in PropertyChanges.
Scroll correctly when cursorPosition is changed within onTextChanged.
Fixing OpenGL module build error on Solaris
Fix dialog position adjustment regression in Symbian
SSL readbuffer 16->32 kB
Fixes to how resize event and layout request are posted.
Limit the cookies count per domain to 50.
Add missing freeTexture() from fix for QTBUG-19180
Last word inputted was duplicated after input method hints changed
Simplify texture pooling logic in GL graphics system.
Fixed move a QGraphicsWidget and invalidate its layout at the same time
Fix infinite recursion when changing geometry on Mac
Diffstat (limited to 'src/opengl/opengl.pro')
| -rw-r--r-- | src/opengl/opengl.pro | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/opengl/opengl.pro b/src/opengl/opengl.pro index e7c1c44..ce1a5d2 100644 --- a/src/opengl/opengl.pro +++ b/src/opengl/opengl.pro @@ -157,10 +157,10 @@ embedded { } symbian { - DEFINES += QGL_USE_TEXTURE_POOL QGL_NO_PRESERVED_SWAP + DEFINES += QGL_NO_PRESERVED_SWAP SOURCES -= qpixmapdata_gl.cpp SOURCES += qgl_symbian.cpp \ - qpixmapdata_poolgl.cpp \ + qpixmapdata_symbiangl.cpp \ qglpixelbuffer_egl.cpp \ qgl_egl.cpp \ qgltexturepool.cpp |