diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2011-03-08 17:28:10 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2011-03-08 17:28:10 (GMT) |
| commit | 3fde625831df6970ff2ad1e58b374541d46dfa97 (patch) | |
| tree | 48dd4a2883e23976bdd68e56fe1b6db8fa672433 /src/3rdparty | |
| parent | b1c908af60a60cf14d68914e1075f8cf6add760b (diff) | |
| parent | 0229691e76484547c5265ff31777d235218b1156 (diff) | |
| download | Qt-3fde625831df6970ff2ad1e58b374541d46dfa97.zip Qt-3fde625831df6970ff2ad1e58b374541d46dfa97.tar.gz Qt-3fde625831df6970ff2ad1e58b374541d46dfa97.tar.bz2 | |
Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into master-integration
* 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1:
Fix preprocessor directive.
Fix compiling issue on Lion.
Add support for Mac OS X 10.7 "Lion".
Unbreak build on Mac OS X 10.5 after b0b80d9e8d11c38d
Don't treat Objective-C property references as l-values
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 |