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

* '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1: (35 commits)
  doc: Added more DITA output to the XML generator
  Prohibit some property names to be used for dynamic properties
  Updated Harfbuzz from git+ssh://git.freedesktop.org/git/harfbuzz to f0dcb906fe56b5dc06aa305b6cfc821d5dd25a28
  doc: Added more DITA output to the XML generator
  doc: Added more DITA output to the XML generator
  qdoc3: Build fix for regression in f321a3f2b1e
  Clean up HB_Anchor's DeviceTables on failure when loading format 3
  Make sure ValueRecord's DeviceTables is cleaned up on failure
  qdoc3: Build fix for regression in e2f0e728e
  Fix incorrect usage of _HB_OPEN_Free_Device() in CaretValue cleanup
  Fix null HB_Device** dereference on exit in Harfbuzz GPOS code
  Doc: Relicensed the documentation under the GNU FDL version 1.3.
  doc: Added more DITA output to the XML generator
  Designer: Prevent QButtonGroup from being added for Q3ButtonGroup.
  Fix for a leak in the mac style.
  Doc: Fixing bugs to style and script
  doc: Added more DITA output to the XML generator
  Make sure that <br/> is seen as a valid tag in Qt::mightBeRichText()
  Fix compiler warnings in QtGui (text,painting).
  Allow Unix to generate unique UUIDs if /dev/urandom exists.
  ...

0 files changed, 0 insertions, 0 deletions