diff options
| author | Morten Engvoldsen <morten.engvoldsen@nokia.com> | 2010-09-06 06:41:41 (GMT) |
|---|---|---|
| committer | Morten Engvoldsen <morten.engvoldsen@nokia.com> | 2010-09-06 06:41:41 (GMT) |
| commit | 4cd5e0dbdf5a8f6142d3961b05dbf35d3144e8cb (patch) | |
| tree | 92fb3640aa52ab2b29c35fe4e2be976bd8dc25eb /tools/configure/configureapp.cpp | |
| parent | 9f56ef9d1538e9edf9dc7bdb3bf696e647c0c092 (diff) | |
| parent | 91b1eff723c47fbe12d406a27053eea7d6c4a812 (diff) | |
| download | Qt-4cd5e0dbdf5a8f6142d3961b05dbf35d3144e8cb.zip Qt-4cd5e0dbdf5a8f6142d3961b05dbf35d3144e8cb.tar.gz Qt-4cd5e0dbdf5a8f6142d3961b05dbf35d3144e8cb.tar.bz2 | |
Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7
Diffstat (limited to 'tools/configure/configureapp.cpp')
| -rw-r--r-- | tools/configure/configureapp.cpp | 4 |
1 files changed, 4 insertions, 0 deletions
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"; |