diff options
| author | Warwick Allison <warwick.allison@nokia.com> | 2009-08-10 22:45:54 (GMT) |
|---|---|---|
| committer | Warwick Allison <warwick.allison@nokia.com> | 2009-08-10 22:45:54 (GMT) |
| commit | 6bb93ab2fd79ae0a04c826d9027503b644b6e374 (patch) | |
| tree | 060d9765cf3f009c86fe6e421dac4ea8930d076e /src/qt3support/network/q3network.cpp | |
| parent | 40db84c97769141f3f2351de1b2d5c64904fe5c2 (diff) | |
| parent | 6c3c9d812a730d5bc1bcd6261befe077a65be594 (diff) | |
| download | Qt-6bb93ab2fd79ae0a04c826d9027503b644b6e374.zip Qt-6bb93ab2fd79ae0a04c826d9027503b644b6e374.tar.gz Qt-6bb93ab2fd79ae0a04c826d9027503b644b6e374.tar.bz2 | |
Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt
Diffstat (limited to 'src/qt3support/network/q3network.cpp')
| -rw-r--r-- | src/qt3support/network/q3network.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/qt3support/network/q3network.cpp b/src/qt3support/network/q3network.cpp index 3a6a6f0..1f918d1 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 } |