Merge remote-tracking branch 'origin/stable' into dev

Conflicts:
	src/concurrent/doc/qtconcurrent.qdocconf
	src/corelib/doc/qtcore.qdocconf
	src/corelib/global/qglobal.h
	src/dbus/doc/qtdbus.qdocconf
	src/dbus/qdbusmessage.h
	src/gui/doc/qtgui.qdocconf
	src/gui/image/qimagereader.cpp
	src/network/doc/qtnetwork.qdocconf
	src/opengl/doc/qtopengl.qdocconf
	src/opengl/qgl.h
	src/plugins/platforms/windows/qwindowswindow.cpp
	src/printsupport/doc/qtprintsupport.qdocconf
	src/sql/doc/qtsql.qdocconf
	src/testlib/doc/qttestlib.qdocconf
	src/tools/qdoc/doc/config/qt-cpp-ignore.qdocconf
	src/widgets/doc/qtwidgets.qdocconf
	src/xml/doc/qtxml.qdocconf

Change-Id: Ie9a1fa2cc44bec22a0b942e817a1095ca3414629

5 files changed, 12 insertions, 12 deletions

diff --git a/src/xml/doc/qtxml.qdocconf b/src/xml/doc/qtxml.qdocconf
index 028af1bf76..4e8cf34b0c 100644
--- a/src/xml/doc/qtxml.qdocconf
+++ b/src/xml/doc/qtxml.qdocconf
@@ -2,22 +2,22 @@ include($QT_INSTALL_DOCS/global/qt-module-defaults.qdocconf)
 
 project                 = QtXml
 description             = Qt XML Reference Documentation
-url                     = http://qt-project.org/doc/qtxml
-version                 = 5.1.0
+url                     = http://qt-project.org/doc/qt-$QT_VER/qtxml
+version                 = $QT_VERSION
 
 examplesinstallpath     = xml
 
 qhp.projects            = QtXml
 
 qhp.QtXml.file            = qtxml.qhp
-qhp.QtXml.namespace           = org.qt-project.qtxml.510
+qhp.QtXml.namespace           = org.qt-project.qtxml.$QT_VERSION_TAG
 qhp.QtXml.virtualFolder       = qtxml
 qhp.QtXml.indexTitle          = Qt XML
 qhp.QtXml.indexRoot           =
 
-qhp.QtXml.filterAttributes    = qtxml 5.1.0 qtrefdoc
-qhp.QtXml.customFilters.Qt.name = QtXml 5.1.0
-qhp.QtXml.customFilters.Qt.filterAttributes = qtxml 5.1.0
+qhp.QtXml.filterAttributes    = qtxml $QT_VERSION qtrefdoc
+qhp.QtXml.customFilters.Qt.name = QtXml $QT_VERSION
+qhp.QtXml.customFilters.Qt.filterAttributes = qtxml $QT_VERSION
 
 qhp.QtXml.subprojects         = classes
 qhp.QtXml.subprojects.classes.title = C++ Classes
diff --git a/src/xml/doc/snippets/code/src_xml_dom_qdom.cpp b/src/xml/doc/snippets/code/src_xml_dom_qdom.cpp
index 367bd22bbe..6b7a9bfbce 100644
--- a/src/xml/doc/snippets/code/src_xml_dom_qdom.cpp
+++ b/src/xml/doc/snippets/code/src_xml_dom_qdom.cpp
@@ -108,7 +108,7 @@ QDomElement element4 = document.createElement("MyElement");
 
 
 //! [7]
-<link href="http://qt.nokia.com" color="red" />
+<link href="http://qt-project.org" color="red" />
 //! [7]
 
 
@@ -116,10 +116,10 @@ QDomElement element4 = document.createElement("MyElement");
 QDomElement e = //...
 //...
 QDomAttr a = e.attributeNode("href");
-cout << a.value() << endl;                // prints "http://qt.nokia.com"
-a.setValue("http://qt.nokia.com/doc"); // change the node's attribute
+cout << a.value() << endl;                // prints "http://qt-project.org"
+a.setValue("http://qt-project.org/doc"); // change the node's attribute
 QDomAttr a2 = e.attributeNode("href");
-cout << a2.value() << endl;               // prints "http://qt.nokia.com/doc"
+cout << a2.value() << endl;               // prints "http://qt-project.org/doc"
 //! [8]
 
 
diff --git a/src/xml/doc/snippets/rsslisting/rsslisting.cpp b/src/xml/doc/snippets/rsslisting/listing.cpp
index c62212713c..c62212713c 100644
--- a/src/xml/doc/snippets/rsslisting/rsslisting.cpp
+++ b/src/xml/doc/snippets/rsslisting/listing.cpp
diff --git a/src/xml/dom/qdom.cpp b/src/xml/dom/qdom.cpp
index 6b0fbd4baf..c37172a187 100644
--- a/src/xml/dom/qdom.cpp
+++ b/src/xml/dom/qdom.cpp
@@ -261,7 +261,7 @@ public:
     /**
      * If true, then the node will redirect insert/remove calls
      * to its parent by calling QDomNodePrivate::appendChild or removeChild.
-     * In addition the map wont increase or decrease the reference count
+     * In addition the map won't increase or decrease the reference count
      * of the nodes it contains.
      *
      * By default this value is false and the map will handle reference counting
diff --git a/src/xml/sax/qxml.cpp b/src/xml/sax/qxml.cpp
index 18673dd5e6..689c75774e 100644
--- a/src/xml/sax/qxml.cpp
+++ b/src/xml/sax/qxml.cpp
@@ -2365,7 +2365,7 @@ events are reported.
     it we can use the same handler for both of the following
     reader functions:
 
-    \snippet rsslisting/rsslisting.cpp 0
+    \snippet rsslisting/listing.cpp 0
 
     Since the reader will inform the handler of parsing errors, it is
     necessary to reimplement QXmlErrorHandler::fatalError() if, for