summaryrefslogtreecommitdiffstats
path: root/src/3rdparty/phonon
diff options
context:
space:
mode:
authorShane Kearns <shane.kearns@sosco.com>2009-11-10 10:35:10 (GMT)
committerShane Kearns <shane.kearns@sosco.com>2009-11-10 10:35:10 (GMT)
commit294ca3b59dc02e1c89e2cac8007a74c61a2828fe (patch)
tree77aaa7a83107953f9e5591d09917ecb0b5400268 /src/3rdparty/phonon
parentf42dd78db71c29d288b4a76a2fcfe720335afe1a (diff)
parent451e7fcad72366cf40bcb00931b86aafba1b983f (diff)
downloadQt-294ca3b59dc02e1c89e2cac8007a74c61a2828fe.zip
Qt-294ca3b59dc02e1c89e2cac8007a74c61a2828fe.tar.gz
Qt-294ca3b59dc02e1c89e2cac8007a74c61a2828fe.tar.bz2
Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt into 4.6
Diffstat (limited to 'src/3rdparty/phonon')
-rw-r--r--src/3rdparty/phonon/mmf/videooutput.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/3rdparty/phonon/mmf/videooutput.cpp b/src/3rdparty/phonon/mmf/videooutput.cpp
index 5288b4d..1b338a2 100644
--- a/src/3rdparty/phonon/mmf/videooutput.cpp
+++ b/src/3rdparty/phonon/mmf/videooutput.cpp
@@ -136,7 +136,7 @@ void MMF::VideoOutput::paintEvent(QPaintEvent* event)
TRACE("rect %d %d - %d %d",
event->rect().left(), event->rect().top(),
event->rect().right(), event->rect().bottom());
- TRACE("regions %d", event->region().numRects());
+ TRACE("regions %d", event->region().rectCount());
TRACE("type %d", event->type());
// Do nothing