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>

dist/changes-5.0.0

@@ -207,8 +207,8 @@ information about a particular change.
 - The QHttp, QHttpHeader, QHttpResponseHeader and QHttpRequestHeader classes have
   been removed, QNetworkAccessManager should be used instead.
 
-- The QFtp class is no longer exported, QNetworkAccessManager should be used
-  instead.
+- The QFtp and QUrlInfo classes are no longer exported, QNetworkAccessManager should be used
+  instead. These classes are available in a separate module, qtftp.
 
 - QProcess
 

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
 

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: ???
 

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
 */
 
 /*!

src/network/access/qftp.cpp

@@ -49,7 +49,7 @@
 
 #include "qcoreapplication.h"
 #include "qtcpsocket.h"
-#include "qurlinfo.h"
+#include "qurlinfo_p.h"
 #include "qstringlist.h"
 #include "qregexp.h"
 #include "qtimer.h"

src/network/access/qftp_p.h

@@ -54,7 +54,7 @@
 #define QFTP_H
 
 #include <QtCore/qstring.h>
-#include <QtNetwork/qurlinfo.h>
+#include <qurlinfo_p.h>
 #include <QtCore/qobject.h>
 
 QT_BEGIN_HEADER

src/network/access/qnetworkaccesscachebackend.cpp

@@ -44,7 +44,7 @@
 #include "qnetworkaccesscachebackend_p.h"
 #include "qabstractnetworkcache.h"
 #include "qfileinfo.h"
-#include "qurlinfo.h"
+#include "qurlinfo_p.h"
 #include "qdir.h"
 #include "qcoreapplication.h"
 

src/network/access/qnetworkaccessfilebackend.cpp

@@ -41,7 +41,7 @@
 
 #include "qnetworkaccessfilebackend_p.h"
 #include "qfileinfo.h"
-#include "qurlinfo.h"
+#include "qurlinfo_p.h"
 #include "qdir.h"
 #include "private/qnoncontiguousbytedevice_p.h"
 

src/network/kernel/kernel.pri

@@ -11,7 +11,7 @@ HEADERS += kernel/qauthenticator.h \
            kernel/qhostaddress_p.h \
            kernel/qhostinfo.h \
            kernel/qhostinfo_p.h \
-           kernel/qurlinfo.h \
+           kernel/qurlinfo_p.h \
            kernel/qnetworkproxy.h \
            kernel/qnetworkproxy_p.h \
 	   kernel/qnetworkinterface.h \

src/network/kernel/qurlinfo.cpp

@@ -39,7 +39,7 @@
 **
 ****************************************************************************/
 
-#include "qurlinfo.h"
+#include "qurlinfo_p.h"
 
 #ifndef QT_NO_URLINFO