Merge remote-tracking branch 'origin/5.4' into 5.5

Conflicts:
	examples/xml/htmlinfo/simpleexample.html
	examples/xml/rsslisting/rsslisting.cpp
	qmake/generators/win32/msbuild_objectmodel.cpp
	src/3rdparty/harfbuzz-ng/src/hb-private.hh
	src/corelib/global/qlogging.cpp
	src/corelib/io/qstorageinfo_unix.cpp
	src/corelib/thread/qwaitcondition_unix.cpp
	src/gui/kernel/qguiapplication.cpp
	src/plugins/platforms/linuxfb/qlinuxfbintegration.cpp
	src/testlib/doc/src/qt-webpages.qdoc
	tests/auto/other/qaccessibility/tst_qaccessibility.cpp

Change-Id: Ib272ff0bc30a1a5d51275eb3cd2f201dc82c11ff

1 files changed, 12 insertions, 12 deletions

diff --git a/src/tools/qdoc/doc/qdoc-manual-markupcmds.qdoc b/src/tools/qdoc/doc/qdoc-manual-markupcmds.qdoc
index b3f4f29f0b..f341699ee8 100644
--- a/src/tools/qdoc/doc/qdoc-manual-markupcmds.qdoc
+++ b/src/tools/qdoc/doc/qdoc-manual-markupcmds.qdoc
@@ -1479,10 +1479,10 @@
                \printuntil hello
 
                First we create a \l
-               {http://qt-project.org/doc/qt-5.0/qtwidgets/qapplication.html} {QApplication}
+               {http://doc.qt.io/qt-5/qapplication.html} {QApplication}
                object using the \c argc and \c argv parameters, then we
                create a \l
-               {http://qt-project.org/doc/qt-5.0/qtwidgets/qpushbutton.html} {QPushButton}.
+               {http://doc.qt.io/qt-5/qpushbutton.html} {QPushButton}.
            \endquotation
 
     See also \l {printline-command} {\\printline} and \l
@@ -1782,7 +1782,7 @@
 
     \code
        / *!
-          Read the \l {http://qt-project.org/doc/qt-5.0/}
+          Read the \l {http://doc.qt.io/qt-5/}
           {Qt 5.0 Documentation} carefully.
        * /
     \endcode
@@ -1790,7 +1790,7 @@
     QDoc renders this as:
 
     \quotation
-       Read the \l {http://qt-project.org/doc/qt-5.0/}
+       Read the \l {http://doc.qt.io/qt-5/}
        {Qt 5.0 Documentation} carefully.
     \endquotation
 
@@ -2419,7 +2419,7 @@
 
                <tr valign="top" bgcolor="#d0d0d0">
                    <td>
-                   <a href="http://qt-project.org/doc/qt-5.0/qtcore/signalsandslots.html">
+                   <a href="http://doc.qt.io/qt-5/signalsandslots.html">
                        Signals and Slots</a>
                    </td>
                    <td>Signals and slots are used for communication
@@ -2428,7 +2428,7 @@
 
                <tr valign="top" bgcolor="#c0c0c0">
                    <td>
-                   <a href="http://qt-project.org/doc/qt-5.0/qtwidgets/layout.html">
+                   <a href="http://doc.qt.io/qt-5/layout.html">
                        Layout Management</a></td>
                    <td>The Qt layout system provides a simple
                        and powerful way of specifying the layout
@@ -2437,7 +2437,7 @@
 
                <tr valign="top" bgcolor="#d0d0d0">
                    <td>
-                   <a href="http://qt-project.org/doc/qt-5.0/qtgui/dnd.html">
+                   <a href="http://doc.qt.io/qt-5/dnd.html">
                        Drag and Drop</a></td>
                    <td>Drag and drop provides a simple visual
                        mechanism which users can use to transfer
@@ -2538,7 +2538,7 @@
 
                <tr valign="top" bgcolor="#d0d0d0">
                    <td>
-                   <a href="http://qt-project.org/doc/qt-5.0/qtcore/signalsandslots.html">
+                   <a href="http://doc.qt.io/qt-5/signalsandslots.html">
                        Signals and Slots</a>
                    </td>
                    <td>Signals and slots are used for communication
@@ -2600,7 +2600,7 @@
 
                <tr valign="top" bgcolor="#d0d0d0">
                    <td>
-                   <a href="http://qt-project.org/doc/qt-5.0/qtcore/signalsandslots.html">
+                   <a href="http://doc.qt.io/qt-5/signalsandslots.html">
                        Signals and Slots</a>
                    </td>
                    <td>Signals and slots are used for communication
@@ -2609,7 +2609,7 @@
 
                <tr valign="top" bgcolor="#c0c0c0">
                    <td>
-                   <a href="http://qt-project.org/doc/qt-5.0/qtwidgets/layout.html">
+                   <a href="http://doc.qt.io/qt-5/layout.html">
                        Layout Management</a></td>
                    <td>The Qt layout system provides a simple
                        and powerful way of specifying the layout
@@ -2618,7 +2618,7 @@
 
                <tr valign="top" bgcolor="#d0d0d0">
                    <td>
-                   <a href="http://qt-project.org/doc/qt-5.0/qtgui/dnd.html">
+                   <a href="http://doc.qt.io/qt-5/dnd.html">
                        Drag and Drop</a></td>
                    <td>Drag and drop provides a simple visual
                        mechanism which users can use to transfer
@@ -3036,7 +3036,7 @@
            \quotation
                \raw HTML
                    <h3>geometry :
-                   <a href="http://qt-project.org/doc/qt-5.0/qtcore/qrect.html">QRect</a>
+                   <a href="http://doc.qt.io/qt-5/qrect.html">QRect</a>
                    </h3>
                \endraw