projects / qt:qt.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: e318b02 b8ded0d)
Merge remote-tracking branch 'origin/4.7' into HEAD
authorThiago Macieira <thiago.macieira@nokia.com>
Wed, 16 Mar 2011 16:25:47 +0000 (17:25 +0100)
committerThiago Macieira <thiago.macieira@nokia.com>
Wed, 16 Mar 2011 16:25:47 +0000 (17:25 +0100)
commit580e3d9968e12fb38348af503ef9ede50691c24c
tree2ae55db9989bd8147de9d25071cecbd279b847d7tree | snapshot
parente318b0276c3d4a0db8660b4fa6d68f1784aee522commit | diff
parentb8ded0df9c85558b93ee5ec5abd5774c87c4deedcommit | diff
Merge remote-tracking branch 'origin/4.7' into HEAD

Conflicts:
configure
mkspecs/symbian-gcce/qmake.conf
qmake/generators/metamakefile.cpp
qmake/generators/win32/mingw_make.cpp
src/corelib/global/global.pri
src/corelib/global/qglobal.h
src/opengl/qgl.cpp
src/opengl/qwindowsurface_gl.cpp
src/plugins/platforms/wayland/qwaylandbuffer.h
tests/auto/qnetworkreply/tst_qnetworkreply.cpp
tools/designer/src/components/formeditor/qdesigner_resource.cpp
19 files changed:
configure diff1 | diff2 | blob | history
mkspecs/common/symbian/symbian.conf diff1 | diff2 | blob | history
src/declarative/graphicsitems/qdeclarativeflickable.cpp diff1 | diff2 | blob | history
src/gui/kernel/qwidget.cpp diff1 | diff2 | blob | history
src/gui/painting/qpainterpath.cpp diff1 | diff2 | blob | history
src/gui/styles/qs60style.cpp diff1 | diff2 | blob | history
src/gui/text/qtextlayout.cpp diff1 | diff2 | blob | history
src/network/access/qhttpnetworkconnectionchannel.cpp diff1 | diff2 | blob | history
src/network/ssl/qsslsocket_openssl.cpp diff1 | diff2 | blob | history
src/opengl/gl2paintengineex/qpaintengineex_opengl2.cpp diff1 | diff2 | blob | history
src/opengl/opengl.pro diff1 | diff2 | blob | history
src/opengl/qgl.cpp diff1 | diff2 | blob | history
src/opengl/qgl.h diff1 | diff2 | blob | history
src/opengl/qwindowsurface_gl.cpp diff1 | diff2 | blob | history
tests/auto/qnetworkreply/tst_qnetworkreply.cpp diff1 | diff2 | blob | history
tests/auto/qpainterpath/tst_qpainterpath.cpp diff1 | diff2 | blob | history
tests/auto/qtextlayout/tst_qtextlayout.cpp diff1 | diff2 | blob | history
tools/designer/src/components/formeditor/qdesigner_resource.cpp diff1 | diff2 | blob | history
tools/designer/src/lib/shared/widgetfactory.cpp diff1 | diff2 | blob | history
6b46b7419a5aee9bd5fce67b7bfa8afe8e