Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-doc-team into 4.7
authorDavid Boddie <david.boddie@nokia.com>
Mon, 4 Oct 2010 14:12:39 +0000 (16:12 +0200)
committerDavid Boddie <david.boddie@nokia.com>
Mon, 4 Oct 2010 14:12:39 +0000 (16:12 +0200)
commit3ea28c383846a4af67ddd0c7d33dad0537a9972e
tree901f26b86b820ec4b4fc949ae38b6ce165b386af
parent7cc2e423d39c3b519279d21cd3881f1a135913fd
parentd04664b9da6356d3c97e632fb35e27c6822e0dc9
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-doc-team into 4.7
14 files changed:
doc/src/declarative/declarativeui.qdoc
doc/src/declarative/modules.qdoc
doc/src/declarative/qdeclarativedebugging.qdoc
doc/src/declarative/qdeclarativedocument.qdoc
doc/src/declarative/qdeclarativei18n.qdoc
doc/src/declarative/qdeclarativeintro.qdoc
doc/src/declarative/qmlruntime.qdoc
doc/src/declarative/qmlviewer.qdoc
doc/src/declarative/qtbinding.qdoc
doc/src/declarative/scope.qdoc
doc/src/development/qmake-manual.qdoc
doc/src/getting-started/gettingstartedqml.qdoc
doc/src/platforms/symbian-introduction.qdoc
src/declarative/graphicsitems/qdeclarativeitem.cpp