diff options
| author | Frederik Gladhorn <frederik.gladhorn@theqtcompany.com> | 2015-08-06 10:45:40 +0200 |
|---|---|---|
| committer | Frederik Gladhorn <frederik.gladhorn@theqtcompany.com> | 2015-08-06 10:54:01 +0200 |
| commit | 77da617dc8e378a631ee8c15b1b414f16b87f147 (patch) | |
| tree | 563f4f8e64e416774ea2b1599b896b589385168c /src/opengl | |
| parent | c17134e2db4d364855aa78a0d3c47cb9ef964dd9 (diff) | |
| parent | 01f3530650f9f6f4c08520263a3c62281d81e3fc (diff) | |
Merge remote-tracking branch 'origin/5.5' into dev
Conflicts:
doc/global/qt-cpp-defines.qdocconf
src/3rdparty/forkfd/forkfd.c
src/corelib/codecs/qtextcodec.cpp
src/corelib/kernel/qmetatype.cpp
src/corelib/tools/qset.qdoc
src/gui/accessible/qaccessible.cpp
src/gui/image/qpixmapcache.cpp
src/opengl/qgl.cpp
src/tools/qdoc/generator.cpp
src/widgets/kernel/qwidget.cpp
tests/auto/widgets/widgets/qcombobox/tst_qcombobox.cpp
Change-Id: I4fbe1fa756a54c6843aa75f4ef70a1069ba7b085
Diffstat (limited to 'src/opengl')
| -rw-r--r-- | src/opengl/gl2paintengineex/qglengineshadermanager.cpp | 3 | ||||
| -rw-r--r-- | src/opengl/qgl.cpp | 7 |
2 files changed, 6 insertions, 4 deletions
diff --git a/src/opengl/gl2paintengineex/qglengineshadermanager.cpp b/src/opengl/gl2paintengineex/qglengineshadermanager.cpp index 8e5d93dce2..903f34f939 100644 --- a/src/opengl/gl2paintengineex/qglengineshadermanager.cpp +++ b/src/opengl/gl2paintengineex/qglengineshadermanager.cpp @@ -424,11 +424,10 @@ QGLEngineShaderProg *QGLEngineSharedShaders::findProgramInCache(const QGLEngineS if (!inCache) shaderCache.store(newProg->program, QGLContext::currentContext()); } else { - QLatin1String none("none"); - QLatin1String br("\n"); QString error; error = QLatin1String("Shader program failed to link,"); #if defined(QT_DEBUG) + QLatin1String br("\n"); error += QLatin1String("\n Shaders Used:\n"); for (int i = 0; i < newProg->program->shaders().count(); ++i) { QGLShader *shader = newProg->program->shaders().at(i); diff --git a/src/opengl/qgl.cpp b/src/opengl/qgl.cpp index 63ebf14bd5..d84b59efff 100644 --- a/src/opengl/qgl.cpp +++ b/src/opengl/qgl.cpp @@ -2168,6 +2168,9 @@ QGLContext::QGLContext(QOpenGLContext *context) d->setupSharing(); } +/*! + Returns the OpenGL context handle. +*/ QOpenGLContext *QGLContext::contextHandle() const { Q_D(const QGLContext); @@ -2175,7 +2178,7 @@ QOpenGLContext *QGLContext::contextHandle() const } /*! - Returns a OpenGL context for the window context specified by the \a context + Returns an OpenGL context for the window context specified by the \a context parameter. */ QGLContext *QGLContext::fromOpenGLContext(QOpenGLContext *context) @@ -4355,7 +4358,7 @@ void QGLWidget::resizeOverlayGL(int, int) } /*!\reimp - */ +*/ bool QGLWidget::event(QEvent *e) { Q_D(QGLWidget); |