diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-07-18 01:00:08 +0200 |
|---|---|---|
| committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-07-18 01:00:08 +0200 |
| commit | 7576250b1c6d27dcc85e059d6f43830d1767e7f7 (patch) | |
| tree | df89adfa2a8bd4dea0d90344a648ae8bbc1583be /src/plugins/platforms/cocoa/qcocoaintegration.mm | |
| parent | 8abbbb4c482c32cd5342f5f8576cee8cbacc3737 (diff) | |
| parent | 1d8c9978fa1baafa17c95713bd5d04f245eeb76f (diff) | |
Merge remote-tracking branch 'origin/5.12' into 5.13
Change-Id: I685000c4f33fb3707b2102fae0b58092107dc8f0
Diffstat (limited to 'src/plugins/platforms/cocoa/qcocoaintegration.mm')
| -rw-r--r-- | src/plugins/platforms/cocoa/qcocoaintegration.mm | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/src/plugins/platforms/cocoa/qcocoaintegration.mm b/src/plugins/platforms/cocoa/qcocoaintegration.mm index 08e7447a75..009074a5f3 100644 --- a/src/plugins/platforms/cocoa/qcocoaintegration.mm +++ b/src/plugins/platforms/cocoa/qcocoaintegration.mm @@ -331,9 +331,7 @@ QPlatformOffscreenSurface *QCocoaIntegration::createPlatformOffscreenSurface(QOf #ifndef QT_NO_OPENGL QPlatformOpenGLContext *QCocoaIntegration::createPlatformOpenGLContext(QOpenGLContext *context) const { - QCocoaGLContext *glContext = new QCocoaGLContext(context); - context->setNativeHandle(QVariant::fromValue<QCocoaNativeContext>(glContext->nativeContext())); - return glContext; + return new QCocoaGLContext(context); } #endif |