diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-07-08 07:33:30 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-07-08 07:33:30 (GMT) |
| commit | 165d5f93ef75f8f4a1bbaeab1f3b3c6825819b0e (patch) | |
| tree | 5298fb0dd72e5ac06b8d29d29ac68314456651c7 /src/plugins/gfxdrivers/eglnullws/eglnullwsscreenplugin.cpp | |
| parent | 86f1d73983ae6a5376fdde6f562e5e4944bc5f87 (diff) | |
| parent | 96507cedbc6007bd8db81d82c051da86da5b0e4b (diff) | |
| download | Qt-165d5f93ef75f8f4a1bbaeab1f3b3c6825819b0e.zip Qt-165d5f93ef75f8f4a1bbaeab1f3b3c6825819b0e.tar.gz Qt-165d5f93ef75f8f4a1bbaeab1f3b3c6825819b0e.tar.bz2 | |
Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into master-integration
* 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-2: (29 commits)
Fixes the double spinbox not updating geometry when suffix is changed
Made QGL2GradientCache thread safe.
Add QItemSelectionRange::operator<()
Don't call GetDC() nedlessly.
Make QScriptAnalysis fit in two bytes again
QGLPixelBuffer should not rely on temporary QGLWidgets.
Initialize pex.
Remove warning.
Fix the tests for the internal GL resource system.
Rework how QGLTextureGlyphCache makes use of the resource system.
The group pointer should no longer be a part of the 64 bit int.
Enable glyph uploads from a thread in the X11 font engine.
Make qt_pixmap_serial thread-safe.
Clean up debug output.
Clarification regarding the WA_X11InitThreads flag.
Rework the internal GL resource system yet again.
Check Qt::AA_X11InitThreads to determine pixmap usage in threads.
Add an application attribute to control XInitThreads().
Unnecessary alloc + remove unused headers.
QGLPixelBuffer should manage its own paint engines.
...
Diffstat (limited to 'src/plugins/gfxdrivers/eglnullws/eglnullwsscreenplugin.cpp')
0 files changed, 0 insertions, 0 deletions