Merge branch '4.7' into qdoc-simplified
authorDavid Boddie <david.boddie@nokia.com>
Fri, 21 Jan 2011 15:33:57 +0000 (16:33 +0100)
committerDavid Boddie <david.boddie@nokia.com>
Fri, 21 Jan 2011 15:33:57 +0000 (16:33 +0100)
commit226d63d6e90bdfdf296f5fed1d5c8b01b4e0cf22
tree491c25c4c9f08b6ef732a9179d2e64776a9e8446
parent84a1df764bf2e29e9e6e43f4f0e1a69201199fbc
parent59a35a794e433f9526aff72025c0899e76ef362e
Merge branch '4.7' into qdoc-simplified

Conflicts:
src/declarative/graphicsitems/qdeclarativeitem.cpp
src/declarative/util/qdeclarativeanimation.cpp
28 files changed:
doc/src/declarative/qdeclarativestates.qdoc
doc/src/snippets/declarative/mousearea/mousearea.qml
doc/src/snippets/declarative/propertyanimation.qml
doc/src/template/style/style.css
src/declarative/graphicsitems/qdeclarativeitem.cpp
src/declarative/graphicsitems/qdeclarativepathview.cpp
src/declarative/util/qdeclarativeanimation.cpp
src/declarative/util/qdeclarativeconnections.cpp
tools/qdoc3/atom.h
tools/qdoc3/codemarker.cpp
tools/qdoc3/codemarker.h
tools/qdoc3/config.h
tools/qdoc3/cppcodemarker.cpp
tools/qdoc3/cppcodemarker.h
tools/qdoc3/ditaxmlgenerator.cpp
tools/qdoc3/ditaxmlgenerator.h
tools/qdoc3/doc.cpp
tools/qdoc3/doc/qdoc-manual.qdoc
tools/qdoc3/generator.cpp
tools/qdoc3/htmlgenerator.cpp
tools/qdoc3/htmlgenerator.h
tools/qdoc3/jscodemarker.h
tools/qdoc3/main.cpp
tools/qdoc3/plaincodemarker.cpp
tools/qdoc3/plaincodemarker.h
tools/qdoc3/qmlcodemarker.h
tools/qdoc3/quoter.cpp
tools/qdoc3/quoter.h