Merge remote branch 'gerrit/master' into refactor
authorSamuel Rødal <samuel.rodal@nokia.com>
Tue, 12 Jul 2011 10:52:22 +0000 (12:52 +0200)
committerSamuel Rødal <samuel.rodal@nokia.com>
Tue, 12 Jul 2011 10:52:22 +0000 (12:52 +0200)
commite048a05ab5e685556a211b470e7335f3fefc2cb2
treee403217e622d8b67dbc23c1d4c50330947b87bdc
parent8d80e7c49bb8debc3a9b8e9d57e76f6ab981f384
parentfc9e419cabc67c33907661dfbfa5595a5896afdb
Merge remote branch 'gerrit/master' into refactor

Conflicts:
src/gui/image/qicon.cpp
src/gui/image/qicon.h
src/gui/image/qicon_p.h
src/gui/text/qfontdatabase.cpp
src/plugins/platforms/wayland/gl_integration/qwaylandglwindowsurface.cpp
src/plugins/platforms/wayland/gl_integration/wayland_egl/qwaylandglcontext.cpp
src/plugins/platforms/wayland/gl_integration/xcomposite_egl/qwaylandxcompositeeglwindow.cpp
sync.profile

Change-Id: Ie0a23a12177ff51bf562e15b2dd41f071afb19b4
src/plugins/platforms/wayland/gl_integration/xcomposite_egl/qwaylandxcompositeeglwindow.cpp
src/plugins/platforms/wayland/gl_integration/xcomposite_egl/qwaylandxcompositeeglwindow.h