diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-07-29 10:06:33 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-07-29 10:06:33 (GMT) |
| commit | 11468d1086315c2d4f77f3747488e423d499bf56 (patch) | |
| tree | 4ee4c62b9de4f4810972f065b77537c8126384fa /src/opengl/qgl.cpp | |
| parent | dbaaece5f5e27503b3b6703265f2b2bd63147b82 (diff) | |
| parent | 84294f47e55073914bcbcdbaf85df1a0e2e2d845 (diff) | |
| download | Qt-11468d1086315c2d4f77f3747488e423d499bf56.zip Qt-11468d1086315c2d4f77f3747488e423d499bf56.tar.gz Qt-11468d1086315c2d4f77f3747488e423d499bf56.tar.bz2 | |
Merge branch 'qt-master-from-4.7' of scm.dev.nokia.troll.no:qt/qt-integration into master-integration
* 'qt-master-from-4.7' of scm.dev.nokia.troll.no:qt/qt-integration: (407 commits)
Cherry pick fix for MOBILITY-1234 from Qt Mobility.
Cherry pick fix for QTMOBILITY-408 from Qt Mobility.
Cherry pick fix for MOBILITY-1194 from Qt Mobility.
Fix compilation error on Symbian^4.
Fix detection of OCC functionality.
Cherry pick fix for MOBILITY-1194 from Qt Mobility.
Fix signal emission of QDesktopWidget on Symbian.
Don't run the QGL test on systems that does not have GL support.
Adding missing image
Fixed gcce linker error when linking against s60main built by armcc.
Make it possible again to build Qt without webkit
Fixed plugin build key for Symbian builds under Linux.
Remove an useless assert from comp_func_SourceOver_sse2()
QScriptEngineAgent: recompile all the function when installing a debugger.
QScriptDeclarativeObject: we need to save the current stack pointer.
QScriptValue::objectId(): do not assert if the value is not a cell
Implement the composition mode "Plus" with SSE2
Clean the CompositionFunction tables of drawhelper
Fix QT_NO_DATESTRING
Check the gesturemanager pointer before accessing it.
...
Diffstat (limited to 'src/opengl/qgl.cpp')
| -rw-r--r-- | src/opengl/qgl.cpp | 16 |
1 files changed, 11 insertions, 5 deletions
diff --git a/src/opengl/qgl.cpp b/src/opengl/qgl.cpp index c625c27..6068dcb 100644 --- a/src/opengl/qgl.cpp +++ b/src/opengl/qgl.cpp @@ -1336,6 +1336,10 @@ QGLFormat::OpenGLVersionFlags Q_AUTOTEST_EXPORT qOpenGLVersionFlagsFromString(co \value OpenGL_Version_3_2 OpenGL version 3.2 or higher is present. + \value OpenGL_Version_3_3 OpenGL version 3.3 or higher is present. + + \value OpenGL_Version_4_0 OpenGL version 4.0 or higher is present. + \value OpenGL_ES_CommonLite_Version_1_0 OpenGL ES version 1.0 Common Lite or higher is present. \value OpenGL_ES_Common_Version_1_0 OpenGL ES version 1.0 Common or higher is present. @@ -3703,7 +3707,7 @@ QGLWidget::~QGLWidget() #endif delete d->glcx; d->glcx = 0; -#if defined(Q_WGL) +#if defined(Q_WS_WIN) delete d->olcx; d->olcx = 0; #endif @@ -5016,8 +5020,9 @@ void QGLWidget::deleteTexture(QMacCompatGLuint id) /*! \since 4.4 - Calls the corresponding QGLContext::drawTexture() on - this widget's context. + Calls the corresponding QGLContext::drawTexture() with + \a target, \a textureId, and \a textureTarget for this + widget's context. */ void QGLWidget::drawTexture(const QRectF &target, GLuint textureId, GLenum textureTarget) { @@ -5037,8 +5042,9 @@ void QGLWidget::drawTexture(const QRectF &target, QMacCompatGLuint textureId, QM /*! \since 4.4 - Calls the corresponding QGLContext::drawTexture() on - this widget's context. + Calls the corresponding QGLContext::drawTexture() with + \a point, \a textureId, and \a textureTarget for this + widget's context. */ void QGLWidget::drawTexture(const QPointF &point, GLuint textureId, GLenum textureTarget) { |