[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    KDE/kdelibs/kdecore
From:       David Faure <faure () kde ! org>
Date:       2010-11-06 1:52:30
Message-ID: 20101106015230.2B138AC89B () svn ! kde ! org
[Download RAW message or body]

SVN commit 1193437 by dfaure:

Enable QFileSystemWatcher on all platforms (except if not available in Qt). Not used by default though
  (it has one downside: delete+recreate+modify doesn't work)


 M  +0 -5      CMakeLists.txt  
 M  +0 -2      io/config-kdirwatch.h.cmake  
 M  +4 -0      io/kdirwatch_p.h  


--- trunk/KDE/kdelibs/kdecore/CMakeLists.txt #1193436:1193437
@@ -15,11 +15,6 @@
 
 check_include_files(sys/inotify.h SYS_INOTIFY_H_FOUND)
 macro_bool_to_01(SYS_INOTIFY_H_FOUND HAVE_SYS_INOTIFY_H)
-if(WIN32)
- # currently for win32 only, since it doesn't support watching files that don't exist yet
- option(USE_QFILESYSTEMWATCHER "Use QFileSystemWatcher instead polling for KDirWatch" ON)
- macro_bool_to_01(USE_QFILESYSTEMWATCHER HAVE_QFILESYSTEMWATCHER)
-endif(WIN32)
 
 # Generate io/config-kdirwatch.h
 include(io/ConfigureChecks.cmake)
--- trunk/KDE/kdelibs/kdecore/io/config-kdirwatch.h.cmake #1193436:1193437
@@ -1,5 +1,3 @@
 #cmakedefine HAVE_FAM 1
 
 #cmakedefine HAVE_SYS_INOTIFY_H 1
-
-#cmakedefine HAVE_QFILESYSTEMWATCHER 1
--- trunk/KDE/kdelibs/kdecore/io/kdirwatch_p.h #1193436:1193437
@@ -30,6 +30,10 @@
 #include "io/config-kdirwatch.h"
 #include "kdirwatch.h"
 
+#ifndef QT_NO_FILESYSTEMWATCHER
+#define HAVE_QFILESYSTEMWATCHER
+#endif
+
 #include <QtCore/QList>
 #include <QtCore/QSet>
 #include <QtCore/QMap>
[prev in list] [next in list] [prev in thread] [next in thread]