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>
This commit is contained in:
parent
cdc436ebe6
commit
019c6d6628
@ -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
|
||||
|
@ -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
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user