From 3918386779da4bfaf65c209eea9aa64c3c5bca69 Mon Sep 17 00:00:00 2001
From: James Turner <james.turner@kdab.com>
Date: Mon, 9 Apr 2012 14:23:45 +0100
Subject: Fix ownership / lifetime of QCocoaNativeInterface
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Change-Id: I21dd1e3186e0dbbc60294f807de0db6aad8b9eee
Reviewed-by: James Turner <james.turner@kdab.com>
Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
Reviewed-by: Christoph Schleifenbaum <christoph.schleifenbaum@kdab.com>
Reviewed-by: Morten Johan Sørvig <morten.sorvig@nokia.com>
---
 src/plugins/platforms/cocoa/qcocoaintegration.h  | 1 +
 src/plugins/platforms/cocoa/qcocoaintegration.mm | 3 ++-
 2 files changed, 3 insertions(+), 1 deletion(-)

(limited to 'src/plugins')

diff --git a/src/plugins/platforms/cocoa/qcocoaintegration.h b/src/plugins/platforms/cocoa/qcocoaintegration.h
index b3eeab3f7a..a001b6234a 100644
--- a/src/plugins/platforms/cocoa/qcocoaintegration.h
+++ b/src/plugins/platforms/cocoa/qcocoaintegration.h
@@ -113,6 +113,7 @@ private:
     QList<QCocoaScreen *> mScreens;
     QCocoaClipboard  *mCocoaClipboard;
     QScopedPointer<QCocoaDrag> mCocoaDrag;
+    QScopedPointer<QPlatformNativeInterface> mNativeInterface;
     QScopedPointer<QCocoaServices> mServices;
 };
 
diff --git a/src/plugins/platforms/cocoa/qcocoaintegration.mm b/src/plugins/platforms/cocoa/qcocoaintegration.mm
index 0a3790fd72..0b87773dee 100644
--- a/src/plugins/platforms/cocoa/qcocoaintegration.mm
+++ b/src/plugins/platforms/cocoa/qcocoaintegration.mm
@@ -99,6 +99,7 @@ QCocoaIntegration::QCocoaIntegration()
     , mAccessibility(new QPlatformAccessibility)
     , mCocoaClipboard(new QCocoaClipboard)
     , mCocoaDrag(new QCocoaDrag)
+    , mNativeInterface(new QCocoaNativeInterface)
     , mServices(new QCocoaServices)
 {
     QCocoaAutoReleasePool pool;
@@ -205,7 +206,7 @@ QPlatformFontDatabase *QCocoaIntegration::fontDatabase() const
 
 QPlatformNativeInterface *QCocoaIntegration::nativeInterface() const
 {
-    return new QCocoaNativeInterface();
+    return mNativeInterface.data();
 }
 
 QPlatformInputContext *QCocoaIntegration::inputContext() const
-- 
cgit v1.2.3