diff options
author | con <qtc-committer@nokia.com> | 2011-03-10 16:53:45 (GMT) |
---|---|---|
committer | con <qtc-committer@nokia.com> | 2011-03-10 19:44:31 (GMT) |
commit | dc96e9a935d8a48bae173b4febfb3bf32b34788d (patch) | |
tree | cebc4d734a28a3138e9b7f612dcfbe54a826af85 /src/corelib/global/qfeatures.h | |
parent | e250660cced1f0bcb16494c23277f9205833ec03 (diff) | |
download | Qt-dc96e9a935d8a48bae173b4febfb3bf32b34788d.zip Qt-dc96e9a935d8a48bae173b4febfb3bf32b34788d.tar.gz Qt-dc96e9a935d8a48bae173b4febfb3bf32b34788d.tar.bz2 |
Fix http in combination with QT_NO_NETWORKPROXY.
Diffstat (limited to 'src/corelib/global/qfeatures.h')
-rw-r--r-- | src/corelib/global/qfeatures.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/corelib/global/qfeatures.h b/src/corelib/global/qfeatures.h index b26563a..d1a73a6 100644 --- a/src/corelib/global/qfeatures.h +++ b/src/corelib/global/qfeatures.h @@ -579,7 +579,7 @@ #endif // Hyper Text Transfer Protocol -#if !defined(QT_NO_HTTP) && (defined(QT_NO_HOSTINFO) || defined(QT_NO_NETWORKPROXY)) +#if !defined(QT_NO_HTTP) && defined(QT_NO_HOSTINFO) #define QT_NO_HTTP #endif |