diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-04-14 21:40:26 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-04-14 21:40:26 (GMT) |
| commit | fbdbcf9d89df56ac6283c1d5e8a65e7ee1fb3d40 (patch) | |
| tree | 8070ee3a2bdccf0aa6867586fb48d1e8cd8ece4e | |
| parent | 55de2bd842a43e84f7bd3efb2cbc5d71640fbda4 (diff) | |
| parent | 53c139f4e42c182a07ebc589393b88e10077cacf (diff) | |
| download | Qt-fbdbcf9d89df56ac6283c1d5e8a65e7ee1fb3d40.zip Qt-fbdbcf9d89df56ac6283c1d5e8a65e7ee1fb3d40.tar.gz Qt-fbdbcf9d89df56ac6283c1d5e8a65e7ee1fb3d40.tar.bz2 | |
Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.6-integration
* '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public:
Phonon MMF: fixed typo in trace statement
| -rw-r--r-- | src/3rdparty/phonon/mmf/videowidget.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/3rdparty/phonon/mmf/videowidget.cpp b/src/3rdparty/phonon/mmf/videowidget.cpp index 4ed9979..122094e 100644 --- a/src/3rdparty/phonon/mmf/videowidget.cpp +++ b/src/3rdparty/phonon/mmf/videowidget.cpp @@ -123,7 +123,7 @@ Phonon::VideoWidget::ScaleMode MMF::VideoWidget::scaleMode() const void MMF::VideoWidget::setScaleMode(Phonon::VideoWidget::ScaleMode scaleMode) { TRACE_CONTEXT(VideoWidget::setScaleMode, EVideoApi); - TRACE("setScaleMode %d", setScaleMode); + TRACE("setScaleMode %d", scaleMode); m_videoOutput->setScaleMode(scaleMode); } |