Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.6-integration

* '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2: (26 commits)
  QLocalSocket::isValid on Windows must check for broken connection
  fix pipe handle leak in qlocalsocket_win.cpp
  GraphicsViewBenchmark: Run app in full screen mode on small desktops.
  Fix Thai text on Windows 7
  Fix License headers.
  QTextCodec::codecForName.  Insert in the cache in all cases.
  Prevented calling the pixmap filter implementations with null pixmaps.
  Make it possible to run benchmarks with the "-graphicssystem" switch.
  Add support for running the GraphicsViewBenchmark application manually.
  Bump version to 4.6.3.
  Fixed a GLX warning that occured with some Intel chipsets under X11.
  Fixed compile for maemo6.
  Cleanup QEglContext & EGLDisplays
  Moved 'hasAlpha' property from GL2 engine to GL paint device.
  Remove useless qDebug in QTextCodec autotest
  QTextCodec: Symbian has codec for UCS2, only fallback to UTF16 if UCS2 codec cannot be loaded
  Add caching to QTextCodec::codecForName and QTextCodec::codecForMib
  Add benchmark for QTextCodec
  Fix several bugs with GL texture cache
  Compile fix for OpenGL ES.
  ...

0 files changed, 0 insertions, 0 deletions