Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-qa-team

* 'master' of git://scm.dev.nokia.troll.no/qt/qt-qa-team: (29 commits)
  Add dita_docs target to generate DITA output.
  Fix missing part from commit dae052cb11c0018121f2c4028aed9db17769fd77
  Fix a bug where 'int'  is not printed in snippets.
  SSL: fix build with -openssl-linked for OpenSSL 0.9.8*
  Fix m_longTapDetector causing crash.
  Fixes to czech translation
  Fix crash in positionInLigature
  Fix to incorrect ApplicationActivate event in QtOpenGL
  Symbian - Fix QFile::map with non page aligned offsets
  Update czech translation
  Symbian: fix tst_QMenuBar::task256322_highlight() regression
  I18n: Updates galician translation (4.8)
  Fix Memoy leak relateded to contextmenu.
  Set execution bits for .test files.
  Default to QDir::homePath() in Symbian native file dialogs
  directfb: Backport the work from QtBase to Qt 4.8
  [blitter] Work on tst_QPixmap::clear()
  [blitter] Use QScopedPointer for the engine and blittable
  [blitter] Generate a new serial number when resizing the
  [blitter] Fix memory leak in the blitter paintengine
  ...

1 files changed, 8 insertions, 0 deletions

diff --git a/src/opengl/qgl_p.h b/src/opengl/qgl_p.h
index df09dfd..89153d9 100644
--- a/src/opengl/qgl_p.h
+++ b/src/opengl/qgl_p.h
@@ -106,6 +106,10 @@ class QMacWindowChangeEvent;
 class QWSGLWindowSurface;
 #endif
 
+#ifdef Q_OS_SYMBIAN
+extern bool qt_initializing_gl_share_widget();
+#endif
+
 #ifndef QT_NO_EGL
 class QEglContext;
 #endif
@@ -183,6 +187,10 @@ public:
 #endif
     {
         isGLWidget = 1;
+#if defined(Q_OS_SYMBIAN)
+        if (qt_initializing_gl_share_widget())
+            isGLGlobalShareWidget = 1;
+#endif
     }
 
     ~QGLWidgetPrivate() {}