summaryrefslogtreecommitdiffstats
path: root/src/corelib/global/qfeatures.h
diff options
context:
space:
mode:
authorDavid Faure <faure@kde.org>2012-05-24 10:36:01 +0200
committerQt by Nokia <qt-info@nokia.com>2012-06-14 12:23:11 +0200
commit741b1fcfa333e33f3e1bd02f975a22e5b0b74316 (patch)
treed8fe862eb1d0f040de5f228ed0c6b584b45aef7b /src/corelib/global/qfeatures.h
parentcd89b164a56fea54aec3cb348923af2bde4d3425 (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/global/qfeatures.h')
-rw-r--r--src/corelib/global/qfeatures.h5
1 files changed, 1 insertions, 4 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