diff options
| author | Andreas Kling <andreas.kling@nokia.com> | 2010-01-20 10:44:28 (GMT) |
|---|---|---|
| committer | Andreas Kling <andreas.kling@nokia.com> | 2010-01-20 10:44:28 (GMT) |
| commit | eac2869ec3aa0d7937548d0caa6b19e0f8918c83 (patch) | |
| tree | 3b92821c130f5f9dc8e6d9df21873ec38663568e | |
| parent | 877d63b35b290649e745e08be104c81dc56a02b9 (diff) | |
| parent | f41ae98f130fb94c5d1ec55fceb27a60014ac90c (diff) | |
| download | Qt-eac2869ec3aa0d7937548d0caa6b19e0f8918c83.zip Qt-eac2869ec3aa0d7937548d0caa6b19e0f8918c83.tar.gz Qt-eac2869ec3aa0d7937548d0caa6b19e0f8918c83.tar.bz2 | |
Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.6
| -rw-r--r-- | src/gui/kernel/qcocoaview_mac.mm | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/gui/kernel/qcocoaview_mac.mm b/src/gui/kernel/qcocoaview_mac.mm index c14798a..f61d2fe 100644 --- a/src/gui/kernel/qcocoaview_mac.mm +++ b/src/gui/kernel/qcocoaview_mac.mm @@ -510,7 +510,7 @@ extern "C" { } // Make sure the opengl context is updated on resize. - if (0 && qwidgetprivate->isGLWidget) { + if (qwidgetprivate->isGLWidget) { qwidgetprivate->needWindowChange = true; QEvent event(QEvent::MacGLWindowChange); qApp->sendEvent(qwidget, &event); |