Merge branch '4.8' of scm.dev.nokia.troll.no:qt/qt into 4.8
authorDavid Boddie <david.boddie@nokia.com>
Tue, 24 May 2011 18:06:51 +0000 (20:06 +0200)
committerDavid Boddie <david.boddie@nokia.com>
Tue, 24 May 2011 18:06:51 +0000 (20:06 +0200)
commitf37c49985f2382b86fe91f7b7224c8fd92961ac9
tree9a05328fa1dc668a7d3d7143f99de39e5f795387
parent16b11332931caef92bd103d854fac4dff3ff771e
parent534f5098c577f262b4b01d1c21cd0ec1af0f25f1
Merge branch '4.8' of scm.dev.nokia.troll.no:qt/qt into 4.8

Conflicts:
src/gui/text/qrawfont.cpp
src/gui/text/qtextlayout.cpp
src/gui/util/qscroller.cpp
src/gui/widgets/qlineedit.cpp
100 files changed:
doc/src/declarative/declarativeui.qdoc
doc/src/declarative/qdeclarativemodels.qdoc
doc/src/declarative/qtbinding.qdoc
doc/src/declarative/qtdeclarative.qdoc
doc/src/declarative/righttoleft.qdoc
doc/src/declarative/whatsnew.qdoc
doc/src/development/designer-manual.qdoc
doc/src/development/qmake-manual.qdoc
doc/src/development/qtestlib.qdoc
doc/src/examples/activeqt/dotnet.qdoc
doc/src/examples/broadcastreceiver.qdoc
doc/src/examples/codeeditor.qdoc
doc/src/examples/combowidgetmapper.qdoc
doc/src/examples/dragdroprobot.qdoc
doc/src/examples/elasticnodes.qdoc
doc/src/examples/fingerpaint.qdoc
doc/src/examples/portedasteroids.qdoc
doc/src/examples/portedcanvas.qdoc
doc/src/examples/recipes.qdoc
doc/src/examples/rsslisting.qdoc
doc/src/examples/schema.qdoc
doc/src/examples/syntaxhighlighter.qdoc
doc/src/external-resources.qdoc
doc/src/getting-started/examples.qdoc
doc/src/getting-started/gettingstartedqt.qdoc
doc/src/getting-started/installation.qdoc
doc/src/platforms/emb-install.qdoc
doc/src/platforms/symbian-introduction.qdoc
doc/src/tutorials/modelview.qdoc
examples/examples.pro
qmake/generators/symbian/symbiancommon.h
src/corelib/global/qglobal.cpp
src/corelib/io/qdatastream.cpp
src/corelib/io/qfile.cpp
src/corelib/io/qfilesystemengine.cpp
src/corelib/io/qfsfileengine.cpp
src/corelib/io/qurl.cpp
src/corelib/kernel/qobject.cpp
src/corelib/kernel/qobject.h
src/corelib/kernel/qtimer.cpp
src/corelib/kernel/qtranslator.cpp
src/corelib/thread/qmutexpool.cpp
src/corelib/tools/qlist.cpp
src/corelib/tools/qlocale.cpp
src/corelib/tools/qlocale.qdoc
src/corelib/tools/qscopedpointer.cpp
src/corelib/tools/qscopedvaluerollback.cpp
src/corelib/tools/qstring.cpp
src/corelib/tools/qstringbuilder.cpp
src/corelib/tools/qstringlist.cpp
src/corelib/tools/qvarlengtharray.qdoc
src/corelib/tools/qvector.cpp
src/corelib/xml/qxmlstream.cpp
src/dbus/qdbusconnection.cpp
src/dbus/qdbusunixfiledescriptor.cpp
src/declarative/debugger/qdeclarativedebugservice_p.h
src/declarative/debugger/qpacketprotocol_p.h
src/declarative/graphicsitems/qdeclarativeborderimage.cpp
src/declarative/graphicsitems/qdeclarativegridview.cpp
src/declarative/graphicsitems/qdeclarativeitem.cpp
src/declarative/qml/qdeclarativetypeloader.cpp
src/gui/accessible/qaccessible.cpp
src/gui/graphicsview/qgraphicslayout.cpp
src/gui/image/qimage.cpp
src/gui/itemviews/qtableview.cpp
src/gui/kernel/qactiongroup.cpp
src/gui/kernel/qapplication_mac.mm
src/gui/kernel/qapplication_qpa.cpp
src/gui/kernel/qevent.cpp
src/gui/kernel/qgenericplugin_qpa.cpp
src/gui/kernel/qgenericpluginfactory_qpa.cpp
src/gui/kernel/qplatformcursor_qpa.cpp
src/gui/kernel/qplatformglcontext_qpa.cpp
src/gui/kernel/qplatformintegration_qpa.cpp
src/gui/kernel/qplatformscreen_qpa.cpp
src/gui/kernel/qplatformwindowformat_qpa.cpp
src/gui/kernel/qwidget_qpa.cpp
src/gui/painting/qbrush.cpp
src/gui/painting/qpaintengine.cpp
src/gui/text/qfontdatabase_qws.cpp
src/gui/text/qfontmetrics.cpp
src/gui/text/qplatformfontdatabase_qpa.cpp
src/gui/text/qrawfont.cpp
src/gui/text/qtextdocument.cpp
src/gui/text/qtextformat.cpp
src/gui/text/qtextlayout.cpp
src/gui/widgets/qlineedit.cpp
src/gui/widgets/qmdiarea.cpp
src/gui/widgets/qtabwidget.cpp
src/network/access/qhttpmultipart.cpp
src/network/access/qnetworkaccessmanager.cpp
src/network/bearer/qnetworkconfigmanager.cpp
src/network/ssl/qsslsocket.cpp
src/opengl/qgl.cpp
src/opengl/qgl_qpa.cpp
src/opengl/qgl_x11.cpp
src/opengl/qglframebufferobject.cpp
src/opengl/qglpixelbuffer.cpp
src/sql/models/qsqltablemodel.cpp
tools/qdoc3/helpprojectwriter.cpp