diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2011-02-03 00:39:03 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2011-02-03 00:39:03 (GMT) |
| commit | 4de2ce7717ba52d3056f10e0a9fbb44eba4091bc (patch) | |
| tree | 21e9c625e67f7f7da2f21f97ae979d2099346d8f /src/declarative | |
| parent | f2d1d7a2f8a6b4a19f7ef7c91786845f2a987b59 (diff) | |
| parent | 7987d4cfd3ce86c20a55b5661a5221f12246b27e (diff) | |
| download | Qt-4de2ce7717ba52d3056f10e0a9fbb44eba4091bc.zip Qt-4de2ce7717ba52d3056f10e0a9fbb44eba4091bc.tar.gz Qt-4de2ce7717ba52d3056f10e0a9fbb44eba4091bc.tar.bz2 | |
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2:
Fix QMutex can deadlock when calling tryLock
Fixed missing text when using static text items in GL 2 engine.
Prevent recursion when creating window surface.
Fixed es2 configure when both EGL/egl.h and GLES/egl.h are present.
document that QThread::exit will exit future event loops
Revert "Restore Qt 4.6 behaviour: exec() always enters the event loop."
Diffstat (limited to 'src/declarative')
0 files changed, 0 insertions, 0 deletions