From: Morten Johan Sørvig <morten.sorvig@digia.com>
Date: Tue, 8 Jan 2013 13:39:10 +0000 (+0100)
Subject: Compile in 32-bit mode.
X-Git-Tag: upstream/5.2.95+rc1~83^2~40
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=77494db8d2a37a37c6410a7d72229f5bc41b3cb5;p=platform%2Fupstream%2Fqtmultimedia.git

Compile in 32-bit mode.

CGRect == NSRect only in 64-bit mode.

Don't add -framework QuickTime based on the host arch,
use QT_ARCH instead.

Change-Id: I829bc1bcfe37f70a07e8c55a5bc7dee90aaa981a
Reviewed-by: Gabriel de Dietrich <gabriel.dedietrich@digia.com>
---

diff --git a/src/plugins/avfoundation/mediaplayer/avfmediaplayersession.mm b/src/plugins/avfoundation/mediaplayer/avfmediaplayersession.mm
index 3fb9354..f931060 100644
--- a/src/plugins/avfoundation/mediaplayer/avfmediaplayersession.mm
+++ b/src/plugins/avfoundation/mediaplayer/avfmediaplayersession.mm
@@ -257,8 +257,8 @@ static void *AVFMediaPlayerSessionObserverCurrentItemObservationContext = &AVFMe
             NSArray *tracks = [asset tracksWithMediaType:AVMediaTypeVideo];
             if ([tracks count]) {
                 AVAssetTrack *videoTrack = [tracks objectAtIndex:0];
-                m_playerLayer.anchorPoint = NSMakePoint(0.0f, 0.0f);
-                m_playerLayer.bounds = NSMakeRect(0.0f, 0.0f, videoTrack.naturalSize.width, videoTrack.naturalSize.height);
+                m_playerLayer.anchorPoint = CGPointMake(0.0f, 0.0f);
+                m_playerLayer.bounds = CGRectMake(0.0f, 0.0f, videoTrack.naturalSize.width, videoTrack.naturalSize.height);
             }
         }
 
@@ -368,8 +368,8 @@ static void *AVFMediaPlayerSessionObserverCurrentItemObservationContext = &AVFMe
                 NSArray *tracks = [asset tracksWithMediaType:AVMediaTypeVideo];
                 if ([tracks count]) {
                     AVAssetTrack *videoTrack = [tracks objectAtIndex:0];
-                    m_playerLayer.anchorPoint = NSMakePoint(0.0f, 0.0f);
-                    m_playerLayer.bounds = NSMakeRect(0.0f, 0.0f, videoTrack.naturalSize.width, videoTrack.naturalSize.height);
+                    m_playerLayer.anchorPoint = CGPointMake(0.0f, 0.0f);
+                    m_playerLayer.bounds = CGRectMake(0.0f, 0.0f, videoTrack.naturalSize.width, videoTrack.naturalSize.height);
                 }
             }
 
diff --git a/src/plugins/avfoundation/mediaplayer/avfvideowidgetcontrol.mm b/src/plugins/avfoundation/mediaplayer/avfvideowidgetcontrol.mm
index b8cd782..c995d92 100644
--- a/src/plugins/avfoundation/mediaplayer/avfvideowidgetcontrol.mm
+++ b/src/plugins/avfoundation/mediaplayer/avfvideowidgetcontrol.mm
@@ -207,7 +207,7 @@ void AVFVideoWidgetControl::updateVideoFrame(const CVTimeStamp &ts)
 
 void AVFVideoWidgetControl::setupVideoOutput()
 {
-    NSRect layerBounds = [(AVPlayerLayer*)m_playerLayer bounds];
+    CGRect layerBounds = [(AVPlayerLayer*)m_playerLayer bounds];
     m_nativeSize = QSize(layerBounds.size.width, layerBounds.size.height);
     m_videoWidget->setNativeSize(m_nativeSize);
 
diff --git a/src/plugins/qt7/qt7.pro b/src/plugins/qt7/qt7.pro
index ae87bd4..f5d8bae 100644
--- a/src/plugins/qt7/qt7.pro
+++ b/src/plugins/qt7/qt7.pro
@@ -23,7 +23,7 @@ LIBS += -framework AppKit -framework AudioUnit \
 
 # QUICKTIME_C_API_AVAILABLE is true only on i386
 # so make sure to link QuickTime
-contains(QMAKE_HOST.arch, i386) {
+contains(QT_ARCH, i386) {
     LIBS += -framework QuickTime
 }