Merge commit 'qt/master-stable'

Conflicts:
	configure.exe
	qmake/Makefile.unix
	qmake/generators/makefile.cpp
	src/corelib/global/qglobal.h
	src/corelib/kernel/kernel.pri
	src/corelib/kernel/qcoreevent.cpp
	src/corelib/kernel/qsharedmemory_unix.cpp
	src/gui/graphicsview/qgraphicsscene.cpp
	src/gui/kernel/qaction.cpp
	src/gui/kernel/qaction.h
	src/gui/kernel/qaction_p.h
	src/gui/kernel/qapplication.cpp
	src/gui/kernel/qapplication.h
	src/gui/kernel/qwidget.cpp
	src/gui/kernel/qwidget.h
	src/gui/kernel/qwidget_mac.mm
	src/gui/painting/qgraphicssystemfactory.cpp
	src/gui/styles/qwindowsstyle.cpp
	src/gui/text/qfontengine_qpf.cpp
	src/gui/widgets/qabstractscrollarea_p.h
	src/network/access/qnetworkaccessdebugpipebackend.cpp
	src/network/socket/qlocalsocket_unix.cpp
	src/network/socket/qnativesocketengine_p.h
	src/network/socket/qnativesocketengine_unix.cpp
	src/openvg/qpaintengine_vg.cpp
	tests/auto/q3sqlcursor/tst_q3sqlcursor.cpp
	tests/auto/qcssparser/qcssparser.pro
	tests/auto/qdir/tst_qdir.cpp
	tests/auto/qfile/tst_qfile.cpp
	tests/auto/qobject/tst_qobject.cpp
	tests/auto/qpathclipper/qpathclipper.pro
	tests/auto/qprocess/tst_qprocess.cpp
	tests/auto/qsettings/tst_qsettings.cpp
	tests/auto/qsharedpointer/qsharedpointer.pro
	tests/auto/qsqlquerymodel/qsqlquerymodel.pro
	tests/auto/qsqlrelationaltablemodel/qsqlrelationaltablemodel.pro
	tests/auto/qsqltablemodel/qsqltablemodel.pro
	tests/auto/qsqlthread/qsqlthread.pro
	tests/auto/qwidget/tst_qwidget.cpp

1 files changed, 26 insertions, 26 deletions

