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

4 files changed, 9 insertions, 9 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