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)
* '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.


Trivial merge