diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-03-05 07:32:40 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-03-05 07:32:40 (GMT) |
| commit | a8b5200403742272811f095c0710193a27eed466 (patch) | |
| tree | e400285c95374df1519abb4a13af82c2ae8c3182 /src/plugins | |
| parent | 267d7ed88d72d2fb3230a1ba5c3aa6b41f9ac79a (diff) | |
| parent | 5278c12ff3c6d8e467fe4034120e258fdaa90b80 (diff) | |
| download | Qt-a8b5200403742272811f095c0710193a27eed466.zip Qt-a8b5200403742272811f095c0710193a27eed466.tar.gz Qt-a8b5200403742272811f095c0710193a27eed466.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:
Fix spelling in enumeration.
Fixed compiler warning
QuickTime movie view output: emit the natural size changes
Diffstat (limited to 'src/plugins')
| -rw-r--r-- | src/plugins/mediaservices/qt7/qt7movieviewoutput.mm | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/src/plugins/mediaservices/qt7/qt7movieviewoutput.mm b/src/plugins/mediaservices/qt7/qt7movieviewoutput.mm index b90470c..254af46 100644 --- a/src/plugins/mediaservices/qt7/qt7movieviewoutput.mm +++ b/src/plugins/mediaservices/qt7/qt7movieviewoutput.mm @@ -60,6 +60,7 @@ - (TransparentQTMovieView *) init; - (void) setDrawRect:(QRect &)rect; +- (CIImage *) view:(QTMovieView *)view willDisplayImage:(CIImage *)img; - (void) setContrast:(qreal) contrast; @end @@ -201,7 +202,10 @@ void QT7MovieViewOutput::setMovie(void *movie) void QT7MovieViewOutput::updateNaturalSize(const QSize &newSize) { - m_nativeSize = newSize; + if (m_nativeSize != newSize) { + m_nativeSize = newSize; + emit nativeSizeChanged(); + } } WId QT7MovieViewOutput::winId() const |