Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into master-integration
authorQt Continuous Integration System <qt-info@nokia.com>
Fri, 13 May 2011 10:39:05 +0000 (20:39 +1000)
committerQt Continuous Integration System <qt-info@nokia.com>
Fri, 13 May 2011 10:39:05 +0000 (20:39 +1000)
commitfa976feb9408ebaa12570997471f63683bdb88a2
tree9c2519e7e859516f5e1aae8b8a4d9ac64ce2b10a
parenta80130b07c5b8ee4b06eabbceb65eb23d4d4602e
parenta45398677309ab905b69c599177b4c2951292b04
Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into master-integration

* 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1:
  X11: Keep the menubar inside the widgetbox window in toplevel mode
  Retain ABI and API compatibility when Qt is built with EGL.