Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qtbase-staging
authorQt Continuous Integration System <qt-info@nokia.com>
Thu, 19 May 2011 17:08:34 +0000 (03:08 +1000)
committerQt Continuous Integration System <qt-info@nokia.com>
Thu, 19 May 2011 17:08:34 +0000 (03:08 +1000)
commit3a88b3c9e65f544f2ef5a415b86b25607c858aeb
tree900019bf7f21e832a83f9b9987004da7ad420482
parentf60b3e90e6fd28a543300365b7ad349215a6f849
parent3d34c9b78ee96b20c5b99358fa574ce057e9ef47
Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qtbase-staging

* 'master' of git://scm.dev.nokia.troll.no/qt/qtbase-staging:
  Full translucent background support in xcb and xlib backend.
  Lighthouse xcb and xlib: Add support for transparency of GLX windows.
  Lighthouse minimal: Add support for transparency
  Compile fixes for Xlib plugin.