Merge remote branch 'staging/master' into bearermanagement/integration

2 files changed, 16 insertions, 3 deletions

diff --git a/src/gui/text/qtextdocument_p.cpp b/src/gui/text/qtextdocument_p.cpp
index e2fdf0e..969d5b4 100644
--- a/src/gui/text/qtextdocument_p.cpp
+++ b/src/gui/text/qtextdocument_p.cpp
@@ -259,8 +259,7 @@ void QTextDocumentPrivate::clear()
         objects.clear();
 
         title.clear();
-        undoState = 0;
-        clearUndoRedoStacks(QTextDocument::RedoStack);
+        clearUndoRedoStacks(QTextDocument::UndoAndRedoStacks);
         text = QString();
         unreachableCharacterCount = 0;
         modifiedState = 0;
@@ -1077,7 +1076,7 @@ void QTextDocumentPrivate::clearUndoRedoStacks(QTextDocument::Stacks stacksToCle
         if (emitSignals)
             emitRedoAvailable(false);
     } else if (stacksToClear == QTextDocument::UndoAndRedoStacks
-               && (undoCommandsAvailable || redoCommandsAvailable)) {
+               && !undoStack.isEmpty()) {
         for (int i = 0; i < undoStack.size(); ++i) {
             QTextUndoCommand c = undoStack[i];
             if (c.command & QTextUndoCommand::Custom)
diff --git a/src/opengl/qglshaderprogram.cpp b/src/opengl/qglshaderprogram.cpp
index 170b650..a0b332d 100644
--- a/src/opengl/qglshaderprogram.cpp
+++ b/src/opengl/qglshaderprogram.cpp
@@ -3080,6 +3080,8 @@ void QGLShaderProgram::setUniformValueArray(const char *name, const QMatrix4x4 *
     Returns the hardware limit for how many vertices a geometry shader
     can output.
 
+    \since 4.7
+
     \sa setGeometryShaderOutputVertexCount
 */
 int QGLShaderProgram::maxGeometryOutputVertices() const
@@ -3095,6 +3097,8 @@ int QGLShaderProgram::maxGeometryOutputVertices() const
     Sets the maximum number of vertices the current geometry shader
     program will produce, if active.
 
+    \since 4.7
+
     This parameter takes effect the next time the program is linked.
 */
 void QGLShaderProgram::setGeometryOutputVertexCount(int count)
@@ -3114,6 +3118,8 @@ void QGLShaderProgram::setGeometryOutputVertexCount(int count)
     Returns the maximum number of vertices the current geometry shader
     program will produce, if active.
 
+    \since 4.7
+
     This parameter takes effect the ntext time the program is linked.
 */
 int QGLShaderProgram::geometryOutputVertexCount() const
@@ -3137,6 +3143,8 @@ void QGLShaderProgram::setGeometryInputType(GLenum inputType)
     Returns the geometry shader input type, if active.
 
     This parameter takes effect the next time the program is linked.
+
+    \since 4.7
  */
 
 GLenum QGLShaderProgram::geometryInputType() const
@@ -3149,6 +3157,8 @@ GLenum QGLShaderProgram::geometryInputType() const
     Sets the output type from the geometry shader, if active.
 
     This parameter takes effect the next time the program is linked.
+
+    \since 4.7
 */
 void QGLShaderProgram::setGeometryOutputType(GLenum outputType)
 {
@@ -3160,6 +3170,8 @@ void QGLShaderProgram::setGeometryOutputType(GLenum outputType)
     Returns the geometry shader output type, if active.
 
     This parameter takes effect the next time the program is linked.
+
+    \since 4.7
  */
 GLenum QGLShaderProgram::geometryOutputType() const
 {
@@ -3209,6 +3221,8 @@ void QGLShaderProgram::shaderDestroyed()
 
     The \a context is used to resolve the GLSL extensions.
     If \a context is null, then QGLContext::currentContext() is used.
+
+    \since 4.7
 */
 bool QGLShader::hasOpenGLShaders(ShaderType type, const QGLContext *context)
 {