diff options
| author | Liang Qi <liang.qi@qt.io> | 2018-10-01 12:39:45 +0000 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2018-10-01 12:39:45 +0000 |
| commit | 1dce83ba31e0e480b8eae43c1fc59c6cd5bb4d5c (patch) | |
| tree | 81c96fe47896b4a238a97fcba3bb973b50156a6d /src/imports/folderlistmodel/fileinfothread_p.h | |
| parent | 91bde278ea2e883b4a46cafb1afc1781c71c1590 (diff) | |
| parent | 87662fd1b71db11f0759e0be03d8a288ee11b775 (diff) | |
Merge "Merge remote-tracking branch 'origin/5.11' into 5.12" into refs/staging/5.12
Diffstat (limited to 'src/imports/folderlistmodel/fileinfothread_p.h')
| -rw-r--r-- | src/imports/folderlistmodel/fileinfothread_p.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/imports/folderlistmodel/fileinfothread_p.h b/src/imports/folderlistmodel/fileinfothread_p.h index 67d2a1f5f7..438dea6faa 100644 --- a/src/imports/folderlistmodel/fileinfothread_p.h +++ b/src/imports/folderlistmodel/fileinfothread_p.h @@ -54,7 +54,9 @@ #include <QThread> #include <QMutex> #include <QWaitCondition> +#if QT_CONFIG(filesystemwatcher) #include <QFileSystemWatcher> +#endif #include <QFileInfo> #include <QDir> |