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)
commitad13e0a1fd8fc9d4e6c9e02fca40501e2d4faa6d
treec9533ac546065b0c3cd5fd4045fa2e4715172a97
parenta85e53d7203576691dc18203d8784979b208033d
parent185baa0d7cebdef3049a8531d953e92e333b9bcb
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
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