diff options
| author | Tor Arne Vestbø <tor.arne.vestbo@qt.io> | 2018-07-31 18:39:41 +0200 |
|---|---|---|
| committer | Tor Arne Vestbø <tor.arne.vestbo@qt.io> | 2018-08-03 22:50:23 +0000 |
| commit | f09b0337d7525478a34ba9c54c5073cb9dfcb66b (patch) | |
| tree | 4b286eae99040e79050e2e301a3a28fc3ad7a7a3 /src/plugins | |
| parent | 137e6c82778934f18474e1ab3df9b70f1a1ad183 (diff) | |
macOS: Don't mess with native handle for QOpenGLContext
QOpenGLContext::setNativeHandle() is documented as:
"configuration settings, like format(), are ignored since this
QOpenGLContext will wrap an already created native context"
We should respect this and not apply QT_MAC_OPENGL_SURFACE_ORDER.
Change-Id: Idfdf3eac0e9f9d0a86f1b23aa475c3e4f12127e2
Reviewed-by: Gabriel de Dietrich <gabriel.dedietrich@qt.io>
Diffstat (limited to 'src/plugins')
| -rw-r--r-- | src/plugins/platforms/cocoa/qcocoaglcontext.mm | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/src/plugins/platforms/cocoa/qcocoaglcontext.mm b/src/plugins/platforms/cocoa/qcocoaglcontext.mm index 876b01e4c7..6b9aa4ad26 100644 --- a/src/plugins/platforms/cocoa/qcocoaglcontext.mm +++ b/src/plugins/platforms/cocoa/qcocoaglcontext.mm @@ -99,9 +99,6 @@ QCocoaGLContext::QCocoaGLContext(const QSurfaceFormat &format, QPlatformOpenGLCo m_context = context; [m_context retain]; m_shareContext = share ? static_cast<QCocoaGLContext *>(share)->nsOpenGLContext() : nil; - // OpenGL surfaces can be ordered either above(default) or below the NSWindow. - const GLint order = qt_mac_resolveOption(1, "QT_MAC_OPENGL_SURFACE_ORDER"); - [m_context setValues:&order forParameter:NSOpenGLCPSurfaceOrder]; updateSurfaceFormat(); return; } |