Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-doc-staging into 4.7-integration
authorQt Continuous Integration System <qt-info@nokia.com>
Sun, 15 May 2011 18:02:29 +0000 (04:02 +1000)
committerQt Continuous Integration System <qt-info@nokia.com>
Sun, 15 May 2011 18:02:29 +0000 (04:02 +1000)
commite07f691ff700399b4e24eb618d64e9522a8ab430
treee2ad6d4301a76cc4a1faf3c2f3938cbbb6e91625
parent61e7b85a146778ce5907000733f246e4ebdce26a
parentb4d88c1bb1b21cce7928b3466776ad41c9424cea
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-doc-staging into 4.7-integration

* '4.7' of scm.dev.nokia.troll.no:qt/qt-doc-staging:
  Fix memory leak in QXmlQuery::setQuery.
  doc: Fixed QTBUG-19226
  doc: Fixed QTBUG-19223
  doc: Remved debug code for QTBUG-18791
  doc: Fixed QTBUG-18791
  doc: Fixed a QML snippet reference