projects / qt:qt.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 140a96d fb44c5b)
Merge remote branch 'origin/4.6' into qt-4.7-from-4.6
authorOlivier Goffart <ogoffart@trolltech.com>
Fri, 16 Apr 2010 10:20:46 +0000 (12:20 +0200)
committerOlivier Goffart <ogoffart@trolltech.com>
Fri, 16 Apr 2010 10:20:46 +0000 (12:20 +0200)
commitd626cfeae84a52f3f752be6dd5ed7df11e4b3be1
treefe9732af8c2c49c20bc450cdb53087e185ff8633tree | snapshot
parent140a96d0b860b045c18d53c1ac96e77b3893d31ccommit | diff
parentfb44c5b866da71fcbe992f6d02fb18ab2470ac53commit | diff
Merge remote branch 'origin/4.6' into qt-4.7-from-4.6

Conflicts:
src/3rdparty/webkit/VERSION
src/3rdparty/webkit/WebCore/ChangeLog
src/3rdparty/webkit/WebCore/page/FrameView.cpp
src/3rdparty/webkit/WebCore/rendering/RenderWidget.cpp
src/3rdparty/webkit/WebKit/qt/symbian/eabi/QtWebKitu.def
src/s60installs/bwins/QtCoreu.def
src/s60installs/bwins/QtGuiu.def
src/s60installs/bwins/QtNetworku.def
src/s60installs/eabi/QtGuiu.def
tests/auto/qscriptextqobject/tst_qscriptextqobject.cpp
31 files changed:
src/3rdparty/harfbuzz/src/harfbuzz-shaper-private.h diff1 | diff2 | blob | history
src/gui/dialogs/qdialog.cpp diff1 | diff2 | blob | history
src/gui/graphicsview/qgraphicsscene.cpp diff1 | diff2 | blob | history
src/gui/image/qimage.cpp diff1 | diff2 | blob | history
src/gui/image/qpaintengine_pic.cpp diff1 | diff2 | blob | history
src/gui/image/qpicture.cpp diff1 | diff2 | blob | history
src/gui/image/qpixmap_raster.cpp diff1 | diff2 | blob | history
src/gui/image/qpixmapfilter.cpp diff1 | diff2 | blob | history
src/gui/kernel/qapplication.cpp diff1 | diff2 | blob | history
src/gui/painting/qbrush.cpp diff1 | diff2 | blob | history
src/gui/painting/qpaintbuffer.cpp diff1 | diff2 | blob | history
src/gui/painting/qpaintengine_raster.cpp diff1 | diff2 | blob | history
src/gui/painting/qpaintengineex.cpp diff1 | diff2 | blob | history
src/gui/painting/qpdf.cpp diff1 | diff2 | blob | history
src/gui/painting/qstroker.cpp diff1 | diff2 | blob | history
src/gui/styles/qstylesheetstyle.cpp diff1 | diff2 | blob | history
src/gui/text/qfontmetrics.cpp diff1 | diff2 | blob | history
src/gui/text/qtextdocument.cpp diff1 | diff2 | blob | history
src/gui/text/qtextengine.cpp diff1 | diff2 | blob | history
src/gui/widgets/qcombobox.cpp diff1 | diff2 | blob | history
src/network/access/qhttpnetworkconnectionchannel.cpp diff1 | diff2 | blob | history
src/openvg/qpaintengine_vg.cpp diff1 | diff2 | blob | history
src/openvg/qpixmapdata_vg.cpp diff1 | diff2 | blob | history
src/openvg/qwindowsurface_vg.cpp diff1 | diff2 | blob | history
src/openvg/qwindowsurface_vgegl.cpp diff1 | diff2 | blob | history
src/openvg/qwindowsurface_vgegl_p.h diff1 | diff2 | blob | history
src/script/api/qscriptengine.cpp diff1 | diff2 | blob | history
src/svg/qsvghandler.cpp diff1 | diff2 | blob | history
tests/auto/qscriptengine/tst_qscriptengine.cpp diff1 | diff2 | blob | history
tests/auto/qscriptextqobject/tst_qscriptextqobject.cpp diff1 | diff2 | blob | history
tests/auto/qtextscriptengine/tst_qtextscriptengine.cpp diff1 | diff2 | blob | history
6b46b7419a5aee9bd5fce67b7bfa8afe8e