summaryrefslogtreecommitdiffstats
path: root/src/corelib/global/qfeatures.txt
diff options
context:
space:
mode:
authorOlivier Goffart <olivier.goffart@nokia.com>2011-03-21 15:09:33 (GMT)
committerOlivier Goffart <olivier.goffart@nokia.com>2011-03-21 15:09:33 (GMT)
commitf464bef8b0d8cd30a3c795558e5a7b28635ac057 (patch)
tree01c17f782a3b79cf71656c6910432ca43d4557d5 /src/corelib/global/qfeatures.txt
parent0112a4ce3980bfaf5a3e45a5f77cf65700db5436 (diff)
parent86ceda033eda6bd615134f71b9850081a0c808c9 (diff)
downloadQt-f464bef8b0d8cd30a3c795558e5a7b28635ac057.zip
Qt-f464bef8b0d8cd30a3c795558e5a7b28635ac057.tar.gz
Qt-f464bef8b0d8cd30a3c795558e5a7b28635ac057.tar.bz2
Merge remote-tracking branch 'origin/master'
Diffstat (limited to 'src/corelib/global/qfeatures.txt')
-rw-r--r--src/corelib/global/qfeatures.txt10
1 files changed, 9 insertions, 1 deletions
diff --git a/src/corelib/global/qfeatures.txt b/src/corelib/global/qfeatures.txt
index f07fbd5..6b861d4 100644
--- a/src/corelib/global/qfeatures.txt
+++ b/src/corelib/global/qfeatures.txt
@@ -242,6 +242,14 @@ Requires:
Name: QFileSystemWatcher
SeeAlso: ???
+Feature: FILESYSTEMITERATOR
+Description: Provides fast file-system iteration.
+for modications.
+Section: File I/O
+Requires:
+Name: QFileSystemIterator
+SeeAlso: ???
+
# Widgets
Feature: TREEWIDGET
@@ -1050,7 +1058,7 @@ SeeAlso: ???
Feature: HTTP
Description: Supports HTTP file access.
Section: Networking
-Requires: HOSTINFO NETWORKPROXY
+Requires: HOSTINFO
Name: Hyper Text Transfer Protocol
SeeAlso: ???