diff options
| author | Morten Johan Sørvig <morten.sorvig@nokia.com> | 2010-10-18 07:51:15 (GMT) |
|---|---|---|
| committer | Jørgen Lind <jorgen.lind@nokia.com> | 2010-10-20 11:56:28 (GMT) |
| commit | b895d7af3a75cbbc2b14a993679538ed02190b40 (patch) | |
| tree | 719b4cb2b051097dfea12e886f08554b7bd6d0d6 /src/corelib/global/qfeatures.h | |
| parent | 4346b33024c76760752fc1dc4b46847883cd0453 (diff) | |
| download | Qt-b895d7af3a75cbbc2b14a993679538ed02190b40.zip Qt-b895d7af3a75cbbc2b14a993679538ed02190b40.tar.gz Qt-b895d7af3a75cbbc2b14a993679538ed02190b40.tar.bz2 | |
Lighthouse on OS X.
Reviewed-by: Jørgen
Diffstat (limited to 'src/corelib/global/qfeatures.h')
| -rw-r--r-- | src/corelib/global/qfeatures.h | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/corelib/global/qfeatures.h b/src/corelib/global/qfeatures.h index b606843..9710079 100644 --- a/src/corelib/global/qfeatures.h +++ b/src/corelib/global/qfeatures.h @@ -523,11 +523,6 @@ #define QT_NO_FTP #endif -// Hyper Text Transfer Protocol -#if !defined(QT_NO_HTTP) && (defined(QT_NO_HOSTINFO)) -#define QT_NO_HTTP -#endif - // QInputContext #if !defined(QT_NO_IM) && (defined(QT_NO_LIBRARY)) #define QT_NO_IM @@ -583,6 +578,11 @@ #define QT_NO_GRAPHICSVIEW #endif +// Hyper Text Transfer Protocol +#if !defined(QT_NO_HTTP) && (defined(QT_NO_HOSTINFO) || defined(QT_NO_NETWORKPROXY)) +#define QT_NO_HTTP +#endif + // QMdiArea #if !defined(QT_NO_MDIAREA) && (defined(QT_NO_SCROLLAREA)) #define QT_NO_MDIAREA |