Fix QFileSystemWatcher::directoryChanged docs/test

QFileSystemWatcher does not signal directoryChanged() when files are
modified in a watched directory. QTBUG-8945 was closed with the
decision that it should not signal. Updating the docs and tests to
reflect this fact.

The test code that is being changed is a partial revert of Qt4 commit
1428cc6d71a65c1ac7123c9c4cc3cfaf225cceed. It appears that Symbian
supported directoryChanged() on modification, hence why the check
was for 0 or 1.

Change-Id: I04320c68f227ca338ce65e525956ee201fd50699
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
Reviewed-by: Robin Burchell <robin.burchell@viroteck.net>

2 files changed, 7 insertions, 16 deletions

diff --git a/src/corelib/io/qfilesystemwatcher.cpp b/src/corelib/io/qfilesystemwatcher.cpp
index 4bca8d90a0..6ec1481243 100644
--- a/src/corelib/io/qfilesystemwatcher.cpp
+++ b/src/corelib/io/qfilesystemwatcher.cpp
@@ -394,12 +394,12 @@ QStringList QFileSystemWatcher::removePaths(const QStringList &paths)
 /*!
     \fn void QFileSystemWatcher::directoryChanged(const QString &path)
 
-    This signal is emitted when the directory at a specified \a path,
-    is modified (e.g., when a file is added, modified or deleted) or
-    removed from disk. Note that if there are several changes during a
-    short period of time, some of the changes might not emit this
-    signal. However, the last change in the sequence of changes will
-    always generate this signal.
+    This signal is emitted when the directory at a specified \a path
+    is modified (e.g., when a file is added or deleted) or removed
+    from disk. Note that if there are several changes during a short
+    period of time, some of the changes might not emit this signal.
+    However, the last change in the sequence of changes will always
+    generate this signal.
 
     \sa fileChanged()
 */
diff --git a/tests/auto/corelib/io/qfilesystemwatcher/tst_qfilesystemwatcher.cpp b/tests/auto/corelib/io/qfilesystemwatcher/tst_qfilesystemwatcher.cpp
index 0a952e9452..7f0b2a4e26 100644
--- a/tests/auto/corelib/io/qfilesystemwatcher/tst_qfilesystemwatcher.cpp
+++ b/tests/auto/corelib/io/qfilesystemwatcher/tst_qfilesystemwatcher.cpp
@@ -460,18 +460,9 @@ void tst_QFileSystemWatcher::watchFileAndItsDirectory()
 #endif
 
     QTRY_VERIFY(fileChangedSpy.count() > 0);
-
-    //according to Qt 4 documentation:
-    //void QFileSystemWatcher::directoryChanged ( const QString & path )   [signal]
-    //This signal is emitted when the directory at a specified path, is modified
-    //(e.g., when a file is added, -->modified<-- or deleted) or removed from disk.
-    //Note that if there are several changes during a short period of time, some
-    //of the changes might not emit this signal. However, the last change in the
-    //sequence of changes will always generate this signal.
-    QVERIFY(dirChangedSpy.count() < 2);
+    QCOMPARE(dirChangedSpy.count(), 0);
 
     fileChangedSpy.clear();
-    dirChangedSpy.clear();
     QFile secondFile(secondFileName);
     QVERIFY2(secondFile.open(QIODevice::WriteOnly | QIODevice::Truncate), msgFileOperationFailed("open", secondFile));
     QVERIFY2(secondFile.write(QByteArrayLiteral("Foo")) > 0, msgFileOperationFailed("write", secondFile));