diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-10-29 06:22:14 (GMT) | 
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-10-29 06:22:14 (GMT) | 
| commit | 8943b44c38ee6244c4a5b190c2b35879b1921843 (patch) | |
| tree | 71ba80eacd8292f89af2b6c90a1f1f0e7beea455 /doc/src/snippets/code/src_opengl_qglshaderprogram.cpp | |
| parent | 77819edac505823226c40033e76d2dda0e8b363a (diff) | |
| parent | 8b7dad6c1290c3c5f9ce35ea9d13a4b7e6398572 (diff) | |
| download | Qt-8943b44c38ee6244c4a5b190c2b35879b1921843.zip Qt-8943b44c38ee6244c4a5b190c2b35879b1921843.tar.gz Qt-8943b44c38ee6244c4a5b190c2b35879b1921843.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: (388 commits)
  Fix the license in files for Lighthouse
  Fix typos found by the spellchecking autotest
  Add missing QT_MODULE macros.
  Fix qt_defaultDpi, but not use Q_DECL_IMPORT but Q_GUI_EXPORT
  Compile fix for RVCT 4
  Fix QT_BLITTER_RASTEROVERLAY and namespace error
  Lighthouse: initial COCOA plugin
  Lighthouse on OS X.
  Fix QWS generic mac mkspec
  actually set egl swap interval
  Remove debug code added by 650a0078e2cef43eff107fe8d2505f64a0bfedf0
  Update sections if model content changes.
  Don't clobber the tty by default
  Add touch offset
  Jitter removal
  Mouse event compression
  Add keycodes for some additional multimedia keys
  Make it possible to choose some EGLFS configuration options via envvars
  use swapInterval=1 by default in EglFS to potentially avoid tearing
  Lighthouse: make QFontconfigDatabase not override application font
  ...
Diffstat (limited to 'doc/src/snippets/code/src_opengl_qglshaderprogram.cpp')
0 files changed, 0 insertions, 0 deletions
