diff options
| author | Tasuku Suzuki <tasuku.suzuki@nokia.com> | 2012-07-11 00:31:47 +0900 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2012-07-17 22:07:58 +0200 |
| commit | 019c6d6628c496508c07d0fdd8674218985b9c0e (patch) | |
| tree | 5b82f934cd147b523ab2bbd8cb37b290c91f0d2e | |
| parent | cdc436ebe625153c626784a15cb224556fca3728 (diff) | |
removing QT_NO_URLINFO and using QT_NO_FTP instead
URLINFO was removed from qfeature.txt but QT_NO_URLINFO macro was not
removed. As QUrlInfo is now private and only used for FTP, the class can
be disabled when FTP is disabled.
Change-Id: Ic63b066f8ff9ad1eea0073ab75b622e5739ac5a8
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
Reviewed-by: Jonas Gastal <jgastal@profusion.mobi>
Reviewed-by: Shane Kearns <shane.kearns@accenture.com>
| -rw-r--r-- | src/network/kernel/qurlinfo.cpp | 4 | ||||
| -rw-r--r-- | src/network/kernel/qurlinfo_p.h | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/src/network/kernel/qurlinfo.cpp b/src/network/kernel/qurlinfo.cpp index 68c521c682..c125b8ba87 100644 --- a/src/network/kernel/qurlinfo.cpp +++ b/src/network/kernel/qurlinfo.cpp @@ -41,7 +41,7 @@ #include "qurlinfo_p.h" -#ifndef QT_NO_URLINFO +#ifndef QT_NO_FTP #include "qurl.h" #include "qdir.h" @@ -729,4 +729,4 @@ bool QUrlInfo::isValid() const QT_END_NAMESPACE -#endif // QT_NO_URLINFO +#endif // QT_NO_FTP diff --git a/src/network/kernel/qurlinfo_p.h b/src/network/kernel/qurlinfo_p.h index 7fbf860c31..4c3bc588d1 100644 --- a/src/network/kernel/qurlinfo_p.h +++ b/src/network/kernel/qurlinfo_p.h @@ -51,7 +51,7 @@ QT_BEGIN_HEADER QT_BEGIN_NAMESPACE -#ifndef QT_NO_URLINFO +#ifndef QT_NO_FTP class QUrl; class QUrlInfoPrivate; @@ -121,7 +121,7 @@ private: QUrlInfoPrivate *d; }; -#endif // QT_NO_URLINFO +#endif // QT_NO_FTP QT_END_NAMESPACE |