Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integration
authorQt Continuous Integration System <qt-info@nokia.com>
Sat, 3 Jul 2010 05:21:49 +0000 (07:21 +0200)
committerQt Continuous Integration System <qt-info@nokia.com>
Sat, 3 Jul 2010 05:21:49 +0000 (07:21 +0200)
commitce01f19674923cb5144bb56fe76ecbe19865d3bd
tree2235ab6b1b469ca0232ccf621309e3a90d770e2a
parentdaeb81493aef4fd8f632ba4ea7f8d12ed80fa7be
parent1358c4b53cf4cec83ea6d9b0f886b99f76c4847e
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:
  Consolidate zlib configuration redundancy
  Fixed whitespace formatting
  Fix incomplete support for built-in jpeg, mng, tiff and gif handlers
  Split image handler plugin project files
  No explicit link to zlib/jpeg for system mng/tiff
  Removed stray line continuations
  Long live else!
  qdoc: Added a solution for creating tables of contents for manuals.
  Doc: Fixed markup.
  Fixed size hint for combo box on windows
configure