Merge remote branch 'qt/4.8' into fire-master
authorPaul Olav Tvete <paul.tvete@nokia.com>
Mon, 6 Jun 2011 10:25:17 +0000 (12:25 +0200)
committerPaul Olav Tvete <paul.tvete@nokia.com>
Mon, 6 Jun 2011 10:25:17 +0000 (12:25 +0200)
commit71cd7dfea1b8f0e287eb1616c0cda5493508c3c4
tree9b0aedf6a235000164c4cb43eb3a99939611e545
parent278c2b360aba87db2d1e5a2d3e14de7260d8a16e
parent408a522ffa25106334c3b29a4799e0d0a1719291
Merge remote branch 'qt/4.8' into fire-master

Conflicts:
src/plugins/platforms/wayland/qwaylandclipboard.cpp
src/plugins/platforms/wayland/qwaylandclipboard.h
src/plugins/platforms/wayland/qwaylanddisplay.cpp
src/s60installs/eabi/QtOpenGLu.def
59 files changed:
src/declarative/qml/qdeclarativeengine.cpp
src/gui/kernel/qapplication_mac.mm
src/gui/kernel/qcocoaview_mac.mm
src/gui/kernel/qplatformclipboard_qpa.cpp
src/gui/kernel/qplatformclipboard_qpa.h
src/gui/kernel/qwidget_qpa.cpp
src/gui/painting/painting.pri
src/gui/painting/qoutlinemapper.cpp
src/gui/painting/qoutlinemapper_p.h
src/gui/painting/qpaintengine_mac_p.h
src/gui/painting/qpaintengine_raster.cpp
src/gui/painting/qpaintengine_raster_p.h
src/gui/painting/qpaintengineex.cpp
src/gui/painting/qpaintengineex_p.h
src/gui/painting/qpainter.cpp
src/gui/painting/qrasterizer.cpp
src/gui/painting/qtextureglyphcache.cpp
src/gui/painting/qunifiedtoolbarsurface_mac.cpp
src/gui/text/qfontdatabase_x11.cpp
src/gui/text/qfontengine_coretext.mm
src/gui/text/qfontengine_x11.cpp
src/gui/text/qtextengine.cpp
src/gui/text/qtextengine_p.h
src/gui/text/qtextlayout.cpp
src/opengl/gl2paintengineex/qpaintengineex_opengl2.cpp
src/opengl/gl2paintengineex/qpaintengineex_opengl2_p.h
src/opengl/qgl_qpa.cpp
src/opengl/qpaintengine_opengl_p.h
src/opengl/qwindowsurface_gl.cpp
src/openvg/qpaintengine_vg_p.h
src/plugins/platforms/glxconvenience/qglxconvenience.cpp
src/plugins/platforms/minimal/qminimalintegration.cpp
src/plugins/platforms/minimal/qminimalintegration.h
src/plugins/platforms/wayland/gl_integration/wayland_egl/qwaylandglcontext.cpp
src/plugins/platforms/wayland/gl_integration/xcomposite_glx/qwaylandxcompositeglxcontext.cpp
src/plugins/platforms/wayland/qwaylandclipboard.cpp
src/plugins/platforms/wayland/qwaylandclipboard.h
src/plugins/platforms/wayland/qwaylanddisplay.cpp
src/plugins/platforms/wayland/qwaylanddisplay.h
src/plugins/platforms/wayland/qwaylandwindow.cpp
src/plugins/platforms/wayland/wayland.pro
src/plugins/platforms/xcb/qxcbwindow.cpp
src/plugins/platforms/xcb/qxcbwindow.h
src/plugins/platforms/xcb/qxcbwindowsurface.cpp
src/plugins/platforms/xlib/qxlibclipboard.cpp
src/plugins/platforms/xlib/qxlibclipboard.h
src/plugins/platforms/xlib/qxlibintegration.cpp
src/plugins/platforms/xlib/qxlibscreen.cpp
src/plugins/platforms/xlib/qxlibstatic.h
src/plugins/platforms/xlib/qxlibwindow.cpp
src/plugins/platforms/xlib/qxlibwindow.h
src/plugins/platforms/xlib/qxlibwindowsurface.cpp
tests/arthur/common/paintcommands.cpp
tests/arthur/common/paintcommands.h
tests/auto/declarative/qdeclarativeqt/tst_qdeclarativeqt.cpp
tests/auto/qgraphicsitem/tst_qgraphicsitem.cpp
tests/auto/qpainter/tst_qpainter.cpp
tests/auto/qstatictext/tst_qstatictext.cpp
tests/auto/qtextlayout/tst_qtextlayout.cpp