Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-doc-team into 4.7
authorJerome Pasion <jerome.pasion@nokia.com>
Mon, 17 Jan 2011 09:23:06 +0000 (10:23 +0100)
committerJerome Pasion <jerome.pasion@nokia.com>
Mon, 17 Jan 2011 09:23:06 +0000 (10:23 +0100)
commit9657c4fa2040758b8aa3a5f7f7c81442cbaba621
tree1d9b018f9563fa6eff1059291dc9edf94be67c9b
parentb5d34f3daafc843c9f9cb63cf8e2733900f0be69
parentec0d663282e191bfb9837e76e709ed2ffe6e8aac
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-doc-team into 4.7

Conflicts:
doc/src/declarative/elements.qdoc
doc/src/declarative/extending.qdoc
src/declarative/qml/qdeclarativecomponent.cpp
36 files changed:
doc/src/declarative/anchor-layout.qdoc
doc/src/declarative/animation.qdoc
doc/src/declarative/basictypes.qdoc
doc/src/declarative/declarativeui.qdoc
doc/src/declarative/dynamicobjects.qdoc
doc/src/declarative/extending-tutorial.qdoc
doc/src/declarative/extending.qdoc
doc/src/declarative/focus.qdoc
doc/src/declarative/integrating.qdoc
doc/src/declarative/network.qdoc
doc/src/declarative/positioners.qdoc
doc/src/declarative/propertybinding.qdoc
doc/src/declarative/qdeclarativei18n.qdoc
doc/src/declarative/qdeclarativemodels.qdoc
doc/src/declarative/qdeclarativestates.qdoc
doc/src/declarative/qmlruntime.qdoc
doc/src/declarative/qmlviewer.qdoc
doc/src/declarative/qtbinding.qdoc
doc/src/declarative/qtprogrammers.qdoc
doc/src/examples/qml-examples.qdoc
doc/src/external-resources.qdoc
doc/src/getting-started/gettingstartedqml.qdoc
doc/src/overviews.qdoc
doc/src/qt-webpages.qdoc
doc/src/snippets/declarative/focus/focusscopewidget.qml
doc/src/snippets/declarative/focus/myfocusscopewidget.qml
doc/src/snippets/declarative/focus/mywidget.qml
examples/declarative/ui-components/tabwidget/TabWidget.qml
src/declarative/graphicsitems/qdeclarativeflipable.cpp
src/declarative/qml/qdeclarativecontext.cpp
src/declarative/util/qdeclarativeanimation.cpp
src/declarative/util/qdeclarativebehavior.cpp
src/declarative/util/qdeclarativesmoothedanimation.cpp
src/declarative/util/qdeclarativespringanimation.cpp
src/declarative/util/qdeclarativetransition.cpp
src/declarative/util/qdeclarativeview.cpp