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: (42 commits)
  QBoxLayout::setGeometry would not respect the widget min/max width
  Revert "QStyleSheetStyle: Fixed some text croped when having padding with native border."
  Use QFile:rename when moving items in QFileystemModel.
  Revert "Add GLfloat[2][2] & GLfloat[3][3] uniform setters to QGLShaderProgram"
  Fix default filter selection when using HideNameFilterDetails option.
  Don't write out fo:word-spacing if its the default value.
  Improved initial startup time for a QGLWidget ontop of EGL/X11.
  Document the QGraphicsView::IndirectPainting flag
  Display broken symlinks in the filesystem model.
  Fix typo in autotest testcase name.
  Fixed a bug with distribution of spans.
  Make unit test more robust
  Compile with QT_NO_DOCKWIDGET
  Removed temporary QGLWidget created during QGLWidget/X11 initialization.
  Fix test: The bug is now fixed
  Fix auto-test failure on Windows
  QScript: Lookup the native setter from the prototype
  Implement QScript::QObjectDelegate::getOwnPropertyDescriptor
  fix compilation in GL2 paint engine for Windows
  Move QGLTextureGlyphCache into it's own file
  ...

0 files changed, 0 insertions, 0 deletions