diff options
Diffstat (limited to 'src/corelib/global')
| -rw-r--r-- | src/corelib/global/qfeatures.h | 5 | ||||
| -rw-r--r-- | src/corelib/global/qfeatures.txt | 9 |
2 files changed, 2 insertions, 12 deletions
diff --git a/src/corelib/global/qfeatures.h b/src/corelib/global/qfeatures.h index 7abddda0c5..3267e3e06e 100644 --- a/src/corelib/global/qfeatures.h +++ b/src/corelib/global/qfeatures.h @@ -235,9 +235,6 @@ // QUndoCommand //#define QT_NO_UNDOCOMMAND -// QUrlInfo -//#define QT_NO_URLINFO - // QValidator //#define QT_NO_VALIDATOR @@ -388,7 +385,7 @@ #endif // File Transfer Protocol -#if !defined(QT_NO_FTP) && (defined(QT_NO_URLINFO) || defined(QT_NO_TEXTDATE)) +#if !defined(QT_NO_FTP) && (defined(QT_NO_TEXTDATE)) #define QT_NO_FTP #endif diff --git a/src/corelib/global/qfeatures.txt b/src/corelib/global/qfeatures.txt index 777128299a..f0b8b470c5 100644 --- a/src/corelib/global/qfeatures.txt +++ b/src/corelib/global/qfeatures.txt @@ -962,13 +962,6 @@ SeeAlso: ??? # Networking -Feature: URLINFO -Description: Supports storage of URL information. -Section: Networking -Requires: -Name: QUrlInfo -SeeAlso: ??? - Feature: HOSTINFO Description: Supports host name lookups. Section: Networking @@ -979,7 +972,7 @@ SeeAlso: ??? Feature: FTP Description: Supports FTP file access. Section: Networking -Requires: URLINFO TEXTDATE +Requires: TEXTDATE Name: File Transfer Protocol SeeAlso: ??? |