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: (31 commits)
  Fix typos in docs
  Layout items had the wrong size if the layout was resized to maximum.
  Disable minRightBearing optimization in QTextLayout on Mac
  Added one test for QRegExp
  QMetaObject::normalizeSignature  avoid reading past the string in case of invalid signature given.
  Fix (implement!) hfw/wfh in QGridLayoutEngine
  Fixed a bug in implementation of sizeHint() when there was a constraint
  Add text decoration support to QStaticText
  Fix QString::arg: When specifying %L1, the group separator would be added even if the local specify QLocale::OmitGroupSeparator
  QtDeclarative: get rid of warnings in public header
  doc: Clarify documentation of QStaticText
  Fix scrollbar randomly popping up in QPlainTextEdit
  Remove the definition of QT_HAVE_NEON from qt.prf
  Use the fast Neon conversion for converting colors of jpeg images.
  Do the conversion from RGB888 to RGB32 using Neon
  Move the build of Neon file from painting.pri to gui.pro
  QSharedPointer documentation: specify that it is not safe to operate on the same object in different threads
  compilation with QT_NO_DEPRECATED
  Test we do not have compiler warnings in our headers with more options
  QStyleSheet documentation: QMenu's tear-off is styled with ::tearoff
  ...

0 files changed, 0 insertions, 0 deletions