diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-09-27 06:37:04 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-09-27 06:37:04 (GMT) |
| commit | b371f77f765d140c7d2a57d99405978f89561494 (patch) | |
| tree | cec4c4d3df2e34804c44e68d8bb673c4a72011a8 /doc | |
| parent | 0ec3281f7deb9a0c5bdc26481bf5c0fb8d3ae750 (diff) | |
| parent | 525fb40e868dbc507165155590c9cb831e2b25f9 (diff) | |
| download | Qt-b371f77f765d140c7d2a57d99405978f89561494.zip Qt-b371f77f765d140c7d2a57d99405978f89561494.tar.gz Qt-b371f77f765d140c7d2a57d99405978f89561494.tar.bz2 | |
Merge branch 'staging' into 4.7-integration
* staging:
fix documentation of drawText(int, int, int, int, ...
Don't pretend to support single buffered EGL surfaces.
Named anonymous struct in the OpenGL paint engine.
Fixes gray_raster incorrectly reporting out of memory error.
Diffstat (limited to 'doc')
0 files changed, 0 insertions, 0 deletions