diff options
| author | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2013-12-05 17:42:33 +0100 |
|---|---|---|
| committer | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2013-12-05 17:42:33 +0100 |
| commit | 733ace5a7ad5b9e9f93ac87667d7d37fa5f894d5 (patch) | |
| tree | a88031a8e1ac30986567070728e29ed1366d0962 /src/plugins/platforms/cocoa/qcocoaglcontext.mm | |
| parent | eaff48d3622bbb0e18e79f79aac6d1ac1b7e2760 (diff) | |
| parent | 835b8213905b315645bc60ff5f2ab99340d075a2 (diff) | |
Merge remote-tracking branch 'origin/release' into stable
Conflicts:
configure
mkspecs/macx-ios-clang/features/default_post.prf
tests/auto/widgets/widgets/qmenu/tst_qmenu.cpp
Change-Id: Iaba97eed2272bccf54289640b8197d40e22f7bf5
Diffstat (limited to 'src/plugins/platforms/cocoa/qcocoaglcontext.mm')
| -rw-r--r-- | src/plugins/platforms/cocoa/qcocoaglcontext.mm | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/src/plugins/platforms/cocoa/qcocoaglcontext.mm b/src/plugins/platforms/cocoa/qcocoaglcontext.mm index 777d4a871b..8f74a71b1e 100644 --- a/src/plugins/platforms/cocoa/qcocoaglcontext.mm +++ b/src/plugins/platforms/cocoa/qcocoaglcontext.mm @@ -192,8 +192,6 @@ bool QCocoaGLContext::makeCurrent(QPlatformSurface *surface) QWindow *window = static_cast<QCocoaWindow *>(surface)->window(); setActiveWindow(window); - if (![m_context view]) - return false; [m_context makeCurrentContext]; update(); return true; |