diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2018-09-30 01:00:19 +0200 |
|---|---|---|
| committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2018-09-30 01:00:19 +0200 |
| commit | 07e92611050f78dae93bcd362112efd8efa7b41e (patch) | |
| tree | 6951f77a6344436150c4f83f407e09d946f2c6c3 /src/corelib/io/qfilesystemwatcher_fsevents.mm | |
| parent | 69e68218e5082166d5c4ab1903fbacde00418a1c (diff) | |
| parent | caa598c843eb27fd0c645e62723fd2d4e3e12f60 (diff) | |
Merge remote-tracking branch 'origin/5.11' into 5.12
Change-Id: Iaa438d14357be1bf75bb645cb8d3245947c055b8
Diffstat (limited to 'src/corelib/io/qfilesystemwatcher_fsevents.mm')
| -rw-r--r-- | src/corelib/io/qfilesystemwatcher_fsevents.mm | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/src/corelib/io/qfilesystemwatcher_fsevents.mm b/src/corelib/io/qfilesystemwatcher_fsevents.mm index f68fb67d79..f594fad803 100644 --- a/src/corelib/io/qfilesystemwatcher_fsevents.mm +++ b/src/corelib/io/qfilesystemwatcher_fsevents.mm @@ -45,8 +45,6 @@ #include "private/qcore_unix_p.h" #include "kernel/qcore_mac_p.h" -#ifndef QT_NO_FILESYSTEMWATCHER - #include <qdebug.h> #include <qdir.h> #include <qfile.h> @@ -585,6 +583,4 @@ bool QFseventsFileSystemWatcherEngine::derefPath(const QString &watchedPath) return false; } -#endif //QT_NO_FILESYSTEMWATCHER - QT_END_NAMESPACE |