projects / qt:qt.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 4adf280 534f509)
Merge branch '4.8' of scm.dev.nokia.troll.no:qt/qt
authorDavid Boddie <david.boddie@nokia.com>
Tue, 24 May 2011 17:20:58 +0000 (19:20 +0200)
committerDavid Boddie <david.boddie@nokia.com>
Tue, 24 May 2011 17:20:58 +0000 (19:20 +0200)
commite463546d11464699061574d671d5cd5f3c14f05f
tree8be5e318067dd7954f4af0c680538d96aca07989tree | snapshot
parent4adf280fb6bda8e519bf23606b841e040cb04fabcommit | diff
parent534f5098c577f262b4b01d1c21cd0ec1af0f25f1commit | diff
Merge branch '4.8' of scm.dev.nokia.troll.no:qt/qt

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