diff options
| author | David Faure <faure@kde.org> | 2012-05-24 10:36:01 +0200 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2012-06-14 12:23:11 +0200 |
| commit | 741b1fcfa333e33f3e1bd02f975a22e5b0b74316 (patch) | |
| tree | d8fe862eb1d0f040de5f228ed0c6b584b45aef7b /src/corelib | |
| parent | cd89b164a56fea54aec3cb348923af2bde4d3425 (diff) | |
Make qurlinfo private, now that QFtp is private.
Change-Id: I0bb641b397b7087c89009f92d9973e0922dce653
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Reviewed-by: Shane Kearns <shane.kearns@accenture.com>
Diffstat (limited to 'src/corelib')
| -rw-r--r-- | src/corelib/global/qfeatures.h | 5 | ||||
| -rw-r--r-- | src/corelib/global/qfeatures.txt | 9 | ||||
| -rw-r--r-- | src/corelib/io/qurl.cpp | 2 |
3 files changed, 2 insertions, 14 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: ??? diff --git a/src/corelib/io/qurl.cpp b/src/corelib/io/qurl.cpp index e4fb18e2f0..6494590679 100644 --- a/src/corelib/io/qurl.cpp +++ b/src/corelib/io/qurl.cpp @@ -116,8 +116,6 @@ \li When creating an QString to contain a URL from a QByteArray or a char*, always use QString::fromUtf8(). \endlist - - \sa QUrlInfo */ /*! |