Merge remote branch 'qt/4.7' into lighthouse-4.7
authorPaul Olav Tvete <paul.tvete@nokia.com>
Mon, 10 May 2010 13:12:30 +0000 (15:12 +0200)
committerPaul Olav Tvete <paul.tvete@nokia.com>
Mon, 10 May 2010 13:12:30 +0000 (15:12 +0200)
commit395508f4700bb72c120e0f9e8a19ffa69a7c5d88
tree92efbecc98b018cfc617aab2c4811f921becd79c
parent6f39ecdabdae9b2132729a2a9940e5febaa420d2
parent03f8f1df0d88f5ffe0b3120cffce614cbeefdb70
Merge remote branch 'qt/4.7' into lighthouse-4.7

Conflicts:
src/gui/egl/egl.pri
src/gui/painting/qwindowsurface_p.h
18 files changed:
configure
src/3rdparty/webkit/WebCore/WebCore.pro
src/corelib/global/qglobal.cpp
src/corelib/global/qglobal.h
src/gui/egl/egl.pri
src/gui/gui.pro
src/gui/kernel/qguiplatformplugin.cpp
src/gui/kernel/qwidget.cpp
src/gui/kernel/qwidget_p.h
src/gui/painting/qpaintengine_raster.cpp
src/gui/painting/qwindowsurface_p.h
src/gui/text/qfont.cpp
src/gui/text/qfontdatabase.cpp
src/gui/widgets/qlinecontrol.cpp
src/opengl/qgl.cpp
src/opengl/qgl.h
src/opengl/qgl_p.h
src/opengl/qwindowsurface_gl.cpp