Merged master into qtquick2.
authoraxis <qt-info@nokia.com>
Wed, 27 Apr 2011 12:13:27 +0000 (14:13 +0200)
committeraxis <qt-info@nokia.com>
Wed, 27 Apr 2011 12:34:19 +0000 (14:34 +0200)
commit9e57cd5e6a1793994fc538f410cce0fc64de95c3
tree25e2c7fbd74d891bb532733a313f3e7e72306bbc
parenteae8fb85997d82ecec0743ba3e470681129bff41
parent106c57c238294387d6667a753e721687de3f9376
Merged master into qtquick2.
src/plugins/platforms/wayland/wayland.pro