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

* 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-2:
  Doc update: Mention the Qt::AA_X11InitThreads application attribute.
  Fix incorrect include order
  Add missing QT_BEGIN_NAMESPACE
  Fix crash introduced with d34287af6fc1c7558e8ed15dbb29c0e6b58b7b00
  find .rodata in qt plugins to optimize loading of plugins with no qt section
  fix missing include
  Optimize plugin loading on ELF platforms
  use QFile:map instead of ::mmap
  QAbstractItemView: optimize handling of editors for view with large numbers of editors.

1 files changed, 10 insertions, 6 deletions

diff --git a/src/opengl/qgl.cpp b/src/opengl/qgl.cpp
index 532c724..d5fdccb 100644
--- a/src/opengl/qgl.cpp
+++ b/src/opengl/qgl.cpp
@@ -3610,12 +3610,16 @@ void QGLContextPrivate::setCurrentContext(QGLContext *context)
 
     \section1 Threading
 
-    It is possible to render into a QGLWidget from another thread, but it
-    requires that all access to the GL context is safe guarded. The Qt GUI
-    thread will try to use the context in resizeEvent and paintEvent, so in
-    order for threaded rendering using a GL widget to work, these functions
-    need to be intercepted in the GUI thread and handled accordingly in the
-    application.
+    It is possible to render into a QGLWidget from another thread, but
+    it requires that all access to the GL context is safe guarded. The
+    Qt GUI thread will try to use the context in resizeEvent and
+    paintEvent, so in order for threaded rendering using a GL widget
+    to work, these functions need to be intercepted in the GUI thread
+    and handled accordingly in the application. Under X11, set the
+    Qt::AA_X11InitThreads application attribute, before you create the
+    QApplication object, to make the X11 library and GLX calls thread
+    safe.
+
 
     \e{OpenGL is a trademark of Silicon Graphics, Inc. in the United States and other
     countries.}