Merge remote-tracking branch 'origin/4.7' into qt-master-from-4.7

Conflicts:
	doc/src/development/qmake-manual.qdoc
	mkspecs/symbian-gcce/qmake.conf
	qmake/project.cpp
	src/corelib/global/qnamespace.qdoc
	src/declarative/graphicsitems/qdeclarativetext.cpp
	src/gui/text/qtextdocumentlayout.cpp
	src/gui/text/qtextdocumentlayout_p.h
	tests/auto/declarative/qdeclarativetext/tst_qdeclarativetext.cpp
	tests/auto/networkselftest/networkselftest.pro
	tests/auto/qscriptengine/tst_qscriptengine.cpp
	tools/designer/src/components/signalsloteditor/signalslot_utils.cpp
	tools/designer/src/components/signalsloteditor/signalsloteditorwindow.cpp
	tools/qdoc3/test/qt-build-docs.qdocconf
	tools/qdoc3/test/qt-html-templates.qdocconf
	tools/qdoc3/test/qt-html-templates_zh_CN.qdocconf
	tools/qdoc3/test/qt.qdocconf
	tools/qdoc3/test/qt_ja_JP.qdocconf
	tools/qdoc3/test/qt_zh_CN.qdocconf

3 files changed, 22 insertions, 12 deletions

diff --git a/src/qt3support/network/q3dns.cpp b/src/qt3support/network/q3dns.cpp
index c95edc1..d489652 100644
--- a/src/qt3support/network/q3dns.cpp
+++ b/src/qt3support/network/q3dns.cpp
@@ -2009,15 +2009,20 @@ Q3ValueList<QHostAddress> Q3Dns::addresses() const
     \class Q3Dns::MailServer
     \brief The Q3Dns::MailServer class is  described in Q3Dns::mailServers().
 
-    \internal
+*/
+
+
+/*! \fn Q3Dns::MailServer::MailServer(const QString& n, Q_UINT16 p)
+  The constructor sets the public data members name and priority.
+  \a n is the name and \a p is the priority.
 */
 
 /*!
     Returns a list of mail servers if the record type is \c Mx. The
     class Q3Dns::MailServer contains the following public variables:
     \list
-    \i QString Q3Dns::MailServer::name
-    \i Q_UINT16 Q3Dns::MailServer::priority
+    \o QString Q3Dns::MailServer::name
+    \o Q_UINT16 Q3Dns::MailServer::priority
     \endlist
 
     Note that if you want to iterate over the list, you should iterate
@@ -2048,22 +2053,26 @@ Q3ValueList<Q3Dns::MailServer> Q3Dns::mailServers() const
     return result;
 }
 
-
 /*!
     \class Q3Dns::Server
     \brief The Q3Dns::Server class is described in Q3Dns::servers().
 
-    \internal
+*/
+
+/*! \fn Q3Dns::Server::Server(const QString& n, Q_UINT16 p, Q_UINT16 w, Q_UINT16 po)
+  The constructor sets the public data members name, priority,
+  weight, and port. \a n is the name, \a p is the priority,
+  \a w is the weight, and \a po is the port.
 */
 
 /*!
     Returns a list of servers if the record type is \c Srv. The class
     Q3Dns::Server contains the following public variables:
     \list
-    \i QString Q3Dns::Server::name
-    \i Q_UINT16 Q3Dns::Server::priority
-    \i Q_UINT16 Q3Dns::Server::weight
-    \i Q_UINT16 Q3Dns::Server::port
+    \o QString Q3Dns::Server::name
+    \o Q_UINT16 Q3Dns::Server::priority
+    \o Q_UINT16 Q3Dns::Server::weight
+    \o Q_UINT16 Q3Dns::Server::port
     \endlist
 
     Note that if you want to iterate over the list, you should iterate
diff --git a/src/qt3support/tools/q3memarray.qdoc b/src/qt3support/tools/q3memarray.qdoc
index 9f2f1cc..f05f433 100644
--- a/src/qt3support/tools/q3memarray.qdoc
+++ b/src/qt3support/tools/q3memarray.qdoc
@@ -221,8 +221,8 @@
 
     New elements are not initialized.
 
-    \a optim is either Q3GArray::MemOptim (the default) or
-    Q3GArray::SpeedOptim. When optimizing for speed rather than memory
+    \a optim is either \c MemOptim (the default) or
+    \c SpeedOptim. When optimizing for speed rather than memory
     consumption, the array uses a smart grow and shrink algorithm that
     might allocate more memory than is actually needed for \a size
     elements. This speeds up subsequent resize operations, for example
diff --git a/src/qt3support/tools/q3ptrlist.qdoc b/src/qt3support/tools/q3ptrlist.qdoc
index c4fdf4f..13e478e 100644
--- a/src/qt3support/tools/q3ptrlist.qdoc
+++ b/src/qt3support/tools/q3ptrlist.qdoc
@@ -93,7 +93,8 @@
     also holds pointers to the next and previous list items. The
     functions currentNode(), removeNode(), and takeNode() operate
     directly on the Q3LNode, but they should be used with care. The
-    data component of the node is available through Q3LNode::getData().
+    data component of the node is available through Q3LNode's getData()
+    function.
 
     The Q3StrList class is a list of \c char*.
     It reimplements newItem(), deleteItem() and compareItems(). (But