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

1 files changed, 5 insertions, 5 deletions

diff --git a/src/network/access/qhttp.cpp b/src/network/access/qhttp.cpp
index 1f27742986..17ea6dfc8b 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.