Merge branch '4.7' of ../qt into 4.7
authorDavid Boddie <david.boddie@nokia.com>
Thu, 13 Jan 2011 15:18:37 +0000 (16:18 +0100)
committerDavid Boddie <david.boddie@nokia.com>
Thu, 13 Jan 2011 15:18:37 +0000 (16:18 +0100)
commit83dc0f2bc78336d117f4842d0b030cc5f0a41eb4
treedfbe406eafc21343c65925234365f1fb276c1f04
parente63c88ac355f9b8b029faab599fb35756f22fb2e
parent9ff210a8ba748ce3d46441886c8feb407e3aa9a6
Merge branch '4.7' of ../qt into 4.7

Conflicts:
doc/src/declarative/qdeclarativeintro.qdoc
doc/src/declarative/qdeclarativereference.qdoc
doc/src/snippets/declarative/focus/focusColumn.qml
tools/qdoc3/apigenerator.cpp
tools/qdoc3/apigenerator.h
tools/qdoc3/archiveextractor.cpp
tools/qdoc3/bookgenerator.cpp
tools/qdoc3/bookgenerator.h
tools/qdoc3/ccodeparser.cpp
tools/qdoc3/command.cpp
tools/qdoc3/command.h
tools/qdoc3/cpptoqsconverter.cpp
tools/qdoc3/dcfsection.cpp
tools/qdoc3/dcfsection.h
tools/qdoc3/jambiapiparser.cpp
tools/qdoc3/jambiapiparser.h
tools/qdoc3/javacodemarker.cpp
tools/qdoc3/javacodemarker.h
tools/qdoc3/javadocgenerator.cpp
tools/qdoc3/javadocgenerator.h
tools/qdoc3/linguistgenerator.cpp
tools/qdoc3/linguistgenerator.h
tools/qdoc3/loutgenerator.h
tools/qdoc3/mangenerator.cpp
tools/qdoc3/mangenerator.h
tools/qdoc3/polyarchiveextractor.cpp
tools/qdoc3/polyarchiveextractor.h
tools/qdoc3/polyuncompressor.cpp
tools/qdoc3/polyuncompressor.h
tools/qdoc3/qsakernelparser.cpp
tools/qdoc3/qscodemarker.cpp
tools/qdoc3/qscodemarker.h
tools/qdoc3/qscodeparser.cpp
tools/qdoc3/qscodeparser.h
tools/qdoc3/sgmlgenerator.cpp
tools/qdoc3/sgmlgenerator.h
tools/qdoc3/test/qt-html-templates.qdocconf
tools/qdoc3/uncompressor.cpp
tools/qdoc3/webxmlgenerator.cpp
tools/qdoc3/webxmlgenerator.h
86 files changed:
doc/src/declarative/anchor-layout.qdoc
doc/src/declarative/declarativeui.qdoc
doc/src/declarative/extending.qdoc
doc/src/declarative/positioners.qdoc
doc/src/declarative/qdeclarativeintro.qdoc
doc/src/declarative/qdeclarativemodels.qdoc
doc/src/declarative/qmlinuse.qdoc
doc/src/declarative/tutorial.qdoc
doc/src/development/developing-with-qt.qdoc
doc/src/examples/svgalib.qdoc
doc/src/getting-started/gettingstartedqml.qdoc
doc/src/getting-started/how-to-learn-qt.qdoc
doc/src/getting-started/installation.qdoc
doc/src/index.qdoc
doc/src/internationalization/linguist-manual.qdoc
doc/src/legal/3rdparty.qdoc
doc/src/overviews.qdoc
doc/src/platforms/emb-accel.qdoc
doc/src/platforms/emb-qvfb.qdoc
doc/src/qt-webpages.qdoc
doc/src/snippets/code/doc_src_lgpl.qdoc
doc/src/widgets-and-layouts/stylesheet.qdoc
doc/src/zh_CN/getting-started/how-to-learn-qt.qdoc
src/corelib/tools/qeasingcurve.cpp
src/corelib/tools/qstring.cpp
src/declarative/graphicsitems/qdeclarativeflickable.cpp
src/declarative/graphicsitems/qdeclarativegridview.cpp
src/declarative/graphicsitems/qdeclarativemousearea.cpp
src/declarative/graphicsitems/qdeclarativerectangle.cpp
src/declarative/util/qdeclarativeconnections.cpp
src/declarative/util/qdeclarativelistmodel.cpp
src/declarative/util/qdeclarativestateoperations.cpp
src/gui/dialogs/qpagesetupdialog.cpp
src/gui/graphicsview/qgraphicsanchorlayout.cpp
src/gui/image/qimage.cpp
src/gui/kernel/qlayout.cpp
src/gui/painting/qbrush.cpp
src/gui/painting/qcolor.cpp
src/gui/painting/qpainter.cpp
src/gui/painting/qpainterpath.cpp
src/gui/widgets/qscrollbar.cpp
src/qt3support/network/q3dns.cpp
src/qt3support/tools/q3memarray.qdoc
src/qt3support/tools/q3ptrlist.qdoc
tools/qdoc3/atom.cpp
tools/qdoc3/atom.h
tools/qdoc3/codemarker.cpp
tools/qdoc3/codemarker.h
tools/qdoc3/codeparser.cpp
tools/qdoc3/codeparser.h
tools/qdoc3/config.cpp
tools/qdoc3/config.h
tools/qdoc3/cppcodemarker.cpp
tools/qdoc3/cppcodemarker.h
tools/qdoc3/cppcodeparser.cpp
tools/qdoc3/cppcodeparser.h
tools/qdoc3/ditaxmlgenerator.cpp
tools/qdoc3/ditaxmlgenerator.h
tools/qdoc3/doc.cpp
tools/qdoc3/doc.h
tools/qdoc3/generator.cpp
tools/qdoc3/generator.h
tools/qdoc3/helpprojectwriter.cpp
tools/qdoc3/htmlgenerator.cpp
tools/qdoc3/htmlgenerator.h
tools/qdoc3/jscodemarker.h
tools/qdoc3/location.cpp
tools/qdoc3/main.cpp
tools/qdoc3/node.cpp
tools/qdoc3/node.h
tools/qdoc3/pagegenerator.cpp
tools/qdoc3/pagegenerator.h
tools/qdoc3/plaincodemarker.cpp
tools/qdoc3/plaincodemarker.h
tools/qdoc3/puredocparser.cpp
tools/qdoc3/puredocparser.h
tools/qdoc3/qmlcodemarker.h
tools/qdoc3/qmlcodeparser.h
tools/qdoc3/qmlvisitor.h
tools/qdoc3/quoter.cpp
tools/qdoc3/quoter.h
tools/qdoc3/text.cpp
tools/qdoc3/text.h
tools/qdoc3/tokenizer.cpp
tools/qdoc3/tr.h
tools/qdoc3/tree.cpp