From a5c760a325bc4c1a3294c9533091eeae8a123a1d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tor=20Arne=20Vestb=C3=B8?= Date: Thu, 6 May 2021 16:58:16 +0200 Subject: Remove duplicated declaration of QCocoaGLContext native interface The interface is already declared in qopenglcontext_platform.h, so the inclusion in qcocoanativeinterface.mm was unintentional. Change-Id: Ic6d4a86527d03787efd858c1a6568933be8a4327 Reviewed-by: Alexandru Croitor --- src/gui/platform/macos/qcocoanativeinterface.mm | 7 ------- 1 file changed, 7 deletions(-) (limited to 'src/gui/platform') diff --git a/src/gui/platform/macos/qcocoanativeinterface.mm b/src/gui/platform/macos/qcocoanativeinterface.mm index f0c18a1bde..ef8d091e47 100644 --- a/src/gui/platform/macos/qcocoanativeinterface.mm +++ b/src/gui/platform/macos/qcocoanativeinterface.mm @@ -104,13 +104,6 @@ QT_DEFINE_PRIVATE_NATIVE_INTERFACE(QCocoaMenuBar); \return the underlying NSOpenGLContext. */ -struct Q_GUI_EXPORT QCocoaGLContext -{ - QT_DECLARE_NATIVE_INTERFACE(QCocoaGLContext) - static QOpenGLContext *fromNative(QT_IGNORE_DEPRECATIONS(NSOpenGLContext) *, QOpenGLContext *shareContext = nullptr); - virtual QT_IGNORE_DEPRECATIONS(NSOpenGLContext) *nativeContext() const = 0; -}; - QT_DEFINE_NATIVE_INTERFACE(QCocoaGLContext, QOpenGLContext); QT_DEFINE_PRIVATE_NATIVE_INTERFACE(QCocoaGLIntegration); -- cgit v1.2.3