Merge commit 'qt/master'

Conflicts:
	doc/src/examples.qdoc
	doc/src/plugins-howto.qdoc
	doc/src/topics.qdoc
	examples/phonon/musicplayer/mainwindow.cpp
	src/3rdparty/freetype/src/base/ftobjs.c
	src/corelib/global/qglobal.h
	src/corelib/tools/qalgorithms.h
	src/corelib/tools/qshareddata.cpp
	src/corelib/tools/qsharedpointer.cpp
	src/corelib/tools/tools.pri
	src/corelib/xml/qxmlstream.h
	src/gui/painting/painting.pri
	src/gui/widgets/qdatetimeedit.cpp
	tests/auto/qdesktopservices/qdesktopservices.pro
	tests/auto/qgraphicsitem/tst_qgraphicsitem.cpp
	tests/auto/qtextcodec/test/test.pro

24 files changed, 33 insertions, 32 deletions

diff --git a/src/network/access/access.pri b/src/network/access/access.pri
index ab7b3a7..edc1b63 100644
--- a/src/network/access/access.pri
+++ b/src/network/access/access.pri
@@ -59,6 +59,6 @@ SOURCES += access/qftp.cpp \
 contains(QT_CONFIG, zlib) {
    INCLUDEPATH += ../3rdparty/zlib
 } else:!contains(QT_CONFIG, no-zlib) {
-   unix:LIBS += -lz
+   unix:LIBS_PRIVATE += -lz
 #  win32:LIBS += libz.lib
 }
diff --git a/src/network/access/qftp.cpp b/src/network/access/qftp.cpp
index d8b2232..5931a67 100644
--- a/src/network/access/qftp.cpp
+++ b/src/network/access/qftp.cpp
@@ -1296,9 +1296,9 @@ int QFtpPrivate::addCommand(QFtpCommand *cmd)
     \class QFtp
     \brief The QFtp class provides an implementation of the client side of FTP protocol.
 
-    \ingroup io
+    \ingroup network
     \inmodule QtNetwork
-    \mainclass
+
 
     This class provides a direct interface to FTP that allows you to
     have more control over the requests. However, for new
diff --git a/src/network/access/qhttp.cpp b/src/network/access/qhttp.cpp
index 1f27742..17ea6df 100644
--- a/src/network/access/qhttp.cpp
+++ b/src/network/access/qhttp.cpp
@@ -516,7 +516,7 @@ public:
     \obsolete
     \brief The QHttpHeader class contains header information for HTTP.
 
-    \ingroup io
+    \ingroup network
     \inmodule QtNetwork
 
     In most cases you should use the more specialized derivatives of
@@ -1010,7 +1010,7 @@ public:
     \obsolete
     \brief The QHttpResponseHeader class contains response header information for HTTP.
 
-    \ingroup io
+    \ingroup network
     \inmodule QtNetwork
 
     This class is used by the QHttp class to report the header
@@ -1215,7 +1215,7 @@ public:
     \obsolete
     \brief The QHttpRequestHeader class contains request header information for HTTP.
 
-    \ingroup io
+    \ingroup network
     \inmodule QtNetwork
 
     This class is used in the QHttp class to report the header
@@ -1420,9 +1420,9 @@ QString QHttpRequestHeader::toString() const
 
     \brief The QHttp class provides an implementation of the HTTP protocol.
 
-    \ingroup io
+    \ingroup network
     \inmodule QtNetwork
-    \mainclass
+
 
     This class provides a direct interface to HTTP that allows you to
     download and upload data with the HTTP protocol.
diff --git a/src/network/access/qnetworkrequest.cpp b/src/network/access/qnetworkrequest.cpp
index dd8af60..9f6f224 100644
--- a/src/network/access/qnetworkrequest.cpp
+++ b/src/network/access/qnetworkrequest.cpp
@@ -55,7 +55,7 @@ QT_BEGIN_NAMESPACE
     \brief The QNetworkRequest class holds one request to be sent with the Network Access API.
     \since 4.4
 
-    \ingroup io
+    \ingroup network
     \inmodule QtNetwork
 
     QNetworkRequest is part of the Network Access API and is the class
