diff options
author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2011-12-05 22:04:08 -0600 |
---|---|---|
committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2011-12-05 22:04:08 -0600 |
commit | e02e31c8b9d854cd62cbe9799228f6e08e882773 (patch) | |
tree | 53303c981d0b20e03c5a2fc8e959fa74adcb90d1 /src/opengl | |
parent | 143f194af098d44bf0dd1ebb29e59f30ce48d523 (diff) | |
download | tqt3-e02e31c8b9d854cd62cbe9799228f6e08e882773.tar.gz tqt3-e02e31c8b9d854cd62cbe9799228f6e08e882773.zip |
Sync with latest script
Diffstat (limited to 'src/opengl')
-rw-r--r-- | src/opengl/qgl.cpp | 12 | ||||
-rw-r--r-- | src/opengl/qgl.h | 2 | ||||
-rw-r--r-- | src/opengl/qgl_x11.cpp | 4 | ||||
-rw-r--r-- | src/opengl/qgl_x11_p.h | 2 | ||||
-rw-r--r-- | src/opengl/qglcolormap.cpp | 2 | ||||
-rw-r--r-- | src/opengl/qglcolormap.h | 2 |
6 files changed, 12 insertions, 12 deletions
diff --git a/src/opengl/qgl.cpp b/src/opengl/qgl.cpp index fd0d6815b..eed5d37b5 100644 --- a/src/opengl/qgl.cpp +++ b/src/opengl/qgl.cpp @@ -18,7 +18,7 @@ ** and the KDE Free TQt Foundation. ** ** Please review the following information to ensure GNU General -** Public Licensing retquirements will be met: +** Public Licensing requirements will be met: ** http://trolltech.com/products/qt/licenses/licensing/opensource/. ** If you are unsure which license is appropriate for your use, please ** review the following information: @@ -159,7 +159,7 @@ static TQCleanupHandler<TQGLFormat> qgl_cleanup_format; if ( !w->format().stereo() ) { // ok, goggles off if ( !w->format().hasOverlay() ) { - qFatal( "Cool hardware retquired" ); + qFatal( "Cool hardware required" ); } } \endcode @@ -1663,7 +1663,7 @@ void TQGLWidget::updateGL() paintGL() or resizeGL(), and then once whenever the widget has been assigned a new TQGLContext. Reimplement it in a subclass. - This function should set up any retquired OpenGL context rendering + This function should set up any required OpenGL context rendering flags, defining display lists, etc. There is no need to call makeCurrent() because this has already @@ -1712,7 +1712,7 @@ void TQGLWidget::resizeGL( int, int ) is called once before the first call to paintOverlayGL() or resizeOverlayGL(). Reimplement it in a subclass. - This function should set up any retquired OpenGL context rendering + This function should set up any required OpenGL context rendering flags, defining display lists, etc. for the overlay context. There is no need to call makeOverlayCurrent() because this has @@ -2294,7 +2294,7 @@ it will include the TQt OpenGL module in the TQt library. (If your OpenGL headers or libraries are placed in a non-standard directory, you may need to change the QMAKE_INCDIR_OPENGL and/or QMAKE_LIBDIR_OPENGL in the config file for your system). Some -configurations retquire threading to be enabled for OpenGL, so if +configurations require threading to be enabled for OpenGL, so if OpenGL is not detected, try \c{configure -thread}. When you install TQt for Windows, the TQt OpenGL module is always @@ -2302,7 +2302,7 @@ included. The TQt OpenGL module is not licensed for use with the TQt Professional Edition. Consider upgrading to the TQt Enterprise Edition if you -retquire OpenGL support. +require OpenGL support. Note about using Mesa on X11: Mesa versions earlier than 3.1 would use the name "MesaGL" and "MesaGLU" for the libraries, instead of "GL" and diff --git a/src/opengl/qgl.h b/src/opengl/qgl.h index def1a763c..e58b18d4d 100644 --- a/src/opengl/qgl.h +++ b/src/opengl/qgl.h @@ -18,7 +18,7 @@ ** and the KDE Free TQt Foundation. ** ** Please review the following information to ensure GNU General -** Public Licensing retquirements will be met: +** Public Licensing requirements will be met: ** http://trolltech.com/products/qt/licenses/licensing/opensource/. ** If you are unsure which license is appropriate for your use, please ** review the following information: diff --git a/src/opengl/qgl_x11.cpp b/src/opengl/qgl_x11.cpp index 1ed11172f..939653661 100644 --- a/src/opengl/qgl_x11.cpp +++ b/src/opengl/qgl_x11.cpp @@ -18,7 +18,7 @@ ** and the KDE Free TQt Foundation. ** ** Please review the following information to ensure GNU General -** Public Licensing retquirements will be met: +** Public Licensing requirements will be met: ** http://trolltech.com/products/qt/licenses/licensing/opensource/. ** If you are unsure which license is appropriate for your use, please ** review the following information: @@ -514,7 +514,7 @@ bool TQGLContext::chooseContext( const TQGLContext* shareContext ) The algorithm for reducing the demands of the format is quite simple-minded, so override this method in your subclass if your - application has spcific retquirements on visual selection. + application has spcific requirements on visual selection. \sa chooseContext() */ diff --git a/src/opengl/qgl_x11_p.h b/src/opengl/qgl_x11_p.h index b74b385f4..cbcd741b9 100644 --- a/src/opengl/qgl_x11_p.h +++ b/src/opengl/qgl_x11_p.h @@ -17,7 +17,7 @@ ** and the KDE Free TQt Foundation. ** ** Please review the following information to ensure GNU General -** Public Licensing retquirements will be met: +** Public Licensing requirements will be met: ** http://trolltech.com/products/qt/licenses/licensing/opensource/. ** If you are unsure which license is appropriate for your use, please ** review the following information: diff --git a/src/opengl/qglcolormap.cpp b/src/opengl/qglcolormap.cpp index e4c3efee0..22b819f39 100644 --- a/src/opengl/qglcolormap.cpp +++ b/src/opengl/qglcolormap.cpp @@ -18,7 +18,7 @@ ** and the KDE Free TQt Foundation. ** ** Please review the following information to ensure GNU General -** Public Licensing retquirements will be met: +** Public Licensing requirements will be met: ** http://trolltech.com/products/qt/licenses/licensing/opensource/. ** If you are unsure which license is appropriate for your use, please ** review the following information: diff --git a/src/opengl/qglcolormap.h b/src/opengl/qglcolormap.h index 8940f2e80..9aaaf22d1 100644 --- a/src/opengl/qglcolormap.h +++ b/src/opengl/qglcolormap.h @@ -18,7 +18,7 @@ ** and the KDE Free TQt Foundation. ** ** Please review the following information to ensure GNU General -** Public Licensing retquirements will be met: +** Public Licensing requirements will be met: ** http://trolltech.com/products/qt/licenses/licensing/opensource/. ** If you are unsure which license is appropriate for your use, please ** review the following information: |