diff options
author | Markus Goetz <Markus.Goetz@nokia.com> | 2010-09-03 11:45:45 (GMT) |
---|---|---|
committer | Markus Goetz <Markus.Goetz@nokia.com> | 2010-09-03 12:23:15 (GMT) |
commit | 0c7d5d106152924dedd822da8c90d9f3247a9947 (patch) | |
tree | 8c4bdb1dd95d1e0f7ed9f1ada250a41a1c3bb830 | |
parent | 36ecdffdb2a2c47b37584eefe57f92a65d6f9030 (diff) | |
download | Qt-0c7d5d106152924dedd822da8c90d9f3247a9947.zip Qt-0c7d5d106152924dedd822da8c90d9f3247a9947.tar.gz Qt-0c7d5d106152924dedd822da8c90d9f3247a9947.tar.bz2 |
Symbian: Disable IPv6 for now
OpenC does not fully support IPv6, therefore we cannot either.
Reviewed-by: ogoffart
-rwxr-xr-x | configure | 10 | ||||
-rw-r--r-- | tools/configure/configureapp.cpp | 4 |
2 files changed, 11 insertions, 3 deletions
@@ -6203,9 +6203,13 @@ fi # find if the platform supports IPv6 if [ "$CFG_IPV6" != "no" ]; then - if [ "$XPLATFORM" = "symbian-sbsv2" ]; then - #IPV6 should always be enabled for Symbian release - CFG_IPV6=yes + # + # 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 echo "$XPLATFORM" | grep symbian > /dev/null; then + CFG_IPV6=no 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 diff --git a/tools/configure/configureapp.cpp b/tools/configure/configureapp.cpp index 89d3ef0..0d0729b 100644 --- a/tools/configure/configureapp.cpp +++ b/tools/configure/configureapp.cpp @@ -1517,6 +1517,10 @@ void Configure::applySpecSpecifics() dictionary[ "QT3SUPPORT" ] = "no"; dictionary[ "OPENGL" ] = "no"; dictionary[ "OPENSSL" ] = "yes"; + // 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. + dictionary[ "IPV6" ] = "no"; dictionary[ "STL" ] = "yes"; dictionary[ "EXCEPTIONS" ] = "yes"; dictionary[ "RTTI" ] = "yes"; |