Merge branch 'mimir' into 4.7
authorDavid Boddie <david.boddie@nokia.com>
Wed, 23 Feb 2011 13:20:55 +0000 (14:20 +0100)
committerDavid Boddie <david.boddie@nokia.com>
Wed, 23 Feb 2011 13:20:55 +0000 (14:20 +0100)
commit7a476ac32f2d21fbffa1bcd09101148e15fbc17e
treeaee861c1f078b39e17a278612ef4efc72ef2842c
parent39ed27f1e382fbc594d2e5b6a23b2bc612b96e64
parent276ae3c231a80b5cf64ae431e9386ac63d48a278
Merge branch 'mimir' into 4.7

Conflicts:
doc/src/declarative/qdeclarativemodels.qdoc
doc/src/index.qdoc
doc/src/template/style/style.css
tools/qdoc3/atom.h
tools/qdoc3/doc.cpp
tools/qdoc3/doc/qdoc-manual.qdoc
tools/qdoc3/doc/qdoc-manual.qdocconf
31 files changed:
doc/src/declarative/basictypes.qdoc
doc/src/declarative/examples.qdoc
doc/src/declarative/positioners.qdoc
doc/src/development/designer-manual.qdoc
doc/src/examples/fademessage.qdoc
doc/src/examples/globalVariables.qdoc
doc/src/examples/icons.qdoc
doc/src/getting-started/how-to-learn-qt.qdoc
doc/src/getting-started/installation.qdoc
doc/src/howtos/scalabilityintro.qdoc
doc/src/overviews.qdoc
doc/src/template/style/style.css
doc/src/tutorials/widgets-tutorial.qdoc
doc/src/zh_CN/getting-started/how-to-learn-qt.qdoc
src/corelib/global/qnamespace.qdoc
src/declarative/graphicsitems/qdeclarativeflickable.cpp
src/declarative/graphicsitems/qdeclarativegridview.cpp
src/declarative/graphicsitems/qdeclarativemousearea.cpp
src/declarative/graphicsitems/qdeclarativerectangle.cpp
src/declarative/util/qdeclarativelistmodel.cpp
src/gui/dialogs/qabstractprintdialog.cpp
src/gui/graphicsview/qgraphicsanchorlayout.cpp
src/gui/widgets/qmenu.cpp
src/imports/gestures/qdeclarativegesturearea.cpp
tools/qdoc3/atom.cpp
tools/qdoc3/atom.h
tools/qdoc3/ditaxmlgenerator.cpp
tools/qdoc3/ditaxmlgenerator.h
tools/qdoc3/doc.cpp
tools/qdoc3/doc/qdoc-manual.qdoc
tools/qdoc3/htmlgenerator.cpp