summaryrefslogtreecommitdiffstats
path: root/src/imports/multimedia/qdeclarativemediabase_p.h
diff options
context:
space:
mode:
authorQt Continuous Integration System <qt-info@nokia.com>2010-03-18 19:09:17 (GMT)
committerQt Continuous Integration System <qt-info@nokia.com>2010-03-18 19:09:17 (GMT)
commitabf09f87af8f57f670904ff25a626d19ec11120b (patch)
tree61c0cdf7978ab91e8935ef62ca8cd39183bad343 /src/imports/multimedia/qdeclarativemediabase_p.h
parentf43c00902e9ff6a314836c6955769e941ea33277 (diff)
parentd08091d728d3f75aaa6a169673a07e3222096954 (diff)
downloadQt-abf09f87af8f57f670904ff25a626d19ec11120b.zip
Qt-abf09f87af8f57f670904ff25a626d19ec11120b.tar.gz
Qt-abf09f87af8f57f670904ff25a626d19ec11120b.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: Replace AspectRatioMode enum from QVideoWidget with Qt::AspectRatioMode.
Diffstat (limited to 'src/imports/multimedia/qdeclarativemediabase_p.h')
0 files changed, 0 insertions, 0 deletions