1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

removing QT_NO_URLINFO and using QT_NO_FTP instead

Browse Source 
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>
This commit is contained in:
Tasuku Suzuki 2012-07-11 00:31:47 +09:00 committed by Qt by Nokia
parent cdc436ebe6
commit 019c6d6628
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/network/kernel/qurlinfo.cpp
View File

@ -41,7 +41,7 @@
#include "qurlinfo_p.h" #include "qurlinfo_p.h"
#ifndef QT_NO_URLINFO #ifndef QT_NO_FTP
#include "qurl.h" #include "qurl.h"
#include "qdir.h" #include "qdir.h"
@ -729,4 +729,4 @@ bool QUrlInfo::isValid() const
QT_END_NAMESPACE QT_END_NAMESPACE
#endif // QT_NO_URLINFO #endif // QT_NO_FTP

4
src/network/kernel/qurlinfo_p.h
View File

@ -51,7 +51,7 @@ QT_BEGIN_HEADER
QT_BEGIN_NAMESPACE QT_BEGIN_NAMESPACE
#ifndef QT_NO_URLINFO #ifndef QT_NO_FTP
class QUrl; class QUrl;
class QUrlInfoPrivate; class QUrlInfoPrivate;
@ -121,7 +121,7 @@ private:
QUrlInfoPrivate *d; QUrlInfoPrivate *d;
}; };
#endif // QT_NO_URLINFO #endif // QT_NO_FTP
QT_END_NAMESPACE QT_END_NAMESPACE