Merge remote branch 'gerrit/master' into HEAD
authorSamuel Rødal <samuel.rodal@nokia.com>
Tue, 6 Sep 2011 08:49:40 +0000 (10:49 +0200)
committerPaul Olav Tvete <paul.tvete@nokia.com>
Mon, 12 Sep 2011 13:25:01 +0000 (15:25 +0200)
commitb51bd8cc6e8a00d86b50c1bd118051562711315f
tree6c4cba5618b8e98f11310c95dd9b1cb0ecbe5e8a
parentf69e3c2ba78ac60cbc74dbded923a2880839c58a
parent151a17761334038181e3f3b36846757560deadf6
Merge remote branch 'gerrit/master' into HEAD

Conflicts:
src/plugins/platforms/wayland/qwaylandnativeinterface.cpp
src/plugins/platforms/wayland/qwaylandnativeinterface.h

Change-Id: I64cf2cefa532ba87a92f632e3595ce6914183e9b
src/plugins/platforms/wayland/qwaylandnativeinterface.cpp
src/plugins/platforms/wayland/qwaylandnativeinterface.h
src/plugins/platforms/wayland/qwaylandwindow.cpp
src/plugins/platforms/wayland/windowmanager_integration/qwaylandwindowmanagerintegration.cpp