diff --git a/src/network/kernel/kernel.pri b/src/network/kernel/kernel.pri
index bf07aab..6145c43 100644
--- a/src/network/kernel/kernel.pri
+++ b/src/network/kernel/kernel.pri
@@ -24,7 +24,7 @@ symbian: SOURCES += kernel/qhostinfo_unix.cpp kernel/qnetworkinterface_symbian.c
 unix:!symbian:SOURCES += kernel/qhostinfo_unix.cpp kernel/qnetworkinterface_unix.cpp
 win32:SOURCES += kernel/qhostinfo_win.cpp kernel/qnetworkinterface_win.cpp
 
-mac:LIBS+= -framework SystemConfiguration
+mac:LIBS_PRIVATE += -framework SystemConfiguration -framework CoreFoundation
 mac:SOURCES += kernel/qnetworkproxy_mac.cpp
 else:win32:SOURCES += kernel/qnetworkproxy_win.cpp
 else:SOURCES += kernel/qnetworkproxy_generic.cpp
diff --git a/src/network/kernel/qauthenticator.cpp b/src/network/kernel/qauthenticator.cpp
index d0e60f7..fc9ff8b 100644
--- a/src/network/kernel/qauthenticator.cpp
+++ b/src/network/kernel/qauthenticator.cpp
@@ -64,7 +64,7 @@ static QByteArray qNtlmPhase3(QAuthenticatorPrivate *ctx, const QByteArray& phas
   \since 4.3
 
   \reentrant
-  \ingroup io
+  \ingroup network
   \inmodule QtNetwork
 
   The QAuthenticator class is usually used in the
diff --git a/src/network/kernel/qhostaddress.cpp b/src/network/kernel/qhostaddress.cpp
index b47d20d..5336a1e 100644
--- a/src/network/kernel/qhostaddress.cpp
+++ b/src/network/kernel/qhostaddress.cpp
@@ -419,7 +419,7 @@ void QNetmaskAddress::setPrefixLength(QAbstractSocket::NetworkLayerProtocol prot
 /*!
     \class QHostAddress
     \brief The QHostAddress class provides an IP address.
-    \ingroup io
+    \ingroup network
     \inmodule QtNetwork
 
     This class holds an IPv4 or IPv6 address in a platform- and
diff --git a/src/network/kernel/qhostinfo.cpp b/src/network/kernel/qhostinfo.cpp
index 59901ee..c8def4a 100644
--- a/src/network/kernel/qhostinfo.cpp
+++ b/src/network/kernel/qhostinfo.cpp
@@ -74,7 +74,7 @@ void QHostInfoAgent::staticCleanup()
 
     \reentrant
     \inmodule QtNetwork
-    \ingroup io
+    \ingroup network
 
     QHostInfo uses the lookup mechanisms provided by the operating
     system to find the IP address(es) associated with a host name,
diff --git a/src/network/kernel/qnetworkinterface.cpp b/src/network/kernel/qnetworkinterface.cpp
index 8677fcf..9f4b3f8 100644
--- a/src/network/kernel/qnetworkinterface.cpp
+++ b/src/network/kernel/qnetworkinterface.cpp
@@ -148,7 +148,7 @@ QString QNetworkInterfacePrivate::makeHwAddress(int len, uchar *data)
 
     \since 4.2
     \reentrant
-    \ingroup io
+    \ingroup network
 
     Each network interface can contain zero or more IP addresses, which
     in turn can be associated with a netmask and/or a broadcast
@@ -332,7 +332,7 @@ void QNetworkAddressEntry::setBroadcast(const QHostAddress &newBroadcast)
 
     \since 4.2
     \reentrant
-    \ingroup io
+    \ingroup network
 
     QNetworkInterface represents one network interface attached to the
     host where the program is being run. Each network interface may
diff --git a/src/network/kernel/qnetworkproxy.cpp b/src/network/kernel/qnetworkproxy.cpp
index 4a8d997..0fa54ed 100644
--- a/src/network/kernel/qnetworkproxy.cpp
+++ b/src/network/kernel/qnetworkproxy.cpp
@@ -48,7 +48,7 @@
     \brief The QNetworkProxy class provides a network layer proxy.
 
     \reentrant
-    \ingroup io
+    \ingroup network
     \inmodule QtNetwork
 
     QNetworkProxy provides the method for configuring network layer
@@ -1118,7 +1118,7 @@ void QNetworkProxyQuery::setUrl(const QUrl &url)
     \brief The QNetworkProxyFactory class provides fine-grained proxy selection.
     \since 4.5
 
-    \ingroup io
+    \ingroup network
     \inmodule QtNetwork
 
     QNetworkProxyFactory is an extension to QNetworkProxy, allowing
diff --git a/src/network/kernel/qurlinfo.cpp b/src/network/kernel/qurlinfo.cpp
index 626bce2..5ab200c 100644
--- a/src/network/kernel/qurlinfo.cpp
+++ b/src/network/kernel/qurlinfo.cpp
@@ -85,7 +85,7 @@ public:
     \brief The QUrlInfo class stores information about URLs.
 
     \ingroup io
-    \ingroup misc
+    \ingroup network
 
     The information about a URL that can be retrieved includes name(),
     permissions(), owner(), group(), size(), lastModified(),
diff --git a/src/network/socket/qabstractsocket.cpp b/src/network/socket/qabstractsocket.cpp
index 9b50840..c38152a 100644
--- a/src/network/socket/qabstractsocket.cpp
+++ b/src/network/socket/qabstractsocket.cpp
@@ -48,7 +48,7 @@
     common to all socket types.
 
     \reentrant
-    \ingroup io
+    \ingroup network
     \inmodule QtNetwork
 
     QAbstractSocket is the base class for QTcpSocket and QUdpSocket
diff --git a/src/network/socket/qnativesocketengine.cpp b/src/network/socket/qnativesocketengine.cpp
index a2f88d7..f8e27e9 100644
--- a/src/network/socket/qnativesocketengine.cpp
+++ b/src/network/socket/qnativesocketengine.cpp
@@ -47,7 +47,7 @@
     \brief The QNativeSocketEngine class provides low level access to a socket.
 
     \reentrant
-    \ingroup io
+    \ingroup network
     \inmodule QtNetwork
 
     QtSocketLayer provides basic socket functionality provided by the
diff --git a/src/network/socket/qtcpserver.cpp b/src/network/socket/qtcpserver.cpp
index 26e3c24..b13a50b 100644
--- a/src/network/socket/qtcpserver.cpp
+++ b/src/network/socket/qtcpserver.cpp
@@ -46,7 +46,7 @@
     \brief The QTcpServer class provides a TCP-based server.
 
     \reentrant
-    \ingroup io
+    \ingroup network
     \inmodule QtNetwork
 
     This class makes it possible to accept incoming TCP connections.
diff --git a/src/network/socket/qtcpsocket.cpp b/src/network/socket/qtcpsocket.cpp
index af1cee7..604143a 100644
--- a/src/network/socket/qtcpsocket.cpp
+++ b/src/network/socket/qtcpsocket.cpp
@@ -47,7 +47,7 @@
     \brief The QTcpSocket class provides a TCP socket.
 
     \reentrant
-    \ingroup io
+    \ingroup network
     \inmodule QtNetwork
 
     TCP (Transmission Control Protocol) is a reliable,
diff --git a/src/network/socket/qudpsocket.cpp b/src/network/socket/qudpsocket.cpp
index be86f44..5483ece 100644
--- a/src/network/socket/qudpsocket.cpp
+++ b/src/network/socket/qudpsocket.cpp
@@ -46,7 +46,7 @@
     \reentrant
     \brief The QUdpSocket class provides a UDP socket.
 
-    \ingroup io
+    \ingroup network
     \inmodule QtNetwork
 
     UDP (User Datagram Protocol) is a lightweight, unreliable,
diff --git a/src/network/ssl/qssl.cpp b/src/network/ssl/qssl.cpp
index c4f792e..1913b49 100644
--- a/src/network/ssl/qssl.cpp
+++ b/src/network/ssl/qssl.cpp
@@ -49,7 +49,8 @@ QT_BEGIN_NAMESPACE
     \brief The QSsl namespace declares enums common to all SSL classes in QtNetwork.
     \since 4.3
 
-    \ingroup io
+    \ingroup network
+    \ingroup ssl
     \inmodule QtNetwork
 */
 
diff --git a/src/network/ssl/qsslcertificate.cpp b/src/network/ssl/qsslcertificate.cpp
index 4950d2d..2ea6d9f 100644
--- a/src/network/ssl/qsslcertificate.cpp
+++ b/src/network/ssl/qsslcertificate.cpp
@@ -46,7 +46,7 @@
     \since 4.3
 
     \reentrant
-    \ingroup io
+    \ingroup network
     \ingroup ssl
     \inmodule QtNetwork
 
@@ -686,7 +686,7 @@ static bool matchLineFeed(const QByteArray &pem, int *offset)
         ch = pem.at(++*offset);
 
     if (ch == '\n') {
-        *offset++;
+        *offset += 1;
         return true;
     }
     if (ch == '\r' && pem.size() > (*offset + 1) && pem.at(*offset + 1) == '\n') {
diff --git a/src/network/ssl/qsslcipher.cpp b/src/network/ssl/qsslcipher.cpp
index 81e7997..b44fde2 100644
--- a/src/network/ssl/qsslcipher.cpp
+++ b/src/network/ssl/qsslcipher.cpp
@@ -46,7 +46,7 @@
     \since 4.3
 
     \reentrant
-    \ingroup io
+    \ingroup network
     \ingroup ssl
     \inmodule QtNetwork
 
diff --git a/src/network/ssl/qsslconfiguration.cpp b/src/network/ssl/qsslconfiguration.cpp
index f207e99..87db324 100644
--- a/src/network/ssl/qsslconfiguration.cpp
+++ b/src/network/ssl/qsslconfiguration.cpp
@@ -66,7 +66,7 @@ template<> void QSharedDataPointer<QSslConfigurationPrivate>::detach()
 
     \reentrant
     \inmodule QtNetwork
-    \ingroup io
+    \ingroup network
     \ingroup ssl
 
     QSslConfiguration is used by Qt networking classes to relay
diff --git a/src/network/ssl/qsslerror.cpp b/src/network/ssl/qsslerror.cpp
index cc55887..d8c2c7a 100644
--- a/src/network/ssl/qsslerror.cpp
+++ b/src/network/ssl/qsslerror.cpp
@@ -46,7 +46,7 @@
     \since 4.3
 
     \reentrant
-    \ingroup io
+    \ingroup network
     \ingroup ssl
     \inmodule QtNetwork
 
diff --git a/src/network/ssl/qsslkey.cpp b/src/network/ssl/qsslkey.cpp
index ef493e9..474e5ee 100644
--- a/src/network/ssl/qsslkey.cpp
+++ b/src/network/ssl/qsslkey.cpp
@@ -46,7 +46,7 @@
     \since 4.3
 
     \reentrant
-    \ingroup io
+    \ingroup network
     \ingroup ssl
     \inmodule QtNetwork
 
diff --git a/src/network/ssl/qsslsocket.cpp b/src/network/ssl/qsslsocket.cpp
index 390b1fc..cdbcb86 100644
--- a/src/network/ssl/qsslsocket.cpp
+++ b/src/network/ssl/qsslsocket.cpp
@@ -49,7 +49,7 @@
     \since 4.3
 
     \reentrant
-    \ingroup io
+    \ingroup network
     \ingroup ssl
     \inmodule QtNetwork
 
diff --git a/src/network/ssl/ssl.pri b/src/network/ssl/ssl.pri
index d07f406..72ea80f 100644
--- a/src/network/ssl/ssl.pri
+++ b/src/network/ssl/ssl.pri
@@ -35,5 +35,5 @@ symbian {
     RESOURCES += network.qrc
 
     # Add optional SSL libs
-    LIBS += $$OPENSSL_LIBS
+    LIBS_PRIVATE += $$OPENSSL_LIBS
 }