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

* '4.7' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging:
  Fixed a broken merge.
  Changed the way we detect touch screen on Windows.
  Fix s60main linking issue with gcce applications
  don't complain multiple times about same abuse of //% meta strings
  Fixed device context leak in QGLWidget on Windows.
  Provide Qml plugins with UID3s on Symbian
  Fix "missing store_build" errors
  Updated UIDs for spectrum demo
  Assigning 0xA UID3s to the new standalone qml demos
  Update 4.7-beta2 def files
  Fix a possible crash with the EVR video renderer in windows
  Stopping a flick resulted in the next click being consumed.
  clearFocus() shouldn't mess with focus if it doesn't have focus
  Fixed infinite recursion when drawing very large painter paths.
  Fix autoScroll implementation

0 files changed, 0 insertions, 0 deletions