projects / qt:qt.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 164728f 705b0f9)
Merge remote-tracking branch 'origin/4.7' into qt-4.8-from-4.7
authorLiang Qi <liang.qi@nokia.com>
Fri, 24 Jun 2011 09:52:41 +0000 (11:52 +0200)
committerLiang Qi <liang.qi@nokia.com>
Fri, 24 Jun 2011 09:52:41 +0000 (11:52 +0200)
commitcf2f72f4f61f3a9e0e7573379c33bb341eeba7be
tree06fbd459f62f87344e7db973a0a9f3050cece825tree | snapshot
parent164728f711136356a6c3482f762321b01c9d82ddcommit | diff
parent705b0f958a6071341b10cbd51917e1378356491bcommit | diff
Merge remote-tracking branch 'origin/4.7' into qt-4.8-from-4.7

Conflicts:
src/gui/image/qpixmap_raster_symbian.cpp
src/gui/image/qpixmapdatafactory.cpp
src/gui/painting/qgraphicssystem.cpp
src/gui/styles/qs60style.cpp
src/network/bearer/qnetworkconfigmanager_p.h
src/s60installs/bwins/QtGuiu.def
src/s60installs/bwins/QtOpenGLu.def
src/s60installs/bwins/QtOpenVGu.def
src/s60installs/eabi/QtGuiu.def
src/s60installs/eabi/QtOpenVGu.def
tests/auto/qnetworkproxyfactory/tst_qnetworkproxyfactory.cpp
34 files changed:
src/corelib/thread/qthread.cpp diff1 | diff2 | blob | history
src/gui/image/image.pri diff1 | diff2 | blob | history
src/gui/image/qimage.cpp diff1 | diff2 | blob | history
src/gui/image/qpixmap.h diff1 | diff2 | blob | history
src/gui/image/qpixmap_raster_symbian.cpp | diff2 | blob | history
src/gui/image/qpixmapdata_p.h diff1 | diff2 | blob | history
src/gui/image/qpixmapdatafactory.cpp diff1 | diff2 | blob | history
src/gui/inputmethod/qcoefepinputcontext_s60.cpp diff1 | diff2 | blob | history
src/gui/kernel/qapplication_s60.cpp diff1 | diff2 | blob | history
src/gui/kernel/qsoftkeymanager_s60.cpp diff1 | diff2 | blob | history
src/gui/kernel/qt_s60_p.h diff1 | diff2 | blob | history
src/gui/kernel/qwidget_s60.cpp diff1 | diff2 | blob | history
src/gui/painting/painting.pri diff1 | diff2 | blob | history
src/gui/painting/qgraphicssystem.cpp diff1 | diff2 | blob | history
src/gui/painting/qwindowsurface_s60.cpp diff1 | diff2 | blob | history
src/gui/s60framework/qs60mainappui.cpp diff1 | diff2 | blob | history
src/gui/styles/qs60style.cpp diff1 | diff2 | blob | history
src/gui/styles/qs60style_p.h diff1 | diff2 | blob | history
src/gui/styles/qs60style_s60.cpp diff1 | diff2 | blob | history
src/gui/text/qfont_s60.cpp diff1 | diff2 | blob | history
src/gui/text/qfontdatabase_s60.cpp diff1 | diff2 | blob | history
src/gui/text/qfontengine_s60.cpp diff1 | diff2 | blob | history
src/network/bearer/qnetworkconfigmanager.cpp diff1 | diff2 | blob | history
src/network/bearer/qnetworkconfigmanager_p.cpp diff1 | diff2 | blob | history
src/network/bearer/qnetworkconfigmanager_p.h diff1 | diff2 | blob | history
src/openvg/qpaintengine_vg.cpp diff1 | diff2 | blob | history
src/openvg/qpixmapdata_vg.cpp diff1 | diff2 | blob | history
src/s60installs/bwins/QtGuiu.def diff1 | diff2 | blob | history
src/s60installs/bwins/QtOpenGLu.def diff1 | diff2 | blob | history
src/s60installs/bwins/QtOpenVGu.def diff1 | diff2 | blob | history
src/s60installs/eabi/QtGuiu.def diff1 | diff2 | blob | history
src/s60installs/eabi/QtOpenVGu.def diff1 | diff2 | blob | history
src/s60installs/qt.iby diff1 | diff2 | blob | history
tests/auto/qnetworkproxyfactory/tst_qnetworkproxyfactory.cpp diff1 | diff2 | blob | history
6b46b7419a5aee9bd5fce67b7bfa8afe8e