From b1e234b2242b7ed1ce4001ae29abecf5ae74fadf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tor=20Arne=20Vestb=C3=B8?= Date: Thu, 8 Oct 2020 12:16:02 +0200 Subject: [PATCH] macOS: Always include non-GL native interfaces Change-Id: Idc8e76b5cb7af8b8df54820a4150ac7d1e3d8944 Reviewed-by: Friedemann Kleint --- src/gui/platform/macos/qcocoanativeinterface.mm | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/src/gui/platform/macos/qcocoanativeinterface.mm b/src/gui/platform/macos/qcocoanativeinterface.mm index c075a07e663..f9d5f5dbe56 100644 --- a/src/gui/platform/macos/qcocoanativeinterface.mm +++ b/src/gui/platform/macos/qcocoanativeinterface.mm @@ -50,13 +50,14 @@ QT_BEGIN_NAMESPACE using namespace QNativeInterface::Private; +QT_DEFINE_PRIVATE_NATIVE_INTERFACE(QCocoaWindow); +QT_DEFINE_PRIVATE_NATIVE_INTERFACE(QCocoaMenu); +QT_DEFINE_PRIVATE_NATIVE_INTERFACE(QCocoaMenuBar); + #ifndef QT_NO_OPENGL QT_DEFINE_NATIVE_INTERFACE(QCocoaGLContext, QOpenGLContext); QT_DEFINE_PRIVATE_NATIVE_INTERFACE(QCocoaGLIntegration); -QT_DEFINE_PRIVATE_NATIVE_INTERFACE(QCocoaWindow); -QT_DEFINE_PRIVATE_NATIVE_INTERFACE(QCocoaMenu); -QT_DEFINE_PRIVATE_NATIVE_INTERFACE(QCocoaMenuBar); QOpenGLContext *QNativeInterface::QCocoaGLContext::fromNative(NSOpenGLContext *nativeContext, QOpenGLContext *shareContext) {