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

Conflicts:
	tests/auto/corelib/io/qfile/tst_qfile.cpp
	tests/auto/corelib/io/qprocess/tst_qprocess.cpp
	tests/auto/corelib/tools/qversionnumber/qversionnumber.pro

Change-Id: Ia93ce500349d96a2fbf0b4a37b73f088cc505c6e

5 files changed, 11 insertions, 11 deletions

diff --git a/src/tools/qdoc/doc/examples/examples.qdoc b/src/tools/qdoc/doc/examples/examples.qdoc
index ce67dea20e..28810e30da 100644
--- a/src/tools/qdoc/doc/examples/examples.qdoc
+++ b/src/tools/qdoc/doc/examples/examples.qdoc
@@ -89,9 +89,9 @@
     \title UI Components
     \brief Basic set of UI components
 
-    This is a listing of a list of UI components implemented by QML types.
-    These files are available for general import and they are based off the
-    \e {Qt Quick Code Samples}.
+    This is a listing of a list of UI components implemented by QML types. These
+    files are available for general import and they are based on the
+    \l{Qt Quick Examples and Tutorials}{Qt Quick Code Samples}.
 
     This module is part of the \l{componentset}{UIComponents} example.
 */
diff --git a/src/tools/qdoc/doc/qdoc-manual-contextcmds.qdoc b/src/tools/qdoc/doc/qdoc-manual-contextcmds.qdoc
index a2e851293c..d707c77cfb 100644
--- a/src/tools/qdoc/doc/qdoc-manual-contextcmds.qdoc
+++ b/src/tools/qdoc/doc/qdoc-manual-contextcmds.qdoc
@@ -269,7 +269,7 @@
         library.} It is provided to keep old source code
         working. We strongly advise against using it in new
         code. See the \l
-        {http://doc.qt.digia.com/4.0/porting4.html} {Porting
+        {http://doc.qt.io/qt-4.8/porting4.html} {Porting
         Guide} for more information.
     \endquotation
 
diff --git a/src/tools/qdoc/doc/qdoc-manual-qdocconf.qdoc b/src/tools/qdoc/doc/qdoc-manual-qdocconf.qdoc
index d490f8549a..69980c1e18 100644
--- a/src/tools/qdoc/doc/qdoc-manual-qdocconf.qdoc
+++ b/src/tools/qdoc/doc/qdoc-manual-qdocconf.qdoc
@@ -1392,8 +1392,8 @@
     \endcode
 
     The complete variable entry in \l qtgui.qdocconf provides the
-    standard header of the \l {http://doc.qt.digia.com/}
-    {Qt Reference Documentation}.
+    standard header of the \l {http://doc.qt.io/qt-5/qtgui-index.html}
+    {Qt GUI Documentation}.
 
     \target HTML.style-variable
     \section1 HTML.style
@@ -1521,7 +1521,7 @@
 
     This makes sure that whenever \c qt.index is used to generate
     references to for example Qt classes, the base URL is \c
-    http://doc.qt.digia.com/4.7.
+    http://doc.qt.io/qt-4.8/.
 
     See also \l indexes.
 
diff --git a/src/tools/qdoc/doc/qdoc-manual-topiccmds.qdoc b/src/tools/qdoc/doc/qdoc-manual-topiccmds.qdoc
index 306fc40cb8..1dfd031633 100644
--- a/src/tools/qdoc/doc/qdoc-manual-topiccmds.qdoc
+++ b/src/tools/qdoc/doc/qdoc-manual-topiccmds.qdoc
@@ -812,7 +812,7 @@
 
                    <tr valign="top" bgcolor="#d0d0d0">
                    <td><b>
-                   <a href="http://doc.qt.digia.com/4.0/qftp.html">QFtp</a>
+                   <a href="http://doc.qt.io/archives/qt-4.7/qftp.html">QFtp</a>
                    </b></td>
                    <td>
                    Implementation of the FTP protocol
@@ -885,7 +885,7 @@
                <pre>#include &lt;Qt&gt;</pre>
                <ul>
                <li>
-               <a href="http://doc.qt.digia.com/4.0/qt-qt3.html">
+               <a href="http://doc.qt.io/archives/qt-4.7/qt-qt3.html">
                    Qt 3 support members</a></li>
                </ul>
 
@@ -893,7 +893,7 @@
                <h3>Types</h3>
                <ul>
                <li>flags
-               <a href="http://doc.qt.digia.com/4.0/qt.html#AlignmentFlag-enum">Alignment</a></b></li>
+               <a href="http://doc.qt.io/archives/qt-4.7/qt.html#AlignmentFlag-enum">Alignment</a></b></li>
                <li>...</li></ul>
                <hr />
                \endraw
diff --git a/src/tools/qdoc/doc/qdoc-minimum-qdocconf.qdoc b/src/tools/qdoc/doc/qdoc-minimum-qdocconf.qdoc
index 66ceed4a3d..1fcd23a0f8 100644
--- a/src/tools/qdoc/doc/qdoc-minimum-qdocconf.qdoc
+++ b/src/tools/qdoc/doc/qdoc-minimum-qdocconf.qdoc
@@ -26,7 +26,7 @@
 ****************************************************************************/
 /*!
 \page qdoc-minimum-qdocconf.html
-\target minimal-qdocconf
+\keyword minimal-qdocconf
 \title A Minimal qdocconf File
 
 \brief Describes a minimal .qdocconf file