diff options
| author | Rohan McGovern <rohan.mcgovern@nokia.com> | 2009-08-06 13:55:27 +1000 |
|---|---|---|
| committer | Rohan McGovern <rohan.mcgovern@nokia.com> | 2009-08-06 13:55:27 +1000 |
| commit | 06d57fc65c47d12047e985202ae1e394c48f78ca (patch) | |
| tree | a897a8f91ad5e919e7cc66671b60d83248c96e72 /src/qt3support | |
| parent | 31fa1d0f6144e7e92748b33f8633eeb2f52483a1 (diff) | |
| parent | 56b349951a70f3ab95e334e41e37f017e91cf481 (diff) | |
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')
| -rw-r--r-- | src/qt3support/network/q3http.cpp | 2 | ||||
| -rw-r--r-- | src/qt3support/network/q3http.h | 5 | ||||
| -rw-r--r-- | src/qt3support/network/q3network.cpp | 2 |
3 files changed, 4 insertions, 5 deletions
diff --git a/src/qt3support/network/q3http.cpp b/src/qt3support/network/q3http.cpp index dba4e88ce1..9b5c33f826 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" diff --git a/src/qt3support/network/q3http.h b/src/qt3support/network/q3http.h index 93ab00e7f6..5311764d7a 100644 --- a/src/qt3support/network/q3http.h +++ b/src/qt3support/network/q3http.h @@ -52,8 +52,7 @@ QT_BEGIN_HEADER QT_BEGIN_NAMESPACE QT_MODULE(Qt3Support) - -#ifndef QT_NO_NETWORKPROTOCOL_HTTP +#ifndef QT_NO_HTTP class Q3Socket; class QTimerEvent; @@ -269,7 +268,7 @@ private: friend class Q3HttpPGHRequest; }; -#endif // QT_NO_NETWORKPROTOCOL_HTTP +#endif // QT_NO_HTTP QT_END_NAMESPACE diff --git a/src/qt3support/network/q3network.cpp b/src/qt3support/network/q3network.cpp index 3a6a6f0342..1f918d138e 100644 --- a/src/qt3support/network/q3network.cpp +++ b/src/qt3support/network/q3network.cpp @@ -63,7 +63,7 @@ void q3InitNetworkProtocols() #ifndef QT_NO_NETWORKPROTOCOL_FTP Q3NetworkProtocol::registerNetworkProtocol( QLatin1String("ftp"), new Q3NetworkProtocolFactory< Q3Ftp > ); #endif -#ifndef QT_NO_NETWORKPROTOCOL_HTTP +#ifndef QT_NO_HTTP Q3NetworkProtocol::registerNetworkProtocol( QLatin1String("http"), new Q3NetworkProtocolFactory< Q3Http > ); #endif } |