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

5 files changed, 10 insertions, 33 deletions

diff --git a/src/network/kernel/qhostaddress.cpp b/src/network/kernel/qhostaddress.cpp
index bff351c34f..3dd7461a75 100644
--- a/src/network/kernel/qhostaddress.cpp
+++ b/src/network/kernel/qhostaddress.cpp
@@ -38,19 +38,18 @@
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
-
 #include "qhostaddress.h"
 #include "qhostaddress_p.h"
 #include "qdebug.h"
+#if defined(Q_OS_WIN)
+#include <winsock2.h>
+#endif
 #include "qplatformdefs.h"
 #include "qstringlist.h"
 #include "qendian.h"
 #ifndef QT_NO_DATASTREAM
 #include <qdatastream.h>
 #endif
-#if defined(Q_OS_WINCE)
-#include <winsock.h>
-#endif
 
 #ifdef QT_LINUXBASE
 #  include <arpa/inet.h>
@@ -65,7 +64,6 @@ QT_BEGIN_NAMESPACE
     } while (0)
 
 #ifdef Q_OS_WIN
-#    if !defined (QT_NO_IPV6)
 // sockaddr_in6 size changed between old and new SDK
 // Only the new version is the correct one, so always
 // use this structure.
@@ -90,12 +88,6 @@ typedef struct {
     struct  qt_in6_addr sin6_addr;  /* IPv6 address */
     u_long  sin6_scope_id;          /* set of interfaces for a scope */
 } qt_sockaddr_in6;
-#    else
-typedef void * qt_sockaddr_in6 ;
-#    endif
-#    ifndef AF_INET6
-#        define AF_INET6        23  /* Internetwork Version 6 */
-#    endif
 #else
 #define qt_sockaddr_in6 sockaddr_in6
 #define qt_s6_addr s6_addr
