diff options
| author | Andrew Knight <andrew.knight@digia.com> | 2013-09-28 15:47:45 +0300 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-09-30 08:56:46 +0200 |
| commit | 248f29075e84cf57529ce7678c21e13a0fbf4a7e (patch) | |
| tree | d9305e25c717aede9cf29aec9504eeb5038c91d5 /src | |
| parent | f30641a7f8c3e38859a6f05a2c190496338b7e7d (diff) | |
qfeatures: Allow QFileSystemModel without QFileSystemWatcher
As of 373e44d, QFileSystemModel can be built without QFileSystemWatcher
support, making this define incorrect.
Change-Id: I1c18dc4f323f94b43f4e49646911fd06b0f01f73
Reviewed-by: Sérgio Martins <sergio.martins@kdab.com>
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
Diffstat (limited to 'src')
| -rw-r--r-- | src/corelib/global/qfeatures.h | 5 | ||||
| -rw-r--r-- | src/corelib/global/qfeatures.txt | 2 |
2 files changed, 1 insertions, 6 deletions
diff --git a/src/corelib/global/qfeatures.h b/src/corelib/global/qfeatures.h index ba84dd109e..17dd600265 100644 --- a/src/corelib/global/qfeatures.h +++ b/src/corelib/global/qfeatures.h @@ -279,11 +279,6 @@ #define QT_NO_DRAGANDDROP #endif -// QFileSystemModel -#if !defined(QT_NO_FILESYSTEMMODEL) && (defined(QT_NO_FILESYSTEMWATCHER)) -#define QT_NO_FILESYSTEMMODEL -#endif - // File Transfer Protocol #if !defined(QT_NO_FTP) && (defined(QT_NO_TEXTDATE)) #define QT_NO_FTP diff --git a/src/corelib/global/qfeatures.txt b/src/corelib/global/qfeatures.txt index 814e95c256..ec54c7bdbf 100644 --- a/src/corelib/global/qfeatures.txt +++ b/src/corelib/global/qfeatures.txt @@ -202,7 +202,7 @@ SeeAlso: ??? Feature: FILESYSTEMMODEL Description: Provides a data model for the local filesystem. Section: File I/O -Requires: FILESYSTEMWATCHER +Requires: Name: QFileSystemModel SeeAlso: ??? |