diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-12-06 17:00:40 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-12-06 17:00:40 (GMT) |
| commit | 4f5017995bd493c30c5e0321711f2e1759b4189c (patch) | |
| tree | e156adab0021995413d0be016768d00629a808e7 /doc/src/snippets/code/src_opengl_qglshaderprogram.cpp | |
| parent | 6af078b2a13f4855a35d48376e58154ee2d57ec1 (diff) | |
| parent | ad512e135ec6407323516526f09f03070d373d2e (diff) | |
| download | Qt-4f5017995bd493c30c5e0321711f2e1759b4189c.zip Qt-4f5017995bd493c30c5e0321711f2e1759b4189c.tar.gz Qt-4f5017995bd493c30c5e0321711f2e1759b4189c.tar.bz2 | |
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/qt-qml:
Document support for QVariantList and QVariantMap type conversion
Some doc clarification for components and javascript integration
Cursor shouldn't blink while dragging cursor position
Qt.include() docs weren't being picked up by qdoc
Doc: make it clear that "z" affects sibling stacking order.
Diffstat (limited to 'doc/src/snippets/code/src_opengl_qglshaderprogram.cpp')
0 files changed, 0 insertions, 0 deletions