diff options
author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-04-22 21:29:32 (GMT) |
---|---|---|
committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-04-22 21:29:32 (GMT) |
commit | 06823355a435fa9bc9b5aa39d8687e85b3b7beaf (patch) | |
tree | 1cbaf91dec8ae67e855b10af52b967477e7c7083 /doc/src/snippets/code/src_opengl_qglpixelbuffer.cpp | |
parent | 8e2d924c9f68c1994b68a4a5bcf67f9ef0159cdc (diff) | |
parent | 08537771bdf9a4759915deda2534337c5cbd12e1 (diff) | |
download | Qt-06823355a435fa9bc9b5aa39d8687e85b3b7beaf.zip Qt-06823355a435fa9bc9b5aa39d8687e85b3b7beaf.tar.gz Qt-06823355a435fa9bc9b5aa39d8687e85b3b7beaf.tar.bz2 |
Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into master-integration
* 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1:
Revert "Fix strerror_r in case it returns a pointer that is not our buffer"
Designer: Fix cardinality error in stringlist properties in ui4 schema.
[qtconfig app] Add an app icon.
Mac: Remove Ctrl+Y as redo shortcut.
Fix strerror_r in case it returns a pointer that is not our buffer
[networkselftest] Verify some CGIs on the test server
[networkselftest] Verify the presence and size of some files on HTTP
[networkselftest] Verify PUT and DELETE commands and the protected area in HTTP
[networkselftest] Enchance test to verify the layout of the FTP server.
[networkselftest] Add a test for the FTP proxy server
[networkselftest] Add a test to try the SMB server.
[networkselftest] Add the FTP proxy and SMB ports to the test.
Add new QDataStream version for Qt 4.8.
Long live Qt 4.8!
Diffstat (limited to 'doc/src/snippets/code/src_opengl_qglpixelbuffer.cpp')
0 files changed, 0 insertions, 0 deletions