From 248f29075e84cf57529ce7678c21e13a0fbf4a7e Mon Sep 17 00:00:00 2001
From: Andrew Knight <andrew.knight@digia.com>
Date: Sat, 28 Sep 2013 15:47:45 +0300
Subject: [PATCH] qfeatures: Allow QFileSystemModel without QFileSystemWatcher
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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>
---
 src/corelib/global/qfeatures.h   | 5 -----
 src/corelib/global/qfeatures.txt | 2 +-
 2 files changed, 1 insertion(+), 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: ???