diff options
| author | Thiago Macieira <thiago.macieira@nokia.com> | 2011-03-11 14:04:57 (GMT) |
|---|---|---|
| committer | Thiago Macieira <thiago.macieira@nokia.com> | 2011-03-11 14:04:57 (GMT) |
| commit | 2ec2dc55ddf424f5a7acd0a4729ddd9af2d7c398 (patch) | |
| tree | 3833140ddaca4723f452ffa6de973784380d91b2 /src/3rdparty | |
| parent | 649e65519bef38948a818f282e3022d034dc80a5 (diff) | |
| parent | 4f3587e749a8503f6207174705ed5db74affb3a5 (diff) | |
| download | Qt-2ec2dc55ddf424f5a7acd0a4729ddd9af2d7c398.zip Qt-2ec2dc55ddf424f5a7acd0a4729ddd9af2d7c398.tar.gz Qt-2ec2dc55ddf424f5a7acd0a4729ddd9af2d7c398.tar.bz2 | |
Merge remote-tracking branch 'origin/master' into qt-master-from-4.7
Conflicts:
src/s60installs/eabi/QtOpenVGu.def
Diffstat (limited to 'src/3rdparty')
| -rw-r--r-- | src/3rdparty/phonon/qt7/videowidget.mm | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/src/3rdparty/phonon/qt7/videowidget.mm b/src/3rdparty/phonon/qt7/videowidget.mm index c281e16..0600268 100644 --- a/src/3rdparty/phonon/qt7/videowidget.mm +++ b/src/3rdparty/phonon/qt7/videowidget.mm @@ -446,10 +446,12 @@ public: void setDrawFrameRect(const QRect &rect) { - m_movieLayer.frame.origin.x = rect.x(); - m_movieLayer.frame.origin.y = rect.y(); - m_movieLayer.frame.size.width = rect.width(); - m_movieLayer.frame.size.height = rect.height(); + CGRect frame = m_movieLayer.frame; + frame.origin.x = rect.x(); + frame.origin.y = rect.y(); + frame.size.width = rect.width(); + frame.size.height = rect.height(); + m_movieLayer.frame = frame; } #else // QT_MAC_USE_COCOA == false |