1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

macOS: Always include non-GL native interfaces

Browse Source 
Change-Id: Idc8e76b5cb7af8b8df54820a4150ac7d1e3d8944
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
This commit is contained in:
Tor Arne Vestbø 2020-10-08 12:16:02 +02:00
parent 2b14556a96
commit b1e234b224
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/gui/platform/macos/qcocoanativeinterface.mm
View File

@ -50,13 +50,14 @@ QT_BEGIN_NAMESPACE
using namespace QNativeInterface::Private; 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 #ifndef QT_NO_OPENGL
QT_DEFINE_NATIVE_INTERFACE(QCocoaGLContext, QOpenGLContext); QT_DEFINE_NATIVE_INTERFACE(QCocoaGLContext, QOpenGLContext);
QT_DEFINE_PRIVATE_NATIVE_INTERFACE(QCocoaGLIntegration); 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) QOpenGLContext *QNativeInterface::QCocoaGLContext::fromNative(NSOpenGLContext *nativeContext, QOpenGLContext *shareContext)
{ {