diff options
| author | Markus Goetz <Markus.Goetz@nokia.com> | 2011-07-01 14:09:46 +0200 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2011-07-04 14:32:41 +0200 |
| commit | 85869920bb9a4ee45cf4a89e74b1bd3d4ce67eaa (patch) | |
| tree | 1dad7fd8061b8b254833873ed8de35b1a2f8f07d /tools | |
| parent | 3d5d8b6c4ff08806934a07df77f9387edc4243df (diff) | |
Always assume IPv6 support
It's 2011 baby! And until Qt5 is released probably 2012 :-)
Change-Id: I397aabf25e93c8afb5f562636710985cf0c7acfa
Reviewed-on: http://codereview.qt.nokia.com/1008
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Shane Kearns <shane.kearns@accenture.com>
Reviewed-by: Martin Petersson <Martin.Petersson@nokia.com>
Reviewed-by: Markus Goetz
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/configure/configure_pch.h | 2 | ||||
| -rw-r--r-- | tools/configure/configureapp.cpp | 10 |
2 files changed, 0 insertions, 12 deletions
diff --git a/tools/configure/configure_pch.h b/tools/configure/configure_pch.h index 33da5f69f2..edf7c04dff 100644 --- a/tools/configure/configure_pch.h +++ b/tools/configure/configure_pch.h @@ -47,9 +47,7 @@ # undef _POSIX_ /* Don't polute */ /* Make sure IP v6 is defined first of all, before windows.h */ -# ifndef QT_NO_IPV6 # include <winsock2.h> -# endif # include <stdlib.h> #endif diff --git a/tools/configure/configureapp.cpp b/tools/configure/configureapp.cpp index 7be1e28d57..698b6a381e 100644 --- a/tools/configure/configureapp.cpp +++ b/tools/configure/configureapp.cpp @@ -341,7 +341,6 @@ Configure::Configure(int& argc, char** argv) dictionary[ "ACCESSIBILITY" ] = "yes"; dictionary[ "OPENGL" ] = "yes"; dictionary[ "OPENVG" ] = "no"; - dictionary[ "IPV6" ] = "yes"; // Always, dynamically loaded dictionary[ "OPENSSL" ] = "auto"; dictionary[ "DBUS" ] = "auto"; dictionary[ "S60" ] = "yes"; @@ -1555,8 +1554,6 @@ void Configure::applySpecSpecifics() dictionary[ "QT3SUPPORT" ] = "no"; dictionary[ "OPENGL" ] = "no"; dictionary[ "OPENSSL" ] = "yes"; - // On Symbian we now always will have IPv6 with no chance to disable it - dictionary[ "IPV6" ] = "yes"; dictionary[ "STL" ] = "yes"; dictionary[ "EXCEPTIONS" ] = "yes"; dictionary[ "RTTI" ] = "yes"; @@ -2435,7 +2432,6 @@ bool Configure::verifyConfiguration() nis nas tablet - ipv6 X11 : x11sm xinerama xcursor xfixes xrandr xrender fontconfig xkb Embedded: embedded freetype @@ -2710,11 +2706,6 @@ void Configure::generateOutputVars() else if (dictionary[ "DBUS" ] == "linked") qtConfig += "dbus dbus-linked"; - if (dictionary["IPV6"] == "yes") - qtConfig += "ipv6"; - else if (dictionary["IPV6"] == "no") - qtConfig += "no-ipv6"; - if (dictionary[ "CETEST" ] == "yes") qtConfig += "cetest"; @@ -3188,7 +3179,6 @@ void Configure::generateConfigfiles() if (dictionary["OPENSSL"] == "no") qconfigList += "QT_NO_OPENSSL"; if (dictionary["OPENSSL"] == "linked") qconfigList += "QT_LINKED_OPENSSL"; if (dictionary["DBUS"] == "no") qconfigList += "QT_NO_DBUS"; - if (dictionary["IPV6"] == "no") qconfigList += "QT_NO_IPV6"; if (dictionary["WEBKIT"] == "no") qconfigList += "QT_NO_WEBKIT"; if (dictionary["DECLARATIVE"] == "no") qconfigList += "QT_NO_DECLARATIVE"; if (dictionary["DECLARATIVE_DEBUG"] == "no") qconfigList += "QDECLARATIVE_NO_DEBUG_PROTOCOL"; |