diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-03-15 10:13:48 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-03-15 10:13:48 (GMT) |
| commit | 33c6983a19942c151fa0bcc878b5219e0b641ba9 (patch) | |
| tree | 4fce12bd84cdc35edf82af505800f3cdb42057d7 /src/declarative/graphicsitems/qdeclarativefocusscope_p.h | |
| parent | 065f26ef3996368ba67ff5d8e34b20106c359a95 (diff) | |
| parent | 9a6c65fc2568c52c3950fdcd326141a62c0cee3e (diff) | |
| download | Qt-33c6983a19942c151fa0bcc878b5219e0b641ba9.zip Qt-33c6983a19942c151fa0bcc878b5219e0b641ba9.tar.gz Qt-33c6983a19942c151fa0bcc878b5219e0b641ba9.tar.bz2 | |
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging into 4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging:
Make QGLShaderProgram-dependency in QtMultimedia explicit in src.pro
Gstreamer player: allow video output changes during video playback.
Diffstat (limited to 'src/declarative/graphicsitems/qdeclarativefocusscope_p.h')
0 files changed, 0 insertions, 0 deletions