Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-doc-staging into master-integration
authorQt Continuous Integration System <qt-info@nokia.com>
Tue, 22 Nov 2011 21:34:44 +0000 (07:34 +1000)
committerQt Continuous Integration System <qt-info@nokia.com>
Tue, 22 Nov 2011 21:34:44 +0000 (07:34 +1000)
commit526eda58dae96dca2c5aebcb48b007f09bd7ecac
tree2262444830c9b20cf88c568f98b916aef1acb1ff
parent5f2090f0f2280c32d06fbc5188ccb799d7b1a489
parent0f4a61a33942744b1609c2b375d28765a215e39f
Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-doc-staging into master-integration

* 'master' of scm.dev.nokia.troll.no:qt/qt-doc-staging: (72 commits)
  Add note to declarative calculator example
  Help: Add \depends to all declarative examples & demos
  Declarative Examples: Fall back to local qmlapplicationviewer.
  Fix qdoc output for <dependency> tag.
  Change installation location of examples.
  Add Symbian platform notes.
  Fix "make install" for declarative examples
  Add C++11 support and QThreadLocalStorage changes to docs.
  Update the license in the qmlapplicationviewer.
  Examples: Add Copright headers, Remove stray file.
  Compile fix.
  Fix use of qmlapplicationviewer.
  Doc: Create relative pathes in Manifest files.
  Doc: Copy manifest files to the places where Creator expects them.
  qdoc3: qdoc supports \depends in 4.8
  qdoc3: qdoc supports \depends in 4.8
  Update qrc files.
  Update qmlapplicationviewer template,
  cppextensions/qgraphicslayout example corrections
  demos/declarative/snake example corrections
  ...