diff options
author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-06-22 08:39:26 (GMT) |
---|---|---|
committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-06-22 08:39:26 (GMT) |
commit | 463ad12efcc43bd9b48ab9f502ec6810a47d3d85 (patch) | |
tree | cadc92436888fa4ffebbcbb74bfe20aeb0690bb5 /doc/src/snippets/sqldatabase/sqldatabase.pro | |
parent | 5238e6a592c43f19a7151d20e36908f1f1a44df8 (diff) | |
parent | 9d0d0800062f0d0cf49ed0d28bdbd5bc5e07a1d2 (diff) | |
download | Qt-463ad12efcc43bd9b48ab9f502ec6810a47d3d85.zip Qt-463ad12efcc43bd9b48ab9f502ec6810a47d3d85.tar.gz Qt-463ad12efcc43bd9b48ab9f502ec6810a47d3d85.tar.bz2 |
Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging into 4.6-integration
* '4.6' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging:
Phonon(qt7); Don't try and display video frames when audio only.
Diffstat (limited to 'doc/src/snippets/sqldatabase/sqldatabase.pro')
0 files changed, 0 insertions, 0 deletions