summaryrefslogtreecommitdiffstats
path: root/demos/qmediaplayer
diff options
context:
space:
mode:
authorQt Continuous Integration System <qt-info@nokia.com>2010-04-10 06:35:39 (GMT)
committerQt Continuous Integration System <qt-info@nokia.com>2010-04-10 06:35:39 (GMT)
commitac27c8ad39a9646a9e509ba7a58f75eeae10bb6e (patch)
treed057f4ce081b643aae0e8db07e5101a213e02551 /demos/qmediaplayer
parent7690bab57ef7ae6d669c6df23e9de72fd8a85d62 (diff)
parentf5ad30c5b425ea4ebaa25d0ffc3d1c3e1f96ae09 (diff)
downloadQt-ac27c8ad39a9646a9e509ba7a58f75eeae10bb6e.zip
Qt-ac27c8ad39a9646a9e509ba7a58f75eeae10bb6e.tar.gz
Qt-ac27c8ad39a9646a9e509ba7a58f75eeae10bb6e.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: Reimplemented event() and sceneEvent() in video item, for BC. Fix Phonon build with mingw.
Diffstat (limited to 'demos/qmediaplayer')
0 files changed, 0 insertions, 0 deletions