diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2011-07-19 13:08:23 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2011-07-19 13:08:23 (GMT) |
| commit | 4e2a44d6d56f2c28709ef9687ca10b820332dd5f (patch) | |
| tree | bf9a0af7516c0a71f516017da07c3aac72095fc4 /doc/src/snippets/code/src_opengl_qglshaderprogram.cpp | |
| parent | 98b40e05ed8289402c4d05c17645db4f8f04d890 (diff) | |
| parent | b683aaa27430ced087b4230e031f56c3100f8068 (diff) | |
| download | Qt-4e2a44d6d56f2c28709ef9687ca10b820332dd5f.zip Qt-4e2a44d6d56f2c28709ef9687ca10b820332dd5f.tar.gz Qt-4e2a44d6d56f2c28709ef9687ca10b820332dd5f.tar.bz2 | |
Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-fire-team
* 'master' of git://scm.dev.nokia.troll.no/qt/qt-fire-team:
Move separator skipping to proper place
Skip shaping for hidden line/paragraph separators
Support interface orientation for uikit.
Add support for opening LinuxInput devices exclusively ('grabbing').
Fixed regression in compilerwarnings.
Properly quit the input event thread in the directfb platform plugin.
Apply 57993ba7 properly to 4.8
Deprecate some QPixmap functions (marked as obsolete already).
Deprecate some functions in QImage (that have been obsolete since 4.1).
Diffstat (limited to 'doc/src/snippets/code/src_opengl_qglshaderprogram.cpp')
0 files changed, 0 insertions, 0 deletions