Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.6-integration

* '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1: (115 commits)
  Avoid calling WSAGetLastError() so often in nativeWrite
  Cocoa: Fix painting errors on QGLWidget resizing.
  Updated WebKit from /home/shausman/src/webkit/trunk to qtwebkit/qtwebkit-4.6 ( e15bd5454732bab9ffff4e1e5a755f41fd4e2eff )
  fix qm generation under windows
  More changelog additions for QtWebKit
  Updated WebKit from /home/shausman/src/webkit/trunk to qtwebkit/qtwebkit-4.6 ( 8f6992f4e8f027818429d428393b08068eca9ffa )
  fixes MMF plugin for Phonon when buidling with WINSCW
  Update my changelog for 4.6.1
  My changes for 4.6.1
  doc: Corrected parameter value in snippet.
  doc: This bug wasn't really a bug; it just required clarification.
  Updated WebKit from /home/shausman/src/webkit/trunk to qtwebkit/qtwebkit-4.6 ( 8b9165d3bc84d1c8cc7df49a191cc3857b5530d4 )
  Polish the changes file.
  Copy changes file from 4.6 branch.
  Changed log updated
  Update change log with Yoann Lopes work.
  Update changelog with some of my stuff
  fix sametext and number heuristics
  my 4.6.1 changelog contributions
  Added changelog entries.
  ...

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);