3 files changed, 26 insertions, 34 deletions

diff --git a/src/corelib/concurrent/qfutureinterface.cpp b/src/corelib/concurrent/qfutureinterface.cpp
index 627d0c7..c5bd802 100644
--- a/src/corelib/concurrent/qfutureinterface.cpp
+++ b/src/corelib/concurrent/qfutureinterface.cpp
@@ -219,7 +219,7 @@ QString QFutureInterfaceBase::progressText() const
 bool QFutureInterfaceBase::isProgressUpdateNeeded() const
 {
     QMutexLocker locker(&d->m_mutex);
-    return (d->progressTime.elapsed() > (1000 / MaxProgressEmitsPerSecond));
+    return !d->progressTime.isValid() || (d->progressTime.elapsed() > (1000 / MaxProgressEmitsPerSecond));
 }
 
 void QFutureInterfaceBase::reportStarted()
diff --git a/src/corelib/io/qdiriterator.cpp b/src/corelib/io/qdiriterator.cpp
index 3b4adc3..4d3f50b 100644
--- a/src/corelib/io/qdiriterator.cpp
+++ b/src/corelib/io/qdiriterator.cpp
@@ -278,6 +278,7 @@ void QDirIteratorPrivate::checkAndPushDirectory(const QFileInfo &fileInfo)
     current entry will be returned as part of the directory iteration);
     otherwise, false is returned.
 */
+
 bool QDirIteratorPrivate::matchesFilters(const QString &fileName, const QFileInfo &fi) const
 {
     Q_ASSERT(!fileName.isEmpty());
@@ -312,6 +313,14 @@ bool QDirIteratorPrivate::matchesFilters(const QString &fileName, const QFileInf
             return false;
     }
 #endif
+    // skip symlinks
+    const bool skipSymlinks = (filters & QDir::NoSymLinks);
+    const bool includeSystem = (filters & QDir::System);
+    if(skipSymlinks && fi.isSymLink()) {
+        // The only reason to save this file is if it is a broken link and we are requesting system files.
+        if(!includeSystem || fi.exists())
+            return false;
+    }
 
     // filter hidden
     const bool includeHidden = (filters & QDir::Hidden);
@@ -319,27 +328,20 @@ bool QDirIteratorPrivate::matchesFilters(const QString &fileName, const QFileInf
         return false;
 
     // filter system files
-    const bool includeSystem = (filters & QDir::System);
-    if (!includeSystem && ((!fi.isFile() && !fi.isDir() && !fi.isSymLink())
+    if (!includeSystem && (!(fi.isFile() || fi.isDir() || fi.isSymLink())
                     || (!fi.exists() && fi.isSymLink())))
         return false;
 
     // skip directories
     const bool skipDirs = !(filters & (QDir::Dirs | QDir::AllDirs));
-    if (skipDirs && fi.isDir()) {
-        if (!((includeHidden && !dotOrDotDot && fi.isHidden())
-              || (includeSystem && !fi.exists() && fi.isSymLink())))
-            return false;
-    }
+    if (skipDirs && fi.isDir())
+        return false;
 
     // skip files
     const bool skipFiles    = !(filters & QDir::Files);
-    const bool skipSymlinks = (filters & QDir::NoSymLinks);
-    if ((skipFiles && (fi.isFile() || !fi.exists())) || (skipSymlinks && fi.isSymLink())) {
-        if (!((includeHidden && !dotOrDotDot && fi.isHidden())
-            || (includeSystem && !fi.exists() && fi.isSymLink())))
-            return false;
-    }
+    if (skipFiles && fi.isFile())
+        // Basically we need a reason not to exclude this file otherwise we just eliminate it.
+        return false;
 
     // filter permissions
     const bool filterPermissions = ((filters & QDir::PermissionMask)
diff --git a/src/corelib/tools/qtextboundaryfinder.cpp b/src/corelib/tools/qtextboundaryfinder.cpp
index c2bb094..34bc406 100644
--- a/src/corelib/tools/qtextboundaryfinder.cpp
+++ b/src/corelib/tools/qtextboundaryfinder.cpp
@@ -457,33 +457,23 @@ QTextBoundaryFinder::BoundaryReasons QTextBoundaryFinder::boundaryReasons() cons
             return NotAtBoundary;
         return StartWord;
     }
-    if (pos >= length - 1) {
+    if (pos == length) {
         if (d->attributes[length-1].whiteSpace)
             return NotAtBoundary;
         return EndWord;
     }
 
-    BoundaryReasons answer;
-    const bool nextIsSpace = d->attributes[pos + 1].whiteSpace;
+    const bool nextIsSpace = d->attributes[pos].whiteSpace;
     const bool prevIsSpace = d->attributes[pos - 1].whiteSpace;
 
-    if (d->attributes[pos].whiteSpace)
-        answer = EndWord;
-    else if (!prevIsSpace) {
-        answer = StartWord;
-        answer |= EndWord;
-    }
-
-    if (prevIsSpace)
-        answer |= StartWord;
-    if (nextIsSpace)
-        answer |= EndWord;
-    if (answer == 0) {
-        answer = StartWord;
-        answer |= EndWord;
-    }
-
-    return answer;
+    if (prevIsSpace && !nextIsSpace)
+        return StartWord;
+    else if (!prevIsSpace && nextIsSpace)
+        return EndWord;
+    else if (!prevIsSpace && !nextIsSpace)
+        return BoundaryReasons(StartWord | EndWord);
+    else
+        return NotAtBoundary;
 }
 
 QT_END_NAMESPACE