summaryrefslogtreecommitdiffstats
path: root/src/multimedia/qml/qmlgraphicsvideo_p.h
diff options
context:
space:
mode:
authorQt Continuous Integration System <qt-info@nokia.com>2010-02-22 01:12:24 (GMT)
committerQt Continuous Integration System <qt-info@nokia.com>2010-02-22 01:12:24 (GMT)
commit155ae1da9dcf11617f412e5c229a2a12a333d7db (patch)
tree7666d887785f0da1fbb0fe2d1dbe161b5e3fb775 /src/multimedia/qml/qmlgraphicsvideo_p.h
parent0a83a6c571fadb454cb8711aed84258b061d44b5 (diff)
parentd47900969aca5532a707d311965a69a1cf1ea5b1 (diff)
downloadQt-155ae1da9dcf11617f412e5c229a2a12a333d7db.zip
Qt-155ae1da9dcf11617f412e5c229a2a12a333d7db.tar.gz
Qt-155ae1da9dcf11617f412e5c229a2a12a333d7db.tar.bz2
Merge branch 'master' of scm.dev.nokia.troll.no:qt/berlin-staging-1 into master-integration
* 'master' of scm.dev.nokia.troll.no:qt/berlin-staging-1: QtMultimedia: Fix compilation of qml/qsoundeffect_pulse on 64 bit.
Diffstat (limited to 'src/multimedia/qml/qmlgraphicsvideo_p.h')
0 files changed, 0 insertions, 0 deletions