diff options
author | Qt Continuous Integration System <qt-info@nokia.com> | 2011-05-11 15:39:22 (GMT) |
---|---|---|
committer | Qt Continuous Integration System <qt-info@nokia.com> | 2011-05-11 15:39:22 (GMT) |
commit | b80c3b1b04c35ae1fa6d7119b6f7dac06ee6494b (patch) | |
tree | d70a9d47210b5ae5e65ea71258678347077787f4 /demos/declarative | |
parent | 86b43e8186055ea232ae94e708d3cd381fa179df (diff) | |
parent | 68f37a29f911fce5bcdd285b1fc1bc6d4868d78e (diff) | |
download | Qt-b80c3b1b04c35ae1fa6d7119b6f7dac06ee6494b.zip Qt-b80c3b1b04c35ae1fa6d7119b6f7dac06ee6494b.tar.gz Qt-b80c3b1b04c35ae1fa6d7119b6f7dac06ee6494b.tar.bz2 |
Merge branch 'staging-master' of scm.dev.nokia.troll.no:qt/qt-lighthouse into master-integration
* 'staging-master' of scm.dev.nokia.troll.no:qt/qt-lighthouse:
Fix GLES2 include path for applications when not using the dash shell
Remove not supported qmake api
Added Wayland selection support.
Added Wayland selection support.
Add the wayland client libraries to rpath if we use rpath
Fix the wayland windowsurface so that we have stencil and depth buffer
Dont do doneCurrent in swapBuffers
Lighthouse: Fix up Xlib
Diffstat (limited to 'demos/declarative')
0 files changed, 0 insertions, 0 deletions