diff options
| author | Martin Smith <msmith@trolltech.com> | 2009-05-22 12:59:26 (GMT) |
|---|---|---|
| committer | Martin Smith <msmith@trolltech.com> | 2009-05-22 12:59:26 (GMT) |
| commit | 1ee8715fe0dfa784be987cc0cfb4519b2f20adb0 (patch) | |
| tree | 21004fd611096d062eb11f0cb9f87dfbb69d257a /src/network/socket/qhttpsocketengine.cpp | |
| parent | 751e0f1b70cb0c80e88f99e5137329d6f4b76562 (diff) | |
| parent | 8b2a16bd7f434a159e34e93dbffc983927a0a143 (diff) | |
| download | Qt-1ee8715fe0dfa784be987cc0cfb4519b2f20adb0.zip Qt-1ee8715fe0dfa784be987cc0cfb4519b2f20adb0.tar.gz Qt-1ee8715fe0dfa784be987cc0cfb4519b2f20adb0.tar.bz2 | |
Merge branch '4.5' of git@scm.dev.nokia.troll.no:qt/qt into 4.5
Diffstat (limited to 'src/network/socket/qhttpsocketengine.cpp')
| -rw-r--r-- | src/network/socket/qhttpsocketengine.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/network/socket/qhttpsocketengine.cpp b/src/network/socket/qhttpsocketengine.cpp index 540c443..5a2a746 100644 --- a/src/network/socket/qhttpsocketengine.cpp +++ b/src/network/socket/qhttpsocketengine.cpp @@ -768,6 +768,6 @@ QAbstractSocketEngine *QHttpSocketEngineHandler::createSocketEngine(int, QObject return 0; } -#endif - QT_END_NAMESPACE + +#endif |