summaryrefslogtreecommitdiffstats
path: root/configure
diff options
context:
space:
mode:
authorMarkus Goetz <Markus.Goetz@nokia.com>2010-12-08 11:50:50 (GMT)
committerMarkus Goetz <Markus.Goetz@nokia.com>2010-12-08 11:55:23 (GMT)
commit4b31d0c75755a57667d5d76e44e4b8653aa15219 (patch)
tree967539f1c596f2e7633257758310e4f1e9c3da33 /configure
parent0975f046497deccd57b59aacded3ffc3c3c912f6 (diff)
downloadQt-4b31d0c75755a57667d5d76e44e4b8653aa15219.zip
Qt-4b31d0c75755a57667d5d76e44e4b8653aa15219.tar.gz
Qt-4b31d0c75755a57667d5d76e44e4b8653aa15219.tar.bz2
Symbian: Enable IPv6 again.
The native QSymbianSocketEngine supports IPv6 just fine. This reverts commit 0c7d5d106152924dedd822da8c90d9f3247a9947.
Diffstat (limited to 'configure')
-rwxr-xr-xconfigure8
1 files changed, 2 insertions, 6 deletions
diff --git a/configure b/configure
index 05b5629..401299b 100755
--- a/configure
+++ b/configure
@@ -6463,13 +6463,9 @@ fi
# find if the platform supports IPv6
if [ "$CFG_IPV6" != "no" ]; then
- #
- # We accidently enabled IPv6 for Qt Symbian in 4.6.x. However the underlying OpenC does not fully support IPV6.
- # Therefore for 4.7.1 and following we disable it until OpenC either supports it or we have the native Qt
- # symbian socket engine.
- #
if [ "$XPLATFORM_SYMBIAN" = "yes" ]; then
- CFG_IPV6=no
+ #IPV6 should always be enabled for Symbian release
+ CFG_IPV6=yes
elif "$unixtests/compile.test" "$XQMAKESPEC" "$QMAKE_CONFIG" $OPT_VERBOSE "$relpath" "$outpath" config.tests/unix/ipv6 "IPv6" $L_FLAGS $I_FLAGS $l_FLAGS $MAC_CONFIG_TEST_COMMANDLINE; then
CFG_IPV6=yes
else