@@ -545,10 +537,8 @@ QHostAddress::QHostAddress(const struct sockaddr *sockaddr)
 {
     if (sockaddr->sa_family == AF_INET)
         setAddress(htonl(((sockaddr_in *)sockaddr)->sin_addr.s_addr));
-#ifndef QT_NO_IPV6
     else if (sockaddr->sa_family == AF_INET6)
         setAddress(((qt_sockaddr_in6 *)sockaddr)->sin6_addr.qt_s6_addr);
-#endif
 }
 
 /*!
@@ -700,10 +690,8 @@ void QHostAddress::setAddress(const struct sockaddr *sockaddr)
     clear();
     if (sockaddr->sa_family == AF_INET)
         setAddress(htonl(((sockaddr_in *)sockaddr)->sin_addr.s_addr));
-#ifndef QT_NO_IPV6
     else if (sockaddr->sa_family == AF_INET6)
         setAddress(((qt_sockaddr_in6 *)sockaddr)->sin6_addr.qt_s6_addr);
-#endif
 }
 
 /*!
diff --git a/src/network/kernel/qhostaddress.h b/src/network/kernel/qhostaddress.h
index efb3198fc0..3d364de6e6 100644
--- a/src/network/kernel/qhostaddress.h
+++ b/src/network/kernel/qhostaddress.h
@@ -117,15 +117,6 @@ public:
     bool isNull() const;
     void clear();
 
-#ifdef QT3_SUPPORT
-    inline QT3_SUPPORT quint32 ip4Addr() const { return toIPv4Address(); }
-    inline QT3_SUPPORT bool isIPv4Address() const { return protocol() == QAbstractSocket::IPv4Protocol
-                                                      || protocol() == QAbstractSocket::UnknownNetworkLayerProtocol; }
-    inline QT3_SUPPORT bool isIp4Addr() const  { return protocol() == QAbstractSocket::IPv4Protocol
-                                                      || protocol() == QAbstractSocket::UnknownNetworkLayerProtocol; }
-    inline QT3_SUPPORT bool isIPv6Address() const { return protocol() == QAbstractSocket::IPv6Protocol; }
-#endif
-
     bool isInSubnet(const QHostAddress &subnet, int netmask) const;
     bool isInSubnet(const QPair<QHostAddress, int> &subnet) const;
 
diff --git a/src/network/kernel/qhostinfo_unix.cpp b/src/network/kernel/qhostinfo_unix.cpp
index 0a56bc309a..37444ae2d9 100644
--- a/src/network/kernel/qhostinfo_unix.cpp
+++ b/src/network/kernel/qhostinfo_unix.cpp
@@ -149,9 +149,7 @@ QHostInfo QHostInfoAgent::fromName(const QString &hostName)
 // Reverse lookups using getnameinfo are broken on darwin, use gethostbyaddr instead.
 #if !defined (QT_NO_GETADDRINFO) && !defined (Q_OS_DARWIN)
         sockaddr_in sa4;
-#ifndef QT_NO_IPV6
         sockaddr_in6 sa6;
-#endif
         sockaddr *sa = 0;
         QT_SOCKLEN_T saSize = 0;
         if (address.protocol() == QAbstractSocket::IPv4Protocol) {
@@ -161,7 +159,6 @@ QHostInfo QHostInfoAgent::fromName(const QString &hostName)
             sa4.sin_family = AF_INET;
             sa4.sin_addr.s_addr = htonl(address.toIPv4Address());
         }
-#ifndef QT_NO_IPV6
         else {
             sa = (sockaddr *)&sa6;
             saSize = sizeof(sa6);
@@ -169,7 +166,6 @@ QHostInfo QHostInfoAgent::fromName(const QString &hostName)
             sa6.sin6_family = AF_INET6;
             memcpy(sa6.sin6_addr.s6_addr, address.toIPv6Address().c, sizeof(sa6.sin6_addr.s6_addr));
         }
-#endif
 
         char hbuf[NI_MAXHOST];
         if (sa && getnameinfo(sa, saSize, hbuf, sizeof(hbuf), 0, 0, 0) == 0)
@@ -231,7 +227,6 @@ QHostInfo QHostInfoAgent::fromName(const QString &hostName)
                 if (!addresses.contains(addr))
                     addresses.append(addr);
             }
-#ifndef QT_NO_IPV6
             else if (node->ai_family == AF_INET6) {
                 QHostAddress addr;
                 sockaddr_in6 *sa6 = (sockaddr_in6 *) node->ai_addr;
@@ -241,7 +236,6 @@ QHostInfo QHostInfoAgent::fromName(const QString &hostName)
                 if (!addresses.contains(addr))
                     addresses.append(addr);
             }
-#endif
             node = node->ai_next;
         }
         if (addresses.isEmpty() && node == 0) {
diff --git a/src/network/kernel/qnetworkinterface_unix.cpp b/src/network/kernel/qnetworkinterface_unix.cpp
index 0ce21f905f..528e195ef6 100644
--- a/src/network/kernel/qnetworkinterface_unix.cpp
+++ b/src/network/kernel/qnetworkinterface_unix.cpp
@@ -80,10 +80,9 @@ static QHostAddress addressFromSockaddr(sockaddr *sa)
 
     if (sa->sa_family == AF_INET)
         address.setAddress(htonl(((sockaddr_in *)sa)->sin_addr.s_addr));
-#ifndef QT_NO_IPV6
     else if (sa->sa_family == AF_INET6)
         address.setAddress(((sockaddr_in6 *)sa)->sin6_addr.s6_addr);
-#endif
+
     return address;
 
 }
diff --git a/src/network/kernel/qnetworkproxy.cpp b/src/network/kernel/qnetworkproxy.cpp
index 4f9836e863..1062663b23 100644
--- a/src/network/kernel/qnetworkproxy.cpp
+++ b/src/network/kernel/qnetworkproxy.cpp
@@ -1191,6 +1191,11 @@ void QNetworkProxyQuery::setUrl(const QUrl &url)
 }
 
 #ifndef QT_NO_BEARERMANAGEMENT
+/*!
+    Returns the network configuration component of the query.
+
+    \sa setNetworkConfiguration()
+*/
 QNetworkConfiguration QNetworkProxyQuery::networkConfiguration() const
 {
     return d ? d->config : QNetworkConfiguration();
@@ -1206,7 +1211,7 @@ QNetworkConfiguration QNetworkProxyQuery::networkConfiguration() const
     you should first start the QNetworkSession and obtain the active
     configuration from its properties.
 
-    \sa networkConfiguration
+    \sa networkConfiguration()
 */
 void QNetworkProxyQuery::setNetworkConfiguration(const QNetworkConfiguration &networkConfiguration)
 {