From 4993d3ed6bff681889faec3711fffa2400b7a601 Mon Sep 17 00:00:00 2001
From: Richard Moe Gustavsen <richard.gustavsen@digia.com>
Date: Wed, 6 Feb 2013 11:34:14 +0100
Subject: iOS: implement QIOSWindow::winId()
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Change-Id: I3dd7accae43bcf7d4d6dfd8b272ab65d67bd935c
Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@digia.com>
---
 src/plugins/platforms/ios/qioscontext.mm     | 3 ++-
 src/plugins/platforms/ios/qiosintegration.mm | 2 +-
 src/plugins/platforms/ios/qioswindow.h       | 2 +-
 3 files changed, 4 insertions(+), 3 deletions(-)

(limited to 'src/plugins/platforms/ios')

diff --git a/src/plugins/platforms/ios/qioscontext.mm b/src/plugins/platforms/ios/qioscontext.mm
index dc431b57dd..d3966964e0 100644
--- a/src/plugins/platforms/ios/qioscontext.mm
+++ b/src/plugins/platforms/ios/qioscontext.mm
@@ -160,7 +160,8 @@ GLuint QIOSContext::defaultFramebufferObject(QPlatformSurface *surface) const
         framebufferObject.renderbufferHeight != platformWindow->effectiveHeight()) {
 
         glBindRenderbuffer(GL_RENDERBUFFER, framebufferObject.colorRenderbuffer);
-        CAEAGLLayer *layer = static_cast<CAEAGLLayer *>(platformWindow->nativeView().layer);
+        UIView *view = reinterpret_cast<UIView *>(platformWindow->winId());
+        CAEAGLLayer *layer = static_cast<CAEAGLLayer *>(view.layer);
         [m_eaglContext renderbufferStorage:GL_RENDERBUFFER fromDrawable:layer];
 
         glGetRenderbufferParameteriv(GL_RENDERBUFFER, GL_RENDERBUFFER_WIDTH, &framebufferObject.renderbufferWidth);
diff --git a/src/plugins/platforms/ios/qiosintegration.mm b/src/plugins/platforms/ios/qiosintegration.mm
index cbe2717c34..c5fef243ce 100644
--- a/src/plugins/platforms/ios/qiosintegration.mm
+++ b/src/plugins/platforms/ios/qiosintegration.mm
@@ -158,7 +158,7 @@ void *QIOSIntegration::nativeResourceForWindow(const QByteArray &resource, QWind
     QIOSWindow *platformWindow = static_cast<QIOSWindow *>(window->handle());
 
     if (lowerCaseResource == "uiview")
-        return platformWindow->nativeView();
+        return reinterpret_cast<void *>(platformWindow->winId());
 
     return 0;
 }
diff --git a/src/plugins/platforms/ios/qioswindow.h b/src/plugins/platforms/ios/qioswindow.h
index 31fd8d3185..7a0224dab0 100644
--- a/src/plugins/platforms/ios/qioswindow.h
+++ b/src/plugins/platforms/ios/qioswindow.h
@@ -76,7 +76,7 @@ public:
     int effectiveWidth() const;
     int effectiveHeight() const;
 
-    UIView *nativeView() const { return m_view; }
+    WId winId() const { return WId(m_view); };
 
     QList<QWindowSystemInterface::TouchPoint> &touchPoints()  { return m_touchPoints; }
     QHash<UITouch *, int> &activeTouches() { return m_activeTouches; }
-- 
cgit v1.2.3