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_win.cpp | |
| 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_win.cpp')
| -rw-r--r-- | src/corelib/io/qfilesystemwatcher_win.cpp | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/src/corelib/io/qfilesystemwatcher_win.cpp b/src/corelib/io/qfilesystemwatcher_win.cpp index 91d0f7a228..66985f8982 100644 --- a/src/corelib/io/qfilesystemwatcher_win.cpp +++ b/src/corelib/io/qfilesystemwatcher_win.cpp @@ -40,8 +40,6 @@ #include "qfilesystemwatcher.h" #include "qfilesystemwatcher_win_p.h" -#ifndef QT_NO_FILESYSTEMWATCHER - #include <qdebug.h> #include <qfileinfo.h> #include <qstringlist.h> @@ -760,5 +758,3 @@ QT_END_NAMESPACE #ifndef Q_OS_WINRT # include "qfilesystemwatcher_win.moc" #endif - -#endif // QT_NO_FILESYSTEMWATCHER |