Merge remote branch 'gerrit/master' into refactor

Conflicts:
	config.tests/unix/opengldesktop/opengldesktop.cpp
	examples/itemviews/interview/interview.pro
	examples/mainwindows/mainwindow/mainwindow.pro
	examples/openvg/README
	examples/richtext/textedit/textedit.pro
	examples/tools/undo/undo.pro
	src/corelib/global/qglobal.h
	src/corelib/kernel/qcoreapplication.h
	src/corelib/kernel/qcoreevent.h
	src/corelib/kernel/qmetatype.h
	src/gui/kernel/qevent.cpp
	src/gui/kernel/qevent.h
	src/gui/painting/qpaintengine_raster.cpp
	src/gui/painting/qpaintengine_raster_p.h
	src/gui/text/qfontdatabase.cpp
	src/opengl/qgl.h
	src/openvg/qpaintengine_vg.cpp
	src/plugins/platforms/wayland/qwaylandwindow.cpp
	tests/auto/qmainwindow/qmainwindow.pro

Change-Id: I6bfb586740a68379bb99f4612ec993393a5f3234

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 f241160e26..cde4ddd833 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";