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>

11 files changed, 10 insertions, 22 deletions

diff --git a/dist/changes-5.0.0 b/dist/changes-5.0.0
index d21fff1f7c..7ddb17f4d1 100644
--- a/dist/changes-5.0.0
+++ b/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
 
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
 */
 
 /*!
diff --git a/src/network/access/qftp.cpp b/src/network/access/qftp.cpp
index a261c19ad6..03244e86ea 100644
--- a/src/network/access/qftp.cpp
+++ b/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"
diff --git a/src/network/access/qftp_p.h b/src/network/access/qftp_p.h
index 8dc423973a..2e86522238 100644
--- a/src/network/access/qftp_p.h
+++ b/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
diff --git a/src/network/access/qnetworkaccesscachebackend.cpp b/src/network/access/qnetworkaccesscachebackend.cpp
index 6abe42f795..8f81e1b150 100644
--- a/src/network/access/qnetworkaccesscachebackend.cpp
+++ b/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"
 
diff --git a/src/network/access/qnetworkaccessfilebackend.cpp b/src/network/access/qnetworkaccessfilebackend.cpp
index dbe964ac8d..5b8eb631a5 100644
--- a/src/network/access/qnetworkaccessfilebackend.cpp
+++ b/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"
 
diff --git a/src/network/kernel/kernel.pri b/src/network/kernel/kernel.pri
index a8aa3622e1..b9cd07ff66 100644
--- a/src/network/kernel/kernel.pri
+++ b/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 \
diff --git a/src/network/kernel/qurlinfo.cpp b/src/network/kernel/qurlinfo.cpp
index 9f571b9e8c..68c521c682 100644
--- a/src/network/kernel/qurlinfo.cpp
+++ b/src/network/kernel/qurlinfo.cpp
@@ -39,7 +39,7 @@
 **
 ****************************************************************************/
 
-#include "qurlinfo.h"
+#include "qurlinfo_p.h"
 
 #ifndef QT_NO_URLINFO
 
diff --git a/src/network/kernel/qurlinfo.h b/src/network/kernel/qurlinfo_p.h
index 7fbf860c31..7fbf860c31 100644
--- a/src/network/kernel/qurlinfo.h
+++ b/src/network/kernel/qurlinfo_p.h