Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/oslo-staging-1

4 files changed, 33 insertions, 15 deletions

diff --git a/src/corelib/io/qdir.cpp b/src/corelib/io/qdir.cpp
index f5d803e..7cfdddf 100644
--- a/src/corelib/io/qdir.cpp
+++ b/src/corelib/io/qdir.cpp
@@ -89,8 +89,6 @@ public:
     QDirPrivate(const QDir *copy = 0);
     ~QDirPrivate();
 
-    QString initFileEngine(const QString &file);
-
     void updateFileLists() const;
     void sortFileList(QDir::SortFlags, QFileInfoList &, QStringList *, QFileInfoList *) const;
 
@@ -146,6 +144,7 @@ public:
     } *data;
     inline void setPath(const QString &p)
     {
+        detach(false);
         QString path = p;
         if ((path.endsWith(QLatin1Char('/')) || path.endsWith(QLatin1Char('\\')))
                 && path.length() > 1) {
@@ -155,8 +154,12 @@ public:
                 path.truncate(path.length() - 1);
         }
 
+        delete data->fileEngine;
+        data->fileEngine = QAbstractFileEngine::create(path);
+
         // set the path to be the qt friendly version so then we can operate on it using just /
-        data->path = initFileEngine(path);
+        data->path = data->fileEngine->fileName(QAbstractFileEngine::DefaultName);
+        data->clear();
     }
     inline void reset() {
         detach();
@@ -310,15 +313,6 @@ inline void QDirPrivate::updateFileLists() const
     }
 }
 
-inline QString QDirPrivate::initFileEngine(const QString &path)
-{
-    detach(false);
-    data->clear();
-    delete data->fileEngine;
-    data->fileEngine = QAbstractFileEngine::create(path);
-    return data->fileEngine->fileName(QAbstractFileEngine::DefaultName);
-}
-
 void QDirPrivate::detach(bool createFileEngine)
 {
     qAtomicDetach(data);
diff --git a/src/gui/kernel/qapplication_win.cpp b/src/gui/kernel/qapplication_win.cpp
index 3355272..2c6e246 100644
--- a/src/gui/kernel/qapplication_win.cpp
+++ b/src/gui/kernel/qapplication_win.cpp
@@ -2547,6 +2547,17 @@ LRESULT CALLBACK QtWndProc(HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam
             result = true;
             break;
         }
+#ifndef QT_NO_CURSOR
+        case WM_SETCURSOR: {
+            QCursor *ovr = QApplication::overrideCursor();
+            if (ovr) {
+                SetCursor(ovr->handle());
+                RETURN(TRUE);
+            }
+            result = false;
+            break;
+        }
+#endif
         default:
             result = false;                        // event was not processed
             break;
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 2a86c91..c18129d 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)
 {