Merge remote branch 'staging/master' into refactor
authorSamuel Rødal <samuel.rodal@nokia.com>
Fri, 20 May 2011 17:45:38 +0000 (19:45 +0200)
committerSamuel Rødal <samuel.rodal@nokia.com>
Fri, 20 May 2011 17:46:19 +0000 (19:46 +0200)
commitd671acd5b296b83440db9836a92189c501c87ff3
treebd9c1a000e17c70124c207666cfb3276b5518ffd
parent42f5786104f9eef9542df2c7469a03324978281d
parent4f2138ecfbdc58e5cb5b0c7d762197ef69752957
Merge remote branch 'staging/master' into refactor

Conflicts:
src/opengl/qgl_qpa.cpp
src/plugins/platforms/glxconvenience/qglxconvenience.cpp
src/plugins/platforms/platforms.pro
src/plugins/platforms/wayland/qwaylandwindow.cpp
src/plugins/platforms/xcb/qxcbwindow.cpp
src/plugins/platforms/xcb/qxcbwindow.h
src/plugins/platforms/xcb/qxcbwindowsurface.cpp
src/widgets/kernel/qwidget_qpa.cpp
tests/auto/qvariant/tst_qvariant.cpp
27 files changed:
configure
src/gui/painting/qcolor.cpp
src/gui/painting/qpaintengine_raster.cpp
src/gui/painting/qpaintengineex_p.h
src/opengl/gl2paintengineex/qpaintengineex_opengl2.cpp
src/opengl/qgl_qpa.cpp
src/opengl/qwindowsurface_gl.cpp
src/plugins/platforms/glxconvenience/qglxconvenience.cpp
src/plugins/platforms/minimal/qminimalintegration.cpp
src/plugins/platforms/minimal/qminimalintegration.h
src/plugins/platforms/platforms.pro
src/plugins/platforms/wayland/gl_integration/xcomposite_glx/qwaylandxcompositeglxcontext.cpp
src/plugins/platforms/wayland/qwaylandclipboard.cpp
src/plugins/platforms/wayland/qwaylanddisplay.cpp
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/uitools/quiloader.cpp
src/widgets/kernel/qwidget_qpa.cpp
src/widgets/platforms/x11/qapplication_x11.cpp
tests/auto/qmetatype/tst_qmetatype.cpp
tests/auto/qwidget/tst_qwidget.cpp
tools/uilib/abstractformbuilder.cpp
tools/uilib/abstractformbuilder.h
tools/uilib/formbuilderextra.cpp