Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integration
authorQt Continuous Integration System <qt-info@nokia.com>
Thu, 3 Feb 2011 00:39:03 +0000 (10:39 +1000)
committerQt Continuous Integration System <qt-info@nokia.com>
Thu, 3 Feb 2011 00:39:03 +0000 (10:39 +1000)
commit4de2ce7717ba52d3056f10e0a9fbb44eba4091bc
tree21e9c625e67f7f7da2f21f97ae979d2099346d8f
parentf2d1d7a2f8a6b4a19f7ef7c91786845f2a987b59
parent7987d4cfd3ce86c20a55b5661a5221f12246b27e
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."