diff options
| author | Rohan McGovern <rohan.mcgovern@nokia.com> | 2009-08-06 03:55:27 (GMT) |
|---|---|---|
| committer | Rohan McGovern <rohan.mcgovern@nokia.com> | 2009-08-06 03:55:27 (GMT) |
| commit | 06d57fc65c47d12047e985202ae1e394c48f78ca (patch) | |
| tree | a897a8f91ad5e919e7cc66671b60d83248c96e72 /src/qt3support/network/q3http.cpp | |
| parent | 31fa1d0f6144e7e92748b33f8633eeb2f52483a1 (diff) | |
| parent | 56b349951a70f3ab95e334e41e37f017e91cf481 (diff) | |
| download | Qt-06d57fc65c47d12047e985202ae1e394c48f78ca.zip Qt-06d57fc65c47d12047e985202ae1e394c48f78ca.tar.gz Qt-06d57fc65c47d12047e985202ae1e394c48f78ca.tar.bz2 | |
Merge commit 'origin/4.5'
Conflicts:
src/gui/dialogs/qfiledialog.cpp
src/gui/dialogs/qfiledialog_win.cpp
tests/auto/qicoimageformat/tst_qicoimageformat.cpp
tests/auto/qscriptqobject/qscriptqobject.pro
Diffstat (limited to 'src/qt3support/network/q3http.cpp')
| -rw-r--r-- | src/qt3support/network/q3http.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/qt3support/network/q3http.cpp b/src/qt3support/network/q3http.cpp index dba4e88..9b5c33f 100644 --- a/src/qt3support/network/q3http.cpp +++ b/src/qt3support/network/q3http.cpp @@ -42,7 +42,7 @@ #include <qplatformdefs.h> #include "q3http.h" -#ifndef QT_NO_NETWORKPROTOCOL_HTTP +#ifndef QT_NO_HTTP #include "q3socket.h" #include "qtextstream.h" |