diff options
| author | Gabriel de Dietrich <gabriel.dedietrich@theqtcompany.com> | 2015-01-05 16:10:46 +0100 |
|---|---|---|
| committer | Erik Verbruggen <erik.verbruggen@theqtcompany.com> | 2015-01-09 10:46:56 +0100 |
| commit | 3d17b73377b4dbab9cc0b989cae44c1791cb726c (patch) | |
| tree | 5df2437048372f16fd90abe3bea7091150de8bd4 /src/corelib/io | |
| parent | 163af2cf53d3441b453744b99254c07a175af5de (diff) | |
QFileSystemWatcher: Use FSEvents FSW on OS X
This removes one of the last references to 10.6.
Change-Id: Ie23d9aba698714460e7478a421e85d4ad50d4ec9
Task-number: QTBUG-43505
Reviewed-by: Liang Qi <liang.qi@theqtcompany.com>
Reviewed-by: Morten Johan Sørvig <morten.sorvig@digia.com>
Diffstat (limited to 'src/corelib/io')
| -rw-r--r-- | src/corelib/io/qfilesystemwatcher.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/corelib/io/qfilesystemwatcher.cpp b/src/corelib/io/qfilesystemwatcher.cpp index 6ec1481243..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); |