diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-04-06 04:58:15 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-04-06 04:58:15 (GMT) |
| commit | 5df9e8ced092f6f61b712d6f8ffaea7bc0041222 (patch) | |
| tree | 59ecacb7f935494ee9df845637bc40e145c2143a /doc/src/snippets/code/src_opengl_qglpixelbuffer.cpp | |
| parent | c96047c0495c58b56a73873fd235ce859e0e9255 (diff) | |
| parent | 281d95827bdce97727ed56049bd4afbac917ee91 (diff) | |
| download | Qt-5df9e8ced092f6f61b712d6f8ffaea7bc0041222.zip Qt-5df9e8ced092f6f61b712d6f8ffaea7bc0041222.tar.gz Qt-5df9e8ced092f6f61b712d6f8ffaea7bc0041222.tar.bz2 | |
Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging into 4.6-integration
* '4.6' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging:
Remove qWait functions as it is used in QTRY_* macros.
QAudioInput: possible change of state without emitting stateChange()
Did not include updated repaint number for parent item in revert.
Partially revert "Remove qWait functions as it is used in QTRY_* macros."
Remove qWait functions as it is used in QTRY_* macros.
Diffstat (limited to 'doc/src/snippets/code/src_opengl_qglpixelbuffer.cpp')
0 files changed, 0 insertions, 0 deletions