diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-04-01 12:14:15 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-04-01 12:14:15 (GMT) |
| commit | 5fb8d729ddf56003af326ba4c9dbff56b57ed105 (patch) | |
| tree | a8ad894df6ff84f9cbbf384c1afcfd648d6502b4 /src/opengl/qgl_x11.cpp | |
| parent | 8ffd45cf6832b67960dbaa10654c4b84358fe3f9 (diff) | |
| parent | 29cef8ab2783bf28955c84f6da2f2cce1490f171 (diff) | |
| download | Qt-5fb8d729ddf56003af326ba4c9dbff56b57ed105.zip Qt-5fb8d729ddf56003af326ba4c9dbff56b57ed105.tar.gz Qt-5fb8d729ddf56003af326ba4c9dbff56b57ed105.tar.bz2 | |
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1:
Revert "adds a timeout option to QThreadPool::waitForDone();"
Diffstat (limited to 'src/opengl/qgl_x11.cpp')
0 files changed, 0 insertions, 0 deletions