diff --git a/src/xml/sax/qxml.cpp b/src/xml/sax/qxml.cpp
index dec273d..125e939 100644
--- a/src/xml/sax/qxml.cpp
+++ b/src/xml/sax/qxml.cpp
@@ -2411,7 +2411,7 @@ events are reported.
 /*!
     \reimp
 
-    Does nothing.
+    This reimplementation does nothing.
 */
 void QXmlDefaultHandler::setDocumentLocator(QXmlLocator*)
 {
@@ -2420,7 +2420,7 @@ void QXmlDefaultHandler::setDocumentLocator(QXmlLocator*)
 /*!
     \reimp
 
-    Does nothing.
+    This reimplementation does nothing.
 */
 bool QXmlDefaultHandler::startDocument()
 {
@@ -2430,7 +2430,7 @@ bool QXmlDefaultHandler::startDocument()
 /*!
     \reimp
 
-    Does nothing.
+    This reimplementation does nothing.
 */
 bool QXmlDefaultHandler::endDocument()
 {
@@ -2440,7 +2440,7 @@ bool QXmlDefaultHandler::endDocument()
 /*!
     \reimp
 
-    Does nothing.
+    This reimplementation does nothing.
 */
 bool QXmlDefaultHandler::startPrefixMapping(const QString&, const QString&)
 {
@@ -2450,7 +2450,7 @@ bool QXmlDefaultHandler::startPrefixMapping(const QString&, const QString&)
 /*!
     \reimp
 
-    Does nothing.
+    This reimplementation does nothing.
 */
 bool QXmlDefaultHandler::endPrefixMapping(const QString&)
 {
@@ -2460,7 +2460,7 @@ bool QXmlDefaultHandler::endPrefixMapping(const QString&)
 /*!
     \reimp
 
-    Does nothing.
+    This reimplementation does nothing.
 */
 bool QXmlDefaultHandler::startElement(const QString&, const QString&,
         const QString&, const QXmlAttributes&)
@@ -2471,7 +2471,7 @@ bool QXmlDefaultHandler::startElement(const QString&, const QString&,
 /*!
     \reimp
 
-    Does nothing.
+    This reimplementation does nothing.
 */
 bool QXmlDefaultHandler::endElement(const QString&, const QString&,
         const QString&)
@@ -2482,7 +2482,7 @@ bool QXmlDefaultHandler::endElement(const QString&, const QString&,
 /*!
     \reimp
 
-    Does nothing.
+    This reimplementation does nothing.
 */
 bool QXmlDefaultHandler::characters(const QString&)
 {
@@ -2492,7 +2492,7 @@ bool QXmlDefaultHandler::characters(const QString&)
 /*!
     \reimp
 
-    Does nothing.
+    This reimplementation does nothing.
 */
 bool QXmlDefaultHandler::ignorableWhitespace(const QString&)
 {
@@ -2502,7 +2502,7 @@ bool QXmlDefaultHandler::ignorableWhitespace(const QString&)
 /*!
     \reimp
 
-    Does nothing.
+    This reimplementation does nothing.
 */
 bool QXmlDefaultHandler::processingInstruction(const QString&,
         const QString&)
@@ -2513,7 +2513,7 @@ bool QXmlDefaultHandler::processingInstruction(const QString&,
 /*!
     \reimp
 
-    Does nothing.
+    This reimplementation does nothing.
 */
 bool QXmlDefaultHandler::skippedEntity(const QString&)
 {
@@ -2523,7 +2523,7 @@ bool QXmlDefaultHandler::skippedEntity(const QString&)
 /*!
     \reimp
 
-    Does nothing.
+    This reimplementation does nothing.
 */
 bool QXmlDefaultHandler::warning(const QXmlParseException&)
 {
@@ -2533,7 +2533,7 @@ bool QXmlDefaultHandler::warning(const QXmlParseException&)
 /*!
     \reimp
 
-    Does nothing.
+    This reimplementation does nothing.
 */
 bool QXmlDefaultHandler::error(const QXmlParseException&)
 {
@@ -2543,7 +2543,7 @@ bool QXmlDefaultHandler::error(const QXmlParseException&)
 /*!
     \reimp
 
-    Does nothing.
+    This reimplementation does nothing.
 */
 bool QXmlDefaultHandler::fatalError(const QXmlParseException&)
 {
@@ -2553,7 +2553,7 @@ bool QXmlDefaultHandler::fatalError(const QXmlParseException&)
 /*!
     \reimp
 
-    Does nothing.
+    This reimplementation does nothing.
 */
 bool QXmlDefaultHandler::notationDecl(const QString&, const QString&,
         const QString&)
@@ -2564,7 +2564,7 @@ bool QXmlDefaultHandler::notationDecl(const QString&, const QString&,
 /*!
     \reimp
 
-    Does nothing.
+    This reimplementation does nothing.
 */
 bool QXmlDefaultHandler::unparsedEntityDecl(const QString&, const QString&,
         const QString&, const QString&)
@@ -2598,7 +2598,7 @@ QString QXmlDefaultHandler::errorString() const
 /*!
     \reimp
 
-    Does nothing.
+    This reimplementation does nothing.
 */
 bool QXmlDefaultHandler::startDTD(const QString&, const QString&, const QString&)
 {
@@ -2608,7 +2608,7 @@ bool QXmlDefaultHandler::startDTD(const QString&, const QString&, const QString&
 /*!
     \reimp
 
-    Does nothing.
+    This reimplementation does nothing.
 */
 bool QXmlDefaultHandler::endDTD()
 {
@@ -2618,7 +2618,7 @@ bool QXmlDefaultHandler::endDTD()
 /*!
     \reimp
 
-    Does nothing.
+    This reimplementation does nothing.
 */
 bool QXmlDefaultHandler::startEntity(const QString&)
 {
@@ -2628,7 +2628,7 @@ bool QXmlDefaultHandler::startEntity(const QString&)
 /*!
     \reimp
 
-    Does nothing.
+    This reimplementation does nothing.
 */
 bool QXmlDefaultHandler::endEntity(const QString&)
 {
@@ -2638,7 +2638,7 @@ bool QXmlDefaultHandler::endEntity(const QString&)
 /*!
     \reimp
 
-    Does nothing.
+    This reimplementation does nothing.
 */
 bool QXmlDefaultHandler::startCDATA()
 {
@@ -2648,7 +2648,7 @@ bool QXmlDefaultHandler::startCDATA()
 /*!
     \reimp
 
-    Does nothing.
+    This reimplementation does nothing.
 */
 bool QXmlDefaultHandler::endCDATA()
 {
@@ -2658,7 +2658,7 @@ bool QXmlDefaultHandler::endCDATA()
 /*!
     \reimp
 
-    Does nothing.
+    This reimplementation does nothing.
 */
 bool QXmlDefaultHandler::comment(const QString&)
 {
@@ -2668,7 +2668,7 @@ bool QXmlDefaultHandler::comment(const QString&)
 /*!
     \reimp
 
-    Does nothing.
+    This reimplementation does nothing.
 */
 bool QXmlDefaultHandler::attributeDecl(const QString&, const QString&, const QString&, const QString&, const QString&)
 {
@@ -2678,7 +2678,7 @@ bool QXmlDefaultHandler::attributeDecl(const QString&, const QString&, const QSt
 /*!
     \reimp
 
-    Does nothing.
+    This reimplementation does nothing.
 */
 bool QXmlDefaultHandler::internalEntityDecl(const QString&, const QString&)
 {
@@ -2688,7 +2688,7 @@ bool QXmlDefaultHandler::internalEntityDecl(const QString&, const QString&)
 /*!
     \reimp
 
-    Does nothing.
+    This reimplementation does nothing.
 */
 bool QXmlDefaultHandler::externalEntityDecl(const QString&, const QString&, const QString&)
 {