Merge branch 'qt-master-from-4.7' of scm.dev.nokia.troll.no:qt/qt-integration into master-integration

* 'qt-master-from-4.7' of scm.dev.nokia.troll.no:qt/qt-integration: (29 commits)
  Fix for QTBUG-17035
  Fix QMutex can deadlock when calling tryLock
  Carefull free the data from XGetWindowProperty on X11.
  Fixes memory leaks in QX11Embed
  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."
  Don't ignore source-text when generating qsTrId translations for QML
  Fix a crash when undoing form layout
  Fix generated mif file cleaning in symbian-abld
  Fix potential networking crash due to null-pointer dereference
  Fix typo in qglthreads auto test.
  Revert "Improve timer ID safety by using a serial counter per ID."
  Invalidate QScriptPrograms when engine is destroyed
  Fix alignment issue causing crash in QtScript/JavaScriptCore
  Orientation control implementation for Symbian
  Restore Qt 4.6 behaviour: exec() always enters the event loop.
  No longer replace dash and dot in TARGET with underscore in Symbian
  ...

0 files changed, 0 insertions, 0 deletions