QTBUG-12564

upstream commit:
https://github.com/qt/qtbase/commit/3b42024fcc49ad0603bc3a601ebe32b015d6a381

Signed-off-by: Ivailo Monev <xakepa10@laimg.moc>

diff --git a/README b/README
index c9cbcd9..6c84a9b 100644 (file)
--- a/README
+++ b/README
@@ -60,7 +60,8 @@ QTBUG-21548, QTBUG-6133, QTBUG-18188, QTBUG-36767, QTBUG-35387, QTBUG-37035,
 QTBUG-28321, QTBUG-21993, QTBUG-26590, QTBUG-2124, QTBUG-20482, QTBUG-41361,
 QTBUG-40153, QTBUG-35479, QTBUG-1628, QTBUG-42989, QTBUG-34861, QTBUG-46767,
 QTBUG-25114, QTBUG-24672, QTBUG-23524 (WIP), QTBUG-56088, QTBUG-42189,
-QTBUG-39285, QTBUG-18173, QTBUG-28968, QTBUG-34336, QTBUG-40974, QTBUG-44286
+QTBUG-39285, QTBUG-18173, QTBUG-28968, QTBUG-34336, QTBUG-40974, QTBUG-44286,
+QTBUG-12564
 
 Unless you use QMake and QDoc porting to Katie or even supporting it along with
 Qt4 in the same codebase is trivial and requires only minor changes because

diff --git a/src/core/io/qfilesystemwatcher_inotify.cpp b/src/core/io/qfilesystemwatcher_inotify.cpp
index 94d5f12..f59294d 100644 (file)
--- a/src/core/io/qfilesystemwatcher_inotify.cpp
+++ b/src/core/io/qfilesystemwatcher_inotify.cpp
@@ -133,7 +133,7 @@ QStringList QInotifyFileSystemWatcherEngine::addPaths(const QStringList &paths,
                                        | IN_MOVE_SELF
                                        | IN_DELETE_SELF
                                        )));
-        if (wd <= 0) {
+        if (wd < 0) {
             perror("QInotifyFileSystemWatcherEngine::addPaths: inotify_add_watch failed");
             continue;
         }