diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2011-05-05 08:12:33 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2011-05-05 08:12:33 (GMT) |
| commit | d1ac6af4f30e822e161fd8772104aa2e30e55a2f (patch) | |
| tree | 71cb36a09e4d9051a40bbeccb5ae4467bb1f7792 /src/network/access | |
| parent | c98eafb1b6b100cf99518b33b8155aff866eb208 (diff) | |
| parent | c79246683a5033f605acd59d1c37d68381383a06 (diff) | |
| download | Qt-d1ac6af4f30e822e161fd8772104aa2e30e55a2f.zip Qt-d1ac6af4f30e822e161fd8772104aa2e30e55a2f.tar.gz Qt-d1ac6af4f30e822e161fd8772104aa2e30e55a2f.tar.bz2 | |
Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into master-integration
* 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1:
don't crash in QProcessEnvironment::systemEnvironment()
qmake: Introduce new template type
no environment on WinCE
fix Widestring vs. Ansi mixup
fix potential crash in QProcessEnvironment::systemEnvironment() on windows
Fix compilation with QT_NO_*
fix build on symbian
skip widget when its focusPolicy is Qt::ClickFocus in TabOrderEditor
fix build on mac
make QProcessEnvironment on Unix cache converted values
make QProcessEnvironment::systemEnvironment() encoding-safe
make QProcessEnvironment on Unix cache converted variable names
move key/value converters to the private class
make QProcessEnvironment on Windows preserve variable name case
split QProcessEnvironmentPrivate::Unit into Key and Value
remove unused functions
minor optimization: use QList::reserve()
use the Hash typedef
Changelog: Qt Designer 4.8
Diffstat (limited to 'src/network/access')
| -rw-r--r-- | src/network/access/qhttpthreaddelegate.cpp | 3 | ||||
| -rw-r--r-- | src/network/access/qhttpthreaddelegate_p.h | 4 |
2 files changed, 7 insertions, 0 deletions
diff --git a/src/network/access/qhttpthreaddelegate.cpp b/src/network/access/qhttpthreaddelegate.cpp index 99f9376..0364dac 100644 --- a/src/network/access/qhttpthreaddelegate.cpp +++ b/src/network/access/qhttpthreaddelegate.cpp @@ -51,6 +51,7 @@ #include "private/qnetworkaccesscache_p.h" #include "private/qnoncontiguousbytedevice_p.h" +#ifndef QT_NO_HTTP QT_BEGIN_NAMESPACE @@ -576,4 +577,6 @@ void QHttpThreadDelegate::synchronousProxyAuthenticationRequiredSlot(const QNet #endif +#endif // QT_NO_HTTP + QT_END_NAMESPACE diff --git a/src/network/access/qhttpthreaddelegate_p.h b/src/network/access/qhttpthreaddelegate_p.h index 752bc09..c0f2077 100644 --- a/src/network/access/qhttpthreaddelegate_p.h +++ b/src/network/access/qhttpthreaddelegate_p.h @@ -68,6 +68,8 @@ #include "private/qnoncontiguousbytedevice_p.h" #include "qnetworkaccessauthenticationmanager_p.h" +#ifndef QT_NO_HTTP + QT_BEGIN_NAMESPACE class QAuthenticator; @@ -285,4 +287,6 @@ signals: QT_END_NAMESPACE +#endif // QT_NO_HTTP + #endif // QHTTPTHREADDELEGATE_H |