diff options
Diffstat (limited to 'src/corelib/io/qfilesystemwatcher.cpp')
| -rw-r--r-- | src/corelib/io/qfilesystemwatcher.cpp | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/src/corelib/io/qfilesystemwatcher.cpp b/src/corelib/io/qfilesystemwatcher.cpp index 4bca8d90a0..416dd29d23 100644 --- a/src/corelib/io/qfilesystemwatcher.cpp +++ b/src/corelib/io/qfilesystemwatcher.cpp @@ -52,9 +52,9 @@ # include "qfilesystemwatcher_win_p.h" #elif defined(USE_INOTIFY) # include "qfilesystemwatcher_inotify_p.h" -#elif defined(Q_OS_FREEBSD) || defined(Q_OS_IOS) || (defined(Q_OS_OSX) && MAC_OS_X_VERSION_MIN_REQUIRED < MAC_OS_X_VERSION_10_7) +#elif defined(Q_OS_FREEBSD) || defined(Q_OS_IOS) # include "qfilesystemwatcher_kqueue_p.h" -#elif defined(Q_OS_OSX) && MAC_OS_X_VERSION_MIN_REQUIRED > MAC_OS_X_VERSION_10_6 +#elif defined(Q_OS_OSX) # include "qfilesystemwatcher_fsevents_p.h" #endif @@ -68,9 +68,9 @@ QFileSystemWatcherEngine *QFileSystemWatcherPrivate::createNativeEngine(QObject // there is a chance that inotify may fail on Linux pre-2.6.13 (August // 2005), so we can't just new inotify directly. return QInotifyFileSystemWatcherEngine::create(parent); -#elif defined(Q_OS_FREEBSD) || defined(Q_OS_IOS) || (defined(Q_OS_OSX) && MAC_OS_X_VERSION_MIN_REQUIRED < MAC_OS_X_VERSION_10_7) +#elif defined(Q_OS_FREEBSD) || defined(Q_OS_IOS) return QKqueueFileSystemWatcherEngine::create(parent); -#elif defined(Q_OS_OSX) && MAC_OS_X_VERSION_MIN_REQUIRED > MAC_OS_X_VERSION_10_6 +#elif defined(Q_OS_OSX) return QFseventsFileSystemWatcherEngine::create(parent); #else Q_UNUSED(parent); @@ -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() */ |