macOS: Disambiguate use of native handles in QCocoaGLContext

We only need the QVariant native handle when creating the context, so
there's no need for a getter, and we then rename the NSOpenGLContext
getter to match e.g. QCocoaScreen::nativeScreen().

Change-Id: I041e0eff39af9c8836d8ecd560ea07e92dc63e03
Reviewed-by: Gabriel de Dietrich <gabriel.dedietrich@qt.io>

1 files changed, 3 insertions, 8 deletions

diff --git a/src/plugins/platforms/cocoa/qcocoaglcontext.mm b/src/plugins/platforms/cocoa/qcocoaglcontext.mm
index febe255dfc..306a143f98 100644
--- a/src/plugins/platforms/cocoa/qcocoaglcontext.mm
+++ b/src/plugins/platforms/cocoa/qcocoaglcontext.mm
@@ -78,7 +78,7 @@ QCocoaGLContext::QCocoaGLContext(const QSurfaceFormat &format, QPlatformOpenGLCo
         }
         m_context = context;
         [m_context retain];
-        m_shareContext = share ? static_cast<QCocoaGLContext *>(share)->nsOpenGLContext() : nil;
+        m_shareContext = share ? static_cast<QCocoaGLContext *>(share)->nativeContext() : nil;
         updateSurfaceFormat();
         return;
     }
@@ -89,7 +89,7 @@ QCocoaGLContext::QCocoaGLContext(const QSurfaceFormat &format, QPlatformOpenGLCo
     if (m_format.renderableType() != QSurfaceFormat::OpenGL)
         return;
 
-    m_shareContext = share ? static_cast<QCocoaGLContext *>(share)->nsOpenGLContext() : nil;
+    m_shareContext = share ? static_cast<QCocoaGLContext *>(share)->nativeContext() : nil;
 
     if (m_shareContext) {
         // Allow sharing between 3.2 Core and 4.1 Core profile versions in
@@ -468,16 +468,11 @@ bool QCocoaGLContext::isSharing() const
     return m_shareContext != nil;
 }
 
-NSOpenGLContext *QCocoaGLContext::nsOpenGLContext() const
+NSOpenGLContext *QCocoaGLContext::nativeContext() const
 {
     return m_context;
 }
 
-QVariant QCocoaGLContext::nativeHandle() const
-{
-    return QVariant::fromValue<QCocoaNativeContext>(QCocoaNativeContext(m_context));
-}
-
 QFunctionPointer QCocoaGLContext::getProcAddress(const char *procName)
 {
     return (QFunctionPointer)dlsym(RTLD_DEFAULT, procName);