Merge remote branch 'origin/4.7' into qt-4.8-from-4.7
authorJani Hautakangas <jani.hautakangas@nokia.com>
Wed, 22 Jun 2011 11:38:32 +0000 (14:38 +0300)
committerJani Hautakangas <jani.hautakangas@nokia.com>
Wed, 22 Jun 2011 11:38:32 +0000 (14:38 +0300)
commit14f10211e72f2d04fa7f4e0faa430eb94c1f8f83
tree1e8d1e2f758c1090a15123cbcb8f615d867caa47
parente4cce8849bf45be9a111072e3fca7bdf67364e8a
parent5e80b137d195625c0d57c1c27e5e8464d1ccfa33
Merge remote branch 'origin/4.7' into qt-4.8-from-4.7

Conflicts:
src/opengl/qgl.cpp
src/opengl/qpixmapdata_symbiangl.cpp
src/opengl/qwindowsurface_gl.cpp
18 files changed:
src/declarative/graphicsitems/qdeclarativetextinput.cpp
src/gui/graphicsview/qgraphicslayout.cpp
src/gui/graphicsview/qgraphicswidget_p.cpp
src/gui/image/qpixmapdata_p.h
src/gui/inputmethod/qcoefepinputcontext_s60.cpp
src/gui/kernel/qapplication_s60.cpp
src/gui/kernel/qwidget_mac.mm
src/network/access/qnetworkcookiejar.cpp
src/network/ssl/qsslsocket_openssl.cpp
src/opengl/gl2paintengineex/qpaintengineex_opengl2.cpp
src/opengl/opengl.pro
src/opengl/qgl.cpp
src/opengl/qgl.h
src/opengl/qgl_p.h
src/opengl/qpixmapdata_symbiangl.cpp
src/opengl/qwindowsurface_gl.cpp
tests/auto/qnetworkcookiejar/tst_qnetworkcookiejar.cpp
tests/auto/qwidget/tst_qwidget.cpp