diff options
Diffstat (limited to 'src/opengl')
| -rw-r--r-- | src/opengl/doc/src/qtopengl-index.qdoc | 2 | ||||
| -rw-r--r-- | src/opengl/doc/src/qtopengl-module.qdoc | 2 | ||||
| -rw-r--r-- | src/opengl/qgl.cpp | 2 | ||||
| -rw-r--r-- | src/opengl/qglpixelbuffer.cpp | 6 |
4 files changed, 6 insertions, 6 deletions
diff --git a/src/opengl/doc/src/qtopengl-index.qdoc b/src/opengl/doc/src/qtopengl-index.qdoc index a01ccc67f6..54dc1af84f 100644 --- a/src/opengl/doc/src/qtopengl-index.qdoc +++ b/src/opengl/doc/src/qtopengl-index.qdoc @@ -37,7 +37,7 @@ OpenGL is a standard API for rendering 3D graphics. OpenGL only deals with 3D rendering and provides little or no support for GUI programming issues. The user interface for an OpenGL application - must be created with another toolkit, such as Cocoa on the OS X + must be created with another toolkit, such as Cocoa on the \macos platform, Microsoft Foundation Classes (MFC) under Windows, or Qt on both platforms. diff --git a/src/opengl/doc/src/qtopengl-module.qdoc b/src/opengl/doc/src/qtopengl-module.qdoc index 80742dd588..a0962fdac5 100644 --- a/src/opengl/doc/src/qtopengl-module.qdoc +++ b/src/opengl/doc/src/qtopengl-module.qdoc @@ -40,7 +40,7 @@ OpenGL is a standard API for rendering 3D graphics. OpenGL only deals with 3D rendering and provides little or no support for GUI programming issues. The user interface for an OpenGL application - must be created with another toolkit, such as Cocoa on the OS X + must be created with another toolkit, such as Cocoa on the \macos platform, Microsoft Foundation Classes (MFC) under Windows, or Qt on both platforms. diff --git a/src/opengl/qgl.cpp b/src/opengl/qgl.cpp index d84b59efff..652a498930 100644 --- a/src/opengl/qgl.cpp +++ b/src/opengl/qgl.cpp @@ -3690,7 +3690,7 @@ void QGLContext::doneCurrent() QGLWidget. This will side-step the issue altogether, and is what we recommend for users that need this kind of functionality. - On OS X, when Qt is built with Cocoa support, a QGLWidget + On \macos, when Qt is built with Cocoa support, a QGLWidget can't have any sibling widgets placed ontop of itself. This is due to limitations in the Cocoa API and is not supported by Apple. diff --git a/src/opengl/qglpixelbuffer.cpp b/src/opengl/qglpixelbuffer.cpp index 943ec7ad30..696cd81e37 100644 --- a/src/opengl/qglpixelbuffer.cpp +++ b/src/opengl/qglpixelbuffer.cpp @@ -60,7 +60,7 @@ an OpenGL texture.} The texture is then updated automatically when the pbuffer contents change, eliminating the need for additional copy operations. This is supported only on Windows - and OS X systems that provide the \c render_texture + and \macos systems that provide the \c render_texture extension. Note that under Windows, a multi-sampled pbuffer can't be used in conjunction with the \c render_texture extension. If a multi-sampled pbuffer is requested under @@ -287,7 +287,7 @@ QGLContext *QGLPixelBuffer::context() const pbuffer contents to a texture using updateDynamicTexture(). \warning For the bindToDynamicTexture() call to succeed on the - OS X, the pbuffer needs a shared context, i.e. the + \macos, the pbuffer needs a shared context, i.e. the QGLPixelBuffer must be created with a share widget. \sa generateDynamicTexture(), releaseFromDynamicTexture() @@ -316,7 +316,7 @@ QGLContext *QGLPixelBuffer::context() const \snippet code/src_opengl_qglpixelbuffer.cpp 1 - An alternative on Windows and OS X systems that support the + An alternative on Windows and \macos systems that support the \c render_texture extension is to use bindToDynamicTexture() to get dynamic updates of the texture. |