summaryrefslogtreecommitdiffstats
path: root/src/3rdparty/phonon
diff options
context:
space:
mode:
authorQt Continuous Integration System <qt-info@nokia.com>2010-04-14 20:50:11 (GMT)
committerQt Continuous Integration System <qt-info@nokia.com>2010-04-14 20:50:11 (GMT)
commitca52a35fa6bf4a86310d06c22aa256ab654712de (patch)
tree4518d5224ed3c1b18b0313928ca32fc443d40fb9 /src/3rdparty/phonon
parentb371999d3e9c207047be6afda89d008b6cf04763 (diff)
parent551c58e2f8bb8861486a3616154c45464601ef15 (diff)
downloadQt-ca52a35fa6bf4a86310d06c22aa256ab654712de.zip
Qt-ca52a35fa6bf4a86310d06c22aa256ab654712de.tar.gz
Qt-ca52a35fa6bf4a86310d06c22aa256ab654712de.tar.bz2
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public: Phonon MMF: fixed typo in trace statement Update to def files for 4.7.0-beta1 Fixed installer_sis target for 4.7
Diffstat (limited to 'src/3rdparty/phonon')
-rw-r--r--src/3rdparty/phonon/mmf/videowidget.cpp2
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